diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-06-22 23:43:08 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-06-22 23:43:08 +0200 |
| commit | f3050b0b9ed14596d74a1bcb340ff7f5d86e1b1a (patch) | |
| tree | 2b1e7628b5bad58c4b4065b9de30321bd02ff502 /fs | |
| parent | b10197dcf2ca1d6afbdf8f131560a3a0a8b9c72d (diff) | |
| parent | 7b7b4260966a5d991b1dabc82c792fbecd77c63a (diff) | |
Merge branch 'linux-cleanup' of git://git.busybox.net/~tpetazzoni/git/buildroot
Conflicts:
target/Makefile.in
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/common.mk | 6 | ||||
| -rw-r--r-- | fs/initramfs/initramfs.mk | 2 | ||||
| -rw-r--r-- | fs/iso9660/Config.in | 6 | ||||
| -rw-r--r-- | fs/iso9660/iso9660.mk | 6 |
4 files changed, 13 insertions, 7 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/fs/iso9660/Config.in b/fs/iso9660/Config.in index 78305814a..4c00583dc 100644 --- a/fs/iso9660/Config.in +++ b/fs/iso9660/Config.in @@ -1,7 +1,7 @@ config BR2_TARGET_ROOTFS_ISO9660 bool "iso image" - depends on BR2_i386 - depends on !BR2_KERNEL_none + depends on (BR2_i386 || BR2_x86_64) + depends on BR2_LINUX_KERNEL select BR2_TARGET_ROOTFS_EXT2 select BR2_TARGET_GRUB help @@ -13,4 +13,4 @@ config BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU default "fs/iso9660/menu.lst" comment "iso image requires a Linux kernel to be built" - depends on BR2_i386 && BR2_KERNEL_none + depends on (BR2_i386 || BR2_x86_64) && !BR2_LINUX_KERNEL diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk index 66e2de20b..6f60893a4 100644 --- a/fs/iso9660/iso9660.mk +++ b/fs/iso9660/iso9660.mk @@ -15,14 +15,14 @@ ifeq ($(BR2_TARGET_ROOTFS_ISO9660_SQUASH),y) ISO9660_OPTS+=-U endif -$(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot $(LINUX_KERNEL) $(BINARIES_DIR)/rootfs.ext2 grub +$(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux26 ext2-root grub @$(call MESSAGE,"Generating root filesystem image rootfs.iso9660") mkdir -p $(ISO9660_TARGET_DIR) mkdir -p $(ISO9660_TARGET_DIR)/boot/grub cp $(GRUB_DIR)/stage2/stage2_eltorito $(ISO9660_TARGET_DIR)/boot/grub/ cp $(ISO9660_BOOT_MENU) $(ISO9660_TARGET_DIR)/boot/grub/menu.lst - cp $(LINUX_KERNEL) $(ISO9660_TARGET_DIR)/kernel - cp $(EXT2_TARGET) $(ISO9660_TARGET_DIR)/initrd + cp $(LINUX26_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel + cp $(BINARIES_DIR)/rootfs.ext2 $(ISO9660_TARGET_DIR)/initrd # Use fakeroot to pretend all target binaries are owned by root rm -f $(FAKEROOT_SCRIPT) touch $(BUILD_DIR)/.fakeroot.00000 |