1 files changed, 55 insertions, 14 deletions

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 83a574efcd..ca7530095e 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -75,7 +75,7 @@ python __anonymous () {
     # KERNEL_IMAGETYPES may contain a mixture of image types supported directly
     # by the kernel build system and types which are created by post-processing
     # the output of the kernel build system (e.g. compressing vmlinux ->
-    # vmlinux.gz in kernel_do_compile()).
+    # vmlinux.gz in kernel_do_transform_kernel()).
     # KERNEL_IMAGETYPE_FOR_MAKE should contain only image types supported
     # directly by the kernel build system.
     if not d.getVar('KERNEL_IMAGETYPE_FOR_MAKE'):
@@ -91,6 +91,8 @@ python __anonymous () {
     imagedest = d.getVar('KERNEL_IMAGEDEST')
 
     for type in types.split():
+        if bb.data.inherits_class('nopackages', d):
+            continue
         typelower = type.lower()
         d.appendVar('PACKAGES', ' %s-image-%s' % (kname, typelower))
         d.setVar('FILES_' + kname + '-image-' + typelower, '/' + imagedest + '/' + type + '-${KERNEL_VERSION_NAME}' + ' /' + imagedest + '/' + type)
@@ -104,6 +106,8 @@ python __anonymous () {
     # standalone for use by wic and other tools.
     if image:
         d.appendVarFlag('do_bundle_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
+    if image and bb.utils.to_boolean(d.getVar('INITRAMFS_IMAGE_BUNDLE')):
+        bb.build.addtask('do_transform_bundled_initramfs', 'do_deploy', 'do_bundle_initramfs', d)
 
     # NOTE: setting INITRAMFS_TASK is for backward compatibility
     #       The preferred method is to set INITRAMFS_IMAGE, because
@@ -139,13 +143,14 @@ do_unpack[cleandirs] += " ${S} ${STAGING_KERNEL_DIR} ${B} ${STAGING_KERNEL_BUILD
 do_clean[cleandirs] += " ${S} ${STAGING_KERNEL_DIR} ${B} ${STAGING_KERNEL_BUILDDIR}"
 python do_symlink_kernsrc () {
     s = d.getVar("S")
-    if s[-1] == '/':
-        # drop trailing slash, so that os.symlink(kernsrc, s) doesn't use s as directory name and fail
-        s=s[:-1]
     kernsrc = d.getVar("STAGING_KERNEL_DIR")
     if s != kernsrc:
         bb.utils.mkdirhier(kernsrc)
         bb.utils.remove(kernsrc, recurse=True)
+        if s[-1] == '/':
+            # drop trailing slash, so that os.symlink(kernsrc, s) doesn't use s as
+            # directory name and fail
+            s = s[:-1]
         if d.getVar("EXTERNALSRC"):
             # With EXTERNALSRC S will not be wiped so we can symlink to it
             os.symlink(s, kernsrc)
@@ -194,6 +199,8 @@ UBOOT_LOADADDRESS ?= "${UBOOT_ENTRYPOINT}"
 KERNEL_EXTRA_ARGS ?= ""
 
 EXTRA_OEMAKE = " HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}""
+EXTRA_OEMAKE += " HOSTCXX="${BUILD_CXX} ${BUILD_CXXFLAGS} ${BUILD_LDFLAGS}""
+
 KERNEL_ALT_IMAGETYPE ??= ""
 
 copy_initramfs() {
@@ -276,6 +283,14 @@ do_bundle_initramfs () {
 }
 do_bundle_initramfs[dirs] = "${B}"
 
+kernel_do_transform_bundled_initramfs() {
+        # vmlinux.gz is not built by kernel
+        if (echo "${KERNEL_IMAGETYPES}" | grep -wq "vmlinux\.gz"); then
+                gzip -9cn < ${KERNEL_OUTPUT_DIR}/vmlinux.initramfs > ${KERNEL_OUTPUT_DIR}/vmlinux.gz.initramfs
+        fi
+}
+do_transform_bundled_initramfs[dirs] = "${B}"
+
 python do_devshell_prepend () {
     os.environ["LDFLAGS"] = ''
 }
@@ -307,6 +322,10 @@ kernel_do_compile() {
                 export KBUILD_BUILD_TIMESTAMP="$ts"
                 export KCONFIG_NOTIMESTAMP=1
                 bbnote "KBUILD_BUILD_TIMESTAMP: $ts"
+        else
+                ts=`LC_ALL=C date`
+                export KBUILD_BUILD_TIMESTAMP="$ts"
+                bbnote "KBUILD_BUILD_TIMESTAMP: $ts"
         fi
         # The $use_alternate_initrd is only set from
         # do_bundle_initramfs() This variable is specifically for the
@@ -325,12 +344,17 @@ kernel_do_compile() {
         for typeformake in ${KERNEL_IMAGETYPE_FOR_MAKE} ; do
                 oe_runmake ${typeformake} CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} $use_alternate_initrd
         done
+}
+
+kernel_do_transform_kernel() {
         # vmlinux.gz is not built by kernel
         if (echo "${KERNEL_IMAGETYPES}" | grep -wq "vmlinux\.gz"); then
                 mkdir -p "${KERNEL_OUTPUT_DIR}"
                 gzip -9cn < ${B}/vmlinux > "${KERNEL_OUTPUT_DIR}/vmlinux.gz"
         fi
 }
+do_transform_kernel[dirs] = "${B}"
+addtask transform_kernel after do_compile before do_install
 
 do_compile_kernelmodules() {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
@@ -348,6 +372,10 @@ do_compile_kernelmodules() {
                 export KBUILD_BUILD_TIMESTAMP="$ts"
                 export KCONFIG_NOTIMESTAMP=1
                 bbnote "KBUILD_BUILD_TIMESTAMP: $ts"
+        else
+                ts=`LC_ALL=C date`
+                export KBUILD_BUILD_TIMESTAMP="$ts"
+                bbnote "KBUILD_BUILD_TIMESTAMP: $ts"
         fi
         if (grep -q -i -e '^CONFIG_MODULES=y$' ${B}/.config); then
                 cc_extra=$(get_cc_option)
@@ -377,8 +405,8 @@ kernel_do_install() {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
         if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
                 oe_runmake DEPMOD=echo MODLIB=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION} INSTALL_FW_PATH=${D}${nonarch_base_libdir}/firmware modules_install
-                rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build"
-                rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source"
+                rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build"
+                rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source"
                 # If the kernel/ directory is empty remove it to prevent QA issues
                 rmdir --ignore-fail-on-non-empty "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel"
         else
@@ -390,12 +418,26 @@ kernel_do_install() {
         #
         install -d ${D}/${KERNEL_IMAGEDEST}
         install -d ${D}/boot
+
+        #
+        # When including an initramfs bundle inside a FIT image, the fitImage is created after the install task
+        # by do_assemble_fitimage_initramfs.
+        # This happens after the generation of the initramfs bundle (done by do_bundle_initramfs).
+        # So, at the level of the install task we should not try to install the fitImage. fitImage is still not
+        # generated yet.
+        # After the generation of the fitImage, the deploy task copies the fitImage from the build directory to
+        # the deploy folder.
+        #
+
         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}
+                if [ $imageType != "fitImage" ] || [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ] ; then
+                        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
                 fi
         done
+
         install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION}
         install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION}
         install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION}
@@ -403,7 +445,6 @@ kernel_do_install() {
         install -d ${D}${sysconfdir}/modules-load.d
         install -d ${D}${sysconfdir}/modprobe.d
 }
-do_install[prefuncs] += "package_get_auto_pr"
 
 # Must be ran no earlier than after do_kernel_checkout or else Makefile won't be in ${S}/Makefile
 do_kernel_version_sanity_check() {
@@ -569,11 +610,11 @@ do_savedefconfig() {
 do_savedefconfig[nostamp] = "1"
 addtask savedefconfig after do_configure
 
-inherit cml1
+inherit cml1 pkgconfig
 
 KCONFIG_CONFIG_COMMAND_append = " LD='${KERNEL_LD}' HOSTLDFLAGS='${BUILD_LDFLAGS}'"
 
-EXPORT_FUNCTIONS do_compile do_install do_configure
+EXPORT_FUNCTIONS do_compile do_transform_kernel do_transform_bundled_initramfs do_install do_configure
 
 # kernel-base becomes kernel-${KERNEL_VERSION}
 # kernel-image becomes kernel-image-${KERNEL_VERSION}
@@ -679,7 +720,7 @@ do_sizecheck() {
                 at_least_one_fits=
                 for imageType in ${KERNEL_IMAGETYPES} ; do
                         size=`du -ks ${B}/${KERNEL_OUTPUT_DIR}/$imageType | awk '{print $1}'`
-                        if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
+                        if [ $size -gt ${KERNEL_IMAGE_MAXSIZE} ]; then
                                 bbwarn "This kernel $imageType (size=$size(K) > ${KERNEL_IMAGE_MAXSIZE}(K)) is too big for your device."
                         else
                                 at_least_one_fits=y
@@ -718,7 +759,7 @@ kernel_do_deploy() {
         fi
 
         if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then
-                for imageType in ${KERNEL_IMAGETYPE_FOR_MAKE} ; do
+                for imageType in ${KERNEL_IMAGETYPES} ; do
                         if [ "$imageType" = "fitImage" ] ; then
                                 continue
                         fi