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

This commit is contained in:
Peter Korsgaard 2010-04-19 23:28:26 +02:00
commit a726691a00
6 changed files with 42 additions and 31 deletions

View File

@ -32,7 +32,7 @@ ROOTFS_DEVICE_TABLE = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE))
define ROOTFS_TARGET_INTERNAL
$(BINARIES_DIR)/rootfs.$(1): $(ROOTFS_$(2)_DEPENDENCIES) host-fakeroot makedevs $(if $(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma)
$(BINARIES_DIR)/rootfs.$(1): $(ROOTFS_$(2)_DEPENDENCIES) host-fakeroot host-makedevs $(if $(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma)
@$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
$(foreach hook,$(ROOTFS_$(2)_PRE_GEN_HOOKS),$(call $(hook))$(sep))
rm -f $(FAKEROOT_SCRIPT)

View File

@ -175,6 +175,7 @@ source "package/input-tools/Config.in"
source "package/iostat/Config.in"
source "package/lm-sensors/Config.in"
source "package/lvm2/Config.in"
source "package/makedevs/Config.in"
source "package/mdadm/Config.in"
source "package/memtester/Config.in"
source "package/mtd/Config.in"

View File

@ -0,0 +1,5 @@
config BR2_PACKAGE_MAKEDEVS
bool "makedevs"
help
The makedevs utility allows to create a set of device files
according to a configuration file.

View File

@ -0,0 +1,35 @@
#############################################################
#
# makedevs
#
#############################################################
MAKEDEVS_DIR=$(BUILD_DIR)/makedevs
$(MAKEDEVS_DIR)/makedevs.c:
rm -rf $(MAKEDEVS_DIR)
mkdir $(MAKEDEVS_DIR)
cp package/makedevs/makedevs.c $(MAKEDEVS_DIR)
$(MAKEDEVS_DIR)/makedevs: $(MAKEDEVS_DIR)/makedevs.c
$(CC) -Wall -Werror -O2 $(MAKEDEVS_DIR)/makedevs.c -o $@
$(TARGET_DIR)/usr/bin/makedevs: $(MAKEDEVS_DIR)/makedevs
$(INSTALL) -m 755 $^ $@
makedevs: $(TARGET_DIR)/usr/bin/makedevs
HOST_MAKEDEVS_DIR=$(BUILD_DIR)/host-makedevs
$(HOST_MAKEDEVS_DIR)/makedevs.c:
rm -rf $(HOST_MAKEDEVS_DIR)
mkdir $(HOST_MAKEDEVS_DIR)
cp package/makedevs/makedevs.c $(HOST_MAKEDEVS_DIR)
$(HOST_MAKEDEVS_DIR)/makedevs: $(HOST_MAKEDEVS_DIR)/makedevs.c
$(CC) -Wall -Werror -O2 $(HOST_MAKEDEVS_DIR)/makedevs.c -o $@
$(HOST_DIR)/usr/bin/makedevs: $(HOST_MAKEDEVS_DIR)/makedevs
$(INSTALL) -m 755 $^ $@
host-makedevs: $(HOST_DIR)/usr/bin/makedevs

View File

@ -1,30 +0,0 @@
#############################################################
#
# build makedevs to run on the build system, in order to create
# device nodes and whatnot for the target device, in conjunction
# with fakeroot.
#
#############################################################
MAKEDEVS_DIR=$(BUILD_DIR)/makedevs-host
$(MAKEDEVS_DIR)/makedevs.c: target/makedevs/makedevs.c
rm -rf $(MAKEDEVS_DIR)
mkdir $(MAKEDEVS_DIR)
cp target/makedevs/makedevs.c $(MAKEDEVS_DIR)
$(MAKEDEVS_DIR)/makedevs: $(MAKEDEVS_DIR)/makedevs.c
$(HOSTCC) -Wall -Werror -O2 $(MAKEDEVS_DIR)/makedevs.c -o $@
$(HOST_DIR)/usr/bin/makedevs: $(MAKEDEVS_DIR)/makedevs
$(INSTALL) -m 755 $^ $@
makedevs: $(HOST_DIR)/usr/bin/makedevs
makedevs-source:
makedevs-clean:
rm -rf $(MAKEDEVS_DIR)/makedevs
makedevs-dirclean:
rm -rf $(MAKEDEVS_DIR)