Orhun Parmaksız pushed to branch main at Arch Linux / Packaging / Packages /
uutils-coreutils
Commits:
ced76115 by E at 2025-06-09T20:40:08+03:00
Replace disable_selinux.patch with official make flag
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- − disable_selinux.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -14,8 +14,6 @@ pkgbase = uutils-coreutils
depends = oniguruma
options = !lto
source =
uutils-coreutils-0.1.0.tar.gz::https://github.com/uutils/coreutils/archive/0.1.0.tar.gz
- source = disable_selinux.patch
sha512sums =
e9b3941573b2267e6a4b17c49a64d71234e4cbf067f1180fe14bfe48012c9d400741067f6231855a6132f93138eb4bbcb1e970e98c5f937f8d3a5e5bc019f03c
- sha512sums =
c1585671d2e0fe34a92746eae291f1be85e65c7ccfe2462cba5d324b8def76296f71b6d15738ecb2683453886de9c0650a0b9a609cad5f03b6ded89e5a91911c
pkgname = uutils-coreutils
=====================================
PKGBUILD
=====================================
@@ -24,25 +24,23 @@ makedepends=(
)
source=(
$pkgname-$pkgver.tar.gz::$_url/archive/$pkgver.tar.gz
- disable_selinux.patch
)
-sha512sums=('e9b3941573b2267e6a4b17c49a64d71234e4cbf067f1180fe14bfe48012c9d400741067f6231855a6132f93138eb4bbcb1e970e98c5f937f8d3a5e5bc019f03c'
-
'c1585671d2e0fe34a92746eae291f1be85e65c7ccfe2462cba5d324b8def76296f71b6d15738ecb2683453886de9c0650a0b9a609cad5f03b6ded89e5a91911c')
+sha512sums=('e9b3941573b2267e6a4b17c49a64d71234e4cbf067f1180fe14bfe48012c9d400741067f6231855a6132f93138eb4bbcb1e970e98c5f937f8d3a5e5bc019f03c')
options=('!lto')
prepare() {
cd $_pkgname-$pkgver
sed 's|"bin"|"builduser"|g' -i tests/by-util/test_{chgrp,chown}.rs
- # disable selinux in Makefile, upstream seems broken in parameter parsing
- # SELINUX_ENABLE=0 should not enable SELINUX but fails
- patch -Np1 -i ../disable_selinux.patch
}
build() {
cd $_pkgname-$pkgver
export RUSTONIG_DYNAMIC_LIBONIG=1
- make PROFILE=release MULTICALL=y
+ # disable selinux by excluding runcon and chcon, upstream seems broken in
parameter parsing
+ # SELINUX_ENABLE=0 should not enable SELINUX but fails
+ # https://github.com/uutils/coreutils/issues/7996
+ make PROFILE=release MULTICALL=y SKIP_UTILS="runcon chcon"
}
check() {
@@ -51,6 +49,7 @@ check() {
make test \
PROFILE=release \
CARGOFLAGS=--release \
+ SKIP_UTILS="runcon chcon" \
TEST_NO_FAIL_FAST="--no-fail-fast -- \
--skip test_chown::test_big_p \
--skip test_chgrp::test_big_p \
@@ -68,6 +67,7 @@ package() {
MANDIR=/share/man/man1 \
PROG_PREFIX=uu- \
PROFILE=release \
+ SKIP_UTILS="runcon chcon" \
MULTICALL=y
install -Dm 644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
=====================================
disable_selinux.patch deleted
=====================================
@@ -1,13 +0,0 @@
-diff --git a/GNUmakefile b/GNUmakefile
-index f46126a82..58bf7fbdd 100644
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -181,8 +181,6 @@ SELINUX_PROGS := \
-
- ifneq ($(OS),Windows_NT)
- PROGS := $(PROGS) $(UNIX_PROGS)
--# Build the selinux command even if not on the system
-- PROGS := $(PROGS) $(SELINUX_PROGS)
- endif
-
- UTILS ?= $(PROGS)
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/uutils-coreutils/-/commit/ced761158b2c6bbacc75a124a0c8f75fa985a82d
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/uutils-coreutils/-/commit/ced761158b2c6bbacc75a124a0c8f75fa985a82d
You're receiving this email because of your account on gitlab.archlinux.org.
