From: Carsten Schlote <[email protected]> util-linux-ng provides newer versions of libblkid and libuuid than the e2fsprogs sources.
Framework changed to use the newer libraries and binaries from util-linux-ng. Added missing swapoff link to swapon binary. Signed-off-by: Carsten Schlote <[email protected]> --- rules/e2fsprogs.in | 57 ++++++++++++++------------------------------- rules/e2fsprogs.make | 41 +++++++++++++++++--------------- rules/mtd-utils.in | 3 +- rules/networkmanager.in | 4 +- rules/nfsutils.in | 4 +- rules/util-linux-ng.in | 33 +++++++++++++++++++++----- rules/util-linux-ng.make | 23 ++++++++++++++++++ 7 files changed, 95 insertions(+), 70 deletions(-) diff --git a/rules/e2fsprogs.in b/rules/e2fsprogs.in index 825d287..2eec3bf 100644 --- a/rules/e2fsprogs.in +++ b/rules/e2fsprogs.in @@ -4,6 +4,9 @@ menuconfig E2FSPROGS tristate prompt "e2fsprogs " select HOST_GETTEXT + select UTIL_LINUX_NG if E2FSPROGS_LIBBLKID || E2FSPROGS_LIBUUID + select UTIL_LINUX_NG_LIBBLKID if E2FSPROGS_LIBBLKID + select UTIL_LINUX_NG_LIBUUID if E2FSPROGS_LIBUUID help The e2fsprogs package provides the filesystem utilities for use with the ext2 filesystem. It also supports the ext3 filesystem @@ -11,10 +14,6 @@ menuconfig E2FSPROGS if E2FSPROGS -# ----------------------------------- -menu "build options " -# ----------------------------------- - config E2FSPROGS_COMPRESSION bool prompt "compression" @@ -35,18 +34,9 @@ config E2FSPROGS_RESIZER help Enable support for e2resize program. -endmenu - -# ----------------------------------- -menu "libraries " -# ----------------------------------- config E2FSPROGS_LIBBLKID bool - prompt "libblkid" - select E2FSPROGS_LIBUUID - help - Install libblkid. config E2FSPROGS_LIBCOM_ERR bool @@ -79,15 +69,6 @@ config E2FSPROGS_LIBSS config E2FSPROGS_LIBUUID bool - prompt "libuuid" - help - Install libuuid. - -endmenu - -# ----------------------------------- -menu "binaries " -# ----------------------------------- config E2FSPROGS_INSTALL_CHATTR bool @@ -105,12 +86,12 @@ config E2FSPROGS_INSTALL_LSATTR help Enable support for lsattr program. -config E2FSPROGS_INSTALL_UUIDGEN - bool - select E2FSPROGS_LIBUUID - prompt "uuidgen" - help - Enable support for uuidgen program. +#config E2FSPROGS_INSTALL_UUIDGEN +# bool +# select E2FSPROGS_LIBUUID +# prompt "uuidgen" +# help +# Enable support for uuidgen program. # ----- @@ -122,15 +103,15 @@ config E2FSPROGS_INSTALL_BADBLOCKS help Enable support for badblocks program. -config E2FSPROGS_INSTALL_BLKID - bool - select E2FSPROGS_LIBBLKID - select E2FSPROGS_LIBCOM_ERR - select E2FSPROGS_LIBEXT2FS - select E2FSPROGS_LIBUUID - prompt "blkid" - help - Enable support for blkid program. +#config E2FSPROGS_INSTALL_BLKID +# bool +# select E2FSPROGS_LIBBLKID +# select E2FSPROGS_LIBCOM_ERR +# select E2FSPROGS_LIBEXT2FS +# select E2FSPROGS_LIBUUID +# prompt "blkid" +# help +# Enable support for blkid program. config E2FSPROGS_INSTALL_DUMPE2FS bool @@ -313,7 +294,5 @@ config E2FSPROGS_INSTALL_UUIDD help Enable support for uuid program. -endmenu - endif diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index 40a2f22..3c93faa 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -56,7 +56,9 @@ E2FSPROGS_AUTOCONF := \ --disable-testio-debug \ --disable-tls \ --enable-elf-shlibs \ - --enable-htree + --enable-htree \ + --disable-libblkid \ + --disable-libuuid ifdef PTXCONF_E2FSPROGS_COMPRESSION E2FSPROGS_AUTOCONF += --enable-compression @@ -109,12 +111,13 @@ $(STATEDIR)/e2fsprogs.targetinstall: # # # # libraries # # -ifdef PTXCONF_E2FSPROGS_LIBBLKID - @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ - /usr/lib/libblkid.so.1.0) - @$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so.1) - @$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so) -endif + +#ifdef PTXCONF_E2FSPROGS_LIBBLKID +# @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ +# /usr/lib/libblkid.so.1.0) +# @$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so.1) +# @$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so) +#endif ifdef PTXCONF_E2FSPROGS_LIBCOM_ERR @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ @@ -144,12 +147,12 @@ ifdef PTXCONF_E2FSPROGS_LIBSS @$(call install_link, e2fsprogs, libss.so.2.0, /usr/lib/libss.so) endif -ifdef PTXCONF_E2FSPROGS_LIBUUID - @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ - /usr/lib/libuuid.so.1.2) - @$(call install_link, e2fsprogs, libuuid.so.1.2, /usr/lib/libuuid.so.1) - @$(call install_link, e2fsprogs, libuuid.so.1.2, /usr/lib/libuuid.so) -endif +#ifdef PTXCONF_E2FSPROGS_LIBUUID +# @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ +# /usr/lib/libuuid.so.1.2) +# @$(call install_link, e2fsprogs, libuuid.so.1.2, /usr/lib/libuuid.so.1) +# @$(call install_link, e2fsprogs, libuuid.so.1.2, /usr/lib/libuuid.so) +#endif # # @@ -161,9 +164,9 @@ endif ifdef PTXCONF_E2FSPROGS_INSTALL_LSATTR @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/bin/lsattr) endif -ifdef PTXCONF_E2FSPROGS_INSTALL_UUIDGEN - @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/bin/uuidgen) -endif +#ifdef PTXCONF_E2FSPROGS_INSTALL_UUIDGEN +# @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/bin/uuidgen) +#endif # # @@ -173,9 +176,9 @@ ifdef PTXCONF_E2FSPROGS_INSTALL_BADBLOCKS @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/badblocks) endif -ifdef PTXCONF_E2FSPROGS_INSTALL_BLKID - @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/blkid) -endif +#ifdef PTXCONF_E2FSPROGS_INSTALL_BLKID +# @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/blkid) +#endif ifdef PTXCONF_E2FSPROGS_INSTALL_DUMPE2FS @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/dumpe2fs) diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in index 5f91944..cbccf36 100644 --- a/rules/mtd-utils.in +++ b/rules/mtd-utils.in @@ -4,7 +4,8 @@ menuconfig MTD_UTILS tristate prompt "mtd-utils " select ZLIB - select E2FSPROGS + select UTIL_LINUX_NG + select UTIL_LINUX_NG_LIBBLKID select LIBLZO if MTD_UTILS_USE_LIBLZO help Memory Technology Device Utilities diff --git a/rules/networkmanager.in b/rules/networkmanager.in index 94b7163..20e2588 100644 --- a/rules/networkmanager.in +++ b/rules/networkmanager.in @@ -7,8 +7,8 @@ config NETWORKMANAGER select DBUS_GLIB select LIBNL # we need libuuid from e2fsprogs - select E2FSPROGS - select E2FSPROGS_LIBUUID + select UTIL_LINUX_NG + select UTIL_LINUX_NG_LIBUUID # FIXME: hal can be configured without policy-kit, but networkmanager depends on it select HAL select HAL__POLKIT diff --git a/rules/nfsutils.in b/rules/nfsutils.in index 09f7c2d..a653d22 100644 --- a/rules/nfsutils.in +++ b/rules/nfsutils.in @@ -2,8 +2,8 @@ menuconfig NFSUTILS tristate # we need libblkid - select E2FSPROGS - select E2FSPROGS_LIBBLKID + select UTIL_LINUX_NG + select UTIL_LINUX_NG_LIBBLKID select TCPWRAPPER if NFSUTILS_WITH_TCPWRAPPERS prompt "nfsutils " help diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in index da3d749..8424ca1 100644 --- a/rules/util-linux-ng.in +++ b/rules/util-linux-ng.in @@ -4,16 +4,19 @@ menuconfig UTIL_LINUX_NG tristate prompt "util-linux-ng " select HOST_GETTEXT - # select LIBC_UTIL - # we may need libuuid from E2FSPROGS, but we always need blkid - select E2FSPROGS - select E2FSPROGS_LIBBLKID - select E2FSPROGS_LIBUUID if UTIL_LINUX_NG_MKSWAP_UUID - select NCURSES if UTIL_LINUX_NG_USES_NCURSES - select UTIL_LINUX_NG_USES_NCURSES if UTIL_LINUX_NG_CFDISK || UTIL_LINUX_NG_SETTERM + select UTIL_LINUX_NG_LIBBLKID + select UTIL_LINUX_NG_LIBUUID if UTIL_LINUX_NG_MKSWAP_UUID + select NCURSES if UTIL_LINUX_NG_USES_NCURSES + select UTIL_LINUX_NG_USES_NCURSES if UTIL_LINUX_NG_CFDISK || UTIL_LINUX_NG_SETTERM if UTIL_LINUX_NG +config UTIL_LINUX_NG_LIBBLKID + bool + +config UTIL_LINUX_NG_LIBUUID + bool + config UTIL_LINUX_NG_USES_NCURSES bool @@ -154,4 +157,20 @@ config UTIL_LINUX_NG_MCOOKIE mcookie generates a 128-bit random hexadecimal number for use with the X authority system. +config UTIL_LINUX_NG_INSTALL_UUIDGEN + bool + select UTIL_LINUX_NG_LIBUUID + prompt "uuidgen" + help + Enable support for uuidgen program. + +config UTIL_LINUX_NG_INSTALL_BLKID + bool + select UTIL_LINUX_NG_LIBBLKID + select UTIL_LINUX_NG_LIBUUID + prompt "blkid" + help + Enable support for blkid program. + + endif diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make index 6a1f119..9948d46 100644 --- a/rules/util-linux-ng.make +++ b/rules/util-linux-ng.make @@ -102,11 +102,34 @@ $(STATEDIR)/util-linux-ng.targetinstall: @$(call install_fixup, util-linux-ng,DEPENDS,) @$(call install_fixup, util-linux-ng,DESCRIPTION,missing) +ifdef PTXCONF_UTIL_LINUX_NG_LIBBLKID + @$(call install_copy, util-linux-ng, 0, 0, 0644, -, \ + /lib/libblkid.so.1.1.0) + @$(call install_link, util-linux-ng, libblkid.so.1.1.0, /lib/libblkid.so.1) + @$(call install_link, util-linux-ng, libblkid.so.1.1.0, /lib/libblkid.so) +endif + +ifdef PTXCONF_UTIL_LINUX_NG_LIBUUID + @$(call install_copy, util-linux-ng, 0, 0, 0644, -, \ + /lib/libuuid.so.1.3.0) + @$(call install_link, util-linux-ng, libuuid.so.1.3.0, /lib/libuuid.so.1) + @$(call install_link, util-linux-ng, libuuid.so.1.3.0, /lib/libuuid.so) +endif + +ifdef PTXCONF_UTIL_LINUX_NG_INSTALL_UUIDGEN + @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/uuidgen) +endif + +ifdef PTXCONF_UTIL_LINUX_NG_INSTALL_BLKID + @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /sbin/blkid) +endif + ifdef PTXCONF_UTIL_LINUX_NG_MKSWAP @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /sbin/mkswap) endif ifdef PTXCONF_UTIL_LINUX_NG_SWAPON @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /sbin/swapon) + @$(call install_link, util-linux-ng, ./swapon, /sbin/swapoff) endif ifdef PTXCONF_UTIL_LINUX_NG_MOUNT @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /bin/mount) -- 1.6.5.6.gb3118 -- ptxdist mailing list [email protected]
