diff options
author | Joel Stanley <joel@jms.id.au> | 2023-08-04 12:06:10 -0500 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-08-18 03:57:05 -1000 |
commit | 870d88bff479fd1fe8f1eb9ec97e0cf5fa27f0a0 (patch) | |
tree | 48e61fdebe618a1155aadc509722648dc8926474 | |
parent | c17b8013ce39cb07825e069fdd5592dd535a6b2d (diff) | |
download | poky-870d88bff479fd1fe8f1eb9ec97e0cf5fa27f0a0.tar.gz |
kernel: don't fail if Modules.symvers doesn't exist
Kernels that do not use modules do not have the Modules.symvers file,
which causes the previous one-liner to fail. Invert the logic so that
the absence of the Modules.symvers is a passing situation but we still
get failure checking on the install operation.
(From OE-Core rev: 6fff6ce35864cfef70ffd10db3b7d5f090dd3f62)
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 856c916ffbf3438d8cf5d8bed344473bde03b56e)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/classes-recipe/kernel.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass index 759f72d571..3abd689794 100644 --- a/meta/classes-recipe/kernel.bbclass +++ b/meta/classes-recipe/kernel.bbclass | |||
@@ -477,7 +477,7 @@ kernel_do_install() { | |||
477 | install -m 0644 System.map ${D}/${KERNEL_IMAGEDEST}/System.map-${KERNEL_VERSION} | 477 | install -m 0644 System.map ${D}/${KERNEL_IMAGEDEST}/System.map-${KERNEL_VERSION} |
478 | install -m 0644 .config ${D}/${KERNEL_IMAGEDEST}/config-${KERNEL_VERSION} | 478 | install -m 0644 .config ${D}/${KERNEL_IMAGEDEST}/config-${KERNEL_VERSION} |
479 | install -m 0644 vmlinux ${D}/${KERNEL_IMAGEDEST}/vmlinux-${KERNEL_VERSION} | 479 | install -m 0644 vmlinux ${D}/${KERNEL_IMAGEDEST}/vmlinux-${KERNEL_VERSION} |
480 | [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/${KERNEL_IMAGEDEST}/Module.symvers-${KERNEL_VERSION} | 480 | ! [ -e Module.symvers ] || install -m 0644 Module.symvers ${D}/${KERNEL_IMAGEDEST}/Module.symvers-${KERNEL_VERSION} |
481 | } | 481 | } |
482 | 482 | ||
483 | # Must be ran no earlier than after do_kernel_checkout or else Makefile won't be in ${S}/Makefile | 483 | # Must be ran no earlier than after do_kernel_checkout or else Makefile won't be in ${S}/Makefile |
@@ -545,7 +545,7 @@ do_shared_workdir () { | |||
545 | 545 | ||
546 | # Copy files required for module builds | 546 | # Copy files required for module builds |
547 | cp System.map $kerneldir/System.map-${KERNEL_VERSION} | 547 | cp System.map $kerneldir/System.map-${KERNEL_VERSION} |
548 | [ -e Module.symvers ] && cp Module.symvers $kerneldir/ | 548 | ! [ -e Module.symvers ] || cp Module.symvers $kerneldir/ |
549 | cp .config $kerneldir/ | 549 | cp .config $kerneldir/ |
550 | mkdir -p $kerneldir/include/config | 550 | mkdir -p $kerneldir/include/config |
551 | cp include/config/kernel.release $kerneldir/include/config/kernel.release | 551 | cp include/config/kernel.release $kerneldir/include/config/kernel.release |