Mercurial > vanilla
changeset 1298:8272573ca2c3
core/util-linux: upgrade to 2.37.2
While here, split package into individual libraries so that util-linux is no
longer required.
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Thu, 11 Nov 2021 11:11:43 +0100 |
| parents | a25750281348 |
| children | 52a393cf8949 |
| files | core/util-linux/util-linux.sh core/util-linux/util-linux.sha1 |
| diffstat | 2 files changed, 50 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/core/util-linux/util-linux.sh Thu Nov 11 11:11:07 2021 +0100 +++ b/core/util-linux/util-linux.sh Thu Nov 11 11:11:43 2021 +0100 @@ -20,12 +20,12 @@ # ---------- # # This package provides both libraries and utilities. Some libraries like -# libuuid, libblkid are dependencies of other packages. Vanilla does not split -# util-linux in different packages like many distribution do. +# libuuid, libblkid are dependencies of other packages. # # Since util-linux tools override busybox utilities, users who only want # util-linux libraries may specify the COMPONENTS option to either "no" or a -# space-separated list of individual components to build. +# space-separated list of individual components to build. Additionally, the +# package is split into libraries and utilities if only libraries are required. # # Example: # @@ -35,12 +35,21 @@ # PKGNAME=util-linux -PKGVERSION=2.33.1 +PKGVERSION=2.37.2 PKGREVISION=1 -PKGLICENSE="GPL-2.0-only+" +PKGLICENSE="BSD-4-Clause-UC + Public-Domain + BSD-3-Clause + GPL-2.0-only + GPL-2.0-or-later + GPL-3.0-or-later + LGPL-2.1-or-later" PKGSUMMARY="standard Linux utilities" -PKGDOWNLOAD="https://mirrors.edge.kernel.org/pub/linux/utils/$PKGNAME/v2.33/$PKGNAME-$PKGVERSION.tar.xz" +PKGWWW="https://github.com/util-linux/util-linux" +PKGDOWNLOAD="https://mirrors.edge.kernel.org/pub/linux/utils/$PKGNAME/v2.37/$PKGNAME-$PKGVERSION.tar.xz" PKGOPTIONS="AUDIT COLORS COMPONENTS NCURSES NLS PYTHON SELINUX" +PKGSPLIT="libblkid libfdisk libmount libsmartcols libuuid" +PKGDEPENDS="$PKGSPLIT" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} @@ -106,7 +115,7 @@ build() { rm -rf $PKGNAME-$PKGVERSION - tar xvf $PKGNAME-$PKGVERSION.tar.xz + tar -xvf $PKGNAME-$PKGVERSION.tar.xz cd $PKGNAME-$PKGVERSION # All these tools are provided by shadow instead: @@ -119,7 +128,10 @@ # The configure.ac script has hardcoded /sbin checks. sed -i -e 's|/sbin|/bin|' configure.ac - autoreconf -vif + libtoolize --force + aclocal -I m4 + autoconf + automake --add-missing CC="$CC" \ CFLAGS="$CFLAGS" \ LDFLAGS="$LDFLAGS" \ @@ -153,6 +165,35 @@ make install DESTDIR=$DESTDIR find $DESTDIR -type f -name "*.la" -delete + # libblkid + mkdir -p $DESTDIR-libblkid/lib/pkgconfig + mkdir -p $DESTDIR-libblkid/share/man/man3 + mv $DESTDIR/lib/libblkid* $DESTDIR-libblkid/lib + mv $DESTDIR/lib/pkgconfig/blkid.pc $DESTDIR-libblkid/lib/pkgconfig + mv $DESTDIR/share/man/man3/libblkid.3 $DESTDIR-libblkid/share/man/man3 + + # libuuid + mkdir -p $DESTDIR-libuuid/lib/pkgconfig + mkdir -p $DESTDIR-libuuid/share/man/man3 + mv $DESTDIR/lib/libuuid* $DESTDIR-libuuid/lib + mv $DESTDIR/lib/pkgconfig/uuid.pc $DESTDIR-libuuid/lib/pkgconfig + mv $DESTDIR/share/man/man3/uuid* $DESTDIR-libuuid/share/man/man3 + + # libsmartcols + mkdir -p $DESTDIR-libsmartcols/lib/pkgconfig + mv $DESTDIR/lib/libsmartcols* $DESTDIR-libsmartcols/lib + mv $DESTDIR/lib/pkgconfig/smartcols.pc $DESTDIR-libsmartcols/lib/pkgconfig + + # libmount + mkdir -p $DESTDIR-libmount/lib/pkgconfig + mv $DESTDIR/lib/libmount* $DESTDIR-libmount/lib + mv $DESTDIR/lib/pkgconfig/mount.pc $DESTDIR-libmount/lib/pkgconfig + + # libfdisk + mkdir -p $DESTDIR-libfdisk/lib/pkgconfig + mv $DESTDIR/lib/libfdisk* $DESTDIR-libfdisk/lib + mv $DESTDIR/lib/pkgconfig/fdisk.pc $DESTDIR-libfdisk/lib/pkgconfig + cd .. rm -rf $PKGNAME-$PKGVERSION }