diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-23 22:43:58 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-23 22:43:58 +0100 |
| commit | 9b7bf77b72ef7a7d741b50a3cca2295f3ce22ef7 (patch) | |
| tree | 40ba3c48e34a61b4a47ae19b14058410ab0e05bb | |
| parent | 2323cb1a252a367db39902cf064203cad00e22b1 (diff) | |
| download | openembedded-core-contrib-9b7bf77b72ef7a7d741b50a3cca2295f3ce22ef7.tar.gz | |
Revert "classes/kernel: Use a copy of image for kernel*.rpm if fs doesn't support symlinks"
This reverts commit 01831f9e76fd8b111a7ce70defa745e2c0ee151e.
| -rw-r--r-- | meta/classes/kernel.bbclass | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 1269b54343..20a0135fc9 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -94,22 +94,6 @@ python __anonymous () { d.appendVar('RDEPENDS_%s-image' % kname, ' %s-image-%s' % (kname, typelower)) 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') - d.setVar('pkg_postinst_ontarget_%s-image-%s' % (kname,typelower), """ -set +e -ln -sf %s-${KERNEL_VERSION} ${KERNEL_IMAGEDEST}/%s > /dev/null 2>&1 -if [ $? -ne 0 ]; then - echo "Filesystem on ${KERNEL_IMAGEDEST}/ doesn't support symlinks, falling back to copied image (%s)." - install -m 0644 ${KERNEL_IMAGEDEST}/%s-${KERNEL_VERSION} ${KERNEL_IMAGEDEST}/%s -fi -set -e -""" % (type, type, type, type, type)) - 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 -set -e -""" % (type, type, type)) image = d.getVar('INITRAMFS_IMAGE') # If the INTIRAMFS_IMAGE is set but the INITRAMFS_IMAGE_BUNDLE is set to 0, @@ -401,6 +385,9 @@ kernel_do_install() { install -d ${D}/boot for imageType in ${KERNEL_IMAGETYPES} ; do install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} ${D}/${KERNEL_IMAGEDEST}/${imageType}-${KERNEL_VERSION} + if [ "${KERNEL_PACKAGE_NAME}" = "kernel" ]; then + ln -sf ${imageType}-${KERNEL_VERSION} ${D}/${KERNEL_IMAGEDEST}/${imageType} + fi done install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION} install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION} |