fng: Fixes and clean-up for Kirkstone

- Clean-up of the Flash-N-Go recipe
- Removed old code parts, that are no longer valid
- Excluded the Kernel from the initramfs, because its too big

conf/distro/guf-fngsystem.conf

@@ -33,9 +33,9 @@ VIRTUAL-RUNTIME:dev_manager = "eudev"
 INITRAMFS_IMAGE_BUNDLE = "0"
 INITRAMFS_FSTYPES = "cpio.gz"
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS:remove="   linux-firmware-imx-vpu  kernel-devicetree     kernel-image "
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS:remove = " linux-firmware-imx-vpu kernel-devicetree kernel-image kernel-image-image "
 RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
-MACHINE_EXTRA_RRECOMMENDS:remove=" kernel-modules "
+MACHINE_EXTRA_RRECOMMENDS:remove = " kernel-modules "
 
 DISTRO_BOOT_FILES = " \
     boot-alt.cfg \
@@ -52,6 +52,7 @@ DISTRO_INSTALL_SCRIPTS:append:mx8 = " fng-install-uboot.sh "
 
 DISTRO_IMAGES = "${IMAGE_LINK_NAME}.tgz ${IMAGE_LINK_NAME}.cpio.gz"
 DISTRO_IMAGES:append:mx8 = " imx-boot.tar.gz imx-boot "
+
 # List build results that are later handled in the CI
 DISTRO_RELEASE_ARTEFACTS:append = "${IMAGE_LINK_NAME}.md5 "
 

recipes-bsp/images/fngsystem-image.bb

@@ -8,7 +8,8 @@ inherit core-image features_check on_bootloader
 # Debug tweak needed for root without passwd
 IMAGE_FEATURES = "ssh-server-openssh empty-root-password allow-empty-password allow-root-login"
 
-# To make sure we are in the guf-fngsystem distro:
+# Flash-N-Go-System doesn't use systemd (because of its size).
+# Make sure we are using sysvinit instead.
 REQUIRED_DISTRO_FEATURES = "sysvinit"
 
 IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
@@ -17,16 +18,16 @@ IMAGE_LINGUAS = "en-us"
 
 REMOVED_FOR_NOW = " \
     automount-fngsystem \
-    cmd-line-env \
-    glibc-ld-linux-compatibility \
-    busybox-telnetd \
     busybox-ftpd \
+    busybox-telnetd \
     cgetty \
+    cmd-line-env \
+    glibc-ld-linux-compatibility \
     packagegroup-guf-graphics-fw \
     packagegroup-guf-kernel-modules \
     packagegroup-guf-wireless-fw \
-    xxd \
     util-linux-2.25-sfdisk \
+    xxd \
 "
 
 DEPENDS += " uuu-scripts "
@@ -37,6 +38,7 @@ IMAGE_INSTALL_FNG = " \
     busybox-ifplugd \
     curl \
     devmem2 \
+    dosfstools \
     dtc \
     e2fsprogs-e2fsck \
     e2fsprogs-mke2fs \
@@ -76,12 +78,19 @@ IMAGE_INSTALL_FNG = " \
     ','')} \
 "
 
-IMAGE_INSTALL_FNG:append_mx8m = " \
+IMAGE_INSTALL_FNG:append:mx8m-generic-bsp = " \
     kernel-module-smsc95xx \
 "
 
-IMAGE_INSTALL_FNG:append_gplv3 = " \
-    dosfstools \
+# @TODO: With an included Kernel, the initramfs is too big.
+# Since the Kernel is loaded separately anyways, we remove it
+# from the ramfs for now.
+PACKAGE_EXCLUDE = " \
+    kernel-image \
+    kernel-image-5.10.9 \
+    kernel-image-image \
+    kernel-image-image-5.10.9 \
+    linux-imx-kuk \
 "
 
 PACKAGE_INSTALL += " \
@@ -89,8 +98,9 @@ PACKAGE_INSTALL += " \
 "
 
 ###############################################################################
-# Package initramfs with kernel, devicetrees and bootscript
+# Package Initramfs with Kernel, Devicetrees and Bootscript
 ###############################################################################
+
 inherit deploy
 
 do_collect_files[depends] += "virtual/kernel:do_deploy"
@@ -99,20 +109,24 @@ do_collect_files[depends] += " ${@' '.join([ f + ':do_deploy' for f in ( d.getVa
 PACKAGE_DIR = "${WORKDIR}/${BP}-package"
 
 do_collect_files () {
-    # initramfs
+    # Initramfs
     cp ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${INITRAMFS_FSTYPES} ${PACKAGE_DIR}/${IMAGE_BASENAME}.${INITRAMFS_FSTYPES}
-    # devicetrees
+
+    # Devicetrees
     for boot_file in ${IMAGE_BOOT_FILES}; do
-        bbnote "copying ${boot_file}"
+        bbnote "Copying ${boot_file}"
         cp -L ${DEPLOY_DIR_IMAGE}/${boot_file} ${PACKAGE_DIR}
     done
-    # kernel
+
+    # Kernel
     for kernel_image in ${KERNEL_IMAGETYPES}; do
-        bbnote "copying ${kernel_image}"
+        bbnote "Copying ${kernel_image}"
         cp -L ${DEPLOY_DIR_IMAGE}/${kernel_image} ${PACKAGE_DIR}
     done
 }
+
 do_collect_files[cleandirs] = "${PACKAGE_DIR}"
+
 addtask do_collect_files after do_image_complete
 
 do_deploy () {
@@ -122,6 +136,7 @@ do_deploy () {
         md5sum ${IMAGE_LINK_NAME}.tgz > ${DEPLOYDIR}/${IMAGE_LINK_NAME}.md5
     )
 }
+
 do_deploy[cleandirs] = "${DEPLOYDIR}"
 do_deploy[dirs] = "${DEPLOYDIR} ${PACKAGE_DIR}"
 do_deploy[depends] = "${PN}:do_collect_files"
@@ -129,7 +144,3 @@ do_build[depends] = "${PN}:do_deploy"
 
 addtask do_deploy after do_collect_files
 
-# TODO disable populate_lic_deploy temporarily as it always fails,
-# needs to be closer inspected and fixed properly
-deltask do_populate_lic_deploy
-