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.make | |
| 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.make')
| -rw-r--r-- | rules/util-linux-ng.make | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make index 4727a707f..12aa44449 100644 --- a/rules/util-linux-ng.make +++ b/rules/util-linux-ng.make @@ -146,6 +146,26 @@ ifdef PTXCONF_UTIL_LINUX_NG_MCOOKIE @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/mcookie) endif +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_INSTALL_BLKID + @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /sbin/blkid) +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 + @$(call install_finish, util-linux-ng) @$(call touch) |