util-linux: temporarily reverted build system to autotools for libuuid breakage

This commit is contained in:
Matt Housh 2024-03-30 22:22:03 -05:00
parent eaf4f3daa7
commit f3a9300f18
No known key found for this signature in database
GPG Key ID: B1B0A17CC95691DF
3 changed files with 184 additions and 63 deletions

View File

@ -10,6 +10,8 @@ drwxr-xr-x root/root bin/
-rwxr-xr-x root/root bin/pipesz
-rwsr-xr-x root/root bin/umount
-rwxr-xr-x root/root bin/wdctl
drwxr-xr-x root/root etc/
-rw-r--r-- root/root etc/adjtime (EMPTY)
drwxr-xr-x root/root lib/
lrwxrwxrwx root/root lib/libblkid.so.1 -> libblkid.so.1.1.0
-rwxr-xr-x root/root lib/libblkid.so.1.1.0
@ -24,6 +26,7 @@ lrwxrwxrwx root/root lib/libsmartcols.so.1 -> libsmartcols.so.1.1.0
lrwxrwxrwx root/root lib/libuuid.so.1 -> libuuid.so.1.3.0
-rwxr-xr-x root/root lib/libuuid.so.1.3.0
drwxr-xr-x root/root lib/security/
-rwxr-xr-x root/root lib/security/pam_lastlog2.la
-rwxr-xr-x root/root lib/security/pam_lastlog2.so
drwxr-xr-x root/root sbin/
-rwxr-xr-x root/root sbin/agetty
@ -52,7 +55,6 @@ drwxr-xr-x root/root sbin/
-rwxr-xr-x root/root sbin/swapoff
-rwxr-xr-x root/root sbin/swapon
-rwxr-xr-x root/root sbin/switch_root
-rwxr-xr-x root/root sbin/tunelp
-rwxr-xr-x root/root sbin/wipefs
-rwxr-xr-x root/root sbin/zramctl
drwxr-xr-x root/root usr/
@ -85,7 +87,6 @@ lrwxrwxrwx root/root usr/bin/i386 -> setarch
-rwxr-xr-x root/root usr/bin/last
lrwxrwxrwx root/root usr/bin/lastb -> last
-rwxr-xr-x root/root usr/bin/lastlog2
-rwxr-xr-x root/root usr/bin/line
lrwxrwxrwx root/root usr/bin/linux32 -> setarch
lrwxrwxrwx root/root usr/bin/linux64 -> setarch
-rwxr-xr-x root/root usr/bin/logger
@ -102,7 +103,6 @@ lrwxrwxrwx root/root usr/bin/linux64 -> setarch
-rwxr-xr-x root/root usr/bin/mesg
-rwxr-xr-x root/root usr/bin/namei
-rwxr-xr-x root/root usr/bin/nsenter
-rwxr-xr-x root/root usr/bin/pg
-rwxr-xr-x root/root usr/bin/prlimit
-rwxr-xr-x root/root usr/bin/rename
-rwxr-xr-x root/root usr/bin/renice
@ -142,15 +142,23 @@ drwxr-xr-x root/root usr/include/uuid/
-rw-r--r-- root/root usr/include/uuid/uuid.h
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libblkid.a
lrwxrwxrwx root/root usr/lib/libblkid.so -> ../../lib/libblkid.so.1
lrwxrwxrwx root/root usr/lib/libfdisk.so -> ../../lib/libfdisk.so.1
-rwxr-xr-x root/root usr/lib/libblkid.la
lrwxrwxrwx root/root usr/lib/libblkid.so -> ../../lib/libblkid.so.1.1.0
-rw-r--r-- root/root usr/lib/libfdisk.a
-rwxr-xr-x root/root usr/lib/libfdisk.la
lrwxrwxrwx root/root usr/lib/libfdisk.so -> ../../lib/libfdisk.so.1.1.0
-rw-r--r-- root/root usr/lib/liblastlog2.a
lrwxrwxrwx root/root usr/lib/liblastlog2.so -> ../../lib/liblastlog2.so.2
lrwxrwxrwx root/root usr/lib/libmount.so -> ../../lib/libmount.so.1
-rwxr-xr-x root/root usr/lib/liblastlog2.la
lrwxrwxrwx root/root usr/lib/liblastlog2.so -> ../../lib/liblastlog2.so.2.0.0
-rw-r--r-- root/root usr/lib/libmount.a
-rwxr-xr-x root/root usr/lib/libmount.la
lrwxrwxrwx root/root usr/lib/libmount.so -> ../../lib/libmount.so.1.1.0
-rw-r--r-- root/root usr/lib/libsmartcols.a
lrwxrwxrwx root/root usr/lib/libsmartcols.so -> ../../lib/libsmartcols.so.1
-rwxr-xr-x root/root usr/lib/libsmartcols.la
lrwxrwxrwx root/root usr/lib/libsmartcols.so -> ../../lib/libsmartcols.so.1.1.0
-rw-r--r-- root/root usr/lib/libuuid.a
lrwxrwxrwx root/root usr/lib/libuuid.so -> ../../lib/libuuid.so.1
-rwxr-xr-x root/root usr/lib/libuuid.la
lrwxrwxrwx root/root usr/lib/libuuid.so -> ../../lib/libuuid.so.1.3.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/blkid.pc
-rw-r--r-- root/root usr/lib/pkgconfig/fdisk.pc
@ -158,13 +166,6 @@ drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/mount.pc
-rw-r--r-- root/root usr/lib/pkgconfig/smartcols.pc
-rw-r--r-- root/root usr/lib/pkgconfig/uuid.pc
drwxr-xr-x root/root usr/lib/python3.10/
drwxr-xr-x root/root usr/lib/python3.10/site-packages/
drwxr-xr-x root/root usr/lib/python3.10/site-packages/libmount/
-rw-r--r-- root/root usr/lib/python3.10/site-packages/libmount/__init__.py
drwxr-xr-x root/root usr/lib/python3.10/site-packages/libmount/__pycache__/
-rw-r--r-- root/root usr/lib/python3.10/site-packages/libmount/__pycache__/__init__.cpython-310.pyc
-rwxr-xr-x root/root usr/lib/python3.10/site-packages/libmount/pylibmount.cpython-310-x86_64-linux-gnu.so
drwxr-xr-x root/root usr/sbin/
-rwxr-xr-x root/root usr/sbin/addpart
-rwxr-xr-x root/root usr/sbin/delpart
@ -176,3 +177,148 @@ drwxr-xr-x root/root usr/sbin/
-rwxr-xr-x root/root usr/sbin/rtcwake
-rwxr-xr-x root/root usr/sbin/uuidd
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/cal.1.gz
-rw-r--r-- root/root usr/share/man/man1/choom.1.gz
-rw-r--r-- root/root usr/share/man/man1/chrt.1.gz
-rw-r--r-- root/root usr/share/man/man1/col.1.gz
-rw-r--r-- root/root usr/share/man/man1/colcrt.1.gz
-rw-r--r-- root/root usr/share/man/man1/colrm.1.gz
-rw-r--r-- root/root usr/share/man/man1/column.1.gz
-rw-r--r-- root/root usr/share/man/man1/dmesg.1.gz
-rw-r--r-- root/root usr/share/man/man1/eject.1.gz
-rw-r--r-- root/root usr/share/man/man1/enosys.1.gz
-rw-r--r-- root/root usr/share/man/man1/exch.1.gz
-rw-r--r-- root/root usr/share/man/man1/fadvise.1.gz
-rw-r--r-- root/root usr/share/man/man1/fallocate.1.gz
-rw-r--r-- root/root usr/share/man/man1/fincore.1.gz
-rw-r--r-- root/root usr/share/man/man1/flock.1.gz
-rw-r--r-- root/root usr/share/man/man1/getopt.1.gz
-rw-r--r-- root/root usr/share/man/man1/hardlink.1.gz
-rw-r--r-- root/root usr/share/man/man1/hexdump.1.gz
-rw-r--r-- root/root usr/share/man/man1/ionice.1.gz
-rw-r--r-- root/root usr/share/man/man1/ipcmk.1.gz
-rw-r--r-- root/root usr/share/man/man1/ipcrm.1.gz
-rw-r--r-- root/root usr/share/man/man1/ipcs.1.gz
-rw-r--r-- root/root usr/share/man/man1/irqtop.1.gz
-rw-r--r-- root/root usr/share/man/man1/kill.1.gz
-rw-r--r-- root/root usr/share/man/man1/last.1.gz
-rw-r--r-- root/root usr/share/man/man1/lastb.1.gz
-rw-r--r-- root/root usr/share/man/man1/logger.1.gz
-rw-r--r-- root/root usr/share/man/man1/look.1.gz
-rw-r--r-- root/root usr/share/man/man1/lsclocks.1.gz
-rw-r--r-- root/root usr/share/man/man1/lscpu.1.gz
-rw-r--r-- root/root usr/share/man/man1/lsfd.1.gz
-rw-r--r-- root/root usr/share/man/man1/lsipc.1.gz
-rw-r--r-- root/root usr/share/man/man1/lsirq.1.gz
-rw-r--r-- root/root usr/share/man/man1/lslogins.1.gz
-rw-r--r-- root/root usr/share/man/man1/lsmem.1.gz
-rw-r--r-- root/root usr/share/man/man1/mcookie.1.gz
-rw-r--r-- root/root usr/share/man/man1/mesg.1.gz
-rw-r--r-- root/root usr/share/man/man1/more.1.gz
-rw-r--r-- root/root usr/share/man/man1/mountpoint.1.gz
-rw-r--r-- root/root usr/share/man/man1/namei.1.gz
-rw-r--r-- root/root usr/share/man/man1/nsenter.1.gz
-rw-r--r-- root/root usr/share/man/man1/pipesz.1.gz
-rw-r--r-- root/root usr/share/man/man1/prlimit.1.gz
-rw-r--r-- root/root usr/share/man/man1/rename.1.gz
-rw-r--r-- root/root usr/share/man/man1/renice.1.gz
-rw-r--r-- root/root usr/share/man/man1/rev.1.gz
-rw-r--r-- root/root usr/share/man/man1/script.1.gz
-rw-r--r-- root/root usr/share/man/man1/scriptlive.1.gz
-rw-r--r-- root/root usr/share/man/man1/scriptreplay.1.gz
-rw-r--r-- root/root usr/share/man/man1/setpgid.1.gz
-rw-r--r-- root/root usr/share/man/man1/setsid.1.gz
-rw-r--r-- root/root usr/share/man/man1/setterm.1.gz
-rw-r--r-- root/root usr/share/man/man1/taskset.1.gz
-rw-r--r-- root/root usr/share/man/man1/uclampset.1.gz
-rw-r--r-- root/root usr/share/man/man1/ul.1.gz
-rw-r--r-- root/root usr/share/man/man1/unshare.1.gz
-rw-r--r-- root/root usr/share/man/man1/utmpdump.1.gz
-rw-r--r-- root/root usr/share/man/man1/uuidgen.1.gz
-rw-r--r-- root/root usr/share/man/man1/uuidparse.1.gz
-rw-r--r-- root/root usr/share/man/man1/waitpid.1.gz
-rw-r--r-- root/root usr/share/man/man1/wall.1.gz
-rw-r--r-- root/root usr/share/man/man1/whereis.1.gz
-rw-r--r-- root/root usr/share/man/man1/write.1.gz
drwxr-xr-x root/root usr/share/man/man3/
-rw-r--r-- root/root usr/share/man/man3/lastlog2.3.gz
-rw-r--r-- root/root usr/share/man/man3/libblkid.3.gz
-rw-r--r-- root/root usr/share/man/man3/ll2_import_lastlog.3.gz
-rw-r--r-- root/root usr/share/man/man3/ll2_read_all.3.gz
-rw-r--r-- root/root usr/share/man/man3/ll2_read_entry.3.gz
-rw-r--r-- root/root usr/share/man/man3/ll2_remove_entry.3.gz
-rw-r--r-- root/root usr/share/man/man3/ll2_rename_user.3.gz
-rw-r--r-- root/root usr/share/man/man3/ll2_update_login_time.3.gz
-rw-r--r-- root/root usr/share/man/man3/ll2_write_entry.3.gz
-rw-r--r-- root/root usr/share/man/man3/uuid.3.gz
-rw-r--r-- root/root usr/share/man/man3/uuid_clear.3.gz
-rw-r--r-- root/root usr/share/man/man3/uuid_compare.3.gz
-rw-r--r-- root/root usr/share/man/man3/uuid_copy.3.gz
-rw-r--r-- root/root usr/share/man/man3/uuid_generate.3.gz
-rw-r--r-- root/root usr/share/man/man3/uuid_generate_random.3.gz
-rw-r--r-- root/root usr/share/man/man3/uuid_generate_time.3.gz
-rw-r--r-- root/root usr/share/man/man3/uuid_generate_time_safe.3.gz
-rw-r--r-- root/root usr/share/man/man3/uuid_is_null.3.gz
-rw-r--r-- root/root usr/share/man/man3/uuid_parse.3.gz
-rw-r--r-- root/root usr/share/man/man3/uuid_time.3.gz
-rw-r--r-- root/root usr/share/man/man3/uuid_unparse.3.gz
drwxr-xr-x root/root usr/share/man/man5/
-rw-r--r-- root/root usr/share/man/man5/adjtime_config.5.gz
-rw-r--r-- root/root usr/share/man/man5/fstab.5.gz
-rw-r--r-- root/root usr/share/man/man5/scols-filter.5.gz
-rw-r--r-- root/root usr/share/man/man5/terminal-colors.d.5.gz
drwxr-xr-x root/root usr/share/man/man8/
-rw-r--r-- root/root usr/share/man/man8/addpart.8.gz
-rw-r--r-- root/root usr/share/man/man8/agetty.8.gz
-rw-r--r-- root/root usr/share/man/man8/blkdiscard.8.gz
-rw-r--r-- root/root usr/share/man/man8/blkid.8.gz
-rw-r--r-- root/root usr/share/man/man8/blkpr.8.gz
-rw-r--r-- root/root usr/share/man/man8/blkzone.8.gz
-rw-r--r-- root/root usr/share/man/man8/blockdev.8.gz
-rw-r--r-- root/root usr/share/man/man8/cfdisk.8.gz
-rw-r--r-- root/root usr/share/man/man8/chcpu.8.gz
-rw-r--r-- root/root usr/share/man/man8/chmem.8.gz
-rw-r--r-- root/root usr/share/man/man8/ctrlaltdel.8.gz
-rw-r--r-- root/root usr/share/man/man8/delpart.8.gz
-rw-r--r-- root/root usr/share/man/man8/fdisk.8.gz
-rw-r--r-- root/root usr/share/man/man8/findfs.8.gz
-rw-r--r-- root/root usr/share/man/man8/findmnt.8.gz
-rw-r--r-- root/root usr/share/man/man8/fsck.8.gz
-rw-r--r-- root/root usr/share/man/man8/fsck.cramfs.8.gz
-rw-r--r-- root/root usr/share/man/man8/fsfreeze.8.gz
-rw-r--r-- root/root usr/share/man/man8/fstrim.8.gz
-rw-r--r-- root/root usr/share/man/man8/hwclock.8.gz
-rw-r--r-- root/root usr/share/man/man8/isosize.8.gz
-rw-r--r-- root/root usr/share/man/man8/lastlog2.8.gz
-rw-r--r-- root/root usr/share/man/man8/ldattach.8.gz
-rw-r--r-- root/root usr/share/man/man8/losetup.8.gz
-rw-r--r-- root/root usr/share/man/man8/lsblk.8.gz
-rw-r--r-- root/root usr/share/man/man8/lslocks.8.gz
-rw-r--r-- root/root usr/share/man/man8/lsns.8.gz
-rw-r--r-- root/root usr/share/man/man8/mkfs.8.gz
-rw-r--r-- root/root usr/share/man/man8/mkfs.cramfs.8.gz
-rw-r--r-- root/root usr/share/man/man8/mkswap.8.gz
-rw-r--r-- root/root usr/share/man/man8/mount.8.gz
-rw-r--r-- root/root usr/share/man/man8/pam_lastlog2.8.gz
-rw-r--r-- root/root usr/share/man/man8/partx.8.gz
-rw-r--r-- root/root usr/share/man/man8/pivot_root.8.gz
-rw-r--r-- root/root usr/share/man/man8/readprofile.8.gz
-rw-r--r-- root/root usr/share/man/man8/resizepart.8.gz
-rw-r--r-- root/root usr/share/man/man8/rfkill.8.gz
-rw-r--r-- root/root usr/share/man/man8/rtcwake.8.gz
-rw-r--r-- root/root usr/share/man/man8/setarch.8.gz
-rw-r--r-- root/root usr/share/man/man8/sfdisk.8.gz
-rw-r--r-- root/root usr/share/man/man8/swaplabel.8.gz
-rw-r--r-- root/root usr/share/man/man8/swapoff.8.gz
-rw-r--r-- root/root usr/share/man/man8/swapon.8.gz
-rw-r--r-- root/root usr/share/man/man8/switch_root.8.gz
-rw-r--r-- root/root usr/share/man/man8/umount.8.gz
-rw-r--r-- root/root usr/share/man/man8/uuidd.8.gz
-rw-r--r-- root/root usr/share/man/man8/wdctl.8.gz
-rw-r--r-- root/root usr/share/man/man8/wipefs.8.gz
-rw-r--r-- root/root usr/share/man/man8/zramctl.8.gz
drwxr-xr-x root/root var/
drwxr-xr-x root/root var/lib/
drwxr-xr-x root/root var/lib/libuuid/

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/core.pub
RWRJc1FUaeVeqr6XO111yydKUPLZbBc7aqHkv58nln+vcPraQypK9kkgkHg6Z5j3PGstSUjTjYCk0osH0GUFNKQy2MJ5rauVigs=
SHA256 (Pkgfile) = bbe7196804fafb05a95e28123ad781cc312ad36c4997304cef188a45ad93defd
SHA256 (.footprint) = 53eb4b2cef8c12f3dd3a6f395ba7fba7ff710f92fb3ae9a0da7a76d2ab9d6621
SHA256 (util-linux-2.40.tar.gz) = f7ff8573289313e38ee3378cbc2938f34444a8cb546e1236e46151834be69784
RWRJc1FUaeVeqgqpYHdPX/CEOzaJ65eSpLkIM59q6750DvQ7niKz8Z4aUq9TO8v+nnKUC2X7Sg49eCqvdH3H8lgf5yn9ZGXTmAk=
SHA256 (Pkgfile) = 618658002c3f063e43a98c95567d28fb0cfcf697d6e25590b31cc66c72b1d962
SHA256 (.footprint) = 3847de47444494a7817db23a570db60e78a1904eca16bd867dc320a4d15c7e83
SHA256 (util-linux-2.40.tar.xz) = d57a626081f9ead02fa44c63a6af162ec19c58f53e993f206ab7c3a6641c2cd7

