diff options
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb | 14 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto.inc | 2 |
6 files changed, 10 insertions, 14 deletions
diff --git a/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb b/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb index 68d3f84c0b..48f012918a 100644 --- a/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb +++ b/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb | |||
@@ -23,17 +23,13 @@ if [ "\$1" != "-a" -o "\$2" != "-b" ]; then | |||
23 | echo "Usage: depmodwrapper -a -b rootfs KERNEL_VERSION" >&2 | 23 | echo "Usage: depmodwrapper -a -b rootfs KERNEL_VERSION" >&2 |
24 | exit 1 | 24 | exit 1 |
25 | fi | 25 | fi |
26 | if [ ! -r ${PKGDATA_DIR}/kernel-depmod/kernel-abiversion ]; then | 26 | |
27 | echo "Unable to read: ${PKGDATA_DIR}/kernel-depmod/kernel-abiversion" >&2 | 27 | kernelabi="" |
28 | else | 28 | if [ -r "${PKGDATA_DIR}/kernel-depmod/kernel-abiversion" ]; then |
29 | kernelabi=\$(cat ${PKGDATA_DIR}/kernel-depmod/kernel-abiversion) | 29 | kernelabi=\$(cat "${PKGDATA_DIR}/kernel-depmod/kernel-abiversion") |
30 | if [ "\$kernelabi" != "\$4" ]; then | ||
31 | echo "Error: Kernel version \$4 does not match kernel-abiversion (\$kernelabi)" >&2 | ||
32 | exit 1 | ||
33 | fi | ||
34 | fi | 30 | fi |
35 | 31 | ||
36 | if [ ! -r ${PKGDATA_DIR}/kernel-depmod/System.map-\$4 ]; then | 32 | if [ ! -r ${PKGDATA_DIR}/kernel-depmod/System.map-\$4 ] || [ "\$kernelabi" != "\$4" ]; then |
37 | echo "Unable to read: ${PKGDATA_DIR}/kernel-depmod/System.map-\$4" >&2 | 33 | echo "Unable to read: ${PKGDATA_DIR}/kernel-depmod/System.map-\$4" >&2 |
38 | exec env depmod "\$1" "\$2" "\$3" "\$4" | 34 | exec env depmod "\$1" "\$2" "\$3" "\$4" |
39 | else | 35 | else |
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb index fd31bf986c..40d6e4ac23 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb | |||
@@ -7,7 +7,7 @@ require recipes-kernel/linux/linux-yocto.inc | |||
7 | # to build multiple virtual/kernel providers, e.g. as dependency of | 7 | # to build multiple virtual/kernel providers, e.g. as dependency of |
8 | # core-image-rt-sdk, core-image-rt. | 8 | # core-image-rt-sdk, core-image-rt. |
9 | python () { | 9 | python () { |
10 | if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": | 10 | if d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": |
11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb index 25f3963c74..ed65f77a91 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb | |||
@@ -7,7 +7,7 @@ require recipes-kernel/linux/linux-yocto.inc | |||
7 | # to build multiple virtual/kernel providers, e.g. as dependency of | 7 | # to build multiple virtual/kernel providers, e.g. as dependency of |
8 | # core-image-rt-sdk, core-image-rt. | 8 | # core-image-rt-sdk, core-image-rt. |
9 | python () { | 9 | python () { |
10 | if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": | 10 | if d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": |
11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb index c1cbf35a25..e1547e9960 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb | |||
@@ -7,7 +7,7 @@ require recipes-kernel/linux/linux-yocto.inc | |||
7 | # to build multiple virtual/kernel providers, e.g. as dependency of | 7 | # to build multiple virtual/kernel providers, e.g. as dependency of |
8 | # core-image-rt-sdk, core-image-rt. | 8 | # core-image-rt-sdk, core-image-rt. |
9 | python () { | 9 | python () { |
10 | if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": | 10 | if d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": |
11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb index d225339c14..fa25629861 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb | |||
@@ -7,7 +7,7 @@ require recipes-kernel/linux/linux-yocto.inc | |||
7 | # to build multiple virtual/kernel providers, e.g. as dependency of | 7 | # to build multiple virtual/kernel providers, e.g. as dependency of |
8 | # core-image-rt-sdk, core-image-rt. | 8 | # core-image-rt-sdk, core-image-rt. |
9 | python () { | 9 | python () { |
10 | if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": | 10 | if d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": |
11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 9c1f61be75..8a70eb5018 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc | |||
@@ -12,7 +12,7 @@ INC_PR = "r4" | |||
12 | # PREFERRED_PROVIDER for virtual/kernel. This avoids network access required | 12 | # PREFERRED_PROVIDER for virtual/kernel. This avoids network access required |
13 | # by the use of AUTOREV SRCREVs, which are the default for this recipe. | 13 | # by the use of AUTOREV SRCREVs, which are the default for this recipe. |
14 | python () { | 14 | python () { |
15 | if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != d.getVar("PN"): | 15 | if d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel", True) != d.getVar("PN", True): |
16 | d.delVar("BB_DONT_CACHE") | 16 | d.delVar("BB_DONT_CACHE") |
17 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to %s to enable it" % (d.getVar("PN"))) | 17 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to %s to enable it" % (d.getVar("PN"))) |
18 | } | 18 | } |