[arch-commits] Commit in util-linux/trunk (PKGBUILD)
Christian Hesse
eworm at gemini.archlinux.org
Sun Jul 31 21:31:58 UTC 2022
Date: Sunday, July 31, 2022 @ 21:31:58
Author: eworm
Revision: 451798
better solution to install to /usr/bin (FS#75098)
Modified:
util-linux/trunk/PKGBUILD
----------+
PKGBUILD | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-07-31 21:06:54 UTC (rev 451797)
+++ PKGBUILD 2022-07-31 21:31:58 UTC (rev 451798)
@@ -72,7 +72,7 @@
cd "${pkgbase}-${_realver}"
- make DESTDIR="${pkgdir}" install
+ make DESTDIR="${pkgdir}" usrsbin_execdir=/usr/bin install
# setuid chfn and chsh
chmod 4755 "${pkgdir}"/usr/bin/{newgrp,ch{sh,fn}}
@@ -89,12 +89,6 @@
# TODO(dreisner): offer this upstream?
sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "${pkgdir}/usr/lib/systemd/system/uuidd.socket"
- # adjust for usrmove
- # TODO(dreisner): fix configure.ac upstream so that this isn't needed
- cd "${pkgdir}"
- mv usr/sbin/* usr/bin
- rmdir usr/sbin
-
### runtime libs are shipped as part of util-linux-libs
rm "${pkgdir}"/usr/lib/lib*.{a,so}*
More information about the arch-commits
mailing list