Packages: replace utillinux-ng in favor of e2fsprogs, we only need libuuid

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

6 files changed, 164 insertions, 237 deletions

diff --git a/packages/system/e2fsprogs/e2fsprogs.kconfig b/packages/system/e2fsprogs/e2fsprogs.kconfig
new file mode 100644
index 0000000..cc29254
--- /dev/null
+++ b/packages/system/e2fsprogs/e2fsprogs.kconfig
@@ -0,0 +1,75 @@
+################################################################################
+# Embtoolkit
+# Copyright(C) 2011 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         e2fsprogs.kconfig
+# \brief	e2fsprogs.kconfig of Embtoolkit
+# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# \date         June 2011
+################################################################################
+
+config EMBTK_HOST_HAVE_E2FSPROGS
+	bool
+	select EMBTK_E2FSPROGS_PKG_IS_TARGZ
+	help
+		NOTE: used only to have libuuid
+
+		UUID library from the e2fsprogs package.
+
+config EMBTK_HAVE_E2FSPROGS
+	bool "Have e2fsprogs/libuuid"
+	select EMBTK_E2FSPROGS_PKG_IS_TARGZ
+	help
+		NOTE: used only to have libuuid
+
+		UUID library from the e2fsprogs package.
+choice
+	prompt "e2fsprogs/libuuid version you wish"
+	depends on EMBTK_HAVE_E2FSPROGS || EMBTK_HOST_HAVE_E2FSPROGS
+	help
+	 Here you can choose which version of e2fsprogs you want to use.
+
+	config  EMBTK_E2FSPROGS_VERSION_1_41_14
+		bool "e2fsprogs/libuuid-1.41.14"
+endchoice
+
+config EMBTK_E2FSPROGS_VERSION_STRING
+	string
+	default "1.41.14"	if EMBTK_E2FSPROGS_VERSION_1_41_14
+
+config EMBTK_E2FSPROGS_NEED_PATCH
+	bool
+	select EMBTK_E2FSPROGS_HOST_NEED_PATCH
+config EMBTK_E2FSPROGS_NEED_AUTORECONF
+	bool
+	select EMBTK_E2FSPROGS_HOST_NEED_AUTORECONF
+config EMBTK_E2FSPROGS_PKG_IS_TARGZ
+	bool
+	select EMBTK_E2FSPROGS_HOST_PKG_IS_TARGZ
+config EMBTK_E2FSPROGS_PKG_IS_TARBZ2
+	bool
+	select EMBTK_E2FSPROGS_HOST_PKG_IS_TARBZ2
+
+config EMBTK_E2FSPROGS_HOST_NEED_PATCH
+	bool
+config EMBTK_E2FSPROGS_HOST_NEED_AUTORECONF
+	bool
+config EMBTK_E2FSPROGS_HOST_PKG_IS_TARGZ
+	bool
+config EMBTK_E2FSPROGS_HOST_PKG_IS_TARBZ2
+	bool
diff --git a/packages/system/e2fsprogs/e2fsprogs.mk b/packages/system/e2fsprogs/e2fsprogs.mk
new file mode 100644
index 0000000..ae0eaab
--- /dev/null
+++ b/packages/system/e2fsprogs/e2fsprogs.mk
@@ -0,0 +1,83 @@
+################################################################################
+# Embtoolkit
+# Copyright(C) 2011 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         e2fsprogs.mk
+# \brief	e2fsprogs.mk of Embtoolkit
+# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# \date         June 2011
+################################################################################
+
+E2FSPROGS_NAME		:= e2fsprogs
+E2FSPROGS_VERSION	:= $(call EMBTK_GET_PKG_VERSION,E2FSPROGS)
+E2FSPROGS_SITE		:= http://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/$(E2FSPROGS_VERSION)
+E2FSPROGS_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+E2FSPROGS_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/e2fsprogs/$(E2FSPROGS_VERSION)
+E2FSPROGS_PACKAGE	:= e2fsprogs-$(E2FSPROGS_VERSION).tar.gz
+E2FSPROGS_SRC_DIR	:= $(PACKAGES_BUILD)/e2fsprogs-$(E2FSPROGS_VERSION)
+E2FSPROGS_BUILD_DIR	:= $(PACKAGES_BUILD)/e2fsprogs-$(E2FSPROGS_VERSION)
+
+E2FSPROGS_BINS		:=
+E2FSPROGS_SBINS		:=
+E2FSPROGS_INCLUDES	:= uuid
+E2FSPROGS_LIBS		:= libuuid.*
+E2FSPROGS_LIBEXECS	:=
+E2FSPROGS_PKGCONFIGS	:= uuid.pc
+
+E2FSPROGS_CONFIGURE_ENV :=
+E2FSPROGS_MAKE_OPTS := LDCONFIG=true
+E2FSPROGS_MAKE_DIRS := lib/uuid
+E2FSPROGS_CONFIGURE_OPTS := --disable-compression --disable-htree	\
+		--enable-elf-shlibs --disable-bsd-shlibs		\
+		--disable-profile --disable-checker --disable-jbd-debug	\
+		--disable-blkid-debug --disable-testio-debug		\
+		--enable-libuuid --enable-libblkid --disable-debugfs	\
+		--disable-imager --disable-resizer --disable-fsck	\
+		--disable-e2initrd-helper --disable-tls --disable-tls	\
+		--disable-nls --disable-rpath --with-included-gettext
+
+e2fsprogs_install:
+	$(call EMBTK_INSTALL_PKG,E2FSPROGS)
+
+download_e2fsprogs:
+	$(call EMBTK_DOWNLOAD_PKG,E2FSPROGS)
+
+e2fsprogs_clean:
+	$(call EMBTK_CLEANUP_PKG,E2FSPROGS)
+
+#
+# E2FSPROGS for host development machine
+#
+E2FSPROGS_HOST_NAME		:= $(E2FSPROGS_NAME)
+E2FSPROGS_HOST_VERSION		:= $(E2FSPROGS_VERSION)
+E2FSPROGS_HOST_SITE		:= $(E2FSPROGS_SITE)
+E2FSPROGS_HOST_SITE_MIRROR3	:= $(E2FSPROGS_SITE_MIRROR3)
+E2FSPROGS_HOST_PATCH_SITE	:= $(E2FSPROGS_PATCH_SITE)
+E2FSPROGS_HOST_PACKAGE		:= $(E2FSPROGS_PACKAGE)
+E2FSPROGS_HOST_SRC_DIR		:= $(TOOLS_BUILD)/e2fsprogs-$(E2FSPROGS_VERSION)
+E2FSPROGS_HOST_BUILD_DIR	:= $(TOOLS_BUILD)/e2fsprogs-$(E2FSPROGS_VERSION)
+
+E2FSPROGS_HOST_MAKE_OPTS := LDCONFIG=true
+
+e2fsprogs_host_install:
+	$(call EMBTK_INSTALL_HOSTPKG,E2FSPROGS_HOST)
+
+download_e2fsprogs_host:
+	$(call EMBTK_DOWNLOAD_PKG,E2FSPROGS_HOST)
+
+e2fsprogs_host_clean:
diff --git a/packages/system/system.kconfig b/packages/system/system.kconfig
index 8e66e44..07eba17 100644
--- a/packages/system/system.kconfig
+++ b/packages/system/system.kconfig
@@ -26,8 +26,8 @@
 #DBUS
 source packages/system/dbus/dbus.kconfig
 
-#util-linux-ng
-source packages/system/utillinuxng/utillinuxng.kconfig
+# e2fsprogs
+source packages/system/e2fsprogs/e2fsprogs.kconfig
 
 #upstart
 source packages/system/upstart/upstart.kconfig
diff --git a/packages/system/system.mk b/packages/system/system.mk
index a95f0f6..beb9126 100644
--- a/packages/system/system.mk
+++ b/packages/system/system.mk
@@ -27,10 +27,10 @@
 include $(EMBTK_ROOT)/packages/system/dbus/dbus.mk
 ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_DBUS) += dbus_install
 
-#util-linux-ng
-include $(EMBTK_ROOT)/packages/system/utillinuxng/utillinuxng.mk
-ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_UTILLINUXNG) += utillinuxng_install
-HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_HOST_HAVE_UTILLINUXNG) += utillinuxng_host_install
+# e2fsprogs
+include $(EMBTK_ROOT)/packages/system/e2fsprogs/e2fsprogs.mk
+ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_E2FSPROGS) += e2fsprogs_install
+HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_HOST_HAVE_E2FSPROGS) += e2fsprogs_host_install
 
 #upstart
 include $(EMBTK_ROOT)/packages/system/upstart/upstart.mk
diff --git a/packages/system/utillinuxng/utillinuxng.kconfig b/packages/system/utillinuxng/utillinuxng.kconfig
deleted file mode 100644
index 3eea6da..0000000
--- a/packages/system/utillinuxng/utillinuxng.kconfig
+++ /dev/null
@@ -1,87 +0,0 @@
-################################################################################
-# Embtoolkit
-# Copyright(C) 2010-2011 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         utillinuxng.kconfig
-# \brief	utillinuxng.kconfig of Embtoolkit
-# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
-# \date         August 2010
-################################################################################
-
-config EMBTK_HOST_HAVE_UTILLINUXNG
-	bool
-	select EMBTK_UTILLINUXNG_PKG_IS_TARBZ2
-
-config EMBTK_HAVE_UTILLINUXNG
-	bool "Have util-linux-ng"
-	select EMBTK_UTILLINUXNG_PKG_IS_TARBZ2
-	select KEMBTK_UCLIBC_UCLIBC_HAS_PROGRAM_INVOCATION_NAME \
-		if EMBTK_CLIB_UCLIBC
-	select KEMBTK_UCLIBC_UCLIBC_HAS___PROGNAME if EMBTK_CLIB_UCLIBC
-	select KEMBTK_UCLIBC_DO_C99_MATH if EMBTK_CLIB_UCLIBC
-	select KEMBTK_UCLIBC_UCLIBC_HAS_WCHAR if EMBTK_CLIB_UCLIBC
-	select KEMBTK_EGLIBC_OPTION_POSIX_C_LANG_WIDE_CHAR if EMBTK_CLIB_EGLIBC
-	select KEMBTK_EGLIBC_OPTION_EGLIBC_LOCALE_CODE if EMBTK_CLIB_EGLIBC
-	help
-		The util-linux-ng is a fork of the original util-linux project.
-		The goal of the util-linux-ng is a transparent and reliable
-		development that follows the Linux kernel and Linux
-		distributions.
-		NOTE:
-		util-linux-ng is only used to have its libuuid, as many of its
-		features are already in busybox.
-choice
-	prompt "util-linux-ng version you wish"
-	depends on EMBTK_HAVE_UTILLINUXNG || EMBTK_HOST_HAVE_UTILLINUXNG
-	help
-		Here you can choose which version of util-linux-ng you want to
-		use.
-
-	config  EMBTK_UTILLINUXNG_VERSION_2_18
-		bool "util-linux-ng-2.18"
-endchoice
-
-config EMBTK_UTILLINUXNG_MAJOR_VERSION_STRING
-	string
-	default "v2.18"		if EMBTK_UTILLINUXNG_VERSION_2_18
-
-config EMBTK_UTILLINUXNG_VERSION_STRING
-	string
-	default "2.18"		if EMBTK_UTILLINUXNG_VERSION_2_18
-
-config EMBTK_UTILLINUXNG_NEED_PATCH
-	bool
-	select EMBTK_UTILLINUXNG_HOST_NEED_PATCH
-config EMBTK_UTILLINUXNG_NEED_AUTORECONF
-	bool
-	select EMBTK_UTILLINUXNG_HOST_NEED_AUTORECONF
-config EMBTK_UTILLINUXNG_PKG_IS_TARGZ
-	bool
-	select EMBTK_UTILLINUXNG_HOST_PKG_IS_TARGZ
-config EMBTK_UTILLINUXNG_PKG_IS_TARBZ2
-	bool
-	select EMBTK_UTILLINUXNG_HOST_PKG_IS_TARBZ2
-
-config EMBTK_UTILLINUXNG_HOST_NEED_PATCH
-	bool
-config EMBTK_UTILLINUXNG_HOST_NEED_AUTORECONF
-	bool
-config EMBTK_UTILLINUXNG_HOST_PKG_IS_TARGZ
-	bool
-config EMBTK_UTILLINUXNG_HOST_PKG_IS_TARBZ2
-	bool
diff --git a/packages/system/utillinuxng/utillinuxng.mk b/packages/system/utillinuxng/utillinuxng.mk
deleted file mode 100644
index 8efeee9..0000000
--- a/packages/system/utillinuxng/utillinuxng.mk
+++ /dev/null
@@ -1,144 +0,0 @@
-################################################################################
-# Embtoolkit
-# Copyright(C) 2010-2011 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         utillinuxng.mk
-# \brief	utillinuxng.mk of Embtoolkit
-# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
-# \date         August 2010
-################################################################################
-
-UTILLINUXNG_NAME		:= util-linux-ng
-UTILLINUXNG_MAJOR_VERSION	:= $(call EMBTK_GET_PKG_VERSION,UTILLINUXNG_MAJOR)
-UTILLINUXNG_VERSION		:= $(call EMBTK_GET_PKG_VERSION,UTILLINUXNG)
-UTILLINUXNG_SITE		:= ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/$(UTILLINUXNG_MAJOR_VERSION)
-UTILLINUXNG_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-UTILLINUXNG_PATCH_SITE		:= ftp://ftp.embtoolkit.org/embtoolkit.org/util-linux-ng/$(UTILLINUXNG_VERSION)
-UTILLINUXNG_PACKAGE		:= util-linux-ng-$(UTILLINUXNG_VERSION).tar.bz2
-UTILLINUXNG_SRC_DIR		:= $(PACKAGES_BUILD)/util-linux-ng-$(UTILLINUXNG_VERSION)
-UTILLINUXNG_BUILD_DIR		:= $(PACKAGES_BUILD)/util-linux-ng-$(UTILLINUXNG_VERSION)
-
-################################
-# util-linux-ng for the target #
-################################
-
-UTILLINUXNG_BINS =
-UTILLINUXNG_SBINS =
-UTILLINUXNG_INCLUDES = uuid
-UTILLINUXNG_LIBS = libuuid.*
-UTILLINUXNG_PKGCONFIGS = uuid.pc
-
-UTILLINUXNG_CONFIGURE_OPTS := --without-audit --without-selinux	\
-	--without-pam --without-slang --without-ncurses \
-	--disable-makeinstall-setuid --disable-makeinstall-chown \
-	--disable-use-tty-group --disable-require-password --disable-pg-bell \
-	--disable-login-stat-mail --disable-login-chown-vcs \
-	--disable-chsh-only-listed --disable-write --disable-wall \
-	--disable-schedutils --disable-login-utils --disable-reset \
-	--disable-rename --disable-raw --disable-partx --disable-mesg \
-	--disable-last --disable-kill  --disable-init --disable-elvtune \
-	--disable-unshare --disable-fallocate --disable-pivot_root \
-	--disable-switch_root --disable-cramfs --disable-agetty \
-	--disable-arch --disable-rpath --disable-nls --disable-libmount \
-	--disable-libblkid --disable-uuidd --enable-libuuid --disable-fsck \
-	--disable-mount  --disable-tls
-
-UTILLINUXNG_DEPS =
-
-utillinuxng_install:
-	@test -e $(UTILLINUXNG_BUILD_DIR)/.installed || \
-	$(MAKE) $(UTILLINUXNG_BUILD_DIR)/.installed
-
-$(UTILLINUXNG_BUILD_DIR)/.installed: $(UTILLINUXNG_DEPS) \
-	download_utillinuxng \
-	$(UTILLINUXNG_SRC_DIR)/.decompressed \
-	$(UTILLINUXNG_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MSG,"Compiling and installing \
-	util-linux-ng-$(UTILLINUXNG_VERSION) in your root filesystem...")
-	$(Q)$(MAKE) -C $(UTILLINUXNG_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(UTILLINUXNG_BUILD_DIR)/shlibs/uuid DESTDIR=$(SYSROOT) install
-	$(Q)$(MAKE) libtool_files_adapt
-	$(Q)$(MAKE) pkgconfig_files_adapt
-	@touch $@
-
-$(UTILLINUXNG_SRC_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,UTILLINUXNG)
-
-$(UTILLINUXNG_BUILD_DIR)/.configured:
-	$(call EMBTK_CONFIGURE_PKG,UTILLINUXNG)
-
-utillinuxng_clean:
-	$(call EMBTK_CLEANUP_PKG,UTILLINUXNG)
-
-##################################################
-# util-linux-ng for the host development machine #
-##################################################
-UTILLINUXNG_HOST_NAME		:= $(UTILLINUXNG_NAME)
-UTILLINUXNG_HOST_VERSION	:= $(UTILLINUXNG_VERSION)
-UTILLINUXNG_HOST_SITE		:= $(UTILLINUXNG_SITE)
-UTILLINUXNG_HOST_SITE_MIRROR3	:= $(UTILLINUXNG_SITE_MIRROR3)
-UTILLINUXNG_HOST_PATCH_SITE	:= $(UTILLINUXNG_PATCH_SITE)
-UTILLINUXNG_HOST_PACKAGE	:= $(UTILLINUXNG_PACKAGE)
-UTILLINUXNG_HOST_SRC_DIR	:= $(TOOLS_BUILD)/util-linux-ng-$(UTILLINUXNG_VERSION)
-UTILLINUXNG_HOST_BUILD_DIR	:= $(TOOLS_BUILD)/util-linux-ng-$(UTILLINUXNG_VERSION)
-
-UTILLINUXNG_HOST_CONFIGURE_OPTS := --without-audit --without-selinux \
-	--without-pam --without-slang --without-ncurses \
-	--disable-makeinstall-setuid --disable-makeinstall-chown \
-	--disable-use-tty-group --disable-require-password --disable-pg-bell \
-	--disable-login-stat-mail --disable-login-chown-vcs \
-	--disable-chsh-only-listed --disable-write --disable-wall \
-	--disable-schedutils --disable-login-utils --disable-reset \
-	--disable-rename --disable-raw --disable-partx --disable-mesg \
-	--disable-last --disable-kill  --disable-init --disable-elvtune \
-	--disable-unshare --disable-fallocate --disable-pivot_root \
-	--disable-switch_root --disable-cramfs --disable-agetty \
-	--disable-arch --disable-rpath --disable-nls --disable-libmount \
-	--disable-libblkid --disable-uuidd --enable-libuuid --disable-fsck \
-	--disable-mount  --disable-tls
-
-UTILLINUXNG_HOST_DEPS =
-
-utillinuxng_host_install:
-	@test -e $(UTILLINUXNG_HOST_BUILD_DIR)/.installed || \
-	$(MAKE) $(UTILLINUXNG_HOST_BUILD_DIR)/.installed
-
-$(UTILLINUXNG_HOST_BUILD_DIR)/.installed: $(UTILLINUXNG_HOST_DEPS) \
-	download_utillinuxng \
-	$(UTILLINUXNG_HOST_SRC_DIR)/.decompressed \
-	$(UTILLINUXNG_HOST_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MSG,"Compiling and installing \
-	util-linux-ng-$(UTILLINUXNG_VERSION) in host tools...")
-	$(Q)$(MAKE) -C $(UTILLINUXNG_HOST_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(UTILLINUXNG_HOST_BUILD_DIR)/shlibs/uuid install
-	@touch $@
-
-$(UTILLINUXNG_HOST_SRC_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_HOSTPKG,UTILLINUXNG_HOST)
-
-$(UTILLINUXNG_HOST_BUILD_DIR)/.configured:
-	$(call EMBTK_CONFIGURE_HOSTPKG,UTILLINUXNG_HOST)
-
-utillinuxng_host_clean:
-	$(call EMBTK_GENERIC_MSG,"Cleanup util-linux-ng for host...")
-
-##############################
-# Common for host and target #
-##############################
-download_utillinuxng download_utillinuxng_host:
-	$(call EMBTK_DOWNLOAD_PKG,UTILLINUXNG)