From c7d211ef8e2b061d4fa7ab73e0339e894c1301ad Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Fri, 23 Jul 2021 13:07:11 +0200 Subject: [PATCH] image-minimal: Cleanup Remove unneeded variables and move FSTYPE to distro BugzID: 73593 --- conf/distro/netmodule-linux-minimal.conf | 2 ++ recipes-core/images/netmodule-linux-image-minimal.bb | 8 +------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/conf/distro/netmodule-linux-minimal.conf b/conf/distro/netmodule-linux-minimal.conf index 9c2019f..4cd3550 100644 --- a/conf/distro/netmodule-linux-minimal.conf +++ b/conf/distro/netmodule-linux-minimal.conf @@ -10,3 +10,5 @@ REPRODUCIBLE_TIMESTAMP_ROOTFS = "" PREFERRED_PROVIDER_virtual/netmodule-image = "netmodule-fitimage" INITRAMFS_IMAGE_pn-netmodule-fitimage = "netmodule-linux-image-minimal" + +IMAGE_FSTYPES = "cpio.gz cpio.gz.u-boot" diff --git a/recipes-core/images/netmodule-linux-image-minimal.bb b/recipes-core/images/netmodule-linux-image-minimal.bb index 7db4ac3..d2b7682 100644 --- a/recipes-core/images/netmodule-linux-image-minimal.bb +++ b/recipes-core/images/netmodule-linux-image-minimal.bb @@ -1,9 +1,4 @@ -DISTRO_FEATURES_BACKFILL_CONSIDERED = " wifi bluetooth" - -inherit image - -IMAGE_FEATURES = "debug-tweaks" -IMAGE_FSTYPES = "tar.gz cpio cpio.gz cpio.gz.u-boot" +inherit core-image KERNELDEPMODDEPEND = "" @@ -22,7 +17,6 @@ IMAGE_INSTALL = " \ tar \ less \ ncurses-terminfo-base \ - kernel-devicetree \ haveged \ "