Skip to content

Commit

Permalink
linux-yocto/5.15: fix build_OID_registry buildpaths warning
Browse files Browse the repository at this point in the history
Integrating the following commit(s) to linux-yocto/5.15:

 Author: Bruce Ashfield <bruce.ashfield@gmail.com>
 Date:   Sun Jul 10 22:56:53 2022 -0400

    lib/build_OID_registry: fix reproducibility issues

    The script build_OID_registry captures the full path of itself
    in the generated data. This causes reproduciblity issues as the
    path is captured and packaged.

    We use the basename of the script instead, and that allows us
    to be reprodicible, with slightly less information captured in
    the output data (but the generating script can still easily
    be found).

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
  • Loading branch information
zeddii authored and rpurdie committed Jul 12, 2022
1 parent 1d63f81 commit 7084212
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}

SRCREV_machine ?= "9179770f29198c123b02f1d7cd20fb08c71c0159"
SRCREV_meta ?= "e532b0393413badf4f0df4b2337015efd8eae932"
SRCREV_machine ?= "4132e425a2dee778212b42d99a9812fe1c78a03d"
SRCREV_meta ?= "f122fe59e74365eba84bae800898ffd7329c628d"

SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
Expand Down
4 changes: 2 additions & 2 deletions meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"

SRCREV_machine ?= "7dc6451b61e67818fe461b950a3450bf9d06067c"
SRCREV_meta ?= "e532b0393413badf4f0df4b2337015efd8eae932"
SRCREV_machine ?= "b2dcc4f70362059ef107000f9be5c76c2886911c"
SRCREV_meta ?= "f122fe59e74365eba84bae800898ffd7329c628d"

PV = "${LINUX_VERSION}+git${SRCPV}"

Expand Down
22 changes: 11 additions & 11 deletions meta/recipes-kernel/linux/linux-yocto_5.15.bb
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ KBRANCH:qemux86 ?= "v5.15/standard/base"
KBRANCH:qemux86-64 ?= "v5.15/standard/base"
KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64"

SRCREV_machine:qemuarm ?= "51fc1677b3378d04bf6bc59f632d80c8a21e54fe"
SRCREV_machine:qemuarm64 ?= "5c9319fd04d643d55836b94f7eeb4dd7561ea197"
SRCREV_machine:qemumips ?= "78b65359d44c9ae535388dfc8bf06eb8dc8764dc"
SRCREV_machine:qemuppc ?= "dd1a7ce7eb8274e72507d634d9239109fdbebb85"
SRCREV_machine:qemuriscv64 ?= "0f586f4ee8adacac79b64d1f3d47799a5eb7fbea"
SRCREV_machine:qemuriscv32 ?= "0f586f4ee8adacac79b64d1f3d47799a5eb7fbea"
SRCREV_machine:qemux86 ?= "0f586f4ee8adacac79b64d1f3d47799a5eb7fbea"
SRCREV_machine:qemux86-64 ?= "0f586f4ee8adacac79b64d1f3d47799a5eb7fbea"
SRCREV_machine:qemumips64 ?= "a6f8486df096f727ec6233a152947d9bf26202bb"
SRCREV_machine ?= "0f586f4ee8adacac79b64d1f3d47799a5eb7fbea"
SRCREV_meta ?= "e532b0393413badf4f0df4b2337015efd8eae932"
SRCREV_machine:qemuarm ?= "3d2ffe77f277a0a650e7d012c5bfe3765a467e4b"
SRCREV_machine:qemuarm64 ?= "1da6524b1508ca6e9b6602471b478d310bec1960"
SRCREV_machine:qemumips ?= "4101fd448319edc00fec2bd822be407d19205bb9"
SRCREV_machine:qemuppc ?= "651a0112fb207bae1be0d2609e9a910135fb4feb"
SRCREV_machine:qemuriscv64 ?= "2fca0fd719812ea2ff67630b01355aa80481623e"
SRCREV_machine:qemuriscv32 ?= "2fca0fd719812ea2ff67630b01355aa80481623e"
SRCREV_machine:qemux86 ?= "2fca0fd719812ea2ff67630b01355aa80481623e"
SRCREV_machine:qemux86-64 ?= "2fca0fd719812ea2ff67630b01355aa80481623e"
SRCREV_machine:qemumips64 ?= "d518b9a80c938ca7ce11e56d2275c33b89dfc9c3"
SRCREV_machine ?= "2fca0fd719812ea2ff67630b01355aa80481623e"
SRCREV_meta ?= "f122fe59e74365eba84bae800898ffd7329c628d"

# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
# get the <version>/base branch, which is pure upstream -stable, and the same
Expand Down

0 comments on commit 7084212

Please sign in to comment.