modularize feature: restructure for dynamic loading

Author: timkenhan

Makefile

@@ -69,6 +69,14 @@ SOFTWARE = BCACHE_TOOLS \
 	ZLIB \
 	ZSTD
 
+FEATURE_COMPONENTS = append_base_layout \
+	create_initramfs \
+	determine_real_args \
+	genkernel_conf \
+	initramfs_append_func \
+	longusage \
+	parse_cmdline
+
 SOFTWARE_VERSION = $(foreach entry, $(SOFTWARE), "VERSION_$(entry)=${VERSION_$(entry)}\n")
 
 PREFIX = /usr/local
@@ -80,12 +88,15 @@ else
 endif
 MANDIR = $(PREFIX)/share/man
 
+FEATURE_FILES = $(addprefix $(addprefix $(BUILD_DIR)/features/, $(GK_FEATURES))/, $(FEATURE_COMPONENTS))
+
 all: $(BUILD_DIR)/genkernel $(BUILD_DIR)/build-config man kconfig
 
 debug:
 	@echo "ARCH_KCONF=$(ARCH_KCONF)"
 	@echo "GENERATED_KCONF=$(GENERATED_KCONF)"
 	@echo "PACKAGE_VERSION=$(PACKAGE_VERSION)"
+	@echo "FEATURE_FILES: $(FEATURE_FILES)"
 
 kconfig: $(GENERATED_KCONF)
 man: $(addprefix $(BUILD_DIR)/,$(MANPAGE))
@@ -186,8 +197,23 @@ $(BUILD_DIR)/software.sh:
 	echo -e $(SOFTWARE_VERSION) > $(BUILD_DIR)/temp/versions
 	cat $(BUILD_DIR)/temp/versions defaults/software.sh > $(BUILD_DIR)/software.sh
 
-$(BUILD_DIR)/doc/genkernel.8.txt:
-	install -D doc/genkernel.8.txt $(BUILD_DIR)/doc/genkernel.8.txt
+$(BUILD_DIR)/temp/%:
+	install -d $(@D)
+	echo > $@
+ifdef GK_FEATURES
+	cat $(addsuffix /$(@F) <(echo), $(addprefix features/,${GK_FEATURES})) > $@
+endif
+
+$(BUILD_DIR)/doc/genkernel.8.txt: $(BUILD_DIR)/temp/man_genkernel_8
+	install -d $(BUILD_DIR)/doc/
+	cat doc/genkernel.8.txt | sed \
+		-e '/\/\/ BEGIN FEATURES man_genkernel_8/ r $(BUILD_DIR)/temp/man_genkernel_8' \
+		> $(BUILD_DIR)/doc/genkernel.8.txt
+
+$(BUILD_DIR)/genkernel.conf: $(BUILD_DIR)/temp/genkernel_conf
+	cat genkernel.conf | sed \
+		-e '/# BEGIN FEATURES genkernel_conf/ r $(BUILD_DIR)/temp/genkernel_conf' \
+		> $(BUILD_DIR)/genkernel.conf
 
 $(BUILD_DIR)/%: %
 	install -D $< $@

gen_cmdline.sh

@@ -137,8 +137,7 @@ longusage() {
   echo "	--no-nfs		Exclude NFS support"
   echo "	--netboot		Create a self-contained env in the initramfs"
   echo "	--no-netboot		Exclude netboot env"
-#BEGIN FEATURES longusage()
-#END FEATURES longusage()
+  $(. load_features longusage)
   echo "	--do-keymap-auto	Forces keymap selection at boot"
   echo "	--keymap		Enables keymap selection support"
   echo "	--no-keymap		Disables keymap selection support"
@@ -447,8 +446,7 @@ parse_cmdline() {
 			CMD_BOOTLOADER="no"
 			print_info 3 "CMD_BOOTLOADER: ${CMD_BOOTLOADER}"
 			;;
-#BEGIN FEATURES parse_cmdline()
-#END FEATURES parse_cmdline()
+		$(. load_features.sh parse_cmdline)
 		--nfs|--no-nfs)
 			CMD_NFS=$(parse_optbool "$*")
 			print_info 3 "CMD_NFS: ${CMD_NFS}"

gen_initramfs.sh

@@ -472,8 +472,7 @@ append_base_layout() {
 	isTrue "${MICROCODE_INITRAMFS}" && build_parameters+=( --microcode-initramfs ) || build_parameters+=( --no-microcode-initramfs )
 	isTrue "${RAMDISKMODULES}" && build_parameters+=( --ramdisk-modules ) || build_parameters+=( --no-ramdisk-modules )
 	isTrue "${BUSYBOX}" && build_parameters+=( --busybox ) || build_parameters+=( --no-busybox )
-#BEGIN FEATURES append_base_layout()
-#END FEATURES append_base_layout()
+	$(. load_features append_base_layout)
 	isTrue "${FIRMWARE}" && build_parameters+=( --firmware ) || build_parameters+=( --no-firmware )
 	[ -n "${FIRMWARE_DIR}" ] && build_parameters+=( --firmware-dir="${FIRMWARE_DIR}" )
 	[ -n "${FIRMWARE_FILES}" ] && build_parameters+=( --firmware-files="${FIRMWARE_FILES}" )

load_features.sh

@@ -0,0 +1 @@
+ls features/*/$1 > /dev/null 2>&1 && cat features/*/$1