diff options
| author | Carsten Schlote <c.schlote@konzeptpark.de> | 2010-02-01 19:42:29 +0100 |
|---|---|---|
| committer | Carsten Schlote <c.schlote@konzeptpark.de> | 2010-02-08 11:30:32 +0100 |
| commit | 6ac2968ec7487e167afcf57a5d7a38da5efa8874 (patch) | |
| tree | 5996358edf595cce52f0e41251385c2b65493728 /rules/util-linux-ng.in | |
| parent | 21231b5c6c6812d0a6d253cb6eb7e42ec869852c (diff) | |
| download | ptxdist-6ac2968ec7487e167afcf57a5d7a38da5efa8874.tar.gz ptxdist-6ac2968ec7487e167afcf57a5d7a38da5efa8874.tar.xz | |
[ptxdist] (2/4) Switch to newer versions of libuuid and libblkid
util-linux-ng provides newer versions of libblkid and libuuid
than the e2fsprogs sources do.
This patch modifies e2fsprogs and util-linux-ng:
- Disable compilation of built-in libs in
e2fsprogs
- Remove selects for e2fsprogs from utils-linux-ng
- Moved installtion of libs to ng-utils
- Commented out blkid and uuidgen from e2fsprogs
to avoid collisions.
Signed-off-by: Carsten Schlote <c.schlote@konzeptpark.de>
Acked-by: Marc Kleine-Budde <mkl@penguttronix.de>
Update: Fixed packet name for install_copy. Now uuidgen and blkid get
installed correctly. I forgot to change that after CCP from e2fstools.
Signed-off-by: Carsten Schlote <c.schlote@konzeptpark.de>
Diffstat (limited to 'rules/util-linux-ng.in')
| -rw-r--r-- | rules/util-linux-ng.in | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in index da3d749f0..eacd4050f 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 |