mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-20 22:27:17 -08:00
sys-apps/util-linux: Removed old
Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
DIST util-linux-2.33.2.tar.xz 4707024 BLAKE2B fdeed0a236edd26d268bccca8cde2cf1b7ecbff521ede9fa26ea22c8e5cdfc380a416a168789504b303f1b569d163e41f6630ee28829be7f2b2129fa14c4fffa SHA512 ac88790a0272366b384b54df19cb28318014d98819d5d96aa05528ff17ab57a8c66d012a2f1b59caca4c5d4ea669e8c041e1123517c1f1c2d9960ef701aaf749
|
||||
DIST util-linux-2.34.tar.xz 4974812 BLAKE2B d26b2f74d490eaee0a40d4c75a1a351ba165b4a52f9bbf6cf9d1afd7ae1382a3a3dfe41180584e97e9aaad6950f604cad928f30747590e3e1e669c8797689758 SHA512 2d0b76f63d32e7afb7acf61a83fabbfd58baa34ab78b3a331ce87f9c676a5fd71c56a493ded95039540d2c46b6048caaa38d7fb4491eb3d52d7b09dc54655cd7
|
||||
DIST util-linux-2.35.1.tar.xz 5138360 BLAKE2B 08c16d4d9fd670b62c2d664feda2cfa53d0cecc36bbaa2c3ed5960bf70f905f11caa7a904c63f36e12b472f10b8e781351cca0cf2f858c2b66e4fd0204b1c456 SHA512 6e27e08bfc02378970f015decfea5a52d6c342c4c8f4ac48dd07d248485eb797e506d91d290dbbca344c3e5cfe1fc150db80a23d510367427232f5abeabe591a
|
||||
DIST util-linux-2.35.2.tar.xz 5150488 BLAKE2B 93eb90ab33db7795b46425ec4ec87f8a2d3d6e0dad671345375ea02efd654bf72041932d30b41bea494e4b62952e2fd14ea9f9e6c738d4eb4b050bd170b9bb0e SHA512 59e038ba71aa74c9af6f927b357483a965f675ab3ffcd25cf0c1b043656312d2d2d07c55659fd3da69ede165bec313e0ae7e1cd73758e49681ae610604b399a2
|
||||
DIST util-linux-2.36.1.tar.xz 5231880 BLAKE2B 52d867aa0b722a84828c37958d80b0bdcc1ceaae4e46fa6550ad0f2f152c52e4aaf2c8bc5fdf4f27b522037a870ff2554382abac0eaa50a6791d8b8016e3d74c SHA512 9dfd01ae4c16fa35015dafd222d555988b72e4d1d2fbadd140791b9ef78f84fa8254d4d08dc67cabf41e873338867f19e786b989d708ccfe5161c4f7679bba7a
|
||||
DIST util-linux-2.36.tar.xz 5242420 BLAKE2B a03b626a376815f37a17b3808d1d421c7ec27a133edf857116603de38f7e13f527687691d0c8aa68f4f6868be6f3bcc64573d759308d74731107e02067449ce6 SHA512 cbb4975da8d99a1edd45514171d59ea7b019ce0f77a81e88b447a733f725e91c53540d9dc78bc626dc011dca129b8b150aaf9e64ccf62a4202ae816581acf4fd
|
||||
|
||||
@@ -1,165 +0,0 @@
|
||||
From cd781c405be82540484da3bfe3d3f17a39b8eb5c Mon Sep 17 00:00:00 2001
|
||||
From: J William Piggott <elseifthen@gmx.com>
|
||||
Date: Fri, 21 Feb 2020 20:03:47 -0500
|
||||
Subject: hwclock: make glibc 2.31 compatible
|
||||
|
||||
______________________________________________________
|
||||
GNU C Library NEWS -- history of user-visible changes.
|
||||
Version 2.31
|
||||
Deprecated and removed features, and other changes affecting compatibility:
|
||||
|
||||
* The settimeofday function can still be used to set a system-wide time
|
||||
zone when the operating system supports it. This is because the Linux
|
||||
kernel reused the API, on some architectures, to describe a system-wide
|
||||
time-zone-like offset between the software clock maintained by the kernel,
|
||||
and the "RTC" clock that keeps time when the system is shut down.
|
||||
|
||||
However, to reduce the odds of this offset being set by accident,
|
||||
settimeofday can no longer be used to set the time and the offset
|
||||
simultaneously. If both of its two arguments are non-null, the call
|
||||
will fail (setting errno to EINVAL).
|
||||
|
||||
Callers attempting to set this offset should also be prepared for the call
|
||||
to fail and set errno to ENOSYS; this already happens on the Hurd and on
|
||||
some Linux architectures. The Linux kernel maintainers are discussing a
|
||||
more principled replacement for the reused API. After a replacement
|
||||
becomes available, we will change settimeofday to fail with ENOSYS on all
|
||||
platforms when its 'tzp' argument is not a null pointer.
|
||||
|
||||
settimeofday itself is obsolescent according to POSIX. Programs that set
|
||||
the system time should use clock_settime and/or the adjtime family of
|
||||
functions instead. We may cease to make settimeofday available to newly
|
||||
linked binaries after there is a replacement for Linux's time-zone-like
|
||||
offset API.
|
||||
______________________________________________________
|
||||
|
||||
hwclock(8) had one settimeofday(2) call where both args were set for
|
||||
--hctosys when the RTC was ticking UTC. This allowed setting the system
|
||||
time, timezone, and locking the warp_clock function with a single call.
|
||||
That operation now takes 3 calls of settimeofday(2).
|
||||
|
||||
Although this common operation now takes three calls, the overall logic
|
||||
for the set_system_clock() function was simplified.
|
||||
|
||||
Co-Author: Karel Zak <kzak@redhat.com>
|
||||
Signed-off-by: J William Piggott <elseifthen@gmx.com>
|
||||
---
|
||||
sys-utils/hwclock.c | 71 ++++++++++++++++++++++++++++-------------------------
|
||||
1 file changed, 37 insertions(+), 34 deletions(-)
|
||||
|
||||
diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
|
||||
index e736da717..1191a8571 100644
|
||||
--- a/sys-utils/hwclock.c
|
||||
+++ b/sys-utils/hwclock.c
|
||||
@@ -643,28 +643,28 @@ display_time(struct timeval hwctime)
|
||||
* tz.tz_minuteswest argument and sets PCIL (see below). At boot settimeofday(2)
|
||||
* has one-shot access to this function as shown in the table below.
|
||||
*
|
||||
- * +-------------------------------------------------------------------+
|
||||
- * | settimeofday(tv, tz) |
|
||||
- * |-------------------------------------------------------------------|
|
||||
- * | Arguments | System Time | PCIL | | warp_clock |
|
||||
- * | tv | tz | set | warped | set | firsttime | locked |
|
||||
- * |---------|---------|---------------|------|-----------|------------|
|
||||
- * | pointer | NULL | yes | no | no | 1 | no |
|
||||
- * | pointer | pointer | yes | no | no | 0 | yes |
|
||||
- * | NULL | ptr2utc | no | no | no | 0 | yes |
|
||||
- * | NULL | pointer | no | yes | yes | 0 | yes |
|
||||
- * +-------------------------------------------------------------------+
|
||||
+ * +-------------------------------------------------------------------------+
|
||||
+ * | settimeofday(tv, tz) |
|
||||
+ * |-------------------------------------------------------------------------|
|
||||
+ * | Arguments | System Time | TZ | PCIL | | warp_clock |
|
||||
+ * | tv | tz | set | warped | set | set | firsttime | locked |
|
||||
+ * |---------|---------|---------------|-----|------|-----------|------------|
|
||||
+ * | pointer | NULL | yes | no | no | no | 1 | no |
|
||||
+ * | NULL | ptr2utc | no | no | yes | no | 0 | yes |
|
||||
+ * | NULL | pointer | no | yes | yes | yes | 0 | yes |
|
||||
+ * +-------------------------------------------------------------------------+
|
||||
* ptr2utc: tz.tz_minuteswest is zero (UTC).
|
||||
* PCIL: persistent_clock_is_local, sets the "11 minute mode" timescale.
|
||||
* firsttime: locks the warp_clock function (initialized to 1 at boot).
|
||||
+ * Since glibc v2.31 settimeofday() will fail if both args are non NULL
|
||||
*
|
||||
* +---------------------------------------------------------------------------+
|
||||
* | op | RTC scale | settimeofday calls |
|
||||
* |---------|-----------|-----------------------------------------------------|
|
||||
* | systz | Local | 1) warps system time*, sets PCIL* and kernel tz |
|
||||
* | systz | UTC | 1st) locks warp_clock* 2nd) sets kernel tz |
|
||||
- * | hctosys | Local | 1st) sets PCIL* 2nd) sets system time and kernel tz |
|
||||
- * | hctosys | UTC | 1) sets system time and kernel tz |
|
||||
+ * | hctosys | Local | 1st) sets PCIL* & kernel tz 2nd) sets system time |
|
||||
+ * | hctosys | UTC | 1st) locks warp* 2nd) sets tz 3rd) sets system time |
|
||||
* +---------------------------------------------------------------------------+
|
||||
* * only on first call after boot
|
||||
*/
|
||||
@@ -675,42 +675,45 @@ set_system_clock(const struct hwclock_control *ctl,
|
||||
struct tm broken;
|
||||
int minuteswest;
|
||||
int rc = 0;
|
||||
- const struct timezone tz_utc = { 0 };
|
||||
|
||||
localtime_r(&newtime.tv_sec, &broken);
|
||||
minuteswest = -get_gmtoff(&broken) / 60;
|
||||
|
||||
if (ctl->verbose) {
|
||||
- if (ctl->hctosys && !ctl->universal)
|
||||
- printf(_("Calling settimeofday(NULL, %d) to set "
|
||||
- "persistent_clock_is_local.\n"), minuteswest);
|
||||
- if (ctl->systz && ctl->universal)
|
||||
+ if (ctl->universal) {
|
||||
puts(_("Calling settimeofday(NULL, 0) "
|
||||
- "to lock the warp function."));
|
||||
+ "to lock the warp_clock function."));
|
||||
+ if (!( ctl->universal && !minuteswest ))
|
||||
+ printf(_("Calling settimeofday(NULL, %d) "
|
||||
+ "to set the kernel timezone.\n"),
|
||||
+ minuteswest);
|
||||
+ } else
|
||||
+ printf(_("Calling settimeofday(NULL, %d) to warp "
|
||||
+ "System time, set PCIL and the kernel tz.\n"),
|
||||
+ minuteswest);
|
||||
+
|
||||
if (ctl->hctosys)
|
||||
- printf(_("Calling settimeofday(%ld.%06ld, %d)\n"),
|
||||
- newtime.tv_sec, newtime.tv_usec, minuteswest);
|
||||
- else {
|
||||
- printf(_("Calling settimeofday(NULL, %d) "), minuteswest);
|
||||
- if (ctl->universal)
|
||||
- puts(_("to set the kernel timezone."));
|
||||
- else
|
||||
- puts(_("to warp System time."));
|
||||
- }
|
||||
+ printf(_("Calling settimeofday(%ld.%06ld, NULL) "
|
||||
+ "to set the System time.\n"),
|
||||
+ newtime.tv_sec, newtime.tv_usec);
|
||||
}
|
||||
|
||||
if (!ctl->testing) {
|
||||
+ const struct timezone tz_utc = { 0 };
|
||||
const struct timezone tz = { minuteswest };
|
||||
|
||||
- if (ctl->hctosys && !ctl->universal) /* set PCIL */
|
||||
- rc = settimeofday(NULL, &tz);
|
||||
- if (ctl->systz && ctl->universal) /* lock warp_clock */
|
||||
+ /* If UTC RTC: lock warp_clock and PCIL */
|
||||
+ if (ctl->universal)
|
||||
rc = settimeofday(NULL, &tz_utc);
|
||||
- if (!rc && ctl->hctosys)
|
||||
- rc = settimeofday(&newtime, &tz);
|
||||
- else if (!rc)
|
||||
+
|
||||
+ /* Set kernel tz; if localtime RTC: warp_clock and set PCIL */
|
||||
+ if (!rc && !( ctl->universal && !minuteswest ))
|
||||
rc = settimeofday(NULL, &tz);
|
||||
|
||||
+ /* Set the System Clock */
|
||||
+ if ((!rc || errno == ENOSYS) && ctl->hctosys)
|
||||
+ rc = settimeofday(&newtime, NULL);
|
||||
+
|
||||
if (rc) {
|
||||
warn(_("settimeofday() failed"));
|
||||
return EXIT_FAILURE;
|
||||
--
|
||||
cgit 1.2-0.3.lf.el7
|
||||
|
||||
@@ -1,58 +0,0 @@
|
||||
From 3cfde0370d3a8949df0c5bcf447cec6692910ed2 Mon Sep 17 00:00:00 2001
|
||||
From: Sami Kerola <kerolasa@iki.fi>
|
||||
Date: Sat, 15 Feb 2020 21:12:50 +0000
|
||||
Subject: [PATCH] kill: include sys/types.h before checking
|
||||
SYS_pidfd_send_signal
|
||||
|
||||
Including sys/types.h must happen before SYS_pidfd_send_signal is checked,
|
||||
because that header defines variable in normal conditions. When sys/types.h
|
||||
does not have SYS_pidfd_send_signal then fallback is defined in config.h
|
||||
that is included by default, and has therefore worked fine before and after
|
||||
this change.
|
||||
|
||||
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
|
||||
---
|
||||
include/pidfd-utils.h | 18 ++++++++++--------
|
||||
1 file changed, 10 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h
|
||||
index 593346576..0baedd2c9 100644
|
||||
--- a/include/pidfd-utils.h
|
||||
+++ b/include/pidfd-utils.h
|
||||
@@ -1,26 +1,28 @@
|
||||
#ifndef UTIL_LINUX_PIDFD_UTILS
|
||||
#define UTIL_LINUX_PIDFD_UTILS
|
||||
|
||||
-#if defined(__linux__) && defined(SYS_pidfd_send_signal)
|
||||
-# include <sys/types.h>
|
||||
+#if defined(__linux__)
|
||||
# include <sys/syscall.h>
|
||||
+# if defined(SYS_pidfd_send_signal)
|
||||
+# include <sys/types.h>
|
||||
|
||||
-# ifndef HAVE_PIDFD_OPEN
|
||||
+# ifndef HAVE_PIDFD_OPEN
|
||||
static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info,
|
||||
unsigned int flags)
|
||||
{
|
||||
return syscall(SYS_pidfd_send_signal, pidfd, sig, info, flags);
|
||||
}
|
||||
-# endif
|
||||
+# endif
|
||||
|
||||
-# ifndef HAVE_PIDFD_SEND_SIGNAL
|
||||
+# ifndef HAVE_PIDFD_SEND_SIGNAL
|
||||
static inline int pidfd_open(pid_t pid, unsigned int flags)
|
||||
{
|
||||
return syscall(SYS_pidfd_open, pid, flags);
|
||||
}
|
||||
-# endif
|
||||
+# endif
|
||||
|
||||
-# define UL_HAVE_PIDFD 1
|
||||
+# define UL_HAVE_PIDFD 1
|
||||
|
||||
-#endif /* __linux__ && SYS_pidfd_send_signal */
|
||||
+# endif /* SYS_pidfd_send_signal */
|
||||
+#endif /* __linux__ */
|
||||
#endif /* UTIL_LINUX_PIDFD_UTILS */
|
||||
@@ -1,317 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{6,7,8} )
|
||||
|
||||
inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
|
||||
pam python-r1 multilib-minimal multiprocessing systemd
|
||||
|
||||
MY_PV="${PV/_/-}"
|
||||
MY_P="${PN}-${MY_PV}"
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
inherit git-r3 autotools
|
||||
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
|
||||
else
|
||||
[[ "${PV}" = *_rc* ]] || \
|
||||
KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
|
||||
SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Various useful Linux utilities"
|
||||
HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
|
||||
|
||||
LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
|
||||
SLOT="0"
|
||||
IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
|
||||
|
||||
# Most lib deps here are related to programs rather than our libs,
|
||||
# so we rarely need to specify ${MULTILIB_USEDEP}.
|
||||
RDEPEND="
|
||||
virtual/libcrypt:=
|
||||
audit? ( >=sys-process/audit-2.6:= )
|
||||
caps? ( sys-libs/libcap-ng )
|
||||
cramfs? ( sys-libs/zlib:= )
|
||||
cryptsetup? ( sys-fs/cryptsetup )
|
||||
hardlink? ( dev-libs/libpcre2:= )
|
||||
ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
|
||||
nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
|
||||
pam? ( sys-libs/pam )
|
||||
ppc? ( sys-libs/librtas )
|
||||
ppc64? ( sys-libs/librtas )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
readline? ( sys-libs/readline:0= )
|
||||
selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
|
||||
slang? ( sys-libs/slang )
|
||||
!build? ( systemd? ( sys-apps/systemd ) )
|
||||
udev? ( virtual/libudev:= )"
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
nls? ( sys-devel/gettext )
|
||||
test? ( sys-devel/bc )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
virtual/os-headers
|
||||
"
|
||||
RDEPEND+="
|
||||
hardlink? ( !app-arch/hardlink )
|
||||
logger? ( !>=app-admin/sysklogd-2.0[logger] )
|
||||
kill? (
|
||||
!sys-apps/coreutils[kill]
|
||||
!sys-process/procps[kill]
|
||||
)
|
||||
su? (
|
||||
!<sys-apps/shadow-4.7-r2
|
||||
!>=sys-apps/shadow-4.7-r2[su]
|
||||
)
|
||||
!net-wireless/rfkill
|
||||
!<app-shells/bash-completion-2.7-r1"
|
||||
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/util-linux-2.35.1-include_sys_types-header.patch
|
||||
"${FILESDIR}"/util-linux-2.35.1-cleanup-pidfd-include.patch
|
||||
"${FILESDIR}"/util-linux-2.35.1-hwclock-glibc-2.31.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Prevent uuidd test failure due to socket path limit. #593304
|
||||
sed -i \
|
||||
-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
|
||||
tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
|
||||
|
||||
if ! use userland_GNU; then
|
||||
# test runner is using GNU-specific xargs call
|
||||
sed -i -e 's:xargs:gxargs:' tests/run.sh || die
|
||||
# test requires util-linux uuidgen (which we don't build)
|
||||
rm tests/ts/uuid/oids || die
|
||||
fi
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
po/update-potfiles
|
||||
eautoreconf
|
||||
fi
|
||||
|
||||
elibtoolize
|
||||
}
|
||||
|
||||
lfs_fallocate_test() {
|
||||
# Make sure we can use fallocate with LFS #300307
|
||||
cat <<-EOF > "${T}"/fallocate.${ABI}.c
|
||||
#define _GNU_SOURCE
|
||||
#include <fcntl.h>
|
||||
main() { return fallocate(0, 0, 0, 0); }
|
||||
EOF
|
||||
append-lfs-flags
|
||||
$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
|
||||
|| export ac_cv_func_fallocate=no
|
||||
rm -f "${T}"/fallocate.${ABI}.c
|
||||
}
|
||||
|
||||
python_configure() {
|
||||
local myeconfargs=(
|
||||
"${commonargs[@]}"
|
||||
--disable-all-programs
|
||||
--disable-bash-completion
|
||||
--without-systemdsystemunitdir
|
||||
--with-python
|
||||
)
|
||||
if use userland_GNU; then
|
||||
myeconfargs+=(
|
||||
--enable-libblkid
|
||||
--enable-libmount
|
||||
--enable-pylibmount
|
||||
)
|
||||
fi
|
||||
mkdir "${BUILD_DIR}" || die
|
||||
pushd "${BUILD_DIR}" >/dev/null || die
|
||||
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
|
||||
popd >/dev/null || die
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
lfs_fallocate_test
|
||||
# The scanf test in a run-time test which fails while cross-compiling.
|
||||
# Blindly assume a POSIX setup since we require libmount, and libmount
|
||||
# itself fails when the scanf test fails. #531856
|
||||
tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
|
||||
export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
|
||||
export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
|
||||
|
||||
# Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530
|
||||
export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
|
||||
export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
|
||||
|
||||
# configure args shared by python and non-python builds
|
||||
local commonargs=(
|
||||
--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
|
||||
)
|
||||
|
||||
local myeconfargs=(
|
||||
"${commonargs[@]}"
|
||||
--with-bashcompletiondir="$(get_bashcompdir)"
|
||||
--without-python
|
||||
$(multilib_native_use_enable suid makeinstall-chown)
|
||||
$(multilib_native_use_enable suid makeinstall-setuid)
|
||||
$(multilib_native_use_with readline)
|
||||
$(multilib_native_use_with slang)
|
||||
$(multilib_native_use_with systemd)
|
||||
$(multilib_native_use_with udev)
|
||||
$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
|
||||
$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
|
||||
$(multilib_native_use_with audit)
|
||||
$(tc-has-tls || echo --disable-tls)
|
||||
$(use_enable nls)
|
||||
$(use_enable unicode widechar)
|
||||
$(use_enable static-libs static)
|
||||
$(use_with ncurses tinfo)
|
||||
$(use_with selinux)
|
||||
)
|
||||
# build programs only on GNU, on *BSD we want libraries only
|
||||
if multilib_is_native_abi && use userland_GNU; then
|
||||
myeconfargs+=(
|
||||
--disable-chfn-chsh
|
||||
--disable-login
|
||||
--disable-nologin
|
||||
--disable-pylibmount
|
||||
--enable-agetty
|
||||
--enable-bash-completion
|
||||
--enable-line
|
||||
--enable-partx
|
||||
--enable-raw
|
||||
--enable-rename
|
||||
--enable-rfkill
|
||||
--enable-schedutils
|
||||
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
|
||||
$(use_enable caps setpriv)
|
||||
$(use_enable cramfs)
|
||||
$(use_enable fdformat)
|
||||
$(use_enable hardlink)
|
||||
$(use_enable kill)
|
||||
$(use_enable logger)
|
||||
$(use_enable ncurses pg)
|
||||
$(use_enable su)
|
||||
$(use_enable tty-helpers mesg)
|
||||
$(use_enable tty-helpers wall)
|
||||
$(use_enable tty-helpers write)
|
||||
$(use_with cryptsetup)
|
||||
)
|
||||
else
|
||||
myeconfargs+=(
|
||||
--disable-all-programs
|
||||
--disable-bash-completion
|
||||
--without-systemdsystemunitdir
|
||||
# build libraries
|
||||
--enable-libuuid
|
||||
--enable-libblkid
|
||||
--enable-libsmartcols
|
||||
--enable-libfdisk
|
||||
)
|
||||
if use userland_GNU; then
|
||||
# those libraries don't work on *BSD
|
||||
myeconfargs+=(
|
||||
--enable-libmount
|
||||
)
|
||||
fi
|
||||
fi
|
||||
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
|
||||
|
||||
if multilib_is_native_abi && use python; then
|
||||
python_foreach_impl python_configure
|
||||
fi
|
||||
}
|
||||
|
||||
python_compile() {
|
||||
pushd "${BUILD_DIR}" >/dev/null || die
|
||||
emake all
|
||||
popd >/dev/null || die
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
emake all
|
||||
|
||||
if multilib_is_native_abi && use python; then
|
||||
python_foreach_impl python_compile
|
||||
fi
|
||||
}
|
||||
|
||||
python_test() {
|
||||
pushd "${BUILD_DIR}" >/dev/null || die
|
||||
emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
|
||||
popd >/dev/null || die
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
|
||||
if multilib_is_native_abi && use python; then
|
||||
python_foreach_impl python_test
|
||||
fi
|
||||
}
|
||||
|
||||
python_install() {
|
||||
pushd "${BUILD_DIR}" >/dev/null || die
|
||||
emake DESTDIR="${D}" install
|
||||
python_optimize
|
||||
popd >/dev/null || die
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
if multilib_is_native_abi && use python; then
|
||||
python_foreach_impl python_install
|
||||
fi
|
||||
|
||||
# This needs to be called AFTER python_install call (#689190)
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
if multilib_is_native_abi && use userland_GNU; then
|
||||
# need the libs in /
|
||||
gen_usr_ldscript -a blkid fdisk mount smartcols uuid
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
|
||||
chmod -x "${ED}"/usr/share/doc/util-linux-${PVR}/getopt/getopt-parse* || die
|
||||
|
||||
# e2fsprogs-libs didnt install .la files, and .pc work fine
|
||||
find "${ED}" -name "*.la" -delete || die
|
||||
|
||||
if ! use userland_GNU; then
|
||||
# manpage collisions
|
||||
# TODO: figure out a good way to keep them
|
||||
rm "${ED}"/usr/share/man/man3/uuid* || die
|
||||
fi
|
||||
|
||||
if use pam; then
|
||||
newpamd "${FILESDIR}/runuser.pamd" runuser
|
||||
newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
|
||||
fi
|
||||
|
||||
# Note:
|
||||
# Bash completion for "runuser" command is provided by same file which
|
||||
# would also provide bash completion for "su" command. However, we don't
|
||||
# use "su" command from this package.
|
||||
# This triggers a known QA warning which we ignore for now to magically
|
||||
# keep bash completion for "su" command which shadow package does not
|
||||
# provide.
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if ! use tty-helpers; then
|
||||
elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
|
||||
fi
|
||||
|
||||
if [[ -z ${REPLACING_VERSIONS} ]]; then
|
||||
elog "The agetty util now clears the terminal by default. You"
|
||||
elog "might want to add --noclear to your /etc/inittab lines."
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user