[Buildroot] [pull request] Pull request for branch makedevs-cleanup

[Buildroot] [pull request] Pull request for branch makedevs-cleanup

[Thomas Petazzoni]

The following changes since commit 7b3a6f0aab19c147ad28f74e3b410c4a8bb2f38f:
  Peter Korsgaard (1):
        python: needs WCHAR support in toolchain

are available in the git repository at:

  git://git.busybox.net/~tpetazzoni/git/buildroot makedevs-cleanup

Thomas Petazzoni (2):
      makedevs: move to package/
      makedevs: convert to a more normal way of building packages

 fs/common.mk                            |    2 +-
 package/Config.in                       |    1 +
 package/makedevs/Config.in              |    5 ++++
 {target => package}/makedevs/makedevs.c |    0
 package/makedevs/makedevs.mk            |   35 +++++++++++++++++++++++++++++++
 target/makedevs/makedevs.mk             |   30 --------------------------
 6 files changed, 42 insertions(+), 31 deletions(-)
 create mode 100644 package/makedevs/Config.in
 rename {target => package}/makedevs/makedevs.c (100%)
 create mode 100644 package/makedevs/makedevs.mk
 delete mode 100644 target/makedevs/makedevs.mk

Thanks,
-- 
Thomas Petazzoni

[Buildroot] [PATCH 1/2] makedevs: move to package/

[Thomas Petazzoni]

Since target/ doesn't contain any .mk file in subdirectories, also
remove the include in target/Makefile.in.
---
 {target => package}/makedevs/makedevs.c  |    0
 {target => package}/makedevs/makedevs.mk |    0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename {target => package}/makedevs/makedevs.c (100%)
 rename {target => package}/makedevs/makedevs.mk (100%)

diff --git a/target/makedevs/makedevs.c b/package/makedevs/makedevs.c
similarity index 100%
rename from target/makedevs/makedevs.c
rename to package/makedevs/makedevs.c
diff --git a/target/makedevs/makedevs.mk b/package/makedevs/makedevs.mk
similarity index 100%
rename from target/makedevs/makedevs.mk
rename to package/makedevs/makedevs.mk
-- 
1.6.3.3

[Buildroot] [PATCH 2/2] makedevs: convert to a more normal way of building packages

[Thomas Petazzoni]

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 fs/common.mk                 |    2 +-
 package/Config.in            |    1 +
 package/makedevs/Config.in   |    5 +++++
 package/makedevs/makedevs.mk |   33 +++++++++++++++++++--------------
 4 files changed, 26 insertions(+), 15 deletions(-)
 create mode 100644 package/makedevs/Config.in

diff --git a/fs/common.mk b/fs/common.mk
index cc94eb4..a3248c1 100644
--- 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 6104903..a4ef362 100644
--- 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
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 fe426ca..a3bb5cb 100644
--- 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
-- 
1.6.3.3

[Buildroot] [pull request] Pull request for branch makedevs-cleanup

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> The following changes since commit 7b3a6f0aab19c147ad28f74e3b410c4a8bb2f38f:
 Thomas>   Peter Korsgaard (1):
 Thomas>         python: needs WCHAR support in toolchain

 Thomas> are available in the git repository at:

 Thomas>   git://git.busybox.net/~tpetazzoni/git/buildroot makedevs-cleanup

Pulled and pushed, thanks!

You are btw still forgetting the trailing newline on your files.

-- 
Bye, Peter Korsgaard