makedevs: convert to a more normal way of building packages

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/fs/common.mk b/fs/common.mk
index cc94eb4ef22fc0a02e06449dea3d9740fc09d1d5..a3248c165d279a56758ff703827cec9c8f851189 100644 (file)
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -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)

diff --git a/package/Config.in b/package/Config.in
index 61049034263ffd1d24c44d07dad4ce1285a8c5ef..a4ef362615e534f6771cbcfeb0ad4cefb2d55152 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"

diff --git a/package/makedevs/Config.in b/package/makedevs/Config.in
new file mode 100644 (file)
index 0000000..4f8c38d
--- /dev/null
+++ b/package/makedevs/Config.in
@@ -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.
\ No newline at end of file

diff --git a/package/makedevs/makedevs.mk b/package/makedevs/makedevs.mk
index fe426cafec67ac296303652aa52a02cf6e7b534f..a3bb5cb54fa6f08aa2f188e7c7655deae49dcb5d 100644 (file)
--- a/package/makedevs/makedevs.mk
+++ b/package/makedevs/makedevs.mk
@@ -1,30 +1,35 @@
 #############################################################
 #
-# 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
 #
 #############################################################
-MAKEDEVS_DIR=$(BUILD_DIR)/makedevs-host
 
-$(MAKEDEVS_DIR)/makedevs.c: target/makedevs/makedevs.c
+MAKEDEVS_DIR=$(BUILD_DIR)/makedevs
+
+$(MAKEDEVS_DIR)/makedevs.c:
        rm -rf $(MAKEDEVS_DIR)
        mkdir $(MAKEDEVS_DIR)
-       cp target/makedevs/makedevs.c $(MAKEDEVS_DIR)
+       cp package/makedevs/makedevs.c $(MAKEDEVS_DIR)
 
 $(MAKEDEVS_DIR)/makedevs: $(MAKEDEVS_DIR)/makedevs.c
-       $(HOSTCC) -Wall -Werror -O2 $(MAKEDEVS_DIR)/makedevs.c -o $@
+       $(CC) -Wall -Werror -O2 $(MAKEDEVS_DIR)/makedevs.c -o $@
 
-$(HOST_DIR)/usr/bin/makedevs: $(MAKEDEVS_DIR)/makedevs
+$(TARGET_DIR)/usr/bin/makedevs: $(MAKEDEVS_DIR)/makedevs
        $(INSTALL) -m 755 $^ $@
 
-makedevs: $(HOST_DIR)/usr/bin/makedevs
+makedevs: $(TARGET_DIR)/usr/bin/makedevs
 
-makedevs-source:
+HOST_MAKEDEVS_DIR=$(BUILD_DIR)/host-makedevs
 
-makedevs-clean:
-       rm -rf $(MAKEDEVS_DIR)/makedevs
+$(HOST_MAKEDEVS_DIR)/makedevs.c:
+       rm -rf $(HOST_MAKEDEVS_DIR)
+       mkdir $(HOST_MAKEDEVS_DIR)
+       cp package/makedevs/makedevs.c $(HOST_MAKEDEVS_DIR)
 
-makedevs-dirclean:
-       rm -rf $(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
\ No newline at end of file