View File

@ -1,58 +1,33 @@
# Description: Miscellaneous system utilities
# URL: https://github.com/karelzak/util-linux
# Maintainer: CRUX System Team, core-ports at crux dot nu
# Depends on: bzip2 eudev file linux-pam readline sqlite3 xz
# Depends on: bzip2 eudev file readline xz linux-pam sqlite3
name=util-linux
version=2.40
release=1
source=(https://github.com/util-linux/util-linux/archive/refs/tags/v$version/$name-$version.tar.gz)
source=(https://www.kernel.org/pub/linux/utils/$name/v${version:0:4}/$name-$version.tar.xz)
build() {
cd $name-$version
meson setup $name-$version build \
./configure \
--prefix=/usr \
--bindir=/usr/bin \
--sbindir=/sbin \
--libdir=/lib \
--buildtype=plain \
--wrap-mode=nodownload \
-D b_lto=true \
-D b_pie=true \
-D nls=disabled \
-D pamlibdir=/lib/security \
-D cryptsetup=disabled \
-D build-chfn-chsh=disabled \
-D build-login=disabled \
-D build-su=disabled \
-D build-sulogin=disabled \
-D build-nologin=disabled \
-D build-runuser=disabled \
-D build-vipw=disabled \
-D build-raw=disabled \
-D build-newgrp=disabled \
-D build-bfs=disabled \
-D build-minix=disabled
--enable-{write,kill} \
--disable-nls \
--disable-asciidoc \
--disable-{login,su,sulogin,nologin,runuser,raw} \
--disable-chfn-chsh \
--without-python
make
make DESTDIR=$PKG install
meson compile -C build -j ${JOBS:-1}
DESTDIR=$PKG meson install -C build
install -d $PKG/{etc,var/lib/libuuid}
touch $PKG/etc/adjtime
rm -r $PKG/usr/share/{doc,locale}
install -d $PKG/{bin,usr/sbin,usr/lib}
mv $PKG/usr/bin/{dmesg,findmnt,kill,lsblk,lsfd,more} $PKG/bin
mv $PKG/usr/bin/{mount,mountpoint,pipesz,umount,wdctl} $PKG/bin
mv $PKG/sbin/{addpart,delpart,ldattach,partx,readprofile} $PKG/usr/sbin
mv $PKG/sbin/{resizepart,rfkill,rtcwake,uuidd} $PKG/usr/sbin
mv $PKG/lib/pkgconfig $PKG/usr/lib
mv $PKG/lib/*.a $PKG/usr/lib
cd $PKG/lib
local LIB
for LIB in lib*.so; do
ln -s ../../lib/$(readlink $LIB) $PKG/usr/lib/$LIB && rm $LIB
done
prt-get isinst bash-completion || rm -r $PKG/usr/share/bash-completion
rm -r $PKG/usr/share/doc
rm $PKG/sbin/{mkfs.bfs,mkfs.minix,fsck.minix}
rm $PKG/usr/share/man/man8/{fsck.minix,mkfs.bfs,mkfs.minix}.8
}