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/e2fsprogs.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/e2fsprogs.in')
| -rw-r--r-- | rules/e2fsprogs.in | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/rules/e2fsprogs.in b/rules/e2fsprogs.in index 825d2871c..4fc989910 100644 --- a/rules/e2fsprogs.in +++ b/rules/e2fsprogs.in @@ -4,6 +4,8 @@ menuconfig E2FSPROGS tristate prompt "e2fsprogs " select HOST_GETTEXT + select LIBBLKID if E2FSPROGS_LIBBLKID + select LIBUUID if E2FSPROGS_LIBUUID help The e2fsprogs package provides the filesystem utilities for use with the ext2 filesystem. It also supports the ext3 filesystem @@ -105,13 +107,6 @@ 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_BADBLOCKS @@ -122,15 +117,6 @@ 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_DUMPE2FS bool |