diff options
| -rw-r--r-- | fs/common.mk | 6 | ||||
| -rw-r--r-- | fs/initramfs/initramfs.mk | 2 | ||||
| -rw-r--r-- | linux/linux.mk | 30 |
3 files changed, 37 insertions, 1 deletions
diff --git a/fs/common.mk b/fs/common.mk index 50dc97425..74e9ce060 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -19,6 +19,10 @@ # ROOTFS_$(FSTYPE)_POST_GEN_HOOKS, a list of hooks to call after # generating the filesystem image # +# ROOTFS_$(FSTYPE)_POST_TARGETS, the list of targets that should be +# run after running the main filesystem target. This is useful for +# initramfs, to rebuild the kernel once the initramfs is generated. +# # In terms of configuration option, this macro assumes that the # BR2_TARGET_ROOTFS_$(FSTYPE) config option allows to enable/disable # the generation of a filesystem image of a particular type. If @@ -60,7 +64,7 @@ endif $(1)-root-show-depends: @echo $(ROOTFS_$(2)_DEPENDENCIES) host-fakeroot host-makedevs $(if $(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma) -$(1)-root: $(BINARIES_DIR)/rootfs.$(1) +$(1)-root: $(BINARIES_DIR)/rootfs.$(1) $(ROOTFS_$(2)_POST_TARGETS) ifeq ($$(BR2_TARGET_ROOTFS_$(2)),y) TARGETS += $(1)-root diff --git a/fs/initramfs/initramfs.mk b/fs/initramfs/initramfs.mk index 3e8156761..e6d004e9b 100644 --- a/fs/initramfs/initramfs.mk +++ b/fs/initramfs/initramfs.mk @@ -23,4 +23,6 @@ define ROOTFS_INITRAMFS_CMD $(SHELL) fs/initramfs/gen_initramfs_list.sh -u 0 -g 0 $(TARGET_DIR) > $$@ endef +ROOTFS_INITRAMFS_POST_TARGETS += linux26-rebuild-with-initramfs + $(eval $(call ROOTFS_TARGET,initramfs))
\ No newline at end of file diff --git a/linux/linux.mk b/linux/linux.mk index d1f1842f7..593a1b40a 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -95,6 +95,19 @@ ifeq ($(BR2_INET_IPV6),y) else $(call KCONFIG_DISABLE_OPT,CONFIG_IPV6,$(@D)/.config) endif +ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y) + # As the kernel gets compiled before root filesystems are + # built, we create a fake initramfs file list. It'll be + # replaced later by the real list, and the kernel will be + # rebuilt using the linux26-rebuild-with-initramfs target. + touch $(BINARIES_DIR)/rootfs.initramfs + $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config) + $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/rootfs.initramfs\",$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_GZIP,$(@D)/.config) +else + $(call KCONFIG_DISABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config) + $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"\",$(@D)/.config) +endif $(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) oldconfig $(Q)touch $@ @@ -127,6 +140,23 @@ linux26: host-module-init-tools $(LINUX26_DEPENDENCIES) $(LINUX26_DIR)/.stamp_in linux26-menuconfig linux26-xconfig linux26-gconfig: $(LINUX26_DIR)/.stamp_configured $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) $(subst linux26-,,$@) +# Support for rebuilding the kernel after the initramfs file list has +# been generated in $(BINARIES_DIR)/rootfs.initramfs. +$(LINUX26_DIR)/.stamp_initramfs_rebuilt: $(LINUX26_DIR)/.stamp_installed $(BINARIES_DIR)/rootfs.initramfs + @$(call MESSAGE,"Rebuilding kernel with initramfs") + # Remove the previously generated initramfs which was empty, + # to make sure the kernel will actually regenerate it. + $(RM) -f $(@D)/usr/initramfs_data.cpio.* + # Build the kernel. + $(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) $(LINUX26_IMAGE_NAME) + # Copy the kernel image to its final destination + cp $(LINUX26_IMAGE_PATH) $(BINARIES_DIR) + $(Q)touch $@ + +# The initramfs building code must make sure this target gets called +# after it generated the initramfs list of files. +linux26-rebuild-with-initramfs: $(LINUX26_DIR)/.stamp_initramfs_rebuilt + ifeq ($(BR2_LINUX_KERNEL),y) TARGETS+=linux26 endif |