summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-05-14 20:24:47 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-05-17 09:14:28 +0100
commitc514bc4141f546f9ce9adb439fffc43f1366002b (patch)
tree0dff2eb3c04e298e49a17871d0cf72889cb4fd3c
parent921bc26ac3afd206d8aa692c197cf9f67e8605de (diff)
downloadpoky-master-next.tar.gz
poky-master-next.tar.bz2
poky-master-next.zip
Revert "classes/kernel.bbclass: allow disabling symlink creation also for pkg_postinst"master-next
This reverts commit d942227fba64d5295a9d66212213d9c14322df39. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel.bbclass6
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index e1714e00bd..83785c3b5b 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -93,7 +93,6 @@ python __anonymous () {
kname = d.getVar('KERNEL_PACKAGE_NAME') or "kernel"
imagedest = d.getVar('KERNEL_IMAGEDEST')
- kernel_imagetype_symlink = d.getVar('KERNEL_IMAGETYPE_SYMLINK')
for type in types.split():
if bb.data.inherits_class('nopackages', d):
@@ -111,8 +110,7 @@ python __anonymous () {
d.setVar('PKG:%s-image-%s' % (kname,typelower), '%s-image-%s-${KERNEL_VERSION_PKG_NAME}' % (kname, typelower))
d.setVar('ALLOW_EMPTY:%s-image-%s' % (kname, typelower), '1')
- if kernel_imagetype_symlink == 1:
- d.setVar('pkg_postinst:%s-image-%s' % (kname,typelower), """set +e
+ d.setVar('pkg_postinst:%s-image-%s' % (kname,typelower), """set +e
if [ -n "$D" ]; then
ln -sf %s-${KERNEL_VERSION} $D/${KERNEL_IMAGEDEST}/%s > /dev/null 2>&1
else
@@ -124,7 +122,7 @@ else
fi
set -e
""" % (type, type, type, type, type, type, type))
- d.setVar('pkg_postrm:%s-image-%s' % (kname,typelower), """set +e
+ d.setVar('pkg_postrm:%s-image-%s' % (kname,typelower), """set +e
if [ -f "${KERNEL_IMAGEDEST}/%s" -o -L "${KERNEL_IMAGEDEST}/%s" ]; then
rm -f ${KERNEL_IMAGEDEST}/%s > /dev/null 2>&1
fi