Commit f3050b0b authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'linux-cleanup' of git://git.busybox.net/~tpetazzoni/git/buildroot 

Conflicts:
	target/Makefile.in
parents b10197dc 7b7b4260

Config.in

+1 −1
Original line number Diff line number Diff line
@@ -288,4 +288,4 @@ source "fs/Config.in" 


source "boot/Config.in"



source "target/Config.in"
 
source "linux/Config.in"

Makefile

+1 −4
Original line number Diff line number Diff line
@@ -309,10 +309,6 @@ else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) 
include toolchain/*/*.mk

endif



ifeq ($(BR2_PACKAGE_LINUX),y)

TARGETS+=linux26-modules

endif



include package/*/*.mk



TARGETS+=target-finalize
@@ -323,6 +319,7 @@ endif 


include boot/common.mk

include target/Makefile.in

include linux/linux.mk

include fs/common.mk



TARGETS+=erase-fakeroots

fs/common.mk

+5 −1
Original line number Diff line number Diff line
@@ -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

fs/initramfs/initramfs.mk

+2 −0
Original line number Diff line number Diff line
@@ -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

fs/iso9660/Config.in

+3 −3
Original line number Diff line number Diff line 
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