build system: move fakeroot under packages/htools/

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

7 files changed, 47 insertions, 31 deletions

diff --git a/mk/packages.mk b/mk/packages.mk
index a59cb7d..22be323 100644
--- a/mk/packages.mk
+++ b/mk/packages.mk
@@ -29,9 +29,6 @@ HOSTTOOLS_COMPONENTS-y		:= mkimage_install pkgconf_install
 # Common include for target and host
 #
 
-# fakeroot
-include mk/fakeroot.mk
-
 # gperf
 include mk/gperf_host.mk
 HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_HOST_HAVE_GPERF) += gperf_host_install
diff --git a/mk/rootfs/rootfs.mk b/mk/rootfs/rootfs.mk
index d5b1c70..ed8f9b8 100644
--- a/mk/rootfs/rootfs.mk
+++ b/mk/rootfs/rootfs.mk
@@ -33,7 +33,7 @@ ROOTFS_TARBZ2		:= rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)-$(embtk_clib).tar.bz2
 ROOTFS_SQUASHFS		:= $(embtk_generated)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)-$(embtk_clib).squashfs
 ROOTFS_INITRAMFS	:= $(embtk_generated)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)-$(embtk_clib).initramfs
 
-HOSTTOOLS_COMPONENTS-y += makedevs_install fakeroot_install
+HOSTTOOLS_COMPONENTS-y += makedevs_install
 HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2) += mtdutils_host_install
 HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_ROOTFS_HAVE_SQUASHFS) += squashfs_tools_install
 
diff --git a/kconfig/fakeroot.kconfig b/packages/htools/fakeroot/fakeroot.kconfig
index 66750eb..81eec51 100644
--- a/kconfig/fakeroot.kconfig
+++ b/packages/htools/fakeroot/fakeroot.kconfig
@@ -23,21 +23,17 @@
 # \date         March 2011
 ################################################################################
 
-config EMBTK_HAVE_FAKEROOT
+config EMBTK_HOST_HAVE_FAKEROOT
 	bool
 	default y
 	help
-		fakeroot for host tools.
+	 fakeroot for host tools.
 
-config EMBTK_FAKEROOT_VERSION_STRING
+config EMBTK_FAKEROOT_HOST_VERSION_STRING
 	string
 	default "1.18.4"
 
-config EMBTK_FAKEROOT_NEED_PATCH
+config EMBTK_FAKEROOT_HOST_NEED_PATCH
 	bool
-config EMBTK_FAKEROOT_NEED_AUTORECONF
-	bool
-config EMBTK_FAKEROOT_PKG_IS_TARGZ
-	bool
-config EMBTK_FAKEROOT_PKG_IS_TARBZ2
+config EMBTK_FAKEROOT_HOST_NEED_AUTORECONF
 	bool
diff --git a/mk/fakeroot.mk b/packages/htools/fakeroot/fakeroot.mk
index c1c39a3..dc9f357 100644
--- a/mk/fakeroot.mk
+++ b/packages/htools/fakeroot/fakeroot.mk
@@ -1,6 +1,6 @@
 ################################################################################
 # Embtoolkit
-# Copyright(C) 2009-2013 Abdoulaye Walsimou GAYE.
+# Copyright(C) 2009-2014 Abdoulaye Walsimou GAYE.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,19 +24,9 @@
 # \date         June 2009
 ################################################################################
 
-FAKEROOT_NAME		:= fakeroot
-FAKEROOT_VERSION	:= $(call embtk_get_pkgversion,fakeroot)
-FAKEROOT_SITE		:= http://ftp.debian.org/debian/pool/main/f/fakeroot
-FAKEROOT_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-FAKEROOT_PACKAGE	:= fakeroot_$(FAKEROOT_VERSION).orig.tar.bz2
-FAKEROOT_SRC_DIR	:= $(embtk_toolsb)/fakeroot-$(FAKEROOT_VERSION)
-FAKEROOT_BUILD_DIR	:= $(embtk_toolsb)/fakeroot-build
-
-# fakeroot binaries and env
-FAKEROOT_BIN		:= $(embtk_htools)/usr/bin/fakeroot
-FAKEROOT_ENV_FILE	:= $(EMBTK_ROOT)/.fakeroot.001
-export FAKEROOT_BIN FAKEROOT_ENV_FILE
-
-define embtk_install_fakeroot
-	$(call __embtk_install_hostpkg,fakeroot)
-endef	
+FAKEROOT_HOST_NAME	:= fakeroot
+FAKEROOT_HOST_VERSION	:= $(call embtk_get_pkgversion,fakeroot_host)
+FAKEROOT_HOST_SITE	:= http://ftp.debian.org/debian/pool/main/f/fakeroot
+FAKEROOT_HOST_PACKAGE	:= fakeroot_$(FAKEROOT_HOST_VERSION).orig.tar.bz2
+FAKEROOT_HOST_SRC_DIR	:= $(embtk_toolsb)/fakeroot-$(FAKEROOT_HOST_VERSION)
+FAKEROOT_HOST_BUILD_DIR	:= $(embtk_toolsb)/fakeroot-build
diff --git a/packages/htools/fakeroot/vars.mk b/packages/htools/fakeroot/vars.mk
new file mode 100644
index 0000000..252a0cc
--- /dev/null
+++ b/packages/htools/fakeroot/vars.mk
@@ -0,0 +1,29 @@
+################################################################################
+# Embtoolkit
+# Copyright(C) 2014 Abdoulaye Walsimou GAYE.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+#
+# \file         vars.mk
+# \brief	fakeroot variables
+# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# \date         Marsh 2014
+################################################################################
+
+# fakeroot binaries and env
+FAKEROOT_BIN		:= $(embtk_htools)/usr/bin/fakeroot
+FAKEROOT_ENV_FILE	:= $(EMBTK_ROOT)/.fakeroot.001
+export FAKEROOT_BIN FAKEROOT_ENV_FILE
diff --git a/packages/htools/hosttools-buildopts.kconfig b/packages/htools/hosttools-buildopts.kconfig
index 07c8b6a..b502753 100644
--- a/packages/htools/hosttools-buildopts.kconfig
+++ b/packages/htools/hosttools-buildopts.kconfig
@@ -135,7 +135,7 @@ source kconfig/pkgconf.kconfig
 #
 # fakeroot
 #
-source kconfig/fakeroot.kconfig
+source packages/htools/fakeroot/fakeroot.kconfig
 
 #
 # gperf for host
diff --git a/packages/htools/hosttools-buildopts.mk b/packages/htools/hosttools-buildopts.mk
index b4dd8b1..8785184 100644
--- a/packages/htools/hosttools-buildopts.mk
+++ b/packages/htools/hosttools-buildopts.mk
@@ -27,3 +27,7 @@ embtk_pkgincdir := packages/htools
 
 # cache
 $(call embtk_include_hostpkg,ccache_host)
+
+# fakeroot
+include packages/htools/fakeroot/vars.mk
+$(call embtk_include_hostpkg,fakeroot_host)