Packages: e2fsprogs-libuuid: update to v1.14.12 and split it into host/target packages

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

6 files changed, 2 insertions, 147 deletions

diff --git a/packages/system/e2fsprogs/e2fsprogs.kconfig b/packages/system/e2fsprogs/e2fsprogs.kconfig
deleted file mode 100644
index ad4c8a2..0000000
--- a/packages/system/e2fsprogs/e2fsprogs.kconfig
+++ /dev/null
@@ -1,71 +0,0 @@
-################################################################################
-# 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
-	help
-		NOTE: used only to have libuuid
-
-		UUID library from the e2fsprogs package.
-
-config EMBTK_HAVE_E2FSPROGS
-	bool "Have e2fsprogs/libuuid"
-	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
-config EMBTK_E2FSPROGS_PKG_IS_TARBZ2
-	bool
-
-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
deleted file mode 100644
index 8759bcf..0000000
--- a/packages/system/e2fsprogs/e2fsprogs.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-################################################################################
-# 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_pkgversion,e2fsprogs)
-E2FSPROGS_SITE		:= http://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/$(E2FSPROGS_VERSION)
-E2FSPROGS_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-E2FSPROGS_PACKAGE	:= e2fsprogs-$(E2FSPROGS_VERSION).tar.gz
-E2FSPROGS_SRC_DIR	:= $(embtk_pkgb)/e2fsprogs-$(E2FSPROGS_VERSION)
-E2FSPROGS_BUILD_DIR	:= $(embtk_pkgb)/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-nls	\
-		--disable-rpath --with-included-gettext
-
-#
-# 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_PACKAGE		:= $(E2FSPROGS_PACKAGE)
-E2FSPROGS_HOST_SRC_DIR		:= $(embtk_toolsb)/e2fsprogs-$(E2FSPROGS_VERSION)
-E2FSPROGS_HOST_BUILD_DIR	:= $(embtk_toolsb)/e2fsprogs-$(E2FSPROGS_VERSION)
-
-E2FSPROGS_HOST_MAKE_OPTS	:= LDCONFIG=true
-E2FSPROGS_HOST_MAKE_DIRS	:= $(E2FSPROGS_MAKE_DIRS)
-E2FSPROGS_HOST_CONFIGURE_OPTS	:= $(E2FSPROGS_CONFIGURE_OPTS)
-
diff --git a/packages/system/mtdutils/mtdutils.kconfig b/packages/system/mtdutils/mtdutils.kconfig
index c32973b..423cc67 100644
--- a/packages/system/mtdutils/mtdutils.kconfig
+++ b/packages/system/mtdutils/mtdutils.kconfig
@@ -25,7 +25,7 @@
 
 config EMBTK_HAVE_MTDUTILS
 	bool "Have mtd-utils in your target root filesystem"
-	select EMBTK_HAVE_E2FSPROGS
+	select EMBTK_HAVE_E2FSPROGS-LIBUUID
 	select EMBTK_HAVE_ZLIB
 	select EMBTK_HAVE_LZO
 	select KEMBTK_UCLIBC_UCLIBC_SUSV3_LEGACY_MACROS if EMBTK_CLIB_UCLIBC
diff --git a/packages/system/mtdutils/mtdutils.mk b/packages/system/mtdutils/mtdutils.mk
index 41bfdf2..ba8c277 100644
--- a/packages/system/mtdutils/mtdutils.mk
+++ b/packages/system/mtdutils/mtdutils.mk
@@ -30,7 +30,7 @@ MTDUTILS_PACKAGE		:= mtd-utils-$(MTDUTILS_VERSION).tar.bz2
 MTDUTILS_SRC_DIR		:= $(embtk_pkgb)/mtd-utils-$(MTDUTILS_VERSION)
 MTDUTILS_BUILD_DIR		:= $(embtk_pkgb)/mtd-utils-$(MTDUTILS_VERSION)
 
-MTDUTILS_DEPS		:= zlib_install lzo_install e2fsprogs_install
+MTDUTILS_DEPS		:= zlib_install lzo_install e2fsprogs-libuuid_install
 
 __embtk_mtdutils_cflags	:= $(TARGET_CFLAGS)
 
diff --git a/packages/system/system.kconfig b/packages/system/system.kconfig
index 76d9099..22150b9 100644
--- a/packages/system/system.kconfig
+++ b/packages/system/system.kconfig
@@ -26,8 +26,5 @@
 # DBUS
 source packages/system/dbus/dbus.kconfig
 
-# e2fsprogs
-source packages/system/e2fsprogs/e2fsprogs.kconfig
-
 # OpenRC
 source packages/system/openrc/openrc.kconfig
diff --git a/packages/system/system.mk b/packages/system/system.mk
index 772c96d..3285ac7 100644
--- a/packages/system/system.mk
+++ b/packages/system/system.mk
@@ -28,10 +28,6 @@ embtk_pkgincdir := packages/system
 # dbus
 $(call embtk_include_pkg,dbus)
 
-# e2fsprogs
-$(call embtk_include_pkg,e2fsprogs)
-$(call embtk_include_hostpkg,e2fsprogs_host)
-
 # OpenRC
 $(call embtk_include_pkg,openrc)