From 258c21a0f9cdad543ad287c86c7de7170ac546d4 Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Sat, 18 Oct 2014 14:42:14 +0200 Subject: Packages: e2fsprogs-libuuid: update to v1.14.12 and split it into host/target packages Signed-off-by: Abdoulaye Walsimou Gaye --- packages/development/development.kconfig | 3 + packages/development/development.mk | 3 + .../e2fsprogs-libuuid/e2fsprogs-libuuid.kconfig | 48 +++++++++++++++ .../e2fsprogs-libuuid/e2fsprogs-libuuid.mk | 60 ++++++++++++++++++ .../e2fsprogs-libuuid/e2fsprogs-libuuid.kconfig | 46 ++++++++++++++ .../htools/e2fsprogs-libuuid/e2fsprogs-libuuid.mk | 60 ++++++++++++++++++ packages/htools/hosttools-buildopts.kconfig | 5 ++ packages/htools/hosttools-buildopts.mk | 3 + packages/htools/mtdutils/mtdutils.kconfig | 2 +- packages/htools/mtdutils/mtdutils.mk | 2 +- packages/system/e2fsprogs/e2fsprogs.kconfig | 71 ---------------------- packages/system/e2fsprogs/e2fsprogs.mk | 67 -------------------- packages/system/mtdutils/mtdutils.kconfig | 2 +- packages/system/mtdutils/mtdutils.mk | 2 +- packages/system/system.kconfig | 3 - packages/system/system.mk | 4 -- 16 files changed, 232 insertions(+), 149 deletions(-) create mode 100644 packages/development/e2fsprogs-libuuid/e2fsprogs-libuuid.kconfig create mode 100644 packages/development/e2fsprogs-libuuid/e2fsprogs-libuuid.mk create mode 100644 packages/htools/e2fsprogs-libuuid/e2fsprogs-libuuid.kconfig create mode 100644 packages/htools/e2fsprogs-libuuid/e2fsprogs-libuuid.mk delete mode 100644 packages/system/e2fsprogs/e2fsprogs.kconfig delete mode 100644 packages/system/e2fsprogs/e2fsprogs.mk (limited to 'packages') diff --git a/packages/development/development.kconfig b/packages/development/development.kconfig index a57e43d..af9a245 100644 --- a/packages/development/development.kconfig +++ b/packages/development/development.kconfig @@ -68,6 +68,9 @@ source packages/development/libsigsegv/libsigsegv.kconfig # libunwind source packages/development/libunwind/libunwind.kconfig +# libuuid +source packages/development/e2fsprogs-libuuid/e2fsprogs-libuuid.kconfig + # openblas source packages/development/openblas/openblas.kconfig diff --git a/packages/development/development.mk b/packages/development/development.mk index 2a9d220..7223a4d 100644 --- a/packages/development/development.mk +++ b/packages/development/development.mk @@ -71,6 +71,9 @@ $(call embtk_include_pkg,libsigsegv) # libunwind $(call embtk_include_pkg,libunwind) +# libuuid +$(call embtk_include_pkg,e2fsprogs-libuuid) + # openblas $(call embtk_include_pkg,openblas) diff --git a/packages/development/e2fsprogs-libuuid/e2fsprogs-libuuid.kconfig b/packages/development/e2fsprogs-libuuid/e2fsprogs-libuuid.kconfig new file mode 100644 index 0000000..71941ee --- /dev/null +++ b/packages/development/e2fsprogs-libuuid/e2fsprogs-libuuid.kconfig @@ -0,0 +1,48 @@ +################################################################################ +# Embtoolkit +# 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 +# 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 . +# +################################################################################ +# +# \file e2fsprogs-libuuid.kconfig +# \brief e2fsprogs-libuuid.kconfig of Embtoolkit +# \author Abdoulaye Walsimou GAYE +# \date June 2011 +################################################################################ + +config EMBTK_HAVE_E2FSPROGS-LIBUUID + bool "Have e2fsprogs-libuuid" + help + Universally unique identifier (UUID) generator from e2fsprogs + +choice + prompt "e2fsprogs-libuuid version you wish" + depends on EMBTK_HAVE_E2FSPROGS-LIBUUID + help + Here you can choose which version you want to use. + + config EMBTK_E2FSPROGS-LIBUUID_VERSION_1_42_12 + bool "e2fsprogs-libuuid-1.42.12" +endchoice + +config EMBTK_E2FSPROGS-LIBUUID_VERSION_STRING + string + default "1.42.12" if EMBTK_E2FSPROGS-LIBUUID_VERSION_1_42_12 + +config EMBTK_E2FSPROGS-LIBUUID_NEED_PATCH + bool +config EMBTK_E2FSPROGS-LIBUUID_NEED_AUTORECONF + bool diff --git a/packages/development/e2fsprogs-libuuid/e2fsprogs-libuuid.mk b/packages/development/e2fsprogs-libuuid/e2fsprogs-libuuid.mk new file mode 100644 index 0000000..8b24873 --- /dev/null +++ b/packages/development/e2fsprogs-libuuid/e2fsprogs-libuuid.mk @@ -0,0 +1,60 @@ +################################################################################ +# Embtoolkit +# 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 +# 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 . +# +################################################################################ +# +# \file e2fsprogs.mk +# \brief e2fsprogs.mk of Embtoolkit +# \author Abdoulaye Walsimou GAYE +# \date June 2011 +################################################################################ + +E2FSPROGS-LIBUUID_NAME := e2fsprogs-libuuid +E2FSPROGS-LIBUUID_VERSION := $(call embtk_pkg_version,e2fsprogs-libuuid) +E2FSPROGS-LIBUUID_SITE := http://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/v$(E2FSPROGS-LIBUUID_VERSION) +E2FSPROGS-LIBUUID_PACKAGE := e2fsprogs-libs-$(E2FSPROGS-LIBUUID_VERSION).tar.gz +E2FSPROGS-LIBUUID_SRC_DIR := $(embtk_pkgb)/e2fsprogs-libs-$(E2FSPROGS-LIBUUID_VERSION) +E2FSPROGS-LIBUUID_BUILD_DIR := $(embtk_pkgb)/e2fsprogs-libs-$(E2FSPROGS-LIBUUID_VERSION)-build + +E2FSPROGS-LIBUUID_INCLUDES := uuid +E2FSPROGS-LIBUUID_LIBS := libuuid.* +E2FSPROGS-LIBUUID_PKGCONFIGS := uuid.pc +E2FSPROGS-LIBUUID_SHARES := man/man*/uuid* + +E2FSPROGS-LIBUUID_MAKE_OPTS := LDCONFIG=true +E2FSPROGS-LIBUUID_MAKE_DIRS := util lib/uuid + +E2FSPROGS-LIBUUID_CONFIGURE_OPTS := --disable-compression +E2FSPROGS-LIBUUID_CONFIGURE_OPTS += --disable-htree +E2FSPROGS-LIBUUID_CONFIGURE_OPTS += --enable-elf-shlibs +E2FSPROGS-LIBUUID_CONFIGURE_OPTS += --disable-bsd-shlibs +E2FSPROGS-LIBUUID_CONFIGURE_OPTS += --disable-profile +E2FSPROGS-LIBUUID_CONFIGURE_OPTS += --disable-checker +E2FSPROGS-LIBUUID_CONFIGURE_OPTS += --disable-jbd-debug +E2FSPROGS-LIBUUID_CONFIGURE_OPTS += --disable-blkid-debug +E2FSPROGS-LIBUUID_CONFIGURE_OPTS += --disable-testio-debug +E2FSPROGS-LIBUUID_CONFIGURE_OPTS += --enable-libuuid +E2FSPROGS-LIBUUID_CONFIGURE_OPTS += --enable-libblkid +E2FSPROGS-LIBUUID_CONFIGURE_OPTS += --disable-debugfs +E2FSPROGS-LIBUUID_CONFIGURE_OPTS += --disable-imager +E2FSPROGS-LIBUUID_CONFIGURE_OPTS += --disable-resizer +E2FSPROGS-LIBUUID_CONFIGURE_OPTS += --disable-fsck +E2FSPROGS-LIBUUID_CONFIGURE_OPTS += --disable-e2initrd-helper +E2FSPROGS-LIBUUID_CONFIGURE_OPTS += --disable-tls +E2FSPROGS-LIBUUID_CONFIGURE_OPTS += --disable-nls +E2FSPROGS-LIBUUID_CONFIGURE_OPTS += --disable-rpath +E2FSPROGS-LIBUUID_CONFIGURE_OPTS += --with-included-gettext diff --git a/packages/htools/e2fsprogs-libuuid/e2fsprogs-libuuid.kconfig b/packages/htools/e2fsprogs-libuuid/e2fsprogs-libuuid.kconfig new file mode 100644 index 0000000..32416a6 --- /dev/null +++ b/packages/htools/e2fsprogs-libuuid/e2fsprogs-libuuid.kconfig @@ -0,0 +1,46 @@ +################################################################################ +# Embtoolkit +# 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 +# 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 . +# +################################################################################ +# +# \file e2fsprogs-libuuid.kconfig +# \brief e2fsprogs-libuuid.kconfig of Embtoolkit +# \author Abdoulaye Walsimou GAYE +# \date June 2011 +################################################################################ + +config EMBTK_HOST_HAVE_E2FSPROGS-LIBUUID + bool + +choice + prompt "e2fsprogs-libuuid version you wish" + depends on EMBTK_HOST_HAVE_E2FSPROGS-LIBUUID + help + Here you can choose which version you want to use. + + config EMBTK_E2FSPROGS-LIBUUID_HOST_VERSION_1_42_12 + bool "e2fsprogs-libuuid-1.42.12" +endchoice + +config EMBTK_E2FSPROGS-LIBUUID_HOST_VERSION_STRING + string + default "1.42.12" if EMBTK_E2FSPROGS-LIBUUID_HOST_VERSION_1_42_12 + +config EMBTK_E2FSPROGS-LIBUUID_HOST_NEED_PATCH + bool +config EMBTK_E2FSPROGS-LIBUUID_HOST_NEED_AUTORECONF + bool diff --git a/packages/htools/e2fsprogs-libuuid/e2fsprogs-libuuid.mk b/packages/htools/e2fsprogs-libuuid/e2fsprogs-libuuid.mk new file mode 100644 index 0000000..3fa91d8 --- /dev/null +++ b/packages/htools/e2fsprogs-libuuid/e2fsprogs-libuuid.mk @@ -0,0 +1,60 @@ +################################################################################ +# Embtoolkit +# 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 +# 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 . +# +################################################################################ +# +# \file e2fsprogs.mk +# \brief e2fsprogs.mk of Embtoolkit +# \author Abdoulaye Walsimou GAYE +# \date June 2011 +################################################################################ + +E2FSPROGS-LIBUUID_HOST_NAME := e2fsprogs-libuuid +E2FSPROGS-LIBUUID_HOST_VERSION := $(call embtk_pkg_version,e2fsprogs-libuuid_host) +E2FSPROGS-LIBUUID_HOST_SITE := http://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/v$(E2FSPROGS-LIBUUID_HOST_VERSION) +E2FSPROGS-LIBUUID_HOST_PACKAGE := e2fsprogs-libs-$(E2FSPROGS-LIBUUID_HOST_VERSION).tar.gz +E2FSPROGS-LIBUUID_HOST_SRC_DIR := $(embtk_toolsb)/e2fsprogs-libs-$(E2FSPROGS-LIBUUID_HOST_VERSION) +E2FSPROGS-LIBUUID_HOST_BUILD_DIR := $(embtk_toolsb)/e2fsprogs-libs-$(E2FSPROGS-LIBUUID_HOST_VERSION)-build + +E2FSPROGS-LIBUUID_HOST_MAKE_OPTS := LDCONFIG=true +E2FSPROGS-LIBUUID_HOST_MAKE_DIRS := util lib/uuid + +E2FSPROGS-LIBUUID_HOST_CONFIGURE_OPTS := --disable-compression +E2FSPROGS-LIBUUID_HOST_CONFIGURE_OPTS += --disable-htree +ifeq ($(embtk_buildhost_os_type),bsd) +E2FSPROGS-LIBUUID_HOST_CONFIGURE_OPTS += --disable-elf-shlibs +E2FSPROGS-LIBUUID_HOST_CONFIGURE_OPTS += --enable-bsd-shlibs +else +E2FSPROGS-LIBUUID_HOST_CONFIGURE_OPTS += --enable-elf-shlibs +E2FSPROGS-LIBUUID_HOST_CONFIGURE_OPTS += --disable-bsd-shlibs +endif +E2FSPROGS-LIBUUID_HOST_CONFIGURE_OPTS += --disable-profile +E2FSPROGS-LIBUUID_HOST_CONFIGURE_OPTS += --disable-checker +E2FSPROGS-LIBUUID_HOST_CONFIGURE_OPTS += --disable-jbd-debug +E2FSPROGS-LIBUUID_HOST_CONFIGURE_OPTS += --disable-blkid-debug +E2FSPROGS-LIBUUID_HOST_CONFIGURE_OPTS += --disable-testio-debug +E2FSPROGS-LIBUUID_HOST_CONFIGURE_OPTS += --enable-libuuid +E2FSPROGS-LIBUUID_HOST_CONFIGURE_OPTS += --enable-libblkid +E2FSPROGS-LIBUUID_HOST_CONFIGURE_OPTS += --disable-debugfs +E2FSPROGS-LIBUUID_HOST_CONFIGURE_OPTS += --disable-imager +E2FSPROGS-LIBUUID_HOST_CONFIGURE_OPTS += --disable-resizer +E2FSPROGS-LIBUUID_HOST_CONFIGURE_OPTS += --disable-fsck +E2FSPROGS-LIBUUID_HOST_CONFIGURE_OPTS += --disable-e2initrd-helper +E2FSPROGS-LIBUUID_HOST_CONFIGURE_OPTS += --disable-tls +E2FSPROGS-LIBUUID_HOST_CONFIGURE_OPTS += --disable-nls +E2FSPROGS-LIBUUID_HOST_CONFIGURE_OPTS += --disable-rpath +E2FSPROGS-LIBUUID_HOST_CONFIGURE_OPTS += --with-included-gettext diff --git a/packages/htools/hosttools-buildopts.kconfig b/packages/htools/hosttools-buildopts.kconfig index b1d7318..a7b2119 100644 --- a/packages/htools/hosttools-buildopts.kconfig +++ b/packages/htools/hosttools-buildopts.kconfig @@ -122,6 +122,11 @@ source core/kconfig/bmake.kconfig # source packages/htools/gmake/gmake.kconfig +# +# libuuid +# +source packages/htools/e2fsprogs-libuuid/e2fsprogs-libuuid.kconfig + # # mtd-utils # diff --git a/packages/htools/hosttools-buildopts.mk b/packages/htools/hosttools-buildopts.mk index 1933f4f..e014dcc 100644 --- a/packages/htools/hosttools-buildopts.mk +++ b/packages/htools/hosttools-buildopts.mk @@ -50,6 +50,9 @@ $(call embtk_include_hostpkg,libelf_host) # libtool $(call embtk_include_hostpkg,libtool_host) +# libuuid +$(call embtk_include_hostpkg,e2fsprogs-libuuid_host) + # mtd-utils $(call embtk_include_hostpkg,mtdutils_host) diff --git a/packages/htools/mtdutils/mtdutils.kconfig b/packages/htools/mtdutils/mtdutils.kconfig index d115eb9..32df276 100644 --- a/packages/htools/mtdutils/mtdutils.kconfig +++ b/packages/htools/mtdutils/mtdutils.kconfig @@ -25,7 +25,7 @@ config EMBTK_HOST_HAVE_MTDUTILS bool - select EMBTK_HOST_HAVE_E2FSPROGS + select EMBTK_HOST_HAVE_E2FSPROGS-LIBUUID select EMBTK_HOST_HAVE_ZLIB select EMBTK_HOST_HAVE_LZO select EMBTK_MTDUTILS_HOST_NEED_PATCH diff --git a/packages/htools/mtdutils/mtdutils.mk b/packages/htools/mtdutils/mtdutils.mk index 790fd4a..ec9e006 100644 --- a/packages/htools/mtdutils/mtdutils.mk +++ b/packages/htools/mtdutils/mtdutils.mk @@ -30,7 +30,7 @@ MTDUTILS_HOST_PACKAGE := mtd-utils-$(MTDUTILS_HOST_VERSION).tar.bz2 MTDUTILS_HOST_SRC_DIR := $(embtk_toolsb)/mtd-utils-$(MTDUTILS_HOST_VERSION) MTDUTILS_HOST_BUILD_DIR := $(embtk_toolsb)/mtd-utils-$(MTDUTILS_HOST_VERSION) -MTDUTILS_HOST_DEPS := zlib_host_install lzo_host_install e2fsprogs_host_install +MTDUTILS_HOST_DEPS := zlib_host_install lzo_host_install e2fsprogs-libuuid_host_install embtk_mtdutils_host_cppflags := -I. -Iinclude -I../include -I$(embtk_htools)/usr/include ifneq ($(embtk_buildhost_os_type),linux) 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 . -# -################################################################################ -# -# \file e2fsprogs.kconfig -# \brief e2fsprogs.kconfig of Embtoolkit -# \author Abdoulaye Walsimou GAYE -# \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 . -# -################################################################################ -# -# \file e2fsprogs.mk -# \brief e2fsprogs.mk of Embtoolkit -# \author Abdoulaye Walsimou GAYE -# \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) -- cgit v1.2.3