build-vm, kernel: Not add specified initrd features into initrd.mk

This features not needed for auto-detect. We also add features not only to initrd.mk, but also specify them explicitly in the command.

build-vm, kernel: Not add specified initrd features into initrd.mk
58e83cea · Anton Midyukov · 5c1239c9 · 58e83cea · 58e83cea
Commit 58e83cea authored Jan 31, 2021 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

17-kernel features.in/build-vm/image-scripts.d/17-kernel +1 -0

config.mk features.in/kernel/config.mk +0 -1

No files found.
--- a/features.in/build-vm/image-scripts.d/17-kernel
+++ b/features.in/build-vm/image-scripts.d/17-kernel
@@ -27,6 +27,7 @@ fi
 for KVER in $kver; do
 	make-initrd -N -k "$KVER" AUTODETECT= \
+	  FEATURES+="add-modules compress cleanup $INITRDFEATURE" \
 	  MODULES_TRY_ADD+="$GLOBAL_VM_INITRDMODULES" \
 	  || { echo "** Error: make-initrd failed" >&2; exit 1; }
 done

--- a/features.in/kernel/config.mk
+++ b/features.in/kernel/config.mk
@@ -46,7 +46,6 @@ use/kernel/server:
 # for vm targets
 use/kernel/initrd-setup: use/kernel
-	@$(call add,VM_INITRDFEATURES,add-modules compress cleanup)
 	@$(call try,VM_FSTYPE,ext4)
 	@$(call add,VM_INITRDMODULES,$$(VM_FSTYPE))
 	@$(call add,VM_INITRDMODULES,ahci sd_mod)