* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-04-17 20:20 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2022-04-17 20:20 UTC (permalink / raw
To: gentoo-commits
commit: b5575e0caf8da2036079e8be329f346afb170b29
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 20:19:17 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 20:19:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5575e0c
sys-apps/systemd-utils: wire up src_configure for 'acl' and 'kmod'
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
...utils-250.4-r2.ebuild => systemd-utils-250.4-r3.ebuild} | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.4-r2.ebuild b/sys-apps/systemd-utils/systemd-utils-250.4-r3.ebuild
similarity index 97%
rename from sys-apps/systemd-utils/systemd-utils-250.4-r2.ebuild
rename to sys-apps/systemd-utils/systemd-utils-250.4-r3.ebuild
index f81737003eb0..f6bc25624f70 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.4-r2.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.4-r3.ebuild
@@ -118,7 +118,6 @@ multilib_src_configure() {
local emesonargs=(
-Drootprefix="${EPREFIX:-/}"
-Dsysvinit-path=
- $(meson_native_true acl)
$(meson_native_use_bool boot efi)
$(meson_native_use_bool boot gnu-efi)
$(meson_native_use_bool selinux)
@@ -126,7 +125,6 @@ multilib_src_configure() {
$(meson_use test tests)
$(meson_native_use_bool tmpfiles)
$(meson_use udev hwdb)
- $(meson_native_use_bool udev kmod)
-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
@@ -209,6 +207,18 @@ multilib_src_configure() {
-Dzstd=false
)
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
if use elibc_musl; then
# Avoid redefinition of struct ethhdr.
append-cppflags -D__UAPI_DEF_ETHHDR=0
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-09-17 16:08 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2024-09-17 16:08 UTC (permalink / raw
To: gentoo-commits
commit: 9e86e89195bfaba6b22217d473020f301dd953fa
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 16:08:04 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 16:08:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e86e891
sys-apps/systemd-utils: Stabilize 254.17 arm, #938904
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.17.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.17.ebuild b/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
index ceef1a090965..bab6818870c8 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-09-17 16:08 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2024-09-17 16:08 UTC (permalink / raw
To: gentoo-commits
commit: f9b6ce179d5867c7d062a9b5669b1e082ca30c26
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 16:08:01 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 16:08:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9b6ce17
sys-apps/systemd-utils: Stabilize 254.17 x86, #938904
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.17.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.17.ebuild b/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
index f482ee26a066..ceef1a090965 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-09-17 16:08 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2024-09-17 16:08 UTC (permalink / raw
To: gentoo-commits
commit: 9cb628533244811354e3819bbb6177a3ccdd5d17
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 16:08:08 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 16:08:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cb62853
sys-apps/systemd-utils: Stabilize 254.17 arm64, #938904
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.17.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.17.ebuild b/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
index bab6818870c8..b863251eb927 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-09-17 16:08 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2024-09-17 16:08 UTC (permalink / raw
To: gentoo-commits
commit: d8544fa99d383033ba799f4cdec4b8d176630781
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 16:08:11 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 16:08:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8544fa9
sys-apps/systemd-utils: Stabilize 254.17 ppc, #938904
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.17.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.17.ebuild b/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
index b863251eb927..fe34d780e2cf 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-09-17 16:08 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2024-09-17 16:08 UTC (permalink / raw
To: gentoo-commits
commit: 84a33d8b6700e89e88604964690d668f0ad9e1d0
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 16:07:58 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 16:07:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84a33d8b
sys-apps/systemd-utils: Stabilize 254.17 amd64, #938904
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.17.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.17.ebuild b/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
index 2703ab5295a2..f482ee26a066 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-09-17 16:08 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2024-09-17 16:08 UTC (permalink / raw
To: gentoo-commits
commit: 1bad6dbd5c2e588a7763082143e0d1c0592d6075
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 16:08:13 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 16:08:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bad6dbd
sys-apps/systemd-utils: Stabilize 254.17 ppc64, #938904
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.17.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.17.ebuild b/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
index fe34d780e2cf..abd270f675db 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-08-31 21:51 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2024-08-31 21:51 UTC (permalink / raw
To: gentoo-commits
commit: 2a527a596c09b4bc07d32335d9effaaa3abfdc2f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 31 21:50:42 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 21:50:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a527a59
sys-apps/systemd-utils: add 255.11
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-255.11.ebuild | 621 +++++++++++++++++++++
2 files changed, 622 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 1e092720333e..de2e44d3b954 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -4,3 +4,4 @@ DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270
DIST systemd-stable-254.16.tar.gz 14564160 BLAKE2B fdf028b128fa8181bc1a4c2d3b5f761431e55613149bee5055a6c2697055a06a52573c4f2ea5a2b9633080a0b7a8d4312d95cb4b61d3943f918bdadf45bc5586 SHA512 0958859610c50f1625a10d67e373c9841678f63dc091abec9d8e7e57bff7e82d2f34a1d54e8ec3c44952f8dc2a5581e65ee54cfbb48c3589561f5bd8658498e0
DIST systemd-stable-254.17.tar.gz 14566862 BLAKE2B fca04c8db285cf22551f7c980da52a8aa3ef3eb78d6005b38cdece4b53ac43a69aa401f8498ee00fcab037dbb22c996b8c626db32c6e4be481f41f752e7a848b SHA512 11ae971e5463fb511c32fbc1ce4012765c73cf87d68ca44c36b85a2ed12f73655b6d071975008c6dd56a27963d1dff5d3c22039fc813bff30be23e6f2dd425ae
DIST systemd-stable-255.10.tar.gz 15102376 BLAKE2B ef35c243e98c43230682904a75f36201ea0f6776a5f17026e98c6a697746e5eebbcd19d614bd1107905c5bf23fbf5913918e7b4790a5d01bbd7a2ec79529234c SHA512 f672cfff18ab80136dedb34908b73d8152f9cb07776c27405a90eb2ad49e22ef86b979a5125c66c6b17d9c76ea516ed920cdbc8e929dda1382f632b414a03df0
+DIST systemd-stable-255.11.tar.gz 15107037 BLAKE2B 7839323367d47dc57914fb501c7be38206f3bc882e560c4df25c65d421e5756108711b0ce57df6ad444d5eabb256d6730366e21d283cb02e1ef014b670855669 SHA512 be06010b56f4ea0651ebe921cd2a68f1794a64367fedea6752f7ba71ac5e00c5f0167d52ba5b662fd9781f5aa3f372e174b65f99a9bac66d4bf6af92caa67ba7
diff --git a/sys-apps/systemd-utils/systemd-utils-255.11.ebuild b/sys-apps/systemd-utils/systemd-utils-255.11.ebuild
new file mode 100644
index 000000000000..523af66c5d3b
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-255.11.ebuild
@@ -0,0 +1,621 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib ninja-utils
+inherit python-single-r1 secureboot udev
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-255.6"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
+REQUIRED_USE="
+ || ( kernel-install tmpfiles sysusers udev )
+ boot? ( kernel-install )
+ ukify? ( boot )
+ ${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ ukify? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep "${PEFILE_DEPEND}")
+ )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ dev-util/patchelf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_cond_dep "
+ dev-python/jinja[\${PYTHON_USEDEP}]
+ dev-python/lxml[\${PYTHON_USEDEP}]
+ boot? (
+ >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
+ test? ( ${PEFILE_DEPEND} )
+ )
+ ")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/systemd-utils-255-musl-fgetxxent.patch"
+ )
+
+ if use elibc_musl; then
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ "${FILESDIR}/musl-efi-wchar.patch"
+ )
+ fi
+ default
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot bootloader)
+ $(meson_native_use_bool kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+ $(meson_native_use_bool ukify)
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+have_dmi() {
+ # see dmi_arches in meson.build
+ case ${CHOST} in
+ mips64*)
+ return 1 ;;
+ aarch64*|arm*|ia64*|i?86*|loongarch64*|mips*|x86_64*)
+ return 0 ;;
+ esac
+ return 1
+}
+
+multilib_src_compile() {
+ local targets=() optional_targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ local efi_arch= efi_arch_alt=
+ case ${CHOST} in
+ aarch64*) efi_arch=aa64 ;;
+ arm*) efi_arch=arm ;;
+ loongarch32*) efi_arch=loongarch32 ;;
+ loongarch64*) efi_arch=loongarch64 ;;
+ riscv32*) efi_arch=riscv32 ;;
+ riscv64*) efi_arch=riscv64 ;;
+ x86_64*) efi_arch=x64 efi_arch_alt=ia32;;
+ i?86*) efi_arch=ia32 ;;
+ esac
+ targets+=(
+ bootctl
+ man/bootctl.1
+ src/boot/efi/systemd-boot${efi_arch}.efi
+ src/boot/efi/linux${efi_arch}.efi.stub
+ src/boot/efi/addon${efi_arch}.efi.stub
+ )
+ if [[ -n ${efi_arch_alt} ]]; then
+ # If we have a multilib toolchain, meson.build will build the
+ # "alt" arch (ia32). There's no easy way to detect this, so try
+ # to build it and ignore failure.
+ optional_targets+=(
+ src/boot/efi/systemd-boot${efi_arch_alt}.efi
+ src/boot/efi/linux${efi_arch_alt}.efi.stub
+ src/boot/efi/addon${efi_arch_alt}.efi.stub
+ )
+ fi
+
+ fi
+ if use kernel-install; then
+ targets+=(
+ kernel-install
+ src/kernel-install/90-loaderentry.install
+ man/kernel-install.8
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=(
+ test-offline-passwd
+ test-tmpfile-util
+ )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ ata_id
+ cdrom_id
+ fido_id
+ iocost
+ mtd_probe
+ scsi_id
+ v4l_id
+ src/udev/udev.pc
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/60-persistent-storage.rules
+ rules.d/64-btrfs.rules
+ # Needed for tests
+ rules.d/99-systemd.rules
+ )
+ if have_dmi; then
+ targets+=( dmi_memory_id )
+ fi
+ if use test; then
+ targets+=(
+ test-fido-id-desc
+ test-link-config-tables
+ test-udev-builtin
+ test-udev-device-thread
+ test-udev-format
+ test-udev-manager
+ test-udev-node
+ test-udev-rule-runner
+ test-udev-rules
+ test-udev-spawn
+ test-udev-util
+ )
+ fi
+ fi
+ if use ukify; then
+ targets+=(
+ ukify
+ src/kernel-install/60-ukify.install
+ man/ukify.1
+ )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ libudev
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if [[ ${#targets[@]} -ne 0 ]]; then
+ meson_src_compile "${targets[@]}"
+ fi
+ if [[ ${#optional_targets[@]} -ne 0 ]]; then
+ ninja ${NINJAOPTS} "${optional_targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ tests+=( --suite boot )
+ fi
+ if use kernel-install; then
+ tests+=( --suite kernel-install )
+ fi
+ if use sysusers; then
+ tests+=( --suite sysusers )
+ fi
+ if use tmpfiles; then
+ tests+=( --suite tmpfiles )
+ fi
+ if use udev; then
+ tests+=( --suite udev )
+ fi
+ fi
+ if use udev; then
+ tests+=( --suite libudev )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test --no-rebuild "${tests[@]}"
+ fi
+}
+
+src_install() {
+ meson-multilib_src_install
+}
+
+set_rpath() {
+ patchelf --set-rpath "${EPREFIX}/usr/$(get_libdir)/systemd" "$@" || die "patchelf failed"
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ exeinto "/usr/$(get_libdir)/systemd"
+ doexe src/shared/libsystemd-shared-${PV%%.*}.so
+ if use boot; then
+ set_rpath bootctl
+ dobin bootctl
+ doman man/bootctl.1
+ meson_install --no-rebuild --tags systemd-boot
+ fi
+ if use kernel-install; then
+ set_rpath kernel-install
+ dobin kernel-install
+ doman man/kernel-install.8
+ exeinto /usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use sysusers; then
+ set_rpath systemd-sysusers
+ dobin systemd-sysusers
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ set_rpath systemd-tmpfiles
+ dobin systemd-tmpfiles
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ set_rpath udevadm systemd-hwdb
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm /usr/lib/systemd/systemd-udevd
+ if use split-usr; then
+ # elogind installs udev rules that hard-code /bin/udevadm
+ dosym ../usr/bin/udevadm /bin/udevadm
+ fi
+
+ exeinto /usr/lib/udev
+ set_rpath {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
+ doexe {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
+
+ if have_dmi; then
+ set_rpath dmi_memory_id
+ doexe dmi_memory_id
+ fi
+
+ rm -f rules.d/99-systemd.rules
+ insinto /usr/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto /usr/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ doman man/libudev.3
+ doman man/udev_*.3
+ fi
+ if use ukify; then
+ dobin ukify
+ dosym ../../bin/ukify /usr/lib/systemd/ukify
+ doman man/ukify.1
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use kernel-install; then
+ exeinto /usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/x11.conf
+ doins "${FILESDIR}"/{legacy,tmp}.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto /usr/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto /usr/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto /usr/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use ukify && python_fix_shebang "${ED}"
+ use boot && secureboot_auto_sign
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_preinst() {
+ # Migrate /lib/{systemd,udev} to /usr/lib
+ if use split-usr; then
+ local d
+ for d in systemd udev; do
+ dosym ../usr/lib/${d} /lib/${d}
+ if [[ -e ${EROOT}/lib/${d} && ! -L ${EROOT}/lib/${d} ]]; then
+ einfo "Copying files from '${EROOT}/lib/${d}' to '${EROOT}/usr/lib/${d}'"
+ cp -rpPT "${EROOT}/lib/${d}" "${EROOT}/usr/lib/${d}" || die
+ einfo "Removing '${EROOT}/lib/${d}'"
+ rm -r "${EROOT}/lib/${d}" || die
+ fi
+ done
+ fi
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-08-31 21:51 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2024-08-31 21:51 UTC (permalink / raw
To: gentoo-commits
commit: 72692399dbcd2419c81df6e974e8bb24dadfe6d8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 31 21:48:31 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 21:48:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72692399
sys-apps/systemd-utils: add 254.17
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-254.17.ebuild | 583 +++++++++++++++++++++
2 files changed, 584 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 0cef56bf9fbd..1e092720333e 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -2,4 +2,5 @@ DIST systemd-musl-patches-254.3-r1.tar.gz 29971 BLAKE2B 2568c0ce93c410177d775fed
DIST systemd-musl-patches-255.6.tar.gz 31529 BLAKE2B 14b737968168238c62a776052bdb97a3cee87c076317f260147939051f24f9ee8f39dec5e38f9b2ce61ea4737422eece680c4d15dd1fdcc5f3e61b6e5ec5f5c4 SHA512 0ab39a653d42d7b58ad875176270aed93e03ba28b33616520548a01e7d06d170379f9206b4a2b280a588d4f7084af10a2a0ec7a6cb724902ddff149e512d789d
DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270e1f97ba78f8280f45100b1b5b33c3531cf79587b596ccbbe594f1e623d918c1fdf19f2231d677e27b5421f1852fbe3225b3 SHA512 852cbc992128dc3ab6ded4215c2540fa3c0b7c7ad98e54036f3981d77a2162f5393ee50960773419133e0d584844af329d3726f45829a56c00b1827e33edf3e1
DIST systemd-stable-254.16.tar.gz 14564160 BLAKE2B fdf028b128fa8181bc1a4c2d3b5f761431e55613149bee5055a6c2697055a06a52573c4f2ea5a2b9633080a0b7a8d4312d95cb4b61d3943f918bdadf45bc5586 SHA512 0958859610c50f1625a10d67e373c9841678f63dc091abec9d8e7e57bff7e82d2f34a1d54e8ec3c44952f8dc2a5581e65ee54cfbb48c3589561f5bd8658498e0
+DIST systemd-stable-254.17.tar.gz 14566862 BLAKE2B fca04c8db285cf22551f7c980da52a8aa3ef3eb78d6005b38cdece4b53ac43a69aa401f8498ee00fcab037dbb22c996b8c626db32c6e4be481f41f752e7a848b SHA512 11ae971e5463fb511c32fbc1ce4012765c73cf87d68ca44c36b85a2ed12f73655b6d071975008c6dd56a27963d1dff5d3c22039fc813bff30be23e6f2dd425ae
DIST systemd-stable-255.10.tar.gz 15102376 BLAKE2B ef35c243e98c43230682904a75f36201ea0f6776a5f17026e98c6a697746e5eebbcd19d614bd1107905c5bf23fbf5913918e7b4790a5d01bbd7a2ec79529234c SHA512 f672cfff18ab80136dedb34908b73d8152f9cb07776c27405a90eb2ad49e22ef86b979a5125c66c6b17d9c76ea516ed920cdbc8e929dda1382f632b414a03df0
diff --git a/sys-apps/systemd-utils/systemd-utils-254.17.ebuild b/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
new file mode 100644
index 000000000000..d76d79f1f07f
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
@@ -0,0 +1,583 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
+inherit python-single-r1 secureboot toolchain-funcs udev
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-254.3-r1"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
+REQUIRED_USE="
+ || ( kernel-install tmpfiles sysusers udev )
+ boot? ( kernel-install )
+ ukify? ( boot )
+ ${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ ukify? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep "${PEFILE_DEPEND}")
+ )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_cond_dep "
+ dev-python/jinja[\${PYTHON_USEDEP}]
+ dev-python/lxml[\${PYTHON_USEDEP}]
+ boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
+ ukify? ( test? ( ${PEFILE_DEPEND} ) )
+ ")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
+ )
+
+ if use elibc_musl; then
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot bootloader)
+ $(meson_native_use_bool kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+ $(meson_native_use_bool ukify)
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-kernel-install-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ man/bootctl.1
+ src/boot/efi/linux$(efi_arch).efi.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use kernel-install; then
+ targets+=(
+ kernel-install
+ src/kernel-install/90-loaderentry.install
+ man/kernel-install.8
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfile-util )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/60-persistent-storage.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ udev-rule-runner
+ )
+ fi
+ fi
+ if use ukify; then
+ targets+=(
+ ukify
+ src/kernel-install/60-ukify.install
+ man/ukify.1
+ )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ libudev
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfile-util
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl
+ doman man/bootctl.1
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use kernel-install; then
+ dobin kernel-install
+ doman man/kernel-install.8
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ rm -f rules.d/99-systemd.rules
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ doman man/libudev.3
+ doman man/udev_*.3
+ fi
+ if use ukify; then
+ exeinto "${rootprefix}"/lib/systemd/
+ doexe ukify
+ doman man/ukify.1
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use kernel-install; then
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/x11.conf
+ doins "${FILESDIR}"/{legacy,tmp}.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use ukify && python_fix_shebang "${ED}"
+ use boot && secureboot_auto_sign
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+
+ if use boot; then
+ optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
+ "sys-kernel/installkernel[systemd-boot]"
+ fi
+ if use ukify; then
+ optfeature "automatically generating an unified kernel image on each kernel installation" \
+ "sys-kernel/installkernel[ukify]"
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-07-28 4:20 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2024-07-28 4:20 UTC (permalink / raw
To: gentoo-commits
commit: b59a2f5141dd8d3f76c31dd6903e24b9100be0a9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 04:19:25 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 04:19:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b59a2f51
sys-apps/systemd-utils: drop 254.14, 254.15
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 2 -
sys-apps/systemd-utils/systemd-utils-254.14.ebuild | 583 ---------------------
sys-apps/systemd-utils/systemd-utils-254.15.ebuild | 583 ---------------------
3 files changed, 1168 deletions(-)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 6434117cdf7f..076926222dbd 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,8 +1,6 @@
DIST systemd-musl-patches-254.3-r1.tar.gz 29971 BLAKE2B 2568c0ce93c410177d775fedb7a67b9498d66f39bfaca220237b3b55cd42c94569d7e3bfde11a9b1faa5eac1804eb75bfdee0ee465c2faac3b8213026b97daec SHA512 817c94765a70eaaa5d23454e03887e149db4612f01c29690baa0c75d61b4b328b742e5d02e8cc63c531eadcd72ae37c0a407aad37c22f1d399dbba81a6bed79d
DIST systemd-musl-patches-255.6.tar.gz 31529 BLAKE2B 14b737968168238c62a776052bdb97a3cee87c076317f260147939051f24f9ee8f39dec5e38f9b2ce61ea4737422eece680c4d15dd1fdcc5f3e61b6e5ec5f5c4 SHA512 0ab39a653d42d7b58ad875176270aed93e03ba28b33616520548a01e7d06d170379f9206b4a2b280a588d4f7084af10a2a0ec7a6cb724902ddff149e512d789d
DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270e1f97ba78f8280f45100b1b5b33c3531cf79587b596ccbbe594f1e623d918c1fdf19f2231d677e27b5421f1852fbe3225b3 SHA512 852cbc992128dc3ab6ded4215c2540fa3c0b7c7ad98e54036f3981d77a2162f5393ee50960773419133e0d584844af329d3726f45829a56c00b1827e33edf3e1
-DIST systemd-stable-254.14.tar.gz 14533129 BLAKE2B 1db933e0f0cdfcabc7a4f3ecfe6e0cf1b10d4b2fa0aee02629d786cb022b18c501a0c48445f9b537a003af22ee64803271fa007e3889b833ec119b4d1346c410 SHA512 bd4e5ce7529f488f7e7199a1ff5976c10cf8e7040893dcf312a23dda5e32eb5c7f40c9ce3676f4a60d5d39197efc3bb1f2a577004b1654d1d0be9a1c617cfcdb
-DIST systemd-stable-254.15.tar.gz 14537162 BLAKE2B cd8235d2522986ec4044306b65f186ab13c1c420e33177fd901254b216910f445b920655aad5ffefca8607ed00ff8a01800f4a8efe56c1577f0ace8d1b2ba9be SHA512 3d6b3e719c9164721f746986a337ab791f7ce7d0bd6e42980bfc0b4232806c3a141e2e93b0f98c1cd33073439a81061e329f3821eafe05a359096dafa71c9966
DIST systemd-stable-254.16.tar.gz 14564160 BLAKE2B fdf028b128fa8181bc1a4c2d3b5f761431e55613149bee5055a6c2697055a06a52573c4f2ea5a2b9633080a0b7a8d4312d95cb4b61d3943f918bdadf45bc5586 SHA512 0958859610c50f1625a10d67e373c9841678f63dc091abec9d8e7e57bff7e82d2f34a1d54e8ec3c44952f8dc2a5581e65ee54cfbb48c3589561f5bd8658498e0
DIST systemd-stable-255.10.tar.gz 15102376 BLAKE2B ef35c243e98c43230682904a75f36201ea0f6776a5f17026e98c6a697746e5eebbcd19d614bd1107905c5bf23fbf5913918e7b4790a5d01bbd7a2ec79529234c SHA512 f672cfff18ab80136dedb34908b73d8152f9cb07776c27405a90eb2ad49e22ef86b979a5125c66c6b17d9c76ea516ed920cdbc8e929dda1382f632b414a03df0
DIST systemd-stable-255.8.tar.gz 15070471 BLAKE2B b437404af7fd73ef527f80d9d14d46a781444103d1756c27494ecf2664c9c5efe1169c85b91148a3bf190dc7c5e31cf8d42a13c84102d101ea7e4a0570e8d719 SHA512 7692be761a393924669a90f6f343998a85707a9daa3ce169ce67f62ae2a39338c2c3496066b2659c6500849104fab0529fca5704a3eb32375f2f44131216d1f1
diff --git a/sys-apps/systemd-utils/systemd-utils-254.14.ebuild b/sys-apps/systemd-utils/systemd-utils-254.14.ebuild
deleted file mode 100644
index d76d79f1f07f..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-254.14.ebuild
+++ /dev/null
@@ -1,583 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
-inherit python-single-r1 secureboot toolchain-funcs udev
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-254.3-r1"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
-REQUIRED_USE="
- || ( kernel-install tmpfiles sysusers udev )
- boot? ( kernel-install )
- ukify? ( boot )
- ${PYTHON_REQUIRED_USE}
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
-"
-
-PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
-
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- ukify? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep "${PEFILE_DEPEND}")
- )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
- $(python_gen_cond_dep "
- dev-python/jinja[\${PYTHON_USEDEP}]
- dev-python/lxml[\${PYTHON_USEDEP}]
- boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
- ukify? ( test? ( ${PEFILE_DEPEND} ) )
- ")
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
- use boot && secureboot_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
- )
-
- if use elibc_musl; then
- PATCHES+=(
- "${WORKDIR}/${MUSL_PATCHSET}"
- )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot bootloader)
- $(meson_native_use_bool kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
- $(meson_native_use_bool ukify)
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-kernel-install-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- man/bootctl.1
- src/boot/efi/linux$(efi_arch).efi.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use kernel-install; then
- targets+=(
- kernel-install
- src/kernel-install/90-loaderentry.install
- man/kernel-install.8
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfile-util )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- man/libudev.3
- man/udev_device_get_syspath.3
- man/udev_device_has_tag.3
- man/udev_device_new_from_syspath.3
- man/udev_enumerate_add_match_subsystem.3
- man/udev_enumerate_new.3
- man/udev_enumerate_scan_devices.3
- man/udev_list_entry.3
- man/udev_monitor_filter_update.3
- man/udev_monitor_new_from_netlink.3
- man/udev_monitor_receive_device.3
- man/udev_new.3
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/60-persistent-storage.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- udev-rule-runner
- )
- fi
- fi
- if use ukify; then
- targets+=(
- ukify
- src/kernel-install/60-ukify.install
- man/ukify.1
- )
- fi
- fi
- if use udev; then
- targets+=(
- libudev
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfile-util
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl
- doman man/bootctl.1
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use kernel-install; then
- dobin kernel-install
- doman man/kernel-install.8
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- rm -f rules.d/99-systemd.rules
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- doman man/libudev.3
- doman man/udev_*.3
- fi
- if use ukify; then
- exeinto "${rootprefix}"/lib/systemd/
- doexe ukify
- doman man/ukify.1
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use kernel-install; then
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/x11.conf
- doins "${FILESDIR}"/{legacy,tmp}.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-
- use ukify && python_fix_shebang "${ED}"
- use boot && secureboot_auto_sign
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-
- if use boot; then
- optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
- "sys-kernel/installkernel[systemd-boot]"
- fi
- if use ukify; then
- optfeature "automatically generating an unified kernel image on each kernel installation" \
- "sys-kernel/installkernel[ukify]"
- fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-254.15.ebuild b/sys-apps/systemd-utils/systemd-utils-254.15.ebuild
deleted file mode 100644
index d76d79f1f07f..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-254.15.ebuild
+++ /dev/null
@@ -1,583 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
-inherit python-single-r1 secureboot toolchain-funcs udev
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-254.3-r1"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
-REQUIRED_USE="
- || ( kernel-install tmpfiles sysusers udev )
- boot? ( kernel-install )
- ukify? ( boot )
- ${PYTHON_REQUIRED_USE}
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
-"
-
-PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
-
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- ukify? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep "${PEFILE_DEPEND}")
- )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
- $(python_gen_cond_dep "
- dev-python/jinja[\${PYTHON_USEDEP}]
- dev-python/lxml[\${PYTHON_USEDEP}]
- boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
- ukify? ( test? ( ${PEFILE_DEPEND} ) )
- ")
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
- use boot && secureboot_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
- )
-
- if use elibc_musl; then
- PATCHES+=(
- "${WORKDIR}/${MUSL_PATCHSET}"
- )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot bootloader)
- $(meson_native_use_bool kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
- $(meson_native_use_bool ukify)
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-kernel-install-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- man/bootctl.1
- src/boot/efi/linux$(efi_arch).efi.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use kernel-install; then
- targets+=(
- kernel-install
- src/kernel-install/90-loaderentry.install
- man/kernel-install.8
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfile-util )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- man/libudev.3
- man/udev_device_get_syspath.3
- man/udev_device_has_tag.3
- man/udev_device_new_from_syspath.3
- man/udev_enumerate_add_match_subsystem.3
- man/udev_enumerate_new.3
- man/udev_enumerate_scan_devices.3
- man/udev_list_entry.3
- man/udev_monitor_filter_update.3
- man/udev_monitor_new_from_netlink.3
- man/udev_monitor_receive_device.3
- man/udev_new.3
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/60-persistent-storage.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- udev-rule-runner
- )
- fi
- fi
- if use ukify; then
- targets+=(
- ukify
- src/kernel-install/60-ukify.install
- man/ukify.1
- )
- fi
- fi
- if use udev; then
- targets+=(
- libudev
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfile-util
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl
- doman man/bootctl.1
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use kernel-install; then
- dobin kernel-install
- doman man/kernel-install.8
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- rm -f rules.d/99-systemd.rules
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- doman man/libudev.3
- doman man/udev_*.3
- fi
- if use ukify; then
- exeinto "${rootprefix}"/lib/systemd/
- doexe ukify
- doman man/ukify.1
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use kernel-install; then
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/x11.conf
- doins "${FILESDIR}"/{legacy,tmp}.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-
- use ukify && python_fix_shebang "${ED}"
- use boot && secureboot_auto_sign
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-
- if use boot; then
- optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
- "sys-kernel/installkernel[systemd-boot]"
- fi
- if use ukify; then
- optfeature "automatically generating an unified kernel image on each kernel installation" \
- "sys-kernel/installkernel[ukify]"
- fi
-}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-07-28 4:20 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2024-07-28 4:20 UTC (permalink / raw
To: gentoo-commits
commit: c834d0a72d946b0a17cd5f0c0674205b063a097f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 04:19:35 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 04:19:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c834d0a7
sys-apps/systemd-utils: drop 255.8, 255.9
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 2 -
sys-apps/systemd-utils/systemd-utils-255.8.ebuild | 621 ----------------------
sys-apps/systemd-utils/systemd-utils-255.9.ebuild | 621 ----------------------
3 files changed, 1244 deletions(-)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 076926222dbd..0cef56bf9fbd 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -3,5 +3,3 @@ DIST systemd-musl-patches-255.6.tar.gz 31529 BLAKE2B 14b737968168238c62a776052bd
DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270e1f97ba78f8280f45100b1b5b33c3531cf79587b596ccbbe594f1e623d918c1fdf19f2231d677e27b5421f1852fbe3225b3 SHA512 852cbc992128dc3ab6ded4215c2540fa3c0b7c7ad98e54036f3981d77a2162f5393ee50960773419133e0d584844af329d3726f45829a56c00b1827e33edf3e1
DIST systemd-stable-254.16.tar.gz 14564160 BLAKE2B fdf028b128fa8181bc1a4c2d3b5f761431e55613149bee5055a6c2697055a06a52573c4f2ea5a2b9633080a0b7a8d4312d95cb4b61d3943f918bdadf45bc5586 SHA512 0958859610c50f1625a10d67e373c9841678f63dc091abec9d8e7e57bff7e82d2f34a1d54e8ec3c44952f8dc2a5581e65ee54cfbb48c3589561f5bd8658498e0
DIST systemd-stable-255.10.tar.gz 15102376 BLAKE2B ef35c243e98c43230682904a75f36201ea0f6776a5f17026e98c6a697746e5eebbcd19d614bd1107905c5bf23fbf5913918e7b4790a5d01bbd7a2ec79529234c SHA512 f672cfff18ab80136dedb34908b73d8152f9cb07776c27405a90eb2ad49e22ef86b979a5125c66c6b17d9c76ea516ed920cdbc8e929dda1382f632b414a03df0
-DIST systemd-stable-255.8.tar.gz 15070471 BLAKE2B b437404af7fd73ef527f80d9d14d46a781444103d1756c27494ecf2664c9c5efe1169c85b91148a3bf190dc7c5e31cf8d42a13c84102d101ea7e4a0570e8d719 SHA512 7692be761a393924669a90f6f343998a85707a9daa3ce169ce67f62ae2a39338c2c3496066b2659c6500849104fab0529fca5704a3eb32375f2f44131216d1f1
-DIST systemd-stable-255.9.tar.gz 15072970 BLAKE2B e720eca0e239293c5488feb8caf3f2df49ebe581cbf3a7ac8eb569d1b9a5c669c3eea28e7fd35a9902208116dc7e626166503bccf628258e2041b9e8f77bcbed SHA512 75b46e443bcbe5e4ae812b6cbbd4ea6485caf5b4addea78a0b42365147a0bdc390a288b4aeda1fc7f3e9a46abf2881cda0e45bb8cb782daa50ea5661514b1af8
diff --git a/sys-apps/systemd-utils/systemd-utils-255.8.ebuild b/sys-apps/systemd-utils/systemd-utils-255.8.ebuild
deleted file mode 100644
index 523af66c5d3b..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-255.8.ebuild
+++ /dev/null
@@ -1,621 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib ninja-utils
-inherit python-single-r1 secureboot udev
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-255.6"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
-REQUIRED_USE="
- || ( kernel-install tmpfiles sysusers udev )
- boot? ( kernel-install )
- ukify? ( boot )
- ${PYTHON_REQUIRED_USE}
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
-"
-
-PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
-
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- ukify? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep "${PEFILE_DEPEND}")
- )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- dev-util/patchelf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
- $(python_gen_cond_dep "
- dev-python/jinja[\${PYTHON_USEDEP}]
- dev-python/lxml[\${PYTHON_USEDEP}]
- boot? (
- >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
- test? ( ${PEFILE_DEPEND} )
- )
- ")
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
- use boot && secureboot_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/systemd-utils-255-musl-fgetxxent.patch"
- )
-
- if use elibc_musl; then
- PATCHES+=(
- "${WORKDIR}/${MUSL_PATCHSET}"
- "${FILESDIR}/musl-efi-wchar.patch"
- )
- fi
- default
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- -Dsysvinit-path=
- $(meson_native_use_bool boot bootloader)
- $(meson_native_use_bool kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
- $(meson_native_use_bool ukify)
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-have_dmi() {
- # see dmi_arches in meson.build
- case ${CHOST} in
- mips64*)
- return 1 ;;
- aarch64*|arm*|ia64*|i?86*|loongarch64*|mips*|x86_64*)
- return 0 ;;
- esac
- return 1
-}
-
-multilib_src_compile() {
- local targets=() optional_targets=()
- if multilib_is_native_abi; then
- if use boot; then
- local efi_arch= efi_arch_alt=
- case ${CHOST} in
- aarch64*) efi_arch=aa64 ;;
- arm*) efi_arch=arm ;;
- loongarch32*) efi_arch=loongarch32 ;;
- loongarch64*) efi_arch=loongarch64 ;;
- riscv32*) efi_arch=riscv32 ;;
- riscv64*) efi_arch=riscv64 ;;
- x86_64*) efi_arch=x64 efi_arch_alt=ia32;;
- i?86*) efi_arch=ia32 ;;
- esac
- targets+=(
- bootctl
- man/bootctl.1
- src/boot/efi/systemd-boot${efi_arch}.efi
- src/boot/efi/linux${efi_arch}.efi.stub
- src/boot/efi/addon${efi_arch}.efi.stub
- )
- if [[ -n ${efi_arch_alt} ]]; then
- # If we have a multilib toolchain, meson.build will build the
- # "alt" arch (ia32). There's no easy way to detect this, so try
- # to build it and ignore failure.
- optional_targets+=(
- src/boot/efi/systemd-boot${efi_arch_alt}.efi
- src/boot/efi/linux${efi_arch_alt}.efi.stub
- src/boot/efi/addon${efi_arch_alt}.efi.stub
- )
- fi
-
- fi
- if use kernel-install; then
- targets+=(
- kernel-install
- src/kernel-install/90-loaderentry.install
- man/kernel-install.8
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=(
- test-offline-passwd
- test-tmpfile-util
- )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- ata_id
- cdrom_id
- fido_id
- iocost
- mtd_probe
- scsi_id
- v4l_id
- src/udev/udev.pc
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- man/libudev.3
- man/udev_device_get_syspath.3
- man/udev_device_has_tag.3
- man/udev_device_new_from_syspath.3
- man/udev_enumerate_add_match_subsystem.3
- man/udev_enumerate_new.3
- man/udev_enumerate_scan_devices.3
- man/udev_list_entry.3
- man/udev_monitor_filter_update.3
- man/udev_monitor_new_from_netlink.3
- man/udev_monitor_receive_device.3
- man/udev_new.3
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/60-persistent-storage.rules
- rules.d/64-btrfs.rules
- # Needed for tests
- rules.d/99-systemd.rules
- )
- if have_dmi; then
- targets+=( dmi_memory_id )
- fi
- if use test; then
- targets+=(
- test-fido-id-desc
- test-link-config-tables
- test-udev-builtin
- test-udev-device-thread
- test-udev-format
- test-udev-manager
- test-udev-node
- test-udev-rule-runner
- test-udev-rules
- test-udev-spawn
- test-udev-util
- )
- fi
- fi
- if use ukify; then
- targets+=(
- ukify
- src/kernel-install/60-ukify.install
- man/ukify.1
- )
- fi
- fi
- if use udev; then
- targets+=(
- libudev
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if [[ ${#targets[@]} -ne 0 ]]; then
- meson_src_compile "${targets[@]}"
- fi
- if [[ ${#optional_targets[@]} -ne 0 ]]; then
- ninja ${NINJAOPTS} "${optional_targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use boot; then
- tests+=( --suite boot )
- fi
- if use kernel-install; then
- tests+=( --suite kernel-install )
- fi
- if use sysusers; then
- tests+=( --suite sysusers )
- fi
- if use tmpfiles; then
- tests+=( --suite tmpfiles )
- fi
- if use udev; then
- tests+=( --suite udev )
- fi
- fi
- if use udev; then
- tests+=( --suite libudev )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test --no-rebuild "${tests[@]}"
- fi
-}
-
-src_install() {
- meson-multilib_src_install
-}
-
-set_rpath() {
- patchelf --set-rpath "${EPREFIX}/usr/$(get_libdir)/systemd" "$@" || die "patchelf failed"
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- exeinto "/usr/$(get_libdir)/systemd"
- doexe src/shared/libsystemd-shared-${PV%%.*}.so
- if use boot; then
- set_rpath bootctl
- dobin bootctl
- doman man/bootctl.1
- meson_install --no-rebuild --tags systemd-boot
- fi
- if use kernel-install; then
- set_rpath kernel-install
- dobin kernel-install
- doman man/kernel-install.8
- exeinto /usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- fi
- if use sysusers; then
- set_rpath systemd-sysusers
- dobin systemd-sysusers
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- set_rpath systemd-tmpfiles
- dobin systemd-tmpfiles
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- set_rpath udevadm systemd-hwdb
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm /usr/lib/systemd/systemd-udevd
- if use split-usr; then
- # elogind installs udev rules that hard-code /bin/udevadm
- dosym ../usr/bin/udevadm /bin/udevadm
- fi
-
- exeinto /usr/lib/udev
- set_rpath {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
- doexe {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
-
- if have_dmi; then
- set_rpath dmi_memory_id
- doexe dmi_memory_id
- fi
-
- rm -f rules.d/99-systemd.rules
- insinto /usr/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto /usr/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- doman man/libudev.3
- doman man/udev_*.3
- fi
- if use ukify; then
- dobin ukify
- dosym ../../bin/ukify /usr/lib/systemd/ukify
- doman man/ukify.1
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use kernel-install; then
- exeinto /usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/x11.conf
- doins "${FILESDIR}"/{legacy,tmp}.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto /usr/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto /usr/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto /usr/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-
- use ukify && python_fix_shebang "${ED}"
- use boot && secureboot_auto_sign
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_preinst() {
- # Migrate /lib/{systemd,udev} to /usr/lib
- if use split-usr; then
- local d
- for d in systemd udev; do
- dosym ../usr/lib/${d} /lib/${d}
- if [[ -e ${EROOT}/lib/${d} && ! -L ${EROOT}/lib/${d} ]]; then
- einfo "Copying files from '${EROOT}/lib/${d}' to '${EROOT}/usr/lib/${d}'"
- cp -rpPT "${EROOT}/lib/${d}" "${EROOT}/usr/lib/${d}" || die
- einfo "Removing '${EROOT}/lib/${d}'"
- rm -r "${EROOT}/lib/${d}" || die
- fi
- done
- fi
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-255.9.ebuild b/sys-apps/systemd-utils/systemd-utils-255.9.ebuild
deleted file mode 100644
index 523af66c5d3b..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-255.9.ebuild
+++ /dev/null
@@ -1,621 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib ninja-utils
-inherit python-single-r1 secureboot udev
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-255.6"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
-REQUIRED_USE="
- || ( kernel-install tmpfiles sysusers udev )
- boot? ( kernel-install )
- ukify? ( boot )
- ${PYTHON_REQUIRED_USE}
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
-"
-
-PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
-
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- ukify? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep "${PEFILE_DEPEND}")
- )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- dev-util/patchelf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
- $(python_gen_cond_dep "
- dev-python/jinja[\${PYTHON_USEDEP}]
- dev-python/lxml[\${PYTHON_USEDEP}]
- boot? (
- >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
- test? ( ${PEFILE_DEPEND} )
- )
- ")
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
- use boot && secureboot_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/systemd-utils-255-musl-fgetxxent.patch"
- )
-
- if use elibc_musl; then
- PATCHES+=(
- "${WORKDIR}/${MUSL_PATCHSET}"
- "${FILESDIR}/musl-efi-wchar.patch"
- )
- fi
- default
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- -Dsysvinit-path=
- $(meson_native_use_bool boot bootloader)
- $(meson_native_use_bool kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
- $(meson_native_use_bool ukify)
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-have_dmi() {
- # see dmi_arches in meson.build
- case ${CHOST} in
- mips64*)
- return 1 ;;
- aarch64*|arm*|ia64*|i?86*|loongarch64*|mips*|x86_64*)
- return 0 ;;
- esac
- return 1
-}
-
-multilib_src_compile() {
- local targets=() optional_targets=()
- if multilib_is_native_abi; then
- if use boot; then
- local efi_arch= efi_arch_alt=
- case ${CHOST} in
- aarch64*) efi_arch=aa64 ;;
- arm*) efi_arch=arm ;;
- loongarch32*) efi_arch=loongarch32 ;;
- loongarch64*) efi_arch=loongarch64 ;;
- riscv32*) efi_arch=riscv32 ;;
- riscv64*) efi_arch=riscv64 ;;
- x86_64*) efi_arch=x64 efi_arch_alt=ia32;;
- i?86*) efi_arch=ia32 ;;
- esac
- targets+=(
- bootctl
- man/bootctl.1
- src/boot/efi/systemd-boot${efi_arch}.efi
- src/boot/efi/linux${efi_arch}.efi.stub
- src/boot/efi/addon${efi_arch}.efi.stub
- )
- if [[ -n ${efi_arch_alt} ]]; then
- # If we have a multilib toolchain, meson.build will build the
- # "alt" arch (ia32). There's no easy way to detect this, so try
- # to build it and ignore failure.
- optional_targets+=(
- src/boot/efi/systemd-boot${efi_arch_alt}.efi
- src/boot/efi/linux${efi_arch_alt}.efi.stub
- src/boot/efi/addon${efi_arch_alt}.efi.stub
- )
- fi
-
- fi
- if use kernel-install; then
- targets+=(
- kernel-install
- src/kernel-install/90-loaderentry.install
- man/kernel-install.8
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=(
- test-offline-passwd
- test-tmpfile-util
- )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- ata_id
- cdrom_id
- fido_id
- iocost
- mtd_probe
- scsi_id
- v4l_id
- src/udev/udev.pc
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- man/libudev.3
- man/udev_device_get_syspath.3
- man/udev_device_has_tag.3
- man/udev_device_new_from_syspath.3
- man/udev_enumerate_add_match_subsystem.3
- man/udev_enumerate_new.3
- man/udev_enumerate_scan_devices.3
- man/udev_list_entry.3
- man/udev_monitor_filter_update.3
- man/udev_monitor_new_from_netlink.3
- man/udev_monitor_receive_device.3
- man/udev_new.3
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/60-persistent-storage.rules
- rules.d/64-btrfs.rules
- # Needed for tests
- rules.d/99-systemd.rules
- )
- if have_dmi; then
- targets+=( dmi_memory_id )
- fi
- if use test; then
- targets+=(
- test-fido-id-desc
- test-link-config-tables
- test-udev-builtin
- test-udev-device-thread
- test-udev-format
- test-udev-manager
- test-udev-node
- test-udev-rule-runner
- test-udev-rules
- test-udev-spawn
- test-udev-util
- )
- fi
- fi
- if use ukify; then
- targets+=(
- ukify
- src/kernel-install/60-ukify.install
- man/ukify.1
- )
- fi
- fi
- if use udev; then
- targets+=(
- libudev
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if [[ ${#targets[@]} -ne 0 ]]; then
- meson_src_compile "${targets[@]}"
- fi
- if [[ ${#optional_targets[@]} -ne 0 ]]; then
- ninja ${NINJAOPTS} "${optional_targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use boot; then
- tests+=( --suite boot )
- fi
- if use kernel-install; then
- tests+=( --suite kernel-install )
- fi
- if use sysusers; then
- tests+=( --suite sysusers )
- fi
- if use tmpfiles; then
- tests+=( --suite tmpfiles )
- fi
- if use udev; then
- tests+=( --suite udev )
- fi
- fi
- if use udev; then
- tests+=( --suite libudev )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test --no-rebuild "${tests[@]}"
- fi
-}
-
-src_install() {
- meson-multilib_src_install
-}
-
-set_rpath() {
- patchelf --set-rpath "${EPREFIX}/usr/$(get_libdir)/systemd" "$@" || die "patchelf failed"
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- exeinto "/usr/$(get_libdir)/systemd"
- doexe src/shared/libsystemd-shared-${PV%%.*}.so
- if use boot; then
- set_rpath bootctl
- dobin bootctl
- doman man/bootctl.1
- meson_install --no-rebuild --tags systemd-boot
- fi
- if use kernel-install; then
- set_rpath kernel-install
- dobin kernel-install
- doman man/kernel-install.8
- exeinto /usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- fi
- if use sysusers; then
- set_rpath systemd-sysusers
- dobin systemd-sysusers
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- set_rpath systemd-tmpfiles
- dobin systemd-tmpfiles
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- set_rpath udevadm systemd-hwdb
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm /usr/lib/systemd/systemd-udevd
- if use split-usr; then
- # elogind installs udev rules that hard-code /bin/udevadm
- dosym ../usr/bin/udevadm /bin/udevadm
- fi
-
- exeinto /usr/lib/udev
- set_rpath {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
- doexe {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
-
- if have_dmi; then
- set_rpath dmi_memory_id
- doexe dmi_memory_id
- fi
-
- rm -f rules.d/99-systemd.rules
- insinto /usr/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto /usr/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- doman man/libudev.3
- doman man/udev_*.3
- fi
- if use ukify; then
- dobin ukify
- dosym ../../bin/ukify /usr/lib/systemd/ukify
- doman man/ukify.1
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use kernel-install; then
- exeinto /usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/x11.conf
- doins "${FILESDIR}"/{legacy,tmp}.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto /usr/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto /usr/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto /usr/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-
- use ukify && python_fix_shebang "${ED}"
- use boot && secureboot_auto_sign
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_preinst() {
- # Migrate /lib/{systemd,udev} to /usr/lib
- if use split-usr; then
- local d
- for d in systemd udev; do
- dosym ../usr/lib/${d} /lib/${d}
- if [[ -e ${EROOT}/lib/${d} && ! -L ${EROOT}/lib/${d} ]]; then
- einfo "Copying files from '${EROOT}/lib/${d}' to '${EROOT}/usr/lib/${d}'"
- cp -rpPT "${EROOT}/lib/${d}" "${EROOT}/usr/lib/${d}" || die
- einfo "Removing '${EROOT}/lib/${d}'"
- rm -r "${EROOT}/lib/${d}" || die
- fi
- done
- fi
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-07-28 4:13 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2024-07-28 4:13 UTC (permalink / raw
To: gentoo-commits
commit: 303e27c05a6b71a543982066f64abd131f0b1f64
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 04:08:01 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 04:08:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=303e27c0
sys-apps/systemd-utils: add 255.10
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-255.10.ebuild | 621 +++++++++++++++++++++
2 files changed, 622 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index d6e0d1df3cd0..6434117cdf7f 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -4,5 +4,6 @@ DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270
DIST systemd-stable-254.14.tar.gz 14533129 BLAKE2B 1db933e0f0cdfcabc7a4f3ecfe6e0cf1b10d4b2fa0aee02629d786cb022b18c501a0c48445f9b537a003af22ee64803271fa007e3889b833ec119b4d1346c410 SHA512 bd4e5ce7529f488f7e7199a1ff5976c10cf8e7040893dcf312a23dda5e32eb5c7f40c9ce3676f4a60d5d39197efc3bb1f2a577004b1654d1d0be9a1c617cfcdb
DIST systemd-stable-254.15.tar.gz 14537162 BLAKE2B cd8235d2522986ec4044306b65f186ab13c1c420e33177fd901254b216910f445b920655aad5ffefca8607ed00ff8a01800f4a8efe56c1577f0ace8d1b2ba9be SHA512 3d6b3e719c9164721f746986a337ab791f7ce7d0bd6e42980bfc0b4232806c3a141e2e93b0f98c1cd33073439a81061e329f3821eafe05a359096dafa71c9966
DIST systemd-stable-254.16.tar.gz 14564160 BLAKE2B fdf028b128fa8181bc1a4c2d3b5f761431e55613149bee5055a6c2697055a06a52573c4f2ea5a2b9633080a0b7a8d4312d95cb4b61d3943f918bdadf45bc5586 SHA512 0958859610c50f1625a10d67e373c9841678f63dc091abec9d8e7e57bff7e82d2f34a1d54e8ec3c44952f8dc2a5581e65ee54cfbb48c3589561f5bd8658498e0
+DIST systemd-stable-255.10.tar.gz 15102376 BLAKE2B ef35c243e98c43230682904a75f36201ea0f6776a5f17026e98c6a697746e5eebbcd19d614bd1107905c5bf23fbf5913918e7b4790a5d01bbd7a2ec79529234c SHA512 f672cfff18ab80136dedb34908b73d8152f9cb07776c27405a90eb2ad49e22ef86b979a5125c66c6b17d9c76ea516ed920cdbc8e929dda1382f632b414a03df0
DIST systemd-stable-255.8.tar.gz 15070471 BLAKE2B b437404af7fd73ef527f80d9d14d46a781444103d1756c27494ecf2664c9c5efe1169c85b91148a3bf190dc7c5e31cf8d42a13c84102d101ea7e4a0570e8d719 SHA512 7692be761a393924669a90f6f343998a85707a9daa3ce169ce67f62ae2a39338c2c3496066b2659c6500849104fab0529fca5704a3eb32375f2f44131216d1f1
DIST systemd-stable-255.9.tar.gz 15072970 BLAKE2B e720eca0e239293c5488feb8caf3f2df49ebe581cbf3a7ac8eb569d1b9a5c669c3eea28e7fd35a9902208116dc7e626166503bccf628258e2041b9e8f77bcbed SHA512 75b46e443bcbe5e4ae812b6cbbd4ea6485caf5b4addea78a0b42365147a0bdc390a288b4aeda1fc7f3e9a46abf2881cda0e45bb8cb782daa50ea5661514b1af8
diff --git a/sys-apps/systemd-utils/systemd-utils-255.10.ebuild b/sys-apps/systemd-utils/systemd-utils-255.10.ebuild
new file mode 100644
index 000000000000..523af66c5d3b
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-255.10.ebuild
@@ -0,0 +1,621 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib ninja-utils
+inherit python-single-r1 secureboot udev
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-255.6"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
+REQUIRED_USE="
+ || ( kernel-install tmpfiles sysusers udev )
+ boot? ( kernel-install )
+ ukify? ( boot )
+ ${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ ukify? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep "${PEFILE_DEPEND}")
+ )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ dev-util/patchelf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_cond_dep "
+ dev-python/jinja[\${PYTHON_USEDEP}]
+ dev-python/lxml[\${PYTHON_USEDEP}]
+ boot? (
+ >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
+ test? ( ${PEFILE_DEPEND} )
+ )
+ ")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/systemd-utils-255-musl-fgetxxent.patch"
+ )
+
+ if use elibc_musl; then
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ "${FILESDIR}/musl-efi-wchar.patch"
+ )
+ fi
+ default
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot bootloader)
+ $(meson_native_use_bool kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+ $(meson_native_use_bool ukify)
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+have_dmi() {
+ # see dmi_arches in meson.build
+ case ${CHOST} in
+ mips64*)
+ return 1 ;;
+ aarch64*|arm*|ia64*|i?86*|loongarch64*|mips*|x86_64*)
+ return 0 ;;
+ esac
+ return 1
+}
+
+multilib_src_compile() {
+ local targets=() optional_targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ local efi_arch= efi_arch_alt=
+ case ${CHOST} in
+ aarch64*) efi_arch=aa64 ;;
+ arm*) efi_arch=arm ;;
+ loongarch32*) efi_arch=loongarch32 ;;
+ loongarch64*) efi_arch=loongarch64 ;;
+ riscv32*) efi_arch=riscv32 ;;
+ riscv64*) efi_arch=riscv64 ;;
+ x86_64*) efi_arch=x64 efi_arch_alt=ia32;;
+ i?86*) efi_arch=ia32 ;;
+ esac
+ targets+=(
+ bootctl
+ man/bootctl.1
+ src/boot/efi/systemd-boot${efi_arch}.efi
+ src/boot/efi/linux${efi_arch}.efi.stub
+ src/boot/efi/addon${efi_arch}.efi.stub
+ )
+ if [[ -n ${efi_arch_alt} ]]; then
+ # If we have a multilib toolchain, meson.build will build the
+ # "alt" arch (ia32). There's no easy way to detect this, so try
+ # to build it and ignore failure.
+ optional_targets+=(
+ src/boot/efi/systemd-boot${efi_arch_alt}.efi
+ src/boot/efi/linux${efi_arch_alt}.efi.stub
+ src/boot/efi/addon${efi_arch_alt}.efi.stub
+ )
+ fi
+
+ fi
+ if use kernel-install; then
+ targets+=(
+ kernel-install
+ src/kernel-install/90-loaderentry.install
+ man/kernel-install.8
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=(
+ test-offline-passwd
+ test-tmpfile-util
+ )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ ata_id
+ cdrom_id
+ fido_id
+ iocost
+ mtd_probe
+ scsi_id
+ v4l_id
+ src/udev/udev.pc
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/60-persistent-storage.rules
+ rules.d/64-btrfs.rules
+ # Needed for tests
+ rules.d/99-systemd.rules
+ )
+ if have_dmi; then
+ targets+=( dmi_memory_id )
+ fi
+ if use test; then
+ targets+=(
+ test-fido-id-desc
+ test-link-config-tables
+ test-udev-builtin
+ test-udev-device-thread
+ test-udev-format
+ test-udev-manager
+ test-udev-node
+ test-udev-rule-runner
+ test-udev-rules
+ test-udev-spawn
+ test-udev-util
+ )
+ fi
+ fi
+ if use ukify; then
+ targets+=(
+ ukify
+ src/kernel-install/60-ukify.install
+ man/ukify.1
+ )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ libudev
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if [[ ${#targets[@]} -ne 0 ]]; then
+ meson_src_compile "${targets[@]}"
+ fi
+ if [[ ${#optional_targets[@]} -ne 0 ]]; then
+ ninja ${NINJAOPTS} "${optional_targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ tests+=( --suite boot )
+ fi
+ if use kernel-install; then
+ tests+=( --suite kernel-install )
+ fi
+ if use sysusers; then
+ tests+=( --suite sysusers )
+ fi
+ if use tmpfiles; then
+ tests+=( --suite tmpfiles )
+ fi
+ if use udev; then
+ tests+=( --suite udev )
+ fi
+ fi
+ if use udev; then
+ tests+=( --suite libudev )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test --no-rebuild "${tests[@]}"
+ fi
+}
+
+src_install() {
+ meson-multilib_src_install
+}
+
+set_rpath() {
+ patchelf --set-rpath "${EPREFIX}/usr/$(get_libdir)/systemd" "$@" || die "patchelf failed"
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ exeinto "/usr/$(get_libdir)/systemd"
+ doexe src/shared/libsystemd-shared-${PV%%.*}.so
+ if use boot; then
+ set_rpath bootctl
+ dobin bootctl
+ doman man/bootctl.1
+ meson_install --no-rebuild --tags systemd-boot
+ fi
+ if use kernel-install; then
+ set_rpath kernel-install
+ dobin kernel-install
+ doman man/kernel-install.8
+ exeinto /usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use sysusers; then
+ set_rpath systemd-sysusers
+ dobin systemd-sysusers
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ set_rpath systemd-tmpfiles
+ dobin systemd-tmpfiles
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ set_rpath udevadm systemd-hwdb
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm /usr/lib/systemd/systemd-udevd
+ if use split-usr; then
+ # elogind installs udev rules that hard-code /bin/udevadm
+ dosym ../usr/bin/udevadm /bin/udevadm
+ fi
+
+ exeinto /usr/lib/udev
+ set_rpath {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
+ doexe {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
+
+ if have_dmi; then
+ set_rpath dmi_memory_id
+ doexe dmi_memory_id
+ fi
+
+ rm -f rules.d/99-systemd.rules
+ insinto /usr/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto /usr/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ doman man/libudev.3
+ doman man/udev_*.3
+ fi
+ if use ukify; then
+ dobin ukify
+ dosym ../../bin/ukify /usr/lib/systemd/ukify
+ doman man/ukify.1
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use kernel-install; then
+ exeinto /usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/x11.conf
+ doins "${FILESDIR}"/{legacy,tmp}.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto /usr/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto /usr/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto /usr/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use ukify && python_fix_shebang "${ED}"
+ use boot && secureboot_auto_sign
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_preinst() {
+ # Migrate /lib/{systemd,udev} to /usr/lib
+ if use split-usr; then
+ local d
+ for d in systemd udev; do
+ dosym ../usr/lib/${d} /lib/${d}
+ if [[ -e ${EROOT}/lib/${d} && ! -L ${EROOT}/lib/${d} ]]; then
+ einfo "Copying files from '${EROOT}/lib/${d}' to '${EROOT}/usr/lib/${d}'"
+ cp -rpPT "${EROOT}/lib/${d}" "${EROOT}/usr/lib/${d}" || die
+ einfo "Removing '${EROOT}/lib/${d}'"
+ rm -r "${EROOT}/lib/${d}" || die
+ fi
+ done
+ fi
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-07-28 4:13 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2024-07-28 4:13 UTC (permalink / raw
To: gentoo-commits
commit: 4b80e35db38b006cb49268d8b6f4d34e8c8d918b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 04:06:05 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 04:06:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b80e35d
sys-apps/systemd-utils: add 254.16
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-254.16.ebuild | 583 +++++++++++++++++++++
2 files changed, 584 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 903ebffefeea..d6e0d1df3cd0 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -3,5 +3,6 @@ DIST systemd-musl-patches-255.6.tar.gz 31529 BLAKE2B 14b737968168238c62a776052bd
DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270e1f97ba78f8280f45100b1b5b33c3531cf79587b596ccbbe594f1e623d918c1fdf19f2231d677e27b5421f1852fbe3225b3 SHA512 852cbc992128dc3ab6ded4215c2540fa3c0b7c7ad98e54036f3981d77a2162f5393ee50960773419133e0d584844af329d3726f45829a56c00b1827e33edf3e1
DIST systemd-stable-254.14.tar.gz 14533129 BLAKE2B 1db933e0f0cdfcabc7a4f3ecfe6e0cf1b10d4b2fa0aee02629d786cb022b18c501a0c48445f9b537a003af22ee64803271fa007e3889b833ec119b4d1346c410 SHA512 bd4e5ce7529f488f7e7199a1ff5976c10cf8e7040893dcf312a23dda5e32eb5c7f40c9ce3676f4a60d5d39197efc3bb1f2a577004b1654d1d0be9a1c617cfcdb
DIST systemd-stable-254.15.tar.gz 14537162 BLAKE2B cd8235d2522986ec4044306b65f186ab13c1c420e33177fd901254b216910f445b920655aad5ffefca8607ed00ff8a01800f4a8efe56c1577f0ace8d1b2ba9be SHA512 3d6b3e719c9164721f746986a337ab791f7ce7d0bd6e42980bfc0b4232806c3a141e2e93b0f98c1cd33073439a81061e329f3821eafe05a359096dafa71c9966
+DIST systemd-stable-254.16.tar.gz 14564160 BLAKE2B fdf028b128fa8181bc1a4c2d3b5f761431e55613149bee5055a6c2697055a06a52573c4f2ea5a2b9633080a0b7a8d4312d95cb4b61d3943f918bdadf45bc5586 SHA512 0958859610c50f1625a10d67e373c9841678f63dc091abec9d8e7e57bff7e82d2f34a1d54e8ec3c44952f8dc2a5581e65ee54cfbb48c3589561f5bd8658498e0
DIST systemd-stable-255.8.tar.gz 15070471 BLAKE2B b437404af7fd73ef527f80d9d14d46a781444103d1756c27494ecf2664c9c5efe1169c85b91148a3bf190dc7c5e31cf8d42a13c84102d101ea7e4a0570e8d719 SHA512 7692be761a393924669a90f6f343998a85707a9daa3ce169ce67f62ae2a39338c2c3496066b2659c6500849104fab0529fca5704a3eb32375f2f44131216d1f1
DIST systemd-stable-255.9.tar.gz 15072970 BLAKE2B e720eca0e239293c5488feb8caf3f2df49ebe581cbf3a7ac8eb569d1b9a5c669c3eea28e7fd35a9902208116dc7e626166503bccf628258e2041b9e8f77bcbed SHA512 75b46e443bcbe5e4ae812b6cbbd4ea6485caf5b4addea78a0b42365147a0bdc390a288b4aeda1fc7f3e9a46abf2881cda0e45bb8cb782daa50ea5661514b1af8
diff --git a/sys-apps/systemd-utils/systemd-utils-254.16.ebuild b/sys-apps/systemd-utils/systemd-utils-254.16.ebuild
new file mode 100644
index 000000000000..d76d79f1f07f
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-254.16.ebuild
@@ -0,0 +1,583 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
+inherit python-single-r1 secureboot toolchain-funcs udev
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-254.3-r1"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
+REQUIRED_USE="
+ || ( kernel-install tmpfiles sysusers udev )
+ boot? ( kernel-install )
+ ukify? ( boot )
+ ${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ ukify? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep "${PEFILE_DEPEND}")
+ )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_cond_dep "
+ dev-python/jinja[\${PYTHON_USEDEP}]
+ dev-python/lxml[\${PYTHON_USEDEP}]
+ boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
+ ukify? ( test? ( ${PEFILE_DEPEND} ) )
+ ")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
+ )
+
+ if use elibc_musl; then
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot bootloader)
+ $(meson_native_use_bool kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+ $(meson_native_use_bool ukify)
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-kernel-install-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ man/bootctl.1
+ src/boot/efi/linux$(efi_arch).efi.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use kernel-install; then
+ targets+=(
+ kernel-install
+ src/kernel-install/90-loaderentry.install
+ man/kernel-install.8
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfile-util )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/60-persistent-storage.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ udev-rule-runner
+ )
+ fi
+ fi
+ if use ukify; then
+ targets+=(
+ ukify
+ src/kernel-install/60-ukify.install
+ man/ukify.1
+ )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ libudev
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfile-util
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl
+ doman man/bootctl.1
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use kernel-install; then
+ dobin kernel-install
+ doman man/kernel-install.8
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ rm -f rules.d/99-systemd.rules
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ doman man/libudev.3
+ doman man/udev_*.3
+ fi
+ if use ukify; then
+ exeinto "${rootprefix}"/lib/systemd/
+ doexe ukify
+ doman man/ukify.1
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use kernel-install; then
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/x11.conf
+ doins "${FILESDIR}"/{legacy,tmp}.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use ukify && python_fix_shebang "${ED}"
+ use boot && secureboot_auto_sign
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+
+ if use boot; then
+ optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
+ "sys-kernel/installkernel[systemd-boot]"
+ fi
+ if use ukify; then
+ optfeature "automatically generating an unified kernel image on each kernel installation" \
+ "sys-kernel/installkernel[ukify]"
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-07-15 3:34 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2024-07-15 3:34 UTC (permalink / raw
To: gentoo-commits
commit: 858554f438a8817977478313dcfc390aa9f444ac
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 03:33:59 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 03:33:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=858554f4
sys-apps/systemd-utils: drop 254.10-r1, 254.12
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 2 -
.../systemd-utils/systemd-utils-254.10-r1.ebuild | 583 ---------------------
sys-apps/systemd-utils/systemd-utils-254.12.ebuild | 583 ---------------------
3 files changed, 1168 deletions(-)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 63399056882f..9f00cdc8a3f5 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,7 +1,5 @@
DIST systemd-musl-patches-254.3-r1.tar.gz 29971 BLAKE2B 2568c0ce93c410177d775fedb7a67b9498d66f39bfaca220237b3b55cd42c94569d7e3bfde11a9b1faa5eac1804eb75bfdee0ee465c2faac3b8213026b97daec SHA512 817c94765a70eaaa5d23454e03887e149db4612f01c29690baa0c75d61b4b328b742e5d02e8cc63c531eadcd72ae37c0a407aad37c22f1d399dbba81a6bed79d
DIST systemd-musl-patches-255.6.tar.gz 31529 BLAKE2B 14b737968168238c62a776052bdb97a3cee87c076317f260147939051f24f9ee8f39dec5e38f9b2ce61ea4737422eece680c4d15dd1fdcc5f3e61b6e5ec5f5c4 SHA512 0ab39a653d42d7b58ad875176270aed93e03ba28b33616520548a01e7d06d170379f9206b4a2b280a588d4f7084af10a2a0ec7a6cb724902ddff149e512d789d
-DIST systemd-stable-254.10.tar.gz 14428960 BLAKE2B 488c27b9657ec7452f876ab6c18bbfe711f1351afa022801f5a646f2dd1d76d63c17e52e6ebf43b38a76807907287b654a7eaca3afdb0688f5b05839e98ad727 SHA512 0c127d38d0ade8655ae12172c2edbaa8af68bd29f42d965b988d75e74626846ae859bcf0b39b535c9a99ad8c709ad7575ed4d5ea5bc95ce8729e3caafdb32b70
-DIST systemd-stable-254.12.tar.gz 14529517 BLAKE2B ed6e4a78363930840e505c4bd789d1d44c238f30d3c0768d435e1cacb43ac3ab07e0dc9085546b4142152bbb4ceb4e2c0a9560e74e1a2b8c09fc885620695e73 SHA512 fa3679915392e641bed73ccb48f5def386ab13ba5ff7efdac952214193c3311543bec4c4370d6880f9599f63e377506b343805c3c56b7dde7eb5e3bbc0dc7a87
DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270e1f97ba78f8280f45100b1b5b33c3531cf79587b596ccbbe594f1e623d918c1fdf19f2231d677e27b5421f1852fbe3225b3 SHA512 852cbc992128dc3ab6ded4215c2540fa3c0b7c7ad98e54036f3981d77a2162f5393ee50960773419133e0d584844af329d3726f45829a56c00b1827e33edf3e1
DIST systemd-stable-254.14.tar.gz 14533129 BLAKE2B 1db933e0f0cdfcabc7a4f3ecfe6e0cf1b10d4b2fa0aee02629d786cb022b18c501a0c48445f9b537a003af22ee64803271fa007e3889b833ec119b4d1346c410 SHA512 bd4e5ce7529f488f7e7199a1ff5976c10cf8e7040893dcf312a23dda5e32eb5c7f40c9ce3676f4a60d5d39197efc3bb1f2a577004b1654d1d0be9a1c617cfcdb
DIST systemd-stable-254.15.tar.gz 14537162 BLAKE2B cd8235d2522986ec4044306b65f186ab13c1c420e33177fd901254b216910f445b920655aad5ffefca8607ed00ff8a01800f4a8efe56c1577f0ace8d1b2ba9be SHA512 3d6b3e719c9164721f746986a337ab791f7ce7d0bd6e42980bfc0b4232806c3a141e2e93b0f98c1cd33073439a81061e329f3821eafe05a359096dafa71c9966
diff --git a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
deleted file mode 100644
index af3b023e8eb8..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
+++ /dev/null
@@ -1,583 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
-inherit python-single-r1 secureboot toolchain-funcs udev
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-254.3-r1"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
-REQUIRED_USE="
- || ( kernel-install tmpfiles sysusers udev )
- boot? ( kernel-install )
- ukify? ( boot )
- ${PYTHON_REQUIRED_USE}
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
-"
-
-PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
-
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- ukify? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep "${PEFILE_DEPEND}")
- )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
- $(python_gen_cond_dep "
- dev-python/jinja[\${PYTHON_USEDEP}]
- dev-python/lxml[\${PYTHON_USEDEP}]
- boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
- ukify? ( test? ( ${PEFILE_DEPEND} ) )
- ")
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
- use boot && secureboot_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
- )
-
- if use elibc_musl; then
- PATCHES+=(
- "${WORKDIR}/${MUSL_PATCHSET}"
- )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot bootloader)
- $(meson_native_use_bool kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
- $(meson_native_use_bool ukify)
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-kernel-install-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- man/bootctl.1
- src/boot/efi/linux$(efi_arch).efi.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use kernel-install; then
- targets+=(
- kernel-install
- src/kernel-install/90-loaderentry.install
- man/kernel-install.8
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfile-util )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- man/libudev.3
- man/udev_device_get_syspath.3
- man/udev_device_has_tag.3
- man/udev_device_new_from_syspath.3
- man/udev_enumerate_add_match_subsystem.3
- man/udev_enumerate_new.3
- man/udev_enumerate_scan_devices.3
- man/udev_list_entry.3
- man/udev_monitor_filter_update.3
- man/udev_monitor_new_from_netlink.3
- man/udev_monitor_receive_device.3
- man/udev_new.3
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/60-persistent-storage.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- udev-rule-runner
- )
- fi
- fi
- if use ukify; then
- targets+=(
- ukify
- src/kernel-install/60-ukify.install
- man/ukify.1
- )
- fi
- fi
- if use udev; then
- targets+=(
- libudev
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfile-util
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl
- doman man/bootctl.1
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use kernel-install; then
- dobin kernel-install
- doman man/kernel-install.8
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- rm -f rules.d/99-systemd.rules
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- doman man/libudev.3
- doman man/udev_*.3
- fi
- if use ukify; then
- exeinto "${rootprefix}"/lib/systemd/
- doexe ukify
- doman man/ukify.1
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use kernel-install; then
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/x11.conf
- doins "${FILESDIR}"/{legacy,tmp}.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-
- use ukify && python_fix_shebang "${ED}"
- use boot && secureboot_auto_sign
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-
- if use boot; then
- optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
- "sys-kernel/installkernel[systemd-boot]"
- fi
- if use ukify; then
- optfeature "automatically generating an unified kernel image on each kernel installation" \
- "sys-kernel/installkernel[ukify]"
- fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-254.12.ebuild b/sys-apps/systemd-utils/systemd-utils-254.12.ebuild
deleted file mode 100644
index d76d79f1f07f..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-254.12.ebuild
+++ /dev/null
@@ -1,583 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
-inherit python-single-r1 secureboot toolchain-funcs udev
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-254.3-r1"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
-REQUIRED_USE="
- || ( kernel-install tmpfiles sysusers udev )
- boot? ( kernel-install )
- ukify? ( boot )
- ${PYTHON_REQUIRED_USE}
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
-"
-
-PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
-
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- ukify? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep "${PEFILE_DEPEND}")
- )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
- $(python_gen_cond_dep "
- dev-python/jinja[\${PYTHON_USEDEP}]
- dev-python/lxml[\${PYTHON_USEDEP}]
- boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
- ukify? ( test? ( ${PEFILE_DEPEND} ) )
- ")
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
- use boot && secureboot_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
- )
-
- if use elibc_musl; then
- PATCHES+=(
- "${WORKDIR}/${MUSL_PATCHSET}"
- )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot bootloader)
- $(meson_native_use_bool kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
- $(meson_native_use_bool ukify)
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-kernel-install-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- man/bootctl.1
- src/boot/efi/linux$(efi_arch).efi.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use kernel-install; then
- targets+=(
- kernel-install
- src/kernel-install/90-loaderentry.install
- man/kernel-install.8
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfile-util )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- man/libudev.3
- man/udev_device_get_syspath.3
- man/udev_device_has_tag.3
- man/udev_device_new_from_syspath.3
- man/udev_enumerate_add_match_subsystem.3
- man/udev_enumerate_new.3
- man/udev_enumerate_scan_devices.3
- man/udev_list_entry.3
- man/udev_monitor_filter_update.3
- man/udev_monitor_new_from_netlink.3
- man/udev_monitor_receive_device.3
- man/udev_new.3
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/60-persistent-storage.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- udev-rule-runner
- )
- fi
- fi
- if use ukify; then
- targets+=(
- ukify
- src/kernel-install/60-ukify.install
- man/ukify.1
- )
- fi
- fi
- if use udev; then
- targets+=(
- libudev
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfile-util
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl
- doman man/bootctl.1
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use kernel-install; then
- dobin kernel-install
- doman man/kernel-install.8
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- rm -f rules.d/99-systemd.rules
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- doman man/libudev.3
- doman man/udev_*.3
- fi
- if use ukify; then
- exeinto "${rootprefix}"/lib/systemd/
- doexe ukify
- doman man/ukify.1
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use kernel-install; then
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/x11.conf
- doins "${FILESDIR}"/{legacy,tmp}.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-
- use ukify && python_fix_shebang "${ED}"
- use boot && secureboot_auto_sign
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-
- if use boot; then
- optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
- "sys-kernel/installkernel[systemd-boot]"
- fi
- if use ukify; then
- optfeature "automatically generating an unified kernel image on each kernel installation" \
- "sys-kernel/installkernel[ukify]"
- fi
-}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-07-15 3:34 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2024-07-15 3:34 UTC (permalink / raw
To: gentoo-commits
commit: 3db13a39f1e2bfe569e875235e3c0060d494095e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 03:34:13 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 03:34:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3db13a39
sys-apps/systemd-utils: drop 255.7-r4
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 -
.../systemd-utils/systemd-utils-255.7-r4.ebuild | 621 ---------------------
2 files changed, 622 deletions(-)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 9f00cdc8a3f5..903ebffefeea 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -3,6 +3,5 @@ DIST systemd-musl-patches-255.6.tar.gz 31529 BLAKE2B 14b737968168238c62a776052bd
DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270e1f97ba78f8280f45100b1b5b33c3531cf79587b596ccbbe594f1e623d918c1fdf19f2231d677e27b5421f1852fbe3225b3 SHA512 852cbc992128dc3ab6ded4215c2540fa3c0b7c7ad98e54036f3981d77a2162f5393ee50960773419133e0d584844af329d3726f45829a56c00b1827e33edf3e1
DIST systemd-stable-254.14.tar.gz 14533129 BLAKE2B 1db933e0f0cdfcabc7a4f3ecfe6e0cf1b10d4b2fa0aee02629d786cb022b18c501a0c48445f9b537a003af22ee64803271fa007e3889b833ec119b4d1346c410 SHA512 bd4e5ce7529f488f7e7199a1ff5976c10cf8e7040893dcf312a23dda5e32eb5c7f40c9ce3676f4a60d5d39197efc3bb1f2a577004b1654d1d0be9a1c617cfcdb
DIST systemd-stable-254.15.tar.gz 14537162 BLAKE2B cd8235d2522986ec4044306b65f186ab13c1c420e33177fd901254b216910f445b920655aad5ffefca8607ed00ff8a01800f4a8efe56c1577f0ace8d1b2ba9be SHA512 3d6b3e719c9164721f746986a337ab791f7ce7d0bd6e42980bfc0b4232806c3a141e2e93b0f98c1cd33073439a81061e329f3821eafe05a359096dafa71c9966
-DIST systemd-stable-255.7.tar.gz 15068684 BLAKE2B 6fb5415d9e013bc8695ef837affce7063d214027529412a25ea73eb25473d1f07cff6ad3ea3ea18b7bbf9d73d2bb8e39838e1aeb2a14d016b3b47e4ba24d02d0 SHA512 1cd2a00f292751b923bd93c60bdcdd66d82792b45e32dce11d77e2b3b6fc5c8ba4c5db386652deffa8c24e75032af1a745700ba91f1726e249f0c447daf85c2a
DIST systemd-stable-255.8.tar.gz 15070471 BLAKE2B b437404af7fd73ef527f80d9d14d46a781444103d1756c27494ecf2664c9c5efe1169c85b91148a3bf190dc7c5e31cf8d42a13c84102d101ea7e4a0570e8d719 SHA512 7692be761a393924669a90f6f343998a85707a9daa3ce169ce67f62ae2a39338c2c3496066b2659c6500849104fab0529fca5704a3eb32375f2f44131216d1f1
DIST systemd-stable-255.9.tar.gz 15072970 BLAKE2B e720eca0e239293c5488feb8caf3f2df49ebe581cbf3a7ac8eb569d1b9a5c669c3eea28e7fd35a9902208116dc7e626166503bccf628258e2041b9e8f77bcbed SHA512 75b46e443bcbe5e4ae812b6cbbd4ea6485caf5b4addea78a0b42365147a0bdc390a288b4aeda1fc7f3e9a46abf2881cda0e45bb8cb782daa50ea5661514b1af8
diff --git a/sys-apps/systemd-utils/systemd-utils-255.7-r4.ebuild b/sys-apps/systemd-utils/systemd-utils-255.7-r4.ebuild
deleted file mode 100644
index 523af66c5d3b..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-255.7-r4.ebuild
+++ /dev/null
@@ -1,621 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib ninja-utils
-inherit python-single-r1 secureboot udev
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-255.6"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
-REQUIRED_USE="
- || ( kernel-install tmpfiles sysusers udev )
- boot? ( kernel-install )
- ukify? ( boot )
- ${PYTHON_REQUIRED_USE}
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
-"
-
-PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
-
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- ukify? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep "${PEFILE_DEPEND}")
- )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- dev-util/patchelf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
- $(python_gen_cond_dep "
- dev-python/jinja[\${PYTHON_USEDEP}]
- dev-python/lxml[\${PYTHON_USEDEP}]
- boot? (
- >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
- test? ( ${PEFILE_DEPEND} )
- )
- ")
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
- use boot && secureboot_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/systemd-utils-255-musl-fgetxxent.patch"
- )
-
- if use elibc_musl; then
- PATCHES+=(
- "${WORKDIR}/${MUSL_PATCHSET}"
- "${FILESDIR}/musl-efi-wchar.patch"
- )
- fi
- default
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- -Dsysvinit-path=
- $(meson_native_use_bool boot bootloader)
- $(meson_native_use_bool kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
- $(meson_native_use_bool ukify)
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-have_dmi() {
- # see dmi_arches in meson.build
- case ${CHOST} in
- mips64*)
- return 1 ;;
- aarch64*|arm*|ia64*|i?86*|loongarch64*|mips*|x86_64*)
- return 0 ;;
- esac
- return 1
-}
-
-multilib_src_compile() {
- local targets=() optional_targets=()
- if multilib_is_native_abi; then
- if use boot; then
- local efi_arch= efi_arch_alt=
- case ${CHOST} in
- aarch64*) efi_arch=aa64 ;;
- arm*) efi_arch=arm ;;
- loongarch32*) efi_arch=loongarch32 ;;
- loongarch64*) efi_arch=loongarch64 ;;
- riscv32*) efi_arch=riscv32 ;;
- riscv64*) efi_arch=riscv64 ;;
- x86_64*) efi_arch=x64 efi_arch_alt=ia32;;
- i?86*) efi_arch=ia32 ;;
- esac
- targets+=(
- bootctl
- man/bootctl.1
- src/boot/efi/systemd-boot${efi_arch}.efi
- src/boot/efi/linux${efi_arch}.efi.stub
- src/boot/efi/addon${efi_arch}.efi.stub
- )
- if [[ -n ${efi_arch_alt} ]]; then
- # If we have a multilib toolchain, meson.build will build the
- # "alt" arch (ia32). There's no easy way to detect this, so try
- # to build it and ignore failure.
- optional_targets+=(
- src/boot/efi/systemd-boot${efi_arch_alt}.efi
- src/boot/efi/linux${efi_arch_alt}.efi.stub
- src/boot/efi/addon${efi_arch_alt}.efi.stub
- )
- fi
-
- fi
- if use kernel-install; then
- targets+=(
- kernel-install
- src/kernel-install/90-loaderentry.install
- man/kernel-install.8
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=(
- test-offline-passwd
- test-tmpfile-util
- )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- ata_id
- cdrom_id
- fido_id
- iocost
- mtd_probe
- scsi_id
- v4l_id
- src/udev/udev.pc
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- man/libudev.3
- man/udev_device_get_syspath.3
- man/udev_device_has_tag.3
- man/udev_device_new_from_syspath.3
- man/udev_enumerate_add_match_subsystem.3
- man/udev_enumerate_new.3
- man/udev_enumerate_scan_devices.3
- man/udev_list_entry.3
- man/udev_monitor_filter_update.3
- man/udev_monitor_new_from_netlink.3
- man/udev_monitor_receive_device.3
- man/udev_new.3
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/60-persistent-storage.rules
- rules.d/64-btrfs.rules
- # Needed for tests
- rules.d/99-systemd.rules
- )
- if have_dmi; then
- targets+=( dmi_memory_id )
- fi
- if use test; then
- targets+=(
- test-fido-id-desc
- test-link-config-tables
- test-udev-builtin
- test-udev-device-thread
- test-udev-format
- test-udev-manager
- test-udev-node
- test-udev-rule-runner
- test-udev-rules
- test-udev-spawn
- test-udev-util
- )
- fi
- fi
- if use ukify; then
- targets+=(
- ukify
- src/kernel-install/60-ukify.install
- man/ukify.1
- )
- fi
- fi
- if use udev; then
- targets+=(
- libudev
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if [[ ${#targets[@]} -ne 0 ]]; then
- meson_src_compile "${targets[@]}"
- fi
- if [[ ${#optional_targets[@]} -ne 0 ]]; then
- ninja ${NINJAOPTS} "${optional_targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use boot; then
- tests+=( --suite boot )
- fi
- if use kernel-install; then
- tests+=( --suite kernel-install )
- fi
- if use sysusers; then
- tests+=( --suite sysusers )
- fi
- if use tmpfiles; then
- tests+=( --suite tmpfiles )
- fi
- if use udev; then
- tests+=( --suite udev )
- fi
- fi
- if use udev; then
- tests+=( --suite libudev )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test --no-rebuild "${tests[@]}"
- fi
-}
-
-src_install() {
- meson-multilib_src_install
-}
-
-set_rpath() {
- patchelf --set-rpath "${EPREFIX}/usr/$(get_libdir)/systemd" "$@" || die "patchelf failed"
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- exeinto "/usr/$(get_libdir)/systemd"
- doexe src/shared/libsystemd-shared-${PV%%.*}.so
- if use boot; then
- set_rpath bootctl
- dobin bootctl
- doman man/bootctl.1
- meson_install --no-rebuild --tags systemd-boot
- fi
- if use kernel-install; then
- set_rpath kernel-install
- dobin kernel-install
- doman man/kernel-install.8
- exeinto /usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- fi
- if use sysusers; then
- set_rpath systemd-sysusers
- dobin systemd-sysusers
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- set_rpath systemd-tmpfiles
- dobin systemd-tmpfiles
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- set_rpath udevadm systemd-hwdb
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm /usr/lib/systemd/systemd-udevd
- if use split-usr; then
- # elogind installs udev rules that hard-code /bin/udevadm
- dosym ../usr/bin/udevadm /bin/udevadm
- fi
-
- exeinto /usr/lib/udev
- set_rpath {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
- doexe {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
-
- if have_dmi; then
- set_rpath dmi_memory_id
- doexe dmi_memory_id
- fi
-
- rm -f rules.d/99-systemd.rules
- insinto /usr/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto /usr/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- doman man/libudev.3
- doman man/udev_*.3
- fi
- if use ukify; then
- dobin ukify
- dosym ../../bin/ukify /usr/lib/systemd/ukify
- doman man/ukify.1
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use kernel-install; then
- exeinto /usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/x11.conf
- doins "${FILESDIR}"/{legacy,tmp}.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto /usr/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto /usr/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto /usr/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-
- use ukify && python_fix_shebang "${ED}"
- use boot && secureboot_auto_sign
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_preinst() {
- # Migrate /lib/{systemd,udev} to /usr/lib
- if use split-usr; then
- local d
- for d in systemd udev; do
- dosym ../usr/lib/${d} /lib/${d}
- if [[ -e ${EROOT}/lib/${d} && ! -L ${EROOT}/lib/${d} ]]; then
- einfo "Copying files from '${EROOT}/lib/${d}' to '${EROOT}/usr/lib/${d}'"
- cp -rpPT "${EROOT}/lib/${d}" "${EROOT}/usr/lib/${d}" || die
- einfo "Removing '${EROOT}/lib/${d}'"
- rm -r "${EROOT}/lib/${d}" || die
- fi
- done
- fi
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-07-15 3:28 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2024-07-15 3:28 UTC (permalink / raw
To: gentoo-commits
commit: 2799be3101f404b585838497941945dcba9001d9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 03:26:00 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 03:26:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2799be31
sys-apps/systemd-utils: add 254.15
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-254.15.ebuild | 583 +++++++++++++++++++++
2 files changed, 584 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 9411d00e3411..c53b32c87f5a 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -4,5 +4,6 @@ DIST systemd-stable-254.10.tar.gz 14428960 BLAKE2B 488c27b9657ec7452f876ab6c18bb
DIST systemd-stable-254.12.tar.gz 14529517 BLAKE2B ed6e4a78363930840e505c4bd789d1d44c238f30d3c0768d435e1cacb43ac3ab07e0dc9085546b4142152bbb4ceb4e2c0a9560e74e1a2b8c09fc885620695e73 SHA512 fa3679915392e641bed73ccb48f5def386ab13ba5ff7efdac952214193c3311543bec4c4370d6880f9599f63e377506b343805c3c56b7dde7eb5e3bbc0dc7a87
DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270e1f97ba78f8280f45100b1b5b33c3531cf79587b596ccbbe594f1e623d918c1fdf19f2231d677e27b5421f1852fbe3225b3 SHA512 852cbc992128dc3ab6ded4215c2540fa3c0b7c7ad98e54036f3981d77a2162f5393ee50960773419133e0d584844af329d3726f45829a56c00b1827e33edf3e1
DIST systemd-stable-254.14.tar.gz 14533129 BLAKE2B 1db933e0f0cdfcabc7a4f3ecfe6e0cf1b10d4b2fa0aee02629d786cb022b18c501a0c48445f9b537a003af22ee64803271fa007e3889b833ec119b4d1346c410 SHA512 bd4e5ce7529f488f7e7199a1ff5976c10cf8e7040893dcf312a23dda5e32eb5c7f40c9ce3676f4a60d5d39197efc3bb1f2a577004b1654d1d0be9a1c617cfcdb
+DIST systemd-stable-254.15.tar.gz 14537162 BLAKE2B cd8235d2522986ec4044306b65f186ab13c1c420e33177fd901254b216910f445b920655aad5ffefca8607ed00ff8a01800f4a8efe56c1577f0ace8d1b2ba9be SHA512 3d6b3e719c9164721f746986a337ab791f7ce7d0bd6e42980bfc0b4232806c3a141e2e93b0f98c1cd33073439a81061e329f3821eafe05a359096dafa71c9966
DIST systemd-stable-255.7.tar.gz 15068684 BLAKE2B 6fb5415d9e013bc8695ef837affce7063d214027529412a25ea73eb25473d1f07cff6ad3ea3ea18b7bbf9d73d2bb8e39838e1aeb2a14d016b3b47e4ba24d02d0 SHA512 1cd2a00f292751b923bd93c60bdcdd66d82792b45e32dce11d77e2b3b6fc5c8ba4c5db386652deffa8c24e75032af1a745700ba91f1726e249f0c447daf85c2a
DIST systemd-stable-255.8.tar.gz 15070471 BLAKE2B b437404af7fd73ef527f80d9d14d46a781444103d1756c27494ecf2664c9c5efe1169c85b91148a3bf190dc7c5e31cf8d42a13c84102d101ea7e4a0570e8d719 SHA512 7692be761a393924669a90f6f343998a85707a9daa3ce169ce67f62ae2a39338c2c3496066b2659c6500849104fab0529fca5704a3eb32375f2f44131216d1f1
diff --git a/sys-apps/systemd-utils/systemd-utils-254.15.ebuild b/sys-apps/systemd-utils/systemd-utils-254.15.ebuild
new file mode 100644
index 000000000000..d76d79f1f07f
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-254.15.ebuild
@@ -0,0 +1,583 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
+inherit python-single-r1 secureboot toolchain-funcs udev
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-254.3-r1"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
+REQUIRED_USE="
+ || ( kernel-install tmpfiles sysusers udev )
+ boot? ( kernel-install )
+ ukify? ( boot )
+ ${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ ukify? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep "${PEFILE_DEPEND}")
+ )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_cond_dep "
+ dev-python/jinja[\${PYTHON_USEDEP}]
+ dev-python/lxml[\${PYTHON_USEDEP}]
+ boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
+ ukify? ( test? ( ${PEFILE_DEPEND} ) )
+ ")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
+ )
+
+ if use elibc_musl; then
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot bootloader)
+ $(meson_native_use_bool kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+ $(meson_native_use_bool ukify)
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-kernel-install-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ man/bootctl.1
+ src/boot/efi/linux$(efi_arch).efi.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use kernel-install; then
+ targets+=(
+ kernel-install
+ src/kernel-install/90-loaderentry.install
+ man/kernel-install.8
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfile-util )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/60-persistent-storage.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ udev-rule-runner
+ )
+ fi
+ fi
+ if use ukify; then
+ targets+=(
+ ukify
+ src/kernel-install/60-ukify.install
+ man/ukify.1
+ )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ libudev
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfile-util
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl
+ doman man/bootctl.1
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use kernel-install; then
+ dobin kernel-install
+ doman man/kernel-install.8
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ rm -f rules.d/99-systemd.rules
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ doman man/libudev.3
+ doman man/udev_*.3
+ fi
+ if use ukify; then
+ exeinto "${rootprefix}"/lib/systemd/
+ doexe ukify
+ doman man/ukify.1
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use kernel-install; then
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/x11.conf
+ doins "${FILESDIR}"/{legacy,tmp}.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use ukify && python_fix_shebang "${ED}"
+ use boot && secureboot_auto_sign
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+
+ if use boot; then
+ optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
+ "sys-kernel/installkernel[systemd-boot]"
+ fi
+ if use ukify; then
+ optfeature "automatically generating an unified kernel image on each kernel installation" \
+ "sys-kernel/installkernel[ukify]"
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-07-15 3:28 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2024-07-15 3:28 UTC (permalink / raw
To: gentoo-commits
commit: 43c768a3b8d1beeea77bde84440a2a6604f3bc18
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 03:27:56 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 03:27:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43c768a3
sys-apps/systemd-utils: add 255.9
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-255.9.ebuild | 621 ++++++++++++++++++++++
2 files changed, 622 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index c53b32c87f5a..63399056882f 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -7,3 +7,4 @@ DIST systemd-stable-254.14.tar.gz 14533129 BLAKE2B 1db933e0f0cdfcabc7a4f3ecfe6e0
DIST systemd-stable-254.15.tar.gz 14537162 BLAKE2B cd8235d2522986ec4044306b65f186ab13c1c420e33177fd901254b216910f445b920655aad5ffefca8607ed00ff8a01800f4a8efe56c1577f0ace8d1b2ba9be SHA512 3d6b3e719c9164721f746986a337ab791f7ce7d0bd6e42980bfc0b4232806c3a141e2e93b0f98c1cd33073439a81061e329f3821eafe05a359096dafa71c9966
DIST systemd-stable-255.7.tar.gz 15068684 BLAKE2B 6fb5415d9e013bc8695ef837affce7063d214027529412a25ea73eb25473d1f07cff6ad3ea3ea18b7bbf9d73d2bb8e39838e1aeb2a14d016b3b47e4ba24d02d0 SHA512 1cd2a00f292751b923bd93c60bdcdd66d82792b45e32dce11d77e2b3b6fc5c8ba4c5db386652deffa8c24e75032af1a745700ba91f1726e249f0c447daf85c2a
DIST systemd-stable-255.8.tar.gz 15070471 BLAKE2B b437404af7fd73ef527f80d9d14d46a781444103d1756c27494ecf2664c9c5efe1169c85b91148a3bf190dc7c5e31cf8d42a13c84102d101ea7e4a0570e8d719 SHA512 7692be761a393924669a90f6f343998a85707a9daa3ce169ce67f62ae2a39338c2c3496066b2659c6500849104fab0529fca5704a3eb32375f2f44131216d1f1
+DIST systemd-stable-255.9.tar.gz 15072970 BLAKE2B e720eca0e239293c5488feb8caf3f2df49ebe581cbf3a7ac8eb569d1b9a5c669c3eea28e7fd35a9902208116dc7e626166503bccf628258e2041b9e8f77bcbed SHA512 75b46e443bcbe5e4ae812b6cbbd4ea6485caf5b4addea78a0b42365147a0bdc390a288b4aeda1fc7f3e9a46abf2881cda0e45bb8cb782daa50ea5661514b1af8
diff --git a/sys-apps/systemd-utils/systemd-utils-255.9.ebuild b/sys-apps/systemd-utils/systemd-utils-255.9.ebuild
new file mode 100644
index 000000000000..523af66c5d3b
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-255.9.ebuild
@@ -0,0 +1,621 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib ninja-utils
+inherit python-single-r1 secureboot udev
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-255.6"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
+REQUIRED_USE="
+ || ( kernel-install tmpfiles sysusers udev )
+ boot? ( kernel-install )
+ ukify? ( boot )
+ ${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ ukify? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep "${PEFILE_DEPEND}")
+ )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ dev-util/patchelf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_cond_dep "
+ dev-python/jinja[\${PYTHON_USEDEP}]
+ dev-python/lxml[\${PYTHON_USEDEP}]
+ boot? (
+ >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
+ test? ( ${PEFILE_DEPEND} )
+ )
+ ")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/systemd-utils-255-musl-fgetxxent.patch"
+ )
+
+ if use elibc_musl; then
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ "${FILESDIR}/musl-efi-wchar.patch"
+ )
+ fi
+ default
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot bootloader)
+ $(meson_native_use_bool kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+ $(meson_native_use_bool ukify)
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+have_dmi() {
+ # see dmi_arches in meson.build
+ case ${CHOST} in
+ mips64*)
+ return 1 ;;
+ aarch64*|arm*|ia64*|i?86*|loongarch64*|mips*|x86_64*)
+ return 0 ;;
+ esac
+ return 1
+}
+
+multilib_src_compile() {
+ local targets=() optional_targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ local efi_arch= efi_arch_alt=
+ case ${CHOST} in
+ aarch64*) efi_arch=aa64 ;;
+ arm*) efi_arch=arm ;;
+ loongarch32*) efi_arch=loongarch32 ;;
+ loongarch64*) efi_arch=loongarch64 ;;
+ riscv32*) efi_arch=riscv32 ;;
+ riscv64*) efi_arch=riscv64 ;;
+ x86_64*) efi_arch=x64 efi_arch_alt=ia32;;
+ i?86*) efi_arch=ia32 ;;
+ esac
+ targets+=(
+ bootctl
+ man/bootctl.1
+ src/boot/efi/systemd-boot${efi_arch}.efi
+ src/boot/efi/linux${efi_arch}.efi.stub
+ src/boot/efi/addon${efi_arch}.efi.stub
+ )
+ if [[ -n ${efi_arch_alt} ]]; then
+ # If we have a multilib toolchain, meson.build will build the
+ # "alt" arch (ia32). There's no easy way to detect this, so try
+ # to build it and ignore failure.
+ optional_targets+=(
+ src/boot/efi/systemd-boot${efi_arch_alt}.efi
+ src/boot/efi/linux${efi_arch_alt}.efi.stub
+ src/boot/efi/addon${efi_arch_alt}.efi.stub
+ )
+ fi
+
+ fi
+ if use kernel-install; then
+ targets+=(
+ kernel-install
+ src/kernel-install/90-loaderentry.install
+ man/kernel-install.8
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=(
+ test-offline-passwd
+ test-tmpfile-util
+ )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ ata_id
+ cdrom_id
+ fido_id
+ iocost
+ mtd_probe
+ scsi_id
+ v4l_id
+ src/udev/udev.pc
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/60-persistent-storage.rules
+ rules.d/64-btrfs.rules
+ # Needed for tests
+ rules.d/99-systemd.rules
+ )
+ if have_dmi; then
+ targets+=( dmi_memory_id )
+ fi
+ if use test; then
+ targets+=(
+ test-fido-id-desc
+ test-link-config-tables
+ test-udev-builtin
+ test-udev-device-thread
+ test-udev-format
+ test-udev-manager
+ test-udev-node
+ test-udev-rule-runner
+ test-udev-rules
+ test-udev-spawn
+ test-udev-util
+ )
+ fi
+ fi
+ if use ukify; then
+ targets+=(
+ ukify
+ src/kernel-install/60-ukify.install
+ man/ukify.1
+ )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ libudev
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if [[ ${#targets[@]} -ne 0 ]]; then
+ meson_src_compile "${targets[@]}"
+ fi
+ if [[ ${#optional_targets[@]} -ne 0 ]]; then
+ ninja ${NINJAOPTS} "${optional_targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ tests+=( --suite boot )
+ fi
+ if use kernel-install; then
+ tests+=( --suite kernel-install )
+ fi
+ if use sysusers; then
+ tests+=( --suite sysusers )
+ fi
+ if use tmpfiles; then
+ tests+=( --suite tmpfiles )
+ fi
+ if use udev; then
+ tests+=( --suite udev )
+ fi
+ fi
+ if use udev; then
+ tests+=( --suite libudev )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test --no-rebuild "${tests[@]}"
+ fi
+}
+
+src_install() {
+ meson-multilib_src_install
+}
+
+set_rpath() {
+ patchelf --set-rpath "${EPREFIX}/usr/$(get_libdir)/systemd" "$@" || die "patchelf failed"
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ exeinto "/usr/$(get_libdir)/systemd"
+ doexe src/shared/libsystemd-shared-${PV%%.*}.so
+ if use boot; then
+ set_rpath bootctl
+ dobin bootctl
+ doman man/bootctl.1
+ meson_install --no-rebuild --tags systemd-boot
+ fi
+ if use kernel-install; then
+ set_rpath kernel-install
+ dobin kernel-install
+ doman man/kernel-install.8
+ exeinto /usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use sysusers; then
+ set_rpath systemd-sysusers
+ dobin systemd-sysusers
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ set_rpath systemd-tmpfiles
+ dobin systemd-tmpfiles
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ set_rpath udevadm systemd-hwdb
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm /usr/lib/systemd/systemd-udevd
+ if use split-usr; then
+ # elogind installs udev rules that hard-code /bin/udevadm
+ dosym ../usr/bin/udevadm /bin/udevadm
+ fi
+
+ exeinto /usr/lib/udev
+ set_rpath {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
+ doexe {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
+
+ if have_dmi; then
+ set_rpath dmi_memory_id
+ doexe dmi_memory_id
+ fi
+
+ rm -f rules.d/99-systemd.rules
+ insinto /usr/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto /usr/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ doman man/libudev.3
+ doman man/udev_*.3
+ fi
+ if use ukify; then
+ dobin ukify
+ dosym ../../bin/ukify /usr/lib/systemd/ukify
+ doman man/ukify.1
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use kernel-install; then
+ exeinto /usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/x11.conf
+ doins "${FILESDIR}"/{legacy,tmp}.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto /usr/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto /usr/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto /usr/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use ukify && python_fix_shebang "${ED}"
+ use boot && secureboot_auto_sign
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_preinst() {
+ # Migrate /lib/{systemd,udev} to /usr/lib
+ if use split-usr; then
+ local d
+ for d in systemd udev; do
+ dosym ../usr/lib/${d} /lib/${d}
+ if [[ -e ${EROOT}/lib/${d} && ! -L ${EROOT}/lib/${d} ]]; then
+ einfo "Copying files from '${EROOT}/lib/${d}' to '${EROOT}/usr/lib/${d}'"
+ cp -rpPT "${EROOT}/lib/${d}" "${EROOT}/usr/lib/${d}" || die
+ einfo "Removing '${EROOT}/lib/${d}'"
+ rm -r "${EROOT}/lib/${d}" || die
+ fi
+ done
+ fi
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-07-03 0:02 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2024-07-03 0:02 UTC (permalink / raw
To: gentoo-commits
commit: fb0e9e0278ffac78d76f3db04ed24aaebef5252c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 3 00:01:38 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 3 00:02:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb0e9e02
sys-apps/systemd-utils: add 255.8
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-255.8.ebuild | 621 ++++++++++++++++++++++
2 files changed, 622 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 0feeb21b0ccb..9411d00e3411 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -5,3 +5,4 @@ DIST systemd-stable-254.12.tar.gz 14529517 BLAKE2B ed6e4a78363930840e505c4bd789d
DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270e1f97ba78f8280f45100b1b5b33c3531cf79587b596ccbbe594f1e623d918c1fdf19f2231d677e27b5421f1852fbe3225b3 SHA512 852cbc992128dc3ab6ded4215c2540fa3c0b7c7ad98e54036f3981d77a2162f5393ee50960773419133e0d584844af329d3726f45829a56c00b1827e33edf3e1
DIST systemd-stable-254.14.tar.gz 14533129 BLAKE2B 1db933e0f0cdfcabc7a4f3ecfe6e0cf1b10d4b2fa0aee02629d786cb022b18c501a0c48445f9b537a003af22ee64803271fa007e3889b833ec119b4d1346c410 SHA512 bd4e5ce7529f488f7e7199a1ff5976c10cf8e7040893dcf312a23dda5e32eb5c7f40c9ce3676f4a60d5d39197efc3bb1f2a577004b1654d1d0be9a1c617cfcdb
DIST systemd-stable-255.7.tar.gz 15068684 BLAKE2B 6fb5415d9e013bc8695ef837affce7063d214027529412a25ea73eb25473d1f07cff6ad3ea3ea18b7bbf9d73d2bb8e39838e1aeb2a14d016b3b47e4ba24d02d0 SHA512 1cd2a00f292751b923bd93c60bdcdd66d82792b45e32dce11d77e2b3b6fc5c8ba4c5db386652deffa8c24e75032af1a745700ba91f1726e249f0c447daf85c2a
+DIST systemd-stable-255.8.tar.gz 15070471 BLAKE2B b437404af7fd73ef527f80d9d14d46a781444103d1756c27494ecf2664c9c5efe1169c85b91148a3bf190dc7c5e31cf8d42a13c84102d101ea7e4a0570e8d719 SHA512 7692be761a393924669a90f6f343998a85707a9daa3ce169ce67f62ae2a39338c2c3496066b2659c6500849104fab0529fca5704a3eb32375f2f44131216d1f1
diff --git a/sys-apps/systemd-utils/systemd-utils-255.8.ebuild b/sys-apps/systemd-utils/systemd-utils-255.8.ebuild
new file mode 100644
index 000000000000..523af66c5d3b
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-255.8.ebuild
@@ -0,0 +1,621 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib ninja-utils
+inherit python-single-r1 secureboot udev
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-255.6"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
+REQUIRED_USE="
+ || ( kernel-install tmpfiles sysusers udev )
+ boot? ( kernel-install )
+ ukify? ( boot )
+ ${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ ukify? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep "${PEFILE_DEPEND}")
+ )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ dev-util/patchelf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_cond_dep "
+ dev-python/jinja[\${PYTHON_USEDEP}]
+ dev-python/lxml[\${PYTHON_USEDEP}]
+ boot? (
+ >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
+ test? ( ${PEFILE_DEPEND} )
+ )
+ ")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/systemd-utils-255-musl-fgetxxent.patch"
+ )
+
+ if use elibc_musl; then
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ "${FILESDIR}/musl-efi-wchar.patch"
+ )
+ fi
+ default
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot bootloader)
+ $(meson_native_use_bool kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+ $(meson_native_use_bool ukify)
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+have_dmi() {
+ # see dmi_arches in meson.build
+ case ${CHOST} in
+ mips64*)
+ return 1 ;;
+ aarch64*|arm*|ia64*|i?86*|loongarch64*|mips*|x86_64*)
+ return 0 ;;
+ esac
+ return 1
+}
+
+multilib_src_compile() {
+ local targets=() optional_targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ local efi_arch= efi_arch_alt=
+ case ${CHOST} in
+ aarch64*) efi_arch=aa64 ;;
+ arm*) efi_arch=arm ;;
+ loongarch32*) efi_arch=loongarch32 ;;
+ loongarch64*) efi_arch=loongarch64 ;;
+ riscv32*) efi_arch=riscv32 ;;
+ riscv64*) efi_arch=riscv64 ;;
+ x86_64*) efi_arch=x64 efi_arch_alt=ia32;;
+ i?86*) efi_arch=ia32 ;;
+ esac
+ targets+=(
+ bootctl
+ man/bootctl.1
+ src/boot/efi/systemd-boot${efi_arch}.efi
+ src/boot/efi/linux${efi_arch}.efi.stub
+ src/boot/efi/addon${efi_arch}.efi.stub
+ )
+ if [[ -n ${efi_arch_alt} ]]; then
+ # If we have a multilib toolchain, meson.build will build the
+ # "alt" arch (ia32). There's no easy way to detect this, so try
+ # to build it and ignore failure.
+ optional_targets+=(
+ src/boot/efi/systemd-boot${efi_arch_alt}.efi
+ src/boot/efi/linux${efi_arch_alt}.efi.stub
+ src/boot/efi/addon${efi_arch_alt}.efi.stub
+ )
+ fi
+
+ fi
+ if use kernel-install; then
+ targets+=(
+ kernel-install
+ src/kernel-install/90-loaderentry.install
+ man/kernel-install.8
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=(
+ test-offline-passwd
+ test-tmpfile-util
+ )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ ata_id
+ cdrom_id
+ fido_id
+ iocost
+ mtd_probe
+ scsi_id
+ v4l_id
+ src/udev/udev.pc
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/60-persistent-storage.rules
+ rules.d/64-btrfs.rules
+ # Needed for tests
+ rules.d/99-systemd.rules
+ )
+ if have_dmi; then
+ targets+=( dmi_memory_id )
+ fi
+ if use test; then
+ targets+=(
+ test-fido-id-desc
+ test-link-config-tables
+ test-udev-builtin
+ test-udev-device-thread
+ test-udev-format
+ test-udev-manager
+ test-udev-node
+ test-udev-rule-runner
+ test-udev-rules
+ test-udev-spawn
+ test-udev-util
+ )
+ fi
+ fi
+ if use ukify; then
+ targets+=(
+ ukify
+ src/kernel-install/60-ukify.install
+ man/ukify.1
+ )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ libudev
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if [[ ${#targets[@]} -ne 0 ]]; then
+ meson_src_compile "${targets[@]}"
+ fi
+ if [[ ${#optional_targets[@]} -ne 0 ]]; then
+ ninja ${NINJAOPTS} "${optional_targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ tests+=( --suite boot )
+ fi
+ if use kernel-install; then
+ tests+=( --suite kernel-install )
+ fi
+ if use sysusers; then
+ tests+=( --suite sysusers )
+ fi
+ if use tmpfiles; then
+ tests+=( --suite tmpfiles )
+ fi
+ if use udev; then
+ tests+=( --suite udev )
+ fi
+ fi
+ if use udev; then
+ tests+=( --suite libudev )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test --no-rebuild "${tests[@]}"
+ fi
+}
+
+src_install() {
+ meson-multilib_src_install
+}
+
+set_rpath() {
+ patchelf --set-rpath "${EPREFIX}/usr/$(get_libdir)/systemd" "$@" || die "patchelf failed"
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ exeinto "/usr/$(get_libdir)/systemd"
+ doexe src/shared/libsystemd-shared-${PV%%.*}.so
+ if use boot; then
+ set_rpath bootctl
+ dobin bootctl
+ doman man/bootctl.1
+ meson_install --no-rebuild --tags systemd-boot
+ fi
+ if use kernel-install; then
+ set_rpath kernel-install
+ dobin kernel-install
+ doman man/kernel-install.8
+ exeinto /usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use sysusers; then
+ set_rpath systemd-sysusers
+ dobin systemd-sysusers
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ set_rpath systemd-tmpfiles
+ dobin systemd-tmpfiles
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ set_rpath udevadm systemd-hwdb
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm /usr/lib/systemd/systemd-udevd
+ if use split-usr; then
+ # elogind installs udev rules that hard-code /bin/udevadm
+ dosym ../usr/bin/udevadm /bin/udevadm
+ fi
+
+ exeinto /usr/lib/udev
+ set_rpath {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
+ doexe {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
+
+ if have_dmi; then
+ set_rpath dmi_memory_id
+ doexe dmi_memory_id
+ fi
+
+ rm -f rules.d/99-systemd.rules
+ insinto /usr/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto /usr/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ doman man/libudev.3
+ doman man/udev_*.3
+ fi
+ if use ukify; then
+ dobin ukify
+ dosym ../../bin/ukify /usr/lib/systemd/ukify
+ doman man/ukify.1
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use kernel-install; then
+ exeinto /usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/x11.conf
+ doins "${FILESDIR}"/{legacy,tmp}.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto /usr/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto /usr/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto /usr/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use ukify && python_fix_shebang "${ED}"
+ use boot && secureboot_auto_sign
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_preinst() {
+ # Migrate /lib/{systemd,udev} to /usr/lib
+ if use split-usr; then
+ local d
+ for d in systemd udev; do
+ dosym ../usr/lib/${d} /lib/${d}
+ if [[ -e ${EROOT}/lib/${d} && ! -L ${EROOT}/lib/${d} ]]; then
+ einfo "Copying files from '${EROOT}/lib/${d}' to '${EROOT}/usr/lib/${d}'"
+ cp -rpPT "${EROOT}/lib/${d}" "${EROOT}/usr/lib/${d}" || die
+ einfo "Removing '${EROOT}/lib/${d}'"
+ rm -r "${EROOT}/lib/${d}" || die
+ fi
+ done
+ fi
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-07-03 0:02 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2024-07-03 0:02 UTC (permalink / raw
To: gentoo-commits
commit: 5ceb71025031f8f03da29e8e14e1850f459ac3d7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 2 23:59:13 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 3 00:02:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ceb7102
sys-apps/systemd-utils: add 254.14
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-254.14.ebuild | 583 +++++++++++++++++++++
2 files changed, 584 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index e29c210b924a..0feeb21b0ccb 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -3,4 +3,5 @@ DIST systemd-musl-patches-255.6.tar.gz 31529 BLAKE2B 14b737968168238c62a776052bd
DIST systemd-stable-254.10.tar.gz 14428960 BLAKE2B 488c27b9657ec7452f876ab6c18bbfe711f1351afa022801f5a646f2dd1d76d63c17e52e6ebf43b38a76807907287b654a7eaca3afdb0688f5b05839e98ad727 SHA512 0c127d38d0ade8655ae12172c2edbaa8af68bd29f42d965b988d75e74626846ae859bcf0b39b535c9a99ad8c709ad7575ed4d5ea5bc95ce8729e3caafdb32b70
DIST systemd-stable-254.12.tar.gz 14529517 BLAKE2B ed6e4a78363930840e505c4bd789d1d44c238f30d3c0768d435e1cacb43ac3ab07e0dc9085546b4142152bbb4ceb4e2c0a9560e74e1a2b8c09fc885620695e73 SHA512 fa3679915392e641bed73ccb48f5def386ab13ba5ff7efdac952214193c3311543bec4c4370d6880f9599f63e377506b343805c3c56b7dde7eb5e3bbc0dc7a87
DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270e1f97ba78f8280f45100b1b5b33c3531cf79587b596ccbbe594f1e623d918c1fdf19f2231d677e27b5421f1852fbe3225b3 SHA512 852cbc992128dc3ab6ded4215c2540fa3c0b7c7ad98e54036f3981d77a2162f5393ee50960773419133e0d584844af329d3726f45829a56c00b1827e33edf3e1
+DIST systemd-stable-254.14.tar.gz 14533129 BLAKE2B 1db933e0f0cdfcabc7a4f3ecfe6e0cf1b10d4b2fa0aee02629d786cb022b18c501a0c48445f9b537a003af22ee64803271fa007e3889b833ec119b4d1346c410 SHA512 bd4e5ce7529f488f7e7199a1ff5976c10cf8e7040893dcf312a23dda5e32eb5c7f40c9ce3676f4a60d5d39197efc3bb1f2a577004b1654d1d0be9a1c617cfcdb
DIST systemd-stable-255.7.tar.gz 15068684 BLAKE2B 6fb5415d9e013bc8695ef837affce7063d214027529412a25ea73eb25473d1f07cff6ad3ea3ea18b7bbf9d73d2bb8e39838e1aeb2a14d016b3b47e4ba24d02d0 SHA512 1cd2a00f292751b923bd93c60bdcdd66d82792b45e32dce11d77e2b3b6fc5c8ba4c5db386652deffa8c24e75032af1a745700ba91f1726e249f0c447daf85c2a
diff --git a/sys-apps/systemd-utils/systemd-utils-254.14.ebuild b/sys-apps/systemd-utils/systemd-utils-254.14.ebuild
new file mode 100644
index 000000000000..d76d79f1f07f
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-254.14.ebuild
@@ -0,0 +1,583 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
+inherit python-single-r1 secureboot toolchain-funcs udev
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-254.3-r1"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
+REQUIRED_USE="
+ || ( kernel-install tmpfiles sysusers udev )
+ boot? ( kernel-install )
+ ukify? ( boot )
+ ${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ ukify? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep "${PEFILE_DEPEND}")
+ )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_cond_dep "
+ dev-python/jinja[\${PYTHON_USEDEP}]
+ dev-python/lxml[\${PYTHON_USEDEP}]
+ boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
+ ukify? ( test? ( ${PEFILE_DEPEND} ) )
+ ")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
+ )
+
+ if use elibc_musl; then
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot bootloader)
+ $(meson_native_use_bool kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+ $(meson_native_use_bool ukify)
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-kernel-install-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ man/bootctl.1
+ src/boot/efi/linux$(efi_arch).efi.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use kernel-install; then
+ targets+=(
+ kernel-install
+ src/kernel-install/90-loaderentry.install
+ man/kernel-install.8
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfile-util )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/60-persistent-storage.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ udev-rule-runner
+ )
+ fi
+ fi
+ if use ukify; then
+ targets+=(
+ ukify
+ src/kernel-install/60-ukify.install
+ man/ukify.1
+ )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ libudev
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfile-util
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl
+ doman man/bootctl.1
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use kernel-install; then
+ dobin kernel-install
+ doman man/kernel-install.8
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ rm -f rules.d/99-systemd.rules
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ doman man/libudev.3
+ doman man/udev_*.3
+ fi
+ if use ukify; then
+ exeinto "${rootprefix}"/lib/systemd/
+ doexe ukify
+ doman man/ukify.1
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use kernel-install; then
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/x11.conf
+ doins "${FILESDIR}"/{legacy,tmp}.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use ukify && python_fix_shebang "${ED}"
+ use boot && secureboot_auto_sign
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+
+ if use boot; then
+ optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
+ "sys-kernel/installkernel[systemd-boot]"
+ fi
+ if use ukify; then
+ optfeature "automatically generating an unified kernel image on each kernel installation" \
+ "sys-kernel/installkernel[ukify]"
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-06-12 17:11 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2024-06-12 17:11 UTC (permalink / raw
To: gentoo-commits
commit: 026796908c1bf7053cc1875054779fd04b249fe5
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 17:09:17 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 17:10:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02679690
sys-apps/systemd-utils: install /bin/udevadm symlink on split-usr
elogind installs udev rules which hard-code this path.
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../{systemd-utils-255.7-r3.ebuild => systemd-utils-255.7-r4.ebuild} | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sys-apps/systemd-utils/systemd-utils-255.7-r3.ebuild b/sys-apps/systemd-utils/systemd-utils-255.7-r4.ebuild
similarity index 99%
rename from sys-apps/systemd-utils/systemd-utils-255.7-r3.ebuild
rename to sys-apps/systemd-utils/systemd-utils-255.7-r4.ebuild
index be5bd107ffa6..523af66c5d3b 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.7-r3.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.7-r4.ebuild
@@ -487,6 +487,10 @@ multilib_src_install() {
set_rpath udevadm systemd-hwdb
dobin udevadm systemd-hwdb
dosym ../../bin/udevadm /usr/lib/systemd/systemd-udevd
+ if use split-usr; then
+ # elogind installs udev rules that hard-code /bin/udevadm
+ dosym ../usr/bin/udevadm /bin/udevadm
+ fi
exeinto /usr/lib/udev
set_rpath {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-06-11 21:26 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2024-06-11 21:26 UTC (permalink / raw
To: gentoo-commits
commit: 4e328d69021fbf102bb42cfe32cf371db8dfd887
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 11 21:25:07 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jun 11 21:25:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e328d69
sys-apps/systemd-utils: move ukify to /usr/bin
Moved upstream in f65aa477d90ab7fbbc50ba05c55180213d5992e0.
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../{systemd-utils-255.7-r2.ebuild => systemd-utils-255.7-r3.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-255.7-r2.ebuild b/sys-apps/systemd-utils/systemd-utils-255.7-r3.ebuild
similarity index 99%
rename from sys-apps/systemd-utils/systemd-utils-255.7-r2.ebuild
rename to sys-apps/systemd-utils/systemd-utils-255.7-r3.ebuild
index 5eada6a19240..be5bd107ffa6 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.7-r2.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.7-r3.ebuild
@@ -513,8 +513,8 @@ multilib_src_install() {
doman man/udev_*.3
fi
if use ukify; then
- exeinto /usr/lib/systemd
- doexe ukify
+ dobin ukify
+ dosym ../../bin/ukify /usr/lib/systemd/ukify
doman man/ukify.1
fi
fi
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-06-08 17:34 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2024-06-08 17:34 UTC (permalink / raw
To: gentoo-commits
commit: b3613ab440c7f0cee9ee0a8f3f230085a3dc65b2
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 8 17:32:38 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jun 8 17:34:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3613ab4
sys-apps/systemd-utils: exclude mips64 in have_dmi
Bug: https://bugs.gentoo.org/933834
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild
index ce13e54935e2..0d6be4c5b60d 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild
@@ -257,6 +257,8 @@ multilib_src_configure() {
have_dmi() {
# see dmi_arches in meson.build
case ${CHOST} in
+ mips64*)
+ return 1 ;;
aarch64*|arm*|ia64*|i?86*|loongarch64*|mips*|x86_64*)
return 0 ;;
esac
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-06-08 17:27 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2024-06-08 17:27 UTC (permalink / raw
To: gentoo-commits
commit: 7702b49add12ca5b5f6508bc5416f2a780ade761
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 8 17:25:59 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jun 8 17:25:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7702b49a
sys-apps/systemd-utils: fix build on arches without DMI
At least according to systemd upstream.
Closes: https://bugs.gentoo.org/933834
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../systemd-utils/systemd-utils-255.7-r1.ebuild | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild
index 48965c8945a6..ce13e54935e2 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild
@@ -254,6 +254,15 @@ multilib_src_configure() {
fi
}
+have_dmi() {
+ # see dmi_arches in meson.build
+ case ${CHOST} in
+ aarch64*|arm*|ia64*|i?86*|loongarch64*|mips*|x86_64*)
+ return 0 ;;
+ esac
+ return 1
+}
+
multilib_src_compile() {
local targets=() optional_targets=()
if multilib_is_native_abi; then
@@ -327,7 +336,6 @@ multilib_src_compile() {
systemd-hwdb
ata_id
cdrom_id
- dmi_memory_id
fido_id
iocost
mtd_probe
@@ -360,6 +368,9 @@ multilib_src_compile() {
# Needed for tests
rules.d/99-systemd.rules
)
+ if have_dmi; then
+ targets+=( dmi_memory_id )
+ fi
if use test; then
targets+=(
test-fido-id-desc
@@ -475,8 +486,13 @@ multilib_src_install() {
dosym ../../bin/udevadm /usr/lib/systemd/systemd-udevd
exeinto /usr/lib/udev
- set_rpath {ata_id,cdrom_id,dmi_memory_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
- doexe {ata_id,cdrom_id,dmi_memory_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
+ set_rpath {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
+ doexe {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
+
+ if have_dmi; then
+ set_rpath dmi_memory_id
+ doexe dmi_memory_id
+ fi
rm -f rules.d/99-systemd.rules
insinto /usr/lib/udev/rules.d
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-06-08 14:00 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2024-06-08 14:00 UTC (permalink / raw
To: gentoo-commits
commit: 63568bcbf574813aa7abdd3370a6bffa0ec748c4
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 8 14:00:04 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jun 8 14:00:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63568bcb
sys-apps/systemd-utils: inherit ninja-utils
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild
index fb228cd0d50a..48965c8945a6 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild
@@ -6,8 +6,8 @@ PYTHON_COMPAT=( python3_{10..12} )
QA_PKGCONFIG_VERSION=$(ver_cut 1)
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-single-r1
-inherit secureboot udev
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib ninja-utils
+inherit python-single-r1 secureboot udev
DESCRIPTION="Utilities split out from systemd for OpenRC users"
HOMEPAGE="https://systemd.io/"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-06-08 13:59 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2024-06-08 13:59 UTC (permalink / raw
To: gentoo-commits
commit: df180ee2e067825c4cedb88983d3bf514b55c0a4
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 8 13:58:44 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jun 8 13:58:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df180ee2
sys-apps/systemd-utils: build optional targtes with ninja directly
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild
index cce058508a35..fb228cd0d50a 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild
@@ -401,7 +401,7 @@ multilib_src_compile() {
meson_src_compile "${targets[@]}"
fi
if [[ ${#optional_targets[@]} -ne 0 ]]; then
- nonfatal meson_src_compile "${optional_targets[@]}"
+ ninja ${NINJAOPTS} "${optional_targets[@]}"
fi
}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-06-08 13:32 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2024-06-08 13:32 UTC (permalink / raw
To: gentoo-commits
commit: ea5c4a81a7f01e5a52765d5795081592e58dea90
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 8 13:31:00 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jun 8 13:31:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea5c4a81
sys-apps/systemd-utils: build 99-systemd.rules for tests
Closes: https://bugs.gentoo.org/933781
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild
index dbab6cb8489d..cce058508a35 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild
@@ -357,6 +357,8 @@ multilib_src_compile() {
rules.d/50-udev-default.rules
rules.d/60-persistent-storage.rules
rules.d/64-btrfs.rules
+ # Needed for tests
+ rules.d/99-systemd.rules
)
if use test; then
targets+=(
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-06-07 20:39 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2024-06-07 20:39 UTC (permalink / raw
To: gentoo-commits
commit: d4d9ce81a38433b3355781a60301c085c31fe7f5
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 7 20:37:08 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Jun 7 20:37:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4d9ce81
sys-apps/systemd-utils: drop unwanted udev rules
Closes: https://bugs.gentoo.org/933774
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../{systemd-utils-255.7.ebuild => systemd-utils-255.7-r1.ebuild} | 4 ----
1 file changed, 4 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-255.7.ebuild b/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild
similarity index 99%
rename from sys-apps/systemd-utils/systemd-utils-255.7.ebuild
rename to sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild
index 1e96daf3e3f5..dbab6cb8489d 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild
@@ -357,10 +357,6 @@ multilib_src_compile() {
rules.d/50-udev-default.rules
rules.d/60-persistent-storage.rules
rules.d/64-btrfs.rules
- rules.d/70-uaccess.rules
- rules.d/71-seat.rules
- rules.d/73-seat-late.rules
- rules.d/99-systemd.rules
)
if use test; then
targets+=(
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-06-07 18:08 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2024-06-07 18:08 UTC (permalink / raw
To: gentoo-commits
commit: 175abedfe7bc9cba8a7b87468028018aec891297
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 7 18:08:00 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Jun 7 18:08:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=175abedf
sys-apps/systemd-utils: keyword 255.7
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-255.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-255.7.ebuild b/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
index e3296435d815..1e96daf3e3f5 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-06-07 18:07 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2024-06-07 18:07 UTC (permalink / raw
To: gentoo-commits
commit: 94c0b383c65d474a04b83e646023fac18f94874a
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 7 18:06:57 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Jun 7 18:06:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94c0b383
sys-apps/systemd-utils: drop blocker on hwids
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-255.7.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-255.7.ebuild b/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
index 7a71b20cb498..e3296435d815 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
@@ -86,7 +86,6 @@ RDEPEND="${COMMON_DEPEND}
acct-group/usb
acct-group/video
!sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
!<sys-fs/udev-250
!sys-fs/eudev
)
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-06-07 17:33 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2024-06-07 17:33 UTC (permalink / raw
To: gentoo-commits
commit: eb915b43537a80615befad1c2bf850891adebeff
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 7 17:30:45 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Jun 7 17:33:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb915b43
sys-apps/systemd-utils: fix build with USE=kernel-install
Compensate for recent changes to meson.eclass.
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild | 4 ++--
sys-apps/systemd-utils/systemd-utils-254.12.ebuild | 4 ++--
sys-apps/systemd-utils/systemd-utils-254.13.ebuild | 4 ++--
sys-apps/systemd-utils/systemd-utils-255.7.ebuild | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
index b906b6110034..af3b023e8eb8 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
@@ -292,7 +292,7 @@ multilib_src_compile() {
if use kernel-install; then
targets+=(
kernel-install
- 90-loaderentry.install
+ src/kernel-install/90-loaderentry.install
man/kernel-install.8
)
fi
@@ -368,7 +368,7 @@ multilib_src_compile() {
if use ukify; then
targets+=(
ukify
- 60-ukify.install
+ src/kernel-install/60-ukify.install
man/ukify.1
)
fi
diff --git a/sys-apps/systemd-utils/systemd-utils-254.12.ebuild b/sys-apps/systemd-utils/systemd-utils-254.12.ebuild
index 4e14021f3732..d76d79f1f07f 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.12.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.12.ebuild
@@ -292,7 +292,7 @@ multilib_src_compile() {
if use kernel-install; then
targets+=(
kernel-install
- 90-loaderentry.install
+ src/kernel-install/90-loaderentry.install
man/kernel-install.8
)
fi
@@ -368,7 +368,7 @@ multilib_src_compile() {
if use ukify; then
targets+=(
ukify
- 60-ukify.install
+ src/kernel-install/60-ukify.install
man/ukify.1
)
fi
diff --git a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
index 29677faa1af9..3f52033ed095 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
@@ -292,7 +292,7 @@ multilib_src_compile() {
if use kernel-install; then
targets+=(
kernel-install
- 90-loaderentry.install
+ src/kernel-install/90-loaderentry.install
man/kernel-install.8
)
fi
@@ -368,7 +368,7 @@ multilib_src_compile() {
if use ukify; then
targets+=(
ukify
- 60-ukify.install
+ src/kernel-install/60-ukify.install
man/ukify.1
)
fi
diff --git a/sys-apps/systemd-utils/systemd-utils-255.7.ebuild b/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
index 01d50ad73596..865a3e795381 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
@@ -291,7 +291,7 @@ multilib_src_compile() {
if use kernel-install; then
targets+=(
kernel-install
- 90-loaderentry.install
+ src/kernel-install/90-loaderentry.install
man/kernel-install.8
)
fi
@@ -381,7 +381,7 @@ multilib_src_compile() {
if use ukify; then
targets+=(
ukify
- 60-ukify.install
+ src/kernel-install/60-ukify.install
man/ukify.1
)
fi
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-06-06 14:48 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2024-06-06 14:48 UTC (permalink / raw
To: gentoo-commits
commit: 8f80d73e11b36f6452b396e73821ff3f72d85de7
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 6 14:47:47 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jun 6 14:47:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f80d73e
sys-apps/systemd-utils: add einfo messages to preinst
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-255.7.ebuild | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-255.7.ebuild b/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
index f34f50b1db52..01d50ad73596 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
@@ -573,13 +573,14 @@ add_service() {
pkg_preinst() {
# Migrate /lib/{systemd,udev} to /usr/lib
if use split-usr; then
- dosym ../usr/lib/systemd /lib/systemd
- dosym ../usr/lib/udev /lib/udev
local d
for d in systemd udev; do
+ dosym ../usr/lib/${d} /lib/${d}
if [[ -e ${EROOT}/lib/${d} && ! -L ${EROOT}/lib/${d} ]]; then
- cp -rpPT "${EROOT}"/{,usr/}lib/${d} || die
- rm -r "${EROOT}"/lib/${d} || die
+ einfo "Copying files from '${EROOT}/lib/${d}' to '${EROOT}/usr/lib/${d}'"
+ cp -rpPT "${EROOT}/lib/${d}" "${EROOT}/usr/lib/${d}" || die
+ einfo "Removing '${EROOT}/lib/${d}'"
+ rm -r "${EROOT}/lib/${d}" || die
fi
done
fi
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-06-06 14:02 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2024-06-06 14:02 UTC (permalink / raw
To: gentoo-commits
commit: 6de415c71946be5f07484e8974297643b93da5b6
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 6 14:00:00 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jun 6 14:01:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6de415c7
sys-apps/systemd-utils: create /lib/{systemd,udev} symlinks in preinst
This should avoid any file collsion checking.
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-255.7.ebuild | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-255.7.ebuild b/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
index 767e5a8b7ec6..f34f50b1db52 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
@@ -558,11 +558,6 @@ multilib_src_install_all() {
use ukify && python_fix_shebang "${ED}"
use boot && secureboot_auto_sign
-
- if use split-usr; then
- dosym ../usr/lib/systemd /lib/systemd
- dosym ../usr/lib/udev /lib/udev
- fi
}
add_service() {
@@ -577,8 +572,9 @@ add_service() {
pkg_preinst() {
# Migrate /lib/{systemd,udev} to /usr/lib
- # Symlinks will be installed in the merge phase
if use split-usr; then
+ dosym ../usr/lib/systemd /lib/systemd
+ dosym ../usr/lib/udev /lib/udev
local d
for d in systemd udev; do
if [[ -e ${EROOT}/lib/${d} && ! -L ${EROOT}/lib/${d} ]]; then
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-06-05 20:26 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2024-06-05 20:26 UTC (permalink / raw
To: gentoo-commits
commit: 05812e6705631e97c16f95225129e37db17ac17f
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 5 20:25:25 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Jun 5 20:25:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05812e67
sys-apps/systemd-utils: add 255.7, drop 255.4
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 4 ++--
...stemd-utils-255.4.ebuild => systemd-utils-255.7.ebuild} | 14 +++++++++-----
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index ee5a4637dc55..e29c210b924a 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,6 +1,6 @@
DIST systemd-musl-patches-254.3-r1.tar.gz 29971 BLAKE2B 2568c0ce93c410177d775fedb7a67b9498d66f39bfaca220237b3b55cd42c94569d7e3bfde11a9b1faa5eac1804eb75bfdee0ee465c2faac3b8213026b97daec SHA512 817c94765a70eaaa5d23454e03887e149db4612f01c29690baa0c75d61b4b328b742e5d02e8cc63c531eadcd72ae37c0a407aad37c22f1d399dbba81a6bed79d
-DIST systemd-musl-patches-255.4.tar.gz 31633 BLAKE2B 86fb36fbfa90dfe7d183f3c814600af93a690c7cfefc551cd23e6b8bdc2a48267910f4e5ef119b1b5d8e4e0cb2e6843e1b7147464809febad3085d2c82a728c3 SHA512 86bbb735012ce20bbc0af34ea062e83d6d3adf7883f5710ab00db7188fa6779e8dc361cdac427540042c4cf2f157242e6409ed5fc213c01d06cc13380e0cc95f
+DIST systemd-musl-patches-255.6.tar.gz 31529 BLAKE2B 14b737968168238c62a776052bdb97a3cee87c076317f260147939051f24f9ee8f39dec5e38f9b2ce61ea4737422eece680c4d15dd1fdcc5f3e61b6e5ec5f5c4 SHA512 0ab39a653d42d7b58ad875176270aed93e03ba28b33616520548a01e7d06d170379f9206b4a2b280a588d4f7084af10a2a0ec7a6cb724902ddff149e512d789d
DIST systemd-stable-254.10.tar.gz 14428960 BLAKE2B 488c27b9657ec7452f876ab6c18bbfe711f1351afa022801f5a646f2dd1d76d63c17e52e6ebf43b38a76807907287b654a7eaca3afdb0688f5b05839e98ad727 SHA512 0c127d38d0ade8655ae12172c2edbaa8af68bd29f42d965b988d75e74626846ae859bcf0b39b535c9a99ad8c709ad7575ed4d5ea5bc95ce8729e3caafdb32b70
DIST systemd-stable-254.12.tar.gz 14529517 BLAKE2B ed6e4a78363930840e505c4bd789d1d44c238f30d3c0768d435e1cacb43ac3ab07e0dc9085546b4142152bbb4ceb4e2c0a9560e74e1a2b8c09fc885620695e73 SHA512 fa3679915392e641bed73ccb48f5def386ab13ba5ff7efdac952214193c3311543bec4c4370d6880f9599f63e377506b343805c3c56b7dde7eb5e3bbc0dc7a87
DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270e1f97ba78f8280f45100b1b5b33c3531cf79587b596ccbbe594f1e623d918c1fdf19f2231d677e27b5421f1852fbe3225b3 SHA512 852cbc992128dc3ab6ded4215c2540fa3c0b7c7ad98e54036f3981d77a2162f5393ee50960773419133e0d584844af329d3726f45829a56c00b1827e33edf3e1
-DIST systemd-stable-255.4.tar.gz 14952427 BLAKE2B 27f5080f83a9e870fbe8e3ebcb500a63c42022f1f96f26f35c76eeeea85dab691291c31ee716cab330b76df5e576910a6a82f51267eff4f766b1d4c304d815c9 SHA512 8a2bde11a55f7f788ba7751789a5e9be6ce9634e88d54e49f6e832c4c49020c6cacaf2a610fe26f92998b0cbf43c6c2150a96b2c0953d23261009f57d71ea979
+DIST systemd-stable-255.7.tar.gz 15068684 BLAKE2B 6fb5415d9e013bc8695ef837affce7063d214027529412a25ea73eb25473d1f07cff6ad3ea3ea18b7bbf9d73d2bb8e39838e1aeb2a14d016b3b47e4ba24d02d0 SHA512 1cd2a00f292751b923bd93c60bdcdd66d82792b45e32dce11d77e2b3b6fc5c8ba4c5db386652deffa8c24e75032af1a745700ba91f1726e249f0c447daf85c2a
diff --git a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild b/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
similarity index 98%
rename from sys-apps/systemd-utils/systemd-utils-255.4.ebuild
rename to sys-apps/systemd-utils/systemd-utils-255.7.ebuild
index ea1032f738dc..767e5a8b7ec6 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
@@ -22,7 +22,7 @@ else
SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
fi
-MUSL_PATCHSET="systemd-musl-patches-255.4"
+MUSL_PATCHSET="systemd-musl-patches-255.6"
SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
@@ -108,8 +108,10 @@ BDEPEND="
$(python_gen_cond_dep "
dev-python/jinja[\${PYTHON_USEDEP}]
dev-python/lxml[\${PYTHON_USEDEP}]
- boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
- ukify? ( test? ( ${PEFILE_DEPEND} ) )
+ boot? (
+ >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
+ test? ( ${PEFILE_DEPEND} )
+ )
")
"
@@ -302,7 +304,6 @@ multilib_src_compile() {
if use test; then
targets+=(
systemd-runtest.env
- test-offline-passwd
)
fi
fi
@@ -314,7 +315,10 @@ multilib_src_compile() {
tmpfiles.d/{etc,static-nodes-permissions,var}.conf
)
if use test; then
- targets+=( test-tmpfile-util )
+ targets+=(
+ test-offline-passwd
+ test-tmpfile-util
+ )
fi
fi
if use udev; then
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-06-03 17:42 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2024-06-03 17:42 UTC (permalink / raw
To: gentoo-commits
commit: 70de8b350640671778e05f9037d613d324cf4528
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 3 17:41:43 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 3 17:41:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70de8b35
sys-apps/systemd-utils: Stabilize 254.13 sparc, #933438
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.13.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
index 4c536c1448de..c39225aa1aad 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-06-03 17:42 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2024-06-03 17:42 UTC (permalink / raw
To: gentoo-commits
commit: 8554dae05f6c9ce79902c26b61abcb3a2f944a44
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 3 17:41:31 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 3 17:41:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8554dae0
sys-apps/systemd-utils: Stabilize 254.13 arm64, #933438
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.13.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
index f7699a2d906e..d1cce8c9d3f6 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-06-03 17:42 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2024-06-03 17:42 UTC (permalink / raw
To: gentoo-commits
commit: bfe1e4f38ad90448aaf873985642b902f0d2b0b1
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 3 17:41:34 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 3 17:41:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfe1e4f3
sys-apps/systemd-utils: Stabilize 254.13 ppc, #933438
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.13.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
index d1cce8c9d3f6..728a0c92b694 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-06-03 17:42 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2024-06-03 17:42 UTC (permalink / raw
To: gentoo-commits
commit: 255d9b22e9433dec74e8db0a07b0d9724751d524
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 3 17:41:27 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 3 17:41:27 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=255d9b22
sys-apps/systemd-utils: Stabilize 254.13 arm, #933438
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.13.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
index a64b305c6ba1..f7699a2d906e 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-06-03 17:42 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2024-06-03 17:42 UTC (permalink / raw
To: gentoo-commits
commit: 13cfeb90e3258172d0cef741ab038d8e5f01da26
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 3 17:41:24 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 3 17:41:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13cfeb90
sys-apps/systemd-utils: Stabilize 254.13 amd64, #933438
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.13.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
index 4e14021f3732..a64b305c6ba1 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-06-03 17:42 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2024-06-03 17:42 UTC (permalink / raw
To: gentoo-commits
commit: 94774806534655dc99118ccc4e5a467ebf2fc936
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 3 17:41:40 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 3 17:41:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94774806
sys-apps/systemd-utils: Stabilize 254.13 ppc64, #933438
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.13.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
index 728a0c92b694..4c536c1448de 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-06-03 17:42 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2024-06-03 17:42 UTC (permalink / raw
To: gentoo-commits
commit: 5268f85409b0f41834108809f27d4cf8b58388ac
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 3 17:41:46 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 3 17:41:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5268f854
sys-apps/systemd-utils: Stabilize 254.13 x86, #933438
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.13.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
index c39225aa1aad..29677faa1af9 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-06-02 19:37 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2024-06-02 19:37 UTC (permalink / raw
To: gentoo-commits
commit: ce0e481964843efa8716bb68b116cb44ce96a58c
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 2 19:35:12 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Jun 2 19:37:27 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce0e4819
sys-apps/systemd-utils: use libudev target alias
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild | 2 +-
sys-apps/systemd-utils/systemd-utils-254.12.ebuild | 2 +-
sys-apps/systemd-utils/systemd-utils-254.13.ebuild | 2 +-
sys-apps/systemd-utils/systemd-utils-255.4.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
index ca3697269cd2..b906b6110034 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
@@ -375,7 +375,7 @@ multilib_src_compile() {
fi
if use udev; then
targets+=(
- udev:shared_library
+ libudev
src/libudev/libudev.pc
)
if use test; then
diff --git a/sys-apps/systemd-utils/systemd-utils-254.12.ebuild b/sys-apps/systemd-utils/systemd-utils-254.12.ebuild
index 9ba529076182..4e14021f3732 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.12.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.12.ebuild
@@ -375,7 +375,7 @@ multilib_src_compile() {
fi
if use udev; then
targets+=(
- udev:shared_library
+ libudev
src/libudev/libudev.pc
)
if use test; then
diff --git a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
index 9ba529076182..4e14021f3732 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
@@ -375,7 +375,7 @@ multilib_src_compile() {
fi
if use udev; then
targets+=(
- udev:shared_library
+ libudev
src/libudev/libudev.pc
)
if use test; then
diff --git a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
index 4c64afbd80c1..ea1032f738dc 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
@@ -384,7 +384,7 @@ multilib_src_compile() {
fi
if use udev; then
targets+=(
- udev:shared_library
+ libudev
src/libudev/libudev.pc
)
if use test; then
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-05-28 0:51 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2024-05-28 0:51 UTC (permalink / raw
To: gentoo-commits
commit: 998a60bf23920ce23bb4626fb0d7d57e5237d35a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 00:50:17 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 28 00:50:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998a60bf
sys-apps/systemd-utils: add 254.13
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-254.13.ebuild | 583 +++++++++++++++++++++
2 files changed, 584 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 61b7eb7518bb..0ffc6ace3607 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -3,5 +3,6 @@ DIST systemd-musl-patches-255.4.tar.gz 31633 BLAKE2B 86fb36fbfa90dfe7d183f3c8146
DIST systemd-stable-254.10.tar.gz 14428960 BLAKE2B 488c27b9657ec7452f876ab6c18bbfe711f1351afa022801f5a646f2dd1d76d63c17e52e6ebf43b38a76807907287b654a7eaca3afdb0688f5b05839e98ad727 SHA512 0c127d38d0ade8655ae12172c2edbaa8af68bd29f42d965b988d75e74626846ae859bcf0b39b535c9a99ad8c709ad7575ed4d5ea5bc95ce8729e3caafdb32b70
DIST systemd-stable-254.11.tar.gz 14439741 BLAKE2B 5103bad91cd01b019ebb431f54f2d795ab995359c90b5c2e7376b5c7b5aec121ea6d070143b8581e3fb0d66ad2ac7e44113fa5e5fae4cb5adbf0e996727264fe SHA512 597c559b27a2879ce3f89efded7adce55d054bbb8ce97cf35efe52b0dcacbfabcbd05b582bd7064d3ba713ec2ec7931241971e67d39f12226e477df23c0d0dc7
DIST systemd-stable-254.12.tar.gz 14529517 BLAKE2B ed6e4a78363930840e505c4bd789d1d44c238f30d3c0768d435e1cacb43ac3ab07e0dc9085546b4142152bbb4ceb4e2c0a9560e74e1a2b8c09fc885620695e73 SHA512 fa3679915392e641bed73ccb48f5def386ab13ba5ff7efdac952214193c3311543bec4c4370d6880f9599f63e377506b343805c3c56b7dde7eb5e3bbc0dc7a87
+DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270e1f97ba78f8280f45100b1b5b33c3531cf79587b596ccbbe594f1e623d918c1fdf19f2231d677e27b5421f1852fbe3225b3 SHA512 852cbc992128dc3ab6ded4215c2540fa3c0b7c7ad98e54036f3981d77a2162f5393ee50960773419133e0d584844af329d3726f45829a56c00b1827e33edf3e1
DIST systemd-stable-254.8.tar.gz 14418468 BLAKE2B e5a151ece86e57c7224fc95bda1b4ede1277fce4a2ba28d3605ab0431a2aafe1088f90c49a20e3b53a5b56aeef7c0f1f5da0601db740150f5efdf6eae7bbde80 SHA512 a3f35d9fcafcccd8d9c33ab1047241f226146017be95562a67c7dcc9eeb4b77bded92ad80e92f4767f2bf2009df0172a621d4c54a805e07ed5a5ed03940ec28e
DIST systemd-stable-255.4.tar.gz 14952427 BLAKE2B 27f5080f83a9e870fbe8e3ebcb500a63c42022f1f96f26f35c76eeeea85dab691291c31ee716cab330b76df5e576910a6a82f51267eff4f766b1d4c304d815c9 SHA512 8a2bde11a55f7f788ba7751789a5e9be6ce9634e88d54e49f6e832c4c49020c6cacaf2a610fe26f92998b0cbf43c6c2150a96b2c0953d23261009f57d71ea979
diff --git a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
new file mode 100644
index 000000000000..9ba529076182
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
@@ -0,0 +1,583 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
+inherit python-single-r1 secureboot toolchain-funcs udev
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-254.3-r1"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
+REQUIRED_USE="
+ || ( kernel-install tmpfiles sysusers udev )
+ boot? ( kernel-install )
+ ukify? ( boot )
+ ${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ ukify? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep "${PEFILE_DEPEND}")
+ )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_cond_dep "
+ dev-python/jinja[\${PYTHON_USEDEP}]
+ dev-python/lxml[\${PYTHON_USEDEP}]
+ boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
+ ukify? ( test? ( ${PEFILE_DEPEND} ) )
+ ")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
+ )
+
+ if use elibc_musl; then
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot bootloader)
+ $(meson_native_use_bool kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+ $(meson_native_use_bool ukify)
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-kernel-install-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ man/bootctl.1
+ src/boot/efi/linux$(efi_arch).efi.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use kernel-install; then
+ targets+=(
+ kernel-install
+ 90-loaderentry.install
+ man/kernel-install.8
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfile-util )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/60-persistent-storage.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ udev-rule-runner
+ )
+ fi
+ fi
+ if use ukify; then
+ targets+=(
+ ukify
+ 60-ukify.install
+ man/ukify.1
+ )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfile-util
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl
+ doman man/bootctl.1
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use kernel-install; then
+ dobin kernel-install
+ doman man/kernel-install.8
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ rm -f rules.d/99-systemd.rules
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ doman man/libudev.3
+ doman man/udev_*.3
+ fi
+ if use ukify; then
+ exeinto "${rootprefix}"/lib/systemd/
+ doexe ukify
+ doman man/ukify.1
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use kernel-install; then
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/x11.conf
+ doins "${FILESDIR}"/{legacy,tmp}.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use ukify && python_fix_shebang "${ED}"
+ use boot && secureboot_auto_sign
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+
+ if use boot; then
+ optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
+ "sys-kernel/installkernel[systemd-boot]"
+ fi
+ if use ukify; then
+ optfeature "automatically generating an unified kernel image on each kernel installation" \
+ "sys-kernel/installkernel[ukify]"
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-05-28 0:51 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2024-05-28 0:51 UTC (permalink / raw
To: gentoo-commits
commit: 39a15fc784b4ed37597c74ab1d4ee6e5b127cac8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 00:50:36 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 28 00:50:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39a15fc7
sys-apps/systemd-utils: drop 254.8-r1, 254.11
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 2 -
sys-apps/systemd-utils/systemd-utils-254.11.ebuild | 583 --------------------
.../systemd-utils/systemd-utils-254.8-r1.ebuild | 584 ---------------------
3 files changed, 1169 deletions(-)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 0ffc6ace3607..ee5a4637dc55 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,8 +1,6 @@
DIST systemd-musl-patches-254.3-r1.tar.gz 29971 BLAKE2B 2568c0ce93c410177d775fedb7a67b9498d66f39bfaca220237b3b55cd42c94569d7e3bfde11a9b1faa5eac1804eb75bfdee0ee465c2faac3b8213026b97daec SHA512 817c94765a70eaaa5d23454e03887e149db4612f01c29690baa0c75d61b4b328b742e5d02e8cc63c531eadcd72ae37c0a407aad37c22f1d399dbba81a6bed79d
DIST systemd-musl-patches-255.4.tar.gz 31633 BLAKE2B 86fb36fbfa90dfe7d183f3c814600af93a690c7cfefc551cd23e6b8bdc2a48267910f4e5ef119b1b5d8e4e0cb2e6843e1b7147464809febad3085d2c82a728c3 SHA512 86bbb735012ce20bbc0af34ea062e83d6d3adf7883f5710ab00db7188fa6779e8dc361cdac427540042c4cf2f157242e6409ed5fc213c01d06cc13380e0cc95f
DIST systemd-stable-254.10.tar.gz 14428960 BLAKE2B 488c27b9657ec7452f876ab6c18bbfe711f1351afa022801f5a646f2dd1d76d63c17e52e6ebf43b38a76807907287b654a7eaca3afdb0688f5b05839e98ad727 SHA512 0c127d38d0ade8655ae12172c2edbaa8af68bd29f42d965b988d75e74626846ae859bcf0b39b535c9a99ad8c709ad7575ed4d5ea5bc95ce8729e3caafdb32b70
-DIST systemd-stable-254.11.tar.gz 14439741 BLAKE2B 5103bad91cd01b019ebb431f54f2d795ab995359c90b5c2e7376b5c7b5aec121ea6d070143b8581e3fb0d66ad2ac7e44113fa5e5fae4cb5adbf0e996727264fe SHA512 597c559b27a2879ce3f89efded7adce55d054bbb8ce97cf35efe52b0dcacbfabcbd05b582bd7064d3ba713ec2ec7931241971e67d39f12226e477df23c0d0dc7
DIST systemd-stable-254.12.tar.gz 14529517 BLAKE2B ed6e4a78363930840e505c4bd789d1d44c238f30d3c0768d435e1cacb43ac3ab07e0dc9085546b4142152bbb4ceb4e2c0a9560e74e1a2b8c09fc885620695e73 SHA512 fa3679915392e641bed73ccb48f5def386ab13ba5ff7efdac952214193c3311543bec4c4370d6880f9599f63e377506b343805c3c56b7dde7eb5e3bbc0dc7a87
DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270e1f97ba78f8280f45100b1b5b33c3531cf79587b596ccbbe594f1e623d918c1fdf19f2231d677e27b5421f1852fbe3225b3 SHA512 852cbc992128dc3ab6ded4215c2540fa3c0b7c7ad98e54036f3981d77a2162f5393ee50960773419133e0d584844af329d3726f45829a56c00b1827e33edf3e1
-DIST systemd-stable-254.8.tar.gz 14418468 BLAKE2B e5a151ece86e57c7224fc95bda1b4ede1277fce4a2ba28d3605ab0431a2aafe1088f90c49a20e3b53a5b56aeef7c0f1f5da0601db740150f5efdf6eae7bbde80 SHA512 a3f35d9fcafcccd8d9c33ab1047241f226146017be95562a67c7dcc9eeb4b77bded92ad80e92f4767f2bf2009df0172a621d4c54a805e07ed5a5ed03940ec28e
DIST systemd-stable-255.4.tar.gz 14952427 BLAKE2B 27f5080f83a9e870fbe8e3ebcb500a63c42022f1f96f26f35c76eeeea85dab691291c31ee716cab330b76df5e576910a6a82f51267eff4f766b1d4c304d815c9 SHA512 8a2bde11a55f7f788ba7751789a5e9be6ce9634e88d54e49f6e832c4c49020c6cacaf2a610fe26f92998b0cbf43c6c2150a96b2c0953d23261009f57d71ea979
diff --git a/sys-apps/systemd-utils/systemd-utils-254.11.ebuild b/sys-apps/systemd-utils/systemd-utils-254.11.ebuild
deleted file mode 100644
index 9ba529076182..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-254.11.ebuild
+++ /dev/null
@@ -1,583 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
-inherit python-single-r1 secureboot toolchain-funcs udev
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-254.3-r1"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
-REQUIRED_USE="
- || ( kernel-install tmpfiles sysusers udev )
- boot? ( kernel-install )
- ukify? ( boot )
- ${PYTHON_REQUIRED_USE}
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
-"
-
-PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
-
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- ukify? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep "${PEFILE_DEPEND}")
- )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
- $(python_gen_cond_dep "
- dev-python/jinja[\${PYTHON_USEDEP}]
- dev-python/lxml[\${PYTHON_USEDEP}]
- boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
- ukify? ( test? ( ${PEFILE_DEPEND} ) )
- ")
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
- use boot && secureboot_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
- )
-
- if use elibc_musl; then
- PATCHES+=(
- "${WORKDIR}/${MUSL_PATCHSET}"
- )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot bootloader)
- $(meson_native_use_bool kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
- $(meson_native_use_bool ukify)
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-kernel-install-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- man/bootctl.1
- src/boot/efi/linux$(efi_arch).efi.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use kernel-install; then
- targets+=(
- kernel-install
- 90-loaderentry.install
- man/kernel-install.8
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfile-util )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- man/libudev.3
- man/udev_device_get_syspath.3
- man/udev_device_has_tag.3
- man/udev_device_new_from_syspath.3
- man/udev_enumerate_add_match_subsystem.3
- man/udev_enumerate_new.3
- man/udev_enumerate_scan_devices.3
- man/udev_list_entry.3
- man/udev_monitor_filter_update.3
- man/udev_monitor_new_from_netlink.3
- man/udev_monitor_receive_device.3
- man/udev_new.3
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/60-persistent-storage.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- udev-rule-runner
- )
- fi
- fi
- if use ukify; then
- targets+=(
- ukify
- 60-ukify.install
- man/ukify.1
- )
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfile-util
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl
- doman man/bootctl.1
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use kernel-install; then
- dobin kernel-install
- doman man/kernel-install.8
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- rm -f rules.d/99-systemd.rules
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- doman man/libudev.3
- doman man/udev_*.3
- fi
- if use ukify; then
- exeinto "${rootprefix}"/lib/systemd/
- doexe ukify
- doman man/ukify.1
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use kernel-install; then
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/x11.conf
- doins "${FILESDIR}"/{legacy,tmp}.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-
- use ukify && python_fix_shebang "${ED}"
- use boot && secureboot_auto_sign
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-
- if use boot; then
- optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
- "sys-kernel/installkernel[systemd-boot]"
- fi
- if use ukify; then
- optfeature "automatically generating an unified kernel image on each kernel installation" \
- "sys-kernel/installkernel[ukify]"
- fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-254.8-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.8-r1.ebuild
deleted file mode 100644
index ced613ea99e1..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-254.8-r1.ebuild
+++ /dev/null
@@ -1,584 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
-inherit python-single-r1 secureboot toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-254.3-r1"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
-REQUIRED_USE="
- || ( kernel-install tmpfiles sysusers udev )
- boot? ( kernel-install )
- ukify? ( boot )
- ${PYTHON_REQUIRED_USE}
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
-"
-
-PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
-
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- ukify? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep "${PEFILE_DEPEND}")
- )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
- $(python_gen_cond_dep "
- dev-python/jinja[\${PYTHON_USEDEP}]
- dev-python/lxml[\${PYTHON_USEDEP}]
- boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
- ukify? ( test? ( ${PEFILE_DEPEND} ) )
- ")
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
- use boot && secureboot_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
- )
-
- if use elibc_musl; then
- PATCHES+=(
- "${WORKDIR}/${MUSL_PATCHSET}"
- )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot bootloader)
- $(meson_native_use_bool kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
- $(meson_native_use_bool ukify)
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-kernel-install-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- man/bootctl.1
- src/boot/efi/linux$(efi_arch).efi.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use kernel-install; then
- targets+=(
- kernel-install
- 90-loaderentry.install
- man/kernel-install.8
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfile-util )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- man/libudev.3
- man/udev_device_get_syspath.3
- man/udev_device_has_tag.3
- man/udev_device_new_from_syspath.3
- man/udev_enumerate_add_match_subsystem.3
- man/udev_enumerate_new.3
- man/udev_enumerate_scan_devices.3
- man/udev_list_entry.3
- man/udev_monitor_filter_update.3
- man/udev_monitor_new_from_netlink.3
- man/udev_monitor_receive_device.3
- man/udev_new.3
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/60-persistent-storage.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- udev-rule-runner
- )
- fi
- fi
- if use ukify; then
- targets+=(
- ukify
- 60-ukify.install
- man/ukify.1
- )
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfile-util
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl
- doman man/bootctl.1
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use kernel-install; then
- dobin kernel-install
- doman man/kernel-install.8
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- rm -f rules.d/99-systemd.rules
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- doman man/libudev.3
- doman man/udev_*.3
- fi
- if use ukify; then
- exeinto "${rootprefix}"/lib/systemd/
- doexe ukify
- doman man/ukify.1
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use kernel-install; then
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/x11.conf
- doins "${FILESDIR}"/{legacy,tmp}.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-
- use ukify && python_fix_shebang "${ED}"
- use boot && secureboot_auto_sign
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-
- if use boot; then
- optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
- "sys-kernel/installkernel[systemd-boot]"
- fi
- if use ukify; then
- optfeature "automatically generating an unified kernel image on each kernel installation" \
- "sys-kernel/installkernel[ukify]"
- fi
-}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-05-09 23:48 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2024-05-09 23:48 UTC (permalink / raw
To: gentoo-commits
commit: e8e745c29c46531ff7ed49fa6ad76511fd5c07ce
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 9 23:42:53 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 9 23:42:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8e745c2
sys-apps/systemd-utils: add 254.12
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-254.12.ebuild | 583 +++++++++++++++++++++
2 files changed, 584 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 78febcf1915f..61b7eb7518bb 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -2,5 +2,6 @@ DIST systemd-musl-patches-254.3-r1.tar.gz 29971 BLAKE2B 2568c0ce93c410177d775fed
DIST systemd-musl-patches-255.4.tar.gz 31633 BLAKE2B 86fb36fbfa90dfe7d183f3c814600af93a690c7cfefc551cd23e6b8bdc2a48267910f4e5ef119b1b5d8e4e0cb2e6843e1b7147464809febad3085d2c82a728c3 SHA512 86bbb735012ce20bbc0af34ea062e83d6d3adf7883f5710ab00db7188fa6779e8dc361cdac427540042c4cf2f157242e6409ed5fc213c01d06cc13380e0cc95f
DIST systemd-stable-254.10.tar.gz 14428960 BLAKE2B 488c27b9657ec7452f876ab6c18bbfe711f1351afa022801f5a646f2dd1d76d63c17e52e6ebf43b38a76807907287b654a7eaca3afdb0688f5b05839e98ad727 SHA512 0c127d38d0ade8655ae12172c2edbaa8af68bd29f42d965b988d75e74626846ae859bcf0b39b535c9a99ad8c709ad7575ed4d5ea5bc95ce8729e3caafdb32b70
DIST systemd-stable-254.11.tar.gz 14439741 BLAKE2B 5103bad91cd01b019ebb431f54f2d795ab995359c90b5c2e7376b5c7b5aec121ea6d070143b8581e3fb0d66ad2ac7e44113fa5e5fae4cb5adbf0e996727264fe SHA512 597c559b27a2879ce3f89efded7adce55d054bbb8ce97cf35efe52b0dcacbfabcbd05b582bd7064d3ba713ec2ec7931241971e67d39f12226e477df23c0d0dc7
+DIST systemd-stable-254.12.tar.gz 14529517 BLAKE2B ed6e4a78363930840e505c4bd789d1d44c238f30d3c0768d435e1cacb43ac3ab07e0dc9085546b4142152bbb4ceb4e2c0a9560e74e1a2b8c09fc885620695e73 SHA512 fa3679915392e641bed73ccb48f5def386ab13ba5ff7efdac952214193c3311543bec4c4370d6880f9599f63e377506b343805c3c56b7dde7eb5e3bbc0dc7a87
DIST systemd-stable-254.8.tar.gz 14418468 BLAKE2B e5a151ece86e57c7224fc95bda1b4ede1277fce4a2ba28d3605ab0431a2aafe1088f90c49a20e3b53a5b56aeef7c0f1f5da0601db740150f5efdf6eae7bbde80 SHA512 a3f35d9fcafcccd8d9c33ab1047241f226146017be95562a67c7dcc9eeb4b77bded92ad80e92f4767f2bf2009df0172a621d4c54a805e07ed5a5ed03940ec28e
DIST systemd-stable-255.4.tar.gz 14952427 BLAKE2B 27f5080f83a9e870fbe8e3ebcb500a63c42022f1f96f26f35c76eeeea85dab691291c31ee716cab330b76df5e576910a6a82f51267eff4f766b1d4c304d815c9 SHA512 8a2bde11a55f7f788ba7751789a5e9be6ce9634e88d54e49f6e832c4c49020c6cacaf2a610fe26f92998b0cbf43c6c2150a96b2c0953d23261009f57d71ea979
diff --git a/sys-apps/systemd-utils/systemd-utils-254.12.ebuild b/sys-apps/systemd-utils/systemd-utils-254.12.ebuild
new file mode 100644
index 000000000000..9ba529076182
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-254.12.ebuild
@@ -0,0 +1,583 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
+inherit python-single-r1 secureboot toolchain-funcs udev
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-254.3-r1"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
+REQUIRED_USE="
+ || ( kernel-install tmpfiles sysusers udev )
+ boot? ( kernel-install )
+ ukify? ( boot )
+ ${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ ukify? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep "${PEFILE_DEPEND}")
+ )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_cond_dep "
+ dev-python/jinja[\${PYTHON_USEDEP}]
+ dev-python/lxml[\${PYTHON_USEDEP}]
+ boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
+ ukify? ( test? ( ${PEFILE_DEPEND} ) )
+ ")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
+ )
+
+ if use elibc_musl; then
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot bootloader)
+ $(meson_native_use_bool kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+ $(meson_native_use_bool ukify)
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-kernel-install-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ man/bootctl.1
+ src/boot/efi/linux$(efi_arch).efi.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use kernel-install; then
+ targets+=(
+ kernel-install
+ 90-loaderentry.install
+ man/kernel-install.8
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfile-util )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/60-persistent-storage.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ udev-rule-runner
+ )
+ fi
+ fi
+ if use ukify; then
+ targets+=(
+ ukify
+ 60-ukify.install
+ man/ukify.1
+ )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfile-util
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl
+ doman man/bootctl.1
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use kernel-install; then
+ dobin kernel-install
+ doman man/kernel-install.8
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ rm -f rules.d/99-systemd.rules
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ doman man/libudev.3
+ doman man/udev_*.3
+ fi
+ if use ukify; then
+ exeinto "${rootprefix}"/lib/systemd/
+ doexe ukify
+ doman man/ukify.1
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use kernel-install; then
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/x11.conf
+ doins "${FILESDIR}"/{legacy,tmp}.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use ukify && python_fix_shebang "${ED}"
+ use boot && secureboot_auto_sign
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+
+ if use boot; then
+ optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
+ "sys-kernel/installkernel[systemd-boot]"
+ fi
+ if use ukify; then
+ optfeature "automatically generating an unified kernel image on each kernel installation" \
+ "sys-kernel/installkernel[ukify]"
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-04-26 17:10 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2024-04-26 17:10 UTC (permalink / raw
To: gentoo-commits
commit: 5bad5decad0f44f768fd74544125133f338e8e53
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Fri Apr 26 13:04:42 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 26 17:09:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bad5dec
sys-apps/systemd-utils: stable 254.10-r1 for hppa, bug #930182
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
index 1bf395f812b3..ca3697269cd2 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-04-26 0:14 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2024-04-26 0:14 UTC (permalink / raw
To: gentoo-commits
commit: f2a6ac2f74494a460569776a9f98a2c3298fbec7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 26 00:09:56 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 26 00:13:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2a6ac2f
sys-apps/systemd-utils: add 254.11
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-254.11.ebuild | 583 +++++++++++++++++++++
2 files changed, 584 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 981650a1aad0..78febcf1915f 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,5 +1,6 @@
DIST systemd-musl-patches-254.3-r1.tar.gz 29971 BLAKE2B 2568c0ce93c410177d775fedb7a67b9498d66f39bfaca220237b3b55cd42c94569d7e3bfde11a9b1faa5eac1804eb75bfdee0ee465c2faac3b8213026b97daec SHA512 817c94765a70eaaa5d23454e03887e149db4612f01c29690baa0c75d61b4b328b742e5d02e8cc63c531eadcd72ae37c0a407aad37c22f1d399dbba81a6bed79d
DIST systemd-musl-patches-255.4.tar.gz 31633 BLAKE2B 86fb36fbfa90dfe7d183f3c814600af93a690c7cfefc551cd23e6b8bdc2a48267910f4e5ef119b1b5d8e4e0cb2e6843e1b7147464809febad3085d2c82a728c3 SHA512 86bbb735012ce20bbc0af34ea062e83d6d3adf7883f5710ab00db7188fa6779e8dc361cdac427540042c4cf2f157242e6409ed5fc213c01d06cc13380e0cc95f
DIST systemd-stable-254.10.tar.gz 14428960 BLAKE2B 488c27b9657ec7452f876ab6c18bbfe711f1351afa022801f5a646f2dd1d76d63c17e52e6ebf43b38a76807907287b654a7eaca3afdb0688f5b05839e98ad727 SHA512 0c127d38d0ade8655ae12172c2edbaa8af68bd29f42d965b988d75e74626846ae859bcf0b39b535c9a99ad8c709ad7575ed4d5ea5bc95ce8729e3caafdb32b70
+DIST systemd-stable-254.11.tar.gz 14439741 BLAKE2B 5103bad91cd01b019ebb431f54f2d795ab995359c90b5c2e7376b5c7b5aec121ea6d070143b8581e3fb0d66ad2ac7e44113fa5e5fae4cb5adbf0e996727264fe SHA512 597c559b27a2879ce3f89efded7adce55d054bbb8ce97cf35efe52b0dcacbfabcbd05b582bd7064d3ba713ec2ec7931241971e67d39f12226e477df23c0d0dc7
DIST systemd-stable-254.8.tar.gz 14418468 BLAKE2B e5a151ece86e57c7224fc95bda1b4ede1277fce4a2ba28d3605ab0431a2aafe1088f90c49a20e3b53a5b56aeef7c0f1f5da0601db740150f5efdf6eae7bbde80 SHA512 a3f35d9fcafcccd8d9c33ab1047241f226146017be95562a67c7dcc9eeb4b77bded92ad80e92f4767f2bf2009df0172a621d4c54a805e07ed5a5ed03940ec28e
DIST systemd-stable-255.4.tar.gz 14952427 BLAKE2B 27f5080f83a9e870fbe8e3ebcb500a63c42022f1f96f26f35c76eeeea85dab691291c31ee716cab330b76df5e576910a6a82f51267eff4f766b1d4c304d815c9 SHA512 8a2bde11a55f7f788ba7751789a5e9be6ce9634e88d54e49f6e832c4c49020c6cacaf2a610fe26f92998b0cbf43c6c2150a96b2c0953d23261009f57d71ea979
diff --git a/sys-apps/systemd-utils/systemd-utils-254.11.ebuild b/sys-apps/systemd-utils/systemd-utils-254.11.ebuild
new file mode 100644
index 000000000000..9ba529076182
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-254.11.ebuild
@@ -0,0 +1,583 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
+inherit python-single-r1 secureboot toolchain-funcs udev
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-254.3-r1"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
+REQUIRED_USE="
+ || ( kernel-install tmpfiles sysusers udev )
+ boot? ( kernel-install )
+ ukify? ( boot )
+ ${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ ukify? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep "${PEFILE_DEPEND}")
+ )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_cond_dep "
+ dev-python/jinja[\${PYTHON_USEDEP}]
+ dev-python/lxml[\${PYTHON_USEDEP}]
+ boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
+ ukify? ( test? ( ${PEFILE_DEPEND} ) )
+ ")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
+ )
+
+ if use elibc_musl; then
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot bootloader)
+ $(meson_native_use_bool kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+ $(meson_native_use_bool ukify)
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-kernel-install-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ man/bootctl.1
+ src/boot/efi/linux$(efi_arch).efi.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use kernel-install; then
+ targets+=(
+ kernel-install
+ 90-loaderentry.install
+ man/kernel-install.8
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfile-util )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/60-persistent-storage.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ udev-rule-runner
+ )
+ fi
+ fi
+ if use ukify; then
+ targets+=(
+ ukify
+ 60-ukify.install
+ man/ukify.1
+ )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfile-util
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl
+ doman man/bootctl.1
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use kernel-install; then
+ dobin kernel-install
+ doman man/kernel-install.8
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ rm -f rules.d/99-systemd.rules
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ doman man/libudev.3
+ doman man/udev_*.3
+ fi
+ if use ukify; then
+ exeinto "${rootprefix}"/lib/systemd/
+ doexe ukify
+ doman man/ukify.1
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use kernel-install; then
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/x11.conf
+ doins "${FILESDIR}"/{legacy,tmp}.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use ukify && python_fix_shebang "${ED}"
+ use boot && secureboot_auto_sign
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+
+ if use boot; then
+ optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
+ "sys-kernel/installkernel[systemd-boot]"
+ fi
+ if use ukify; then
+ optfeature "automatically generating an unified kernel image on each kernel installation" \
+ "sys-kernel/installkernel[ukify]"
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-04-19 16:21 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2024-04-19 16:21 UTC (permalink / raw
To: gentoo-commits
commit: d7c835234c2d4750ecc5b561dae9de791ab49f9b
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 19 16:20:36 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 16:20:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7c83523
sys-apps/systemd-utils: Stabilize 254.10-r1 arm64, #930182
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
index 05c1387c7dff..e564105f2446 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-04-19 16:21 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2024-04-19 16:21 UTC (permalink / raw
To: gentoo-commits
commit: 31b175b60cf0bc23f67dba7c998883b697dae038
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 19 16:20:33 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 16:20:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31b175b6
sys-apps/systemd-utils: Stabilize 254.10-r1 arm, #930182
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
index 15ad168efdc7..05c1387c7dff 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-04-19 16:21 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2024-04-19 16:21 UTC (permalink / raw
To: gentoo-commits
commit: 840d00ce2310321ce44f0df9cd99fe2b736fec94
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 19 16:20:39 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 16:20:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=840d00ce
sys-apps/systemd-utils: Stabilize 254.10-r1 sparc, #930182
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
index e564105f2446..1bf395f812b3 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-04-19 16:21 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2024-04-19 16:21 UTC (permalink / raw
To: gentoo-commits
commit: abe9e5031aaba1fc8b1068c035a6a6b8bb341fb6
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 19 16:20:25 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 16:20:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abe9e503
sys-apps/systemd-utils: Stabilize 254.10-r1 amd64, #930182
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
index 0d04073fe541..2329843e0de2 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-04-19 16:21 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2024-04-19 16:21 UTC (permalink / raw
To: gentoo-commits
commit: 75b0cf64c877364ab23a0a43c3deb96c9d1a291e
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 19 16:20:22 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 16:20:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75b0cf64
sys-apps/systemd-utils: Stabilize 254.10-r1 x86, #930182
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
index 9ba529076182..0d04073fe541 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-04-19 16:21 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2024-04-19 16:21 UTC (permalink / raw
To: gentoo-commits
commit: 20e597d51301531e34044475f4cf0f2d55ff5544
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 19 16:20:31 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 16:20:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20e597d5
sys-apps/systemd-utils: Stabilize 254.10-r1 ppc, #930182
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
index c949fb3f4dce..15ad168efdc7 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-04-19 16:21 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2024-04-19 16:21 UTC (permalink / raw
To: gentoo-commits
commit: 755e594cb595cf6f3fbb4ac5d82cd470ffb47b00
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 19 16:20:28 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 16:20:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=755e594c
sys-apps/systemd-utils: Stabilize 254.10-r1 ppc64, #930182
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
index 2329843e0de2..c949fb3f4dce 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-04-16 0:52 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2024-04-16 0:52 UTC (permalink / raw
To: gentoo-commits
commit: c94b25236d2f7cdffc52afcf8be531b417498cba
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 16 00:51:59 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 00:52:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c94b2523
sys-apps/systemd-utils: add basename fix
Closes: https://bugs.gentoo.org/926277
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 2 +-
sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild | 2 +-
sys-apps/systemd-utils/systemd-utils-254.8-r1.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index b5a5d59afb87..981650a1aad0 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,4 +1,4 @@
-DIST systemd-musl-patches-254.3.tar.gz 28640 BLAKE2B 54837f49cdb8cf025e367ad13bab0d0509c2e11ad84d29724bb6baa226c54e0ab97a91035361f66009dd9b1a22f7b3e82f90b1c14adf4aa20d576b9410589d38 SHA512 07d028a57025b2626471d6f48507f2dfc50658db24efaac93bafae9a1d4cdc3ec82e80da426d2a6280c32af2d813565609dab7df5538260ba809b63309a0ffed
+DIST systemd-musl-patches-254.3-r1.tar.gz 29971 BLAKE2B 2568c0ce93c410177d775fedb7a67b9498d66f39bfaca220237b3b55cd42c94569d7e3bfde11a9b1faa5eac1804eb75bfdee0ee465c2faac3b8213026b97daec SHA512 817c94765a70eaaa5d23454e03887e149db4612f01c29690baa0c75d61b4b328b742e5d02e8cc63c531eadcd72ae37c0a407aad37c22f1d399dbba81a6bed79d
DIST systemd-musl-patches-255.4.tar.gz 31633 BLAKE2B 86fb36fbfa90dfe7d183f3c814600af93a690c7cfefc551cd23e6b8bdc2a48267910f4e5ef119b1b5d8e4e0cb2e6843e1b7147464809febad3085d2c82a728c3 SHA512 86bbb735012ce20bbc0af34ea062e83d6d3adf7883f5710ab00db7188fa6779e8dc361cdac427540042c4cf2f157242e6409ed5fc213c01d06cc13380e0cc95f
DIST systemd-stable-254.10.tar.gz 14428960 BLAKE2B 488c27b9657ec7452f876ab6c18bbfe711f1351afa022801f5a646f2dd1d76d63c17e52e6ebf43b38a76807907287b654a7eaca3afdb0688f5b05839e98ad727 SHA512 0c127d38d0ade8655ae12172c2edbaa8af68bd29f42d965b988d75e74626846ae859bcf0b39b535c9a99ad8c709ad7575ed4d5ea5bc95ce8729e3caafdb32b70
DIST systemd-stable-254.8.tar.gz 14418468 BLAKE2B e5a151ece86e57c7224fc95bda1b4ede1277fce4a2ba28d3605ab0431a2aafe1088f90c49a20e3b53a5b56aeef7c0f1f5da0601db740150f5efdf6eae7bbde80 SHA512 a3f35d9fcafcccd8d9c33ab1047241f226146017be95562a67c7dcc9eeb4b77bded92ad80e92f4767f2bf2009df0172a621d4c54a805e07ed5a5ed03940ec28e
diff --git a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
index 80c11bee8adc..9ba529076182 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
@@ -22,7 +22,7 @@ else
SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
fi
-MUSL_PATCHSET="systemd-musl-patches-254.3"
+MUSL_PATCHSET="systemd-musl-patches-254.3-r1"
SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
diff --git a/sys-apps/systemd-utils/systemd-utils-254.8-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.8-r1.ebuild
index bbe8dec823b3..ced613ea99e1 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.8-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.8-r1.ebuild
@@ -22,7 +22,7 @@ else
SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
fi
-MUSL_PATCHSET="systemd-musl-patches-254.3"
+MUSL_PATCHSET="systemd-musl-patches-254.3-r1"
SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-04-04 1:07 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2024-04-04 1:07 UTC (permalink / raw
To: gentoo-commits
commit: b7c4eb1b798b791446313398ac949be011aca3a1
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 15:01:52 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 4 01:06:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7c4eb1b
sys-apps/systemd-utils: add workaround for no-multilib
meson.build has some logic to build ia32 EFI binaries on x86_64 if the
toolchain is compatible. Rather than trying to reproduce this logic in
the ebuild, just try to build it and ignore any failures.
If meson.build actually defines the targets but we have some other
compile error, this will move the failure to the install phase instead.
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-255.4.ebuild | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
index a4f60f47e7f3..4c64afbd80c1 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
@@ -253,7 +253,7 @@ multilib_src_configure() {
}
multilib_src_compile() {
- local targets=()
+ local targets=() optional_targets=()
if multilib_is_native_abi; then
if use boot; then
local efi_arch= efi_arch_alt=
@@ -275,7 +275,10 @@ multilib_src_compile() {
src/boot/efi/addon${efi_arch}.efi.stub
)
if [[ -n ${efi_arch_alt} ]]; then
- targets+=(
+ # If we have a multilib toolchain, meson.build will build the
+ # "alt" arch (ia32). There's no easy way to detect this, so try
+ # to build it and ignore failure.
+ optional_targets+=(
src/boot/efi/systemd-boot${efi_arch_alt}.efi
src/boot/efi/linux${efi_arch_alt}.efi.stub
src/boot/efi/addon${efi_arch_alt}.efi.stub
@@ -392,9 +395,12 @@ multilib_src_compile() {
)
fi
fi
- if multilib_is_native_abi || use udev; then
+ if [[ ${#targets[@]} -ne 0 ]]; then
meson_src_compile "${targets[@]}"
fi
+ if [[ ${#optional_targets[@]} -ne 0 ]]; then
+ nonfatal meson_src_compile "${optional_targets[@]}"
+ fi
}
multilib_src_test() {
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-03-26 14:48 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2024-03-26 14:48 UTC (permalink / raw
To: gentoo-commits
commit: b8fd60bd72ca5de86a54da43371aedcd71a9f331
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 14:47:08 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 14:47:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8fd60bd
sys-apps/systemd-utils: fix udev rules targets
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-255.4.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
index d6aeb2a85d2c..b258f5748243 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
@@ -350,9 +350,9 @@ multilib_src_compile() {
rules.d/50-udev-default.rules
rules.d/60-persistent-storage.rules
rules.d/64-btrfs.rules
- rules.d/70-uaccess.rules.in
- rules.d/71-seat.rules.in
- rules.d/73-seat-late.rules.in
+ rules.d/70-uaccess.rules
+ rules.d/71-seat.rules
+ rules.d/73-seat-late.rules
rules.d/99-systemd.rules
)
if use test; then
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-03-24 3:39 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2024-03-24 3:39 UTC (permalink / raw
To: gentoo-commits
commit: e647c4400de997278056385ce91886bf269a5963
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 03:39:32 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 03:39:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e647c440
sys-apps/systemd-utils: drop toolchain-funcs
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-255.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
index 1f1ea4b6508e..d6aeb2a85d2c 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..12} )
QA_PKGCONFIG_VERSION=$(ver_cut 1)
inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-single-r1
-inherit secureboot toolchain-funcs udev
+inherit secureboot udev
DESCRIPTION="Utilities split out from systemd for OpenRC users"
HOMEPAGE="https://systemd.io/"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-03-24 3:38 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2024-03-24 3:38 UTC (permalink / raw
To: gentoo-commits
commit: 9a33ca79da27cb658287ffc6299b32420473d542
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 03:36:57 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 03:37:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a33ca79
sys-apps/systemd-utils: fix tests, install
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-255.4.ebuild | 99 +++++++++++++----------
1 file changed, 55 insertions(+), 44 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
index a92779a24a0c..1f1ea4b6508e 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
@@ -252,25 +252,36 @@ multilib_src_configure() {
fi
}
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
multilib_src_compile() {
local targets=()
if multilib_is_native_abi; then
if use boot; then
+ local efi_arch= efi_arch_alt=
+ case ${CHOST} in
+ aarch64*) efi_arch=aa64 ;;
+ arm*) efi_arch=arm ;;
+ loongarch32*) efi_arch=loongarch32 ;;
+ loongarch64*) efi_arch=loongarch64 ;;
+ riscv32*) efi_arch=riscv32 ;;
+ riscv64*) efi_arch=riscv64 ;;
+ x86_64*) efi_arch=x64 efi_arch_alt=ia32;;
+ i?86*) efi_arch=ia32 ;;
+ esac
targets+=(
bootctl
man/bootctl.1
- src/boot/efi/linux$(efi_arch).efi.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
+ src/boot/efi/systemd-boot${efi_arch}.efi
+ src/boot/efi/linux${efi_arch}.efi.stub
+ src/boot/efi/addon${efi_arch}.efi.stub
)
+ if [[ -n ${efi_arch_alt} ]]; then
+ targets+=(
+ src/boot/efi/systemd-boot${efi_arch_alt}.efi
+ src/boot/efi/linux${efi_arch_alt}.efi.stub
+ src/boot/efi/addon${efi_arch_alt}.efi.stub
+ )
+ fi
+
fi
if use kernel-install; then
targets+=(
@@ -288,6 +299,7 @@ multilib_src_compile() {
if use test; then
targets+=(
systemd-runtest.env
+ test-offline-passwd
)
fi
fi
@@ -308,7 +320,9 @@ multilib_src_compile() {
systemd-hwdb
ata_id
cdrom_id
+ dmi_memory_id
fido_id
+ iocost
mtd_probe
scsi_id
v4l_id
@@ -336,15 +350,24 @@ multilib_src_compile() {
rules.d/50-udev-default.rules
rules.d/60-persistent-storage.rules
rules.d/64-btrfs.rules
+ rules.d/70-uaccess.rules.in
+ rules.d/71-seat.rules.in
+ rules.d/73-seat-late.rules.in
+ rules.d/99-systemd.rules
)
if use test; then
targets+=(
test-fido-id-desc
+ test-link-config-tables
test-udev-builtin
- test-udev-event
+ test-udev-device-thread
+ test-udev-format
+ test-udev-manager
test-udev-node
+ test-udev-rule-runner
+ test-udev-rules
+ test-udev-spawn
test-udev-util
- udev-rule-runner
)
fi
fi
@@ -377,38 +400,27 @@ multilib_src_compile() {
multilib_src_test() {
local tests=()
if multilib_is_native_abi; then
+ if use boot; then
+ tests+=( --suite boot )
+ fi
+ if use kernel-install; then
+ tests+=( --suite kernel-install )
+ fi
if use sysusers; then
- tests+=(
- test-sysusers
- )
+ tests+=( --suite sysusers )
fi
if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles
- test-tmpfile-util
- )
+ tests+=( --suite tmpfiles )
fi
if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
+ tests+=( --suite udev )
fi
fi
if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
+ tests+=( --suite libudev )
fi
if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
+ meson_src_test --no-rebuild "${tests[@]}"
fi
}
@@ -421,11 +433,6 @@ set_rpath() {
}
multilib_src_install() {
- if use udev; then
- meson_install --no-rebuild --tags libudev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
if multilib_is_native_abi; then
exeinto "/usr/$(get_libdir)/systemd"
doexe src/shared/libsystemd-shared-${PV%%.*}.so
@@ -433,8 +440,7 @@ multilib_src_install() {
set_rpath bootctl
dobin bootctl
doman man/bootctl.1
- insinto /usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ meson_install --no-rebuild --tags systemd-boot
fi
if use kernel-install; then
set_rpath kernel-install
@@ -461,8 +467,8 @@ multilib_src_install() {
dosym ../../bin/udevadm /usr/lib/systemd/systemd-udevd
exeinto /usr/lib/udev
- set_rpath {ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
- doexe {ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+ set_rpath {ata_id,cdrom_id,dmi_memory_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
+ doexe {ata_id,cdrom_id,dmi_memory_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
rm -f rules.d/99-systemd.rules
insinto /usr/lib/udev/rules.d
@@ -485,6 +491,11 @@ multilib_src_install() {
doman man/ukify.1
fi
fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
}
multilib_src_install_all() {
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-03-23 19:57 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2024-03-23 19:57 UTC (permalink / raw
To: gentoo-commits
commit: 0c2508ab610aead82cfe95094cb5b64c8cc33e35
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 17:52:33 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 19:57:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c2508ab
sys-apps/systemd-utils: add 255.4
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 2 +
sys-apps/systemd-utils/systemd-utils-255.4.ebuild | 582 ++++++++++++++++++++++
2 files changed, 584 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 8edb8e267613..b5a5d59afb87 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,3 +1,5 @@
DIST systemd-musl-patches-254.3.tar.gz 28640 BLAKE2B 54837f49cdb8cf025e367ad13bab0d0509c2e11ad84d29724bb6baa226c54e0ab97a91035361f66009dd9b1a22f7b3e82f90b1c14adf4aa20d576b9410589d38 SHA512 07d028a57025b2626471d6f48507f2dfc50658db24efaac93bafae9a1d4cdc3ec82e80da426d2a6280c32af2d813565609dab7df5538260ba809b63309a0ffed
+DIST systemd-musl-patches-255.4.tar.gz 31633 BLAKE2B 86fb36fbfa90dfe7d183f3c814600af93a690c7cfefc551cd23e6b8bdc2a48267910f4e5ef119b1b5d8e4e0cb2e6843e1b7147464809febad3085d2c82a728c3 SHA512 86bbb735012ce20bbc0af34ea062e83d6d3adf7883f5710ab00db7188fa6779e8dc361cdac427540042c4cf2f157242e6409ed5fc213c01d06cc13380e0cc95f
DIST systemd-stable-254.10.tar.gz 14428960 BLAKE2B 488c27b9657ec7452f876ab6c18bbfe711f1351afa022801f5a646f2dd1d76d63c17e52e6ebf43b38a76807907287b654a7eaca3afdb0688f5b05839e98ad727 SHA512 0c127d38d0ade8655ae12172c2edbaa8af68bd29f42d965b988d75e74626846ae859bcf0b39b535c9a99ad8c709ad7575ed4d5ea5bc95ce8729e3caafdb32b70
DIST systemd-stable-254.8.tar.gz 14418468 BLAKE2B e5a151ece86e57c7224fc95bda1b4ede1277fce4a2ba28d3605ab0431a2aafe1088f90c49a20e3b53a5b56aeef7c0f1f5da0601db740150f5efdf6eae7bbde80 SHA512 a3f35d9fcafcccd8d9c33ab1047241f226146017be95562a67c7dcc9eeb4b77bded92ad80e92f4767f2bf2009df0172a621d4c54a805e07ed5a5ed03940ec28e
+DIST systemd-stable-255.4.tar.gz 14952427 BLAKE2B 27f5080f83a9e870fbe8e3ebcb500a63c42022f1f96f26f35c76eeeea85dab691291c31ee716cab330b76df5e576910a6a82f51267eff4f766b1d4c304d815c9 SHA512 8a2bde11a55f7f788ba7751789a5e9be6ce9634e88d54e49f6e832c4c49020c6cacaf2a610fe26f92998b0cbf43c6c2150a96b2c0953d23261009f57d71ea979
diff --git a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
new file mode 100644
index 000000000000..8ce20d0734ec
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
@@ -0,0 +1,582 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-single-r1
+inherit secureboot toolchain-funcs udev
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-255.4"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
+REQUIRED_USE="
+ || ( kernel-install tmpfiles sysusers udev )
+ boot? ( kernel-install )
+ ukify? ( boot )
+ ${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ ukify? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep "${PEFILE_DEPEND}")
+ )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ dev-util/patchelf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_cond_dep "
+ dev-python/jinja[\${PYTHON_USEDEP}]
+ dev-python/lxml[\${PYTHON_USEDEP}]
+ boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
+ ukify? ( test? ( ${PEFILE_DEPEND} ) )
+ ")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ )
+
+ if use elibc_musl; then
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ )
+ fi
+ default
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot bootloader)
+ $(meson_native_use_bool kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+ $(meson_native_use_bool ukify)
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ man/bootctl.1
+ src/boot/efi/linux$(efi_arch).efi.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use kernel-install; then
+ targets+=(
+ kernel-install
+ 90-loaderentry.install
+ man/kernel-install.8
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfile-util )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ ata_id
+ cdrom_id
+ fido_id
+ mtd_probe
+ scsi_id
+ v4l_id
+ src/udev/udev.pc
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/60-persistent-storage.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ udev-rule-runner
+ )
+ fi
+ fi
+ if use ukify; then
+ targets+=(
+ ukify
+ 60-ukify.install
+ man/ukify.1
+ )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles
+ test-tmpfile-util
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ meson-multilib_src_install
+}
+
+set_rpath() {
+ patchelf --set-rpath "${EPREFIX}/usr/$(get_libdir)/systemd" "$@" || die "patchelf failed"
+}
+
+multilib_src_install() {
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+ if multilib_is_native_abi; then
+ exeinto "/usr/$(get_libdir)/systemd"
+ doexe src/shared/libsystemd-shared-${PV%%.*}.so
+ if use boot; then
+ set_rpath bootctl
+ dobin bootctl
+ doman man/bootctl.1
+ insinto /usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use kernel-install; then
+ set_rpath kernel-install
+ dobin kernel-install
+ doman man/kernel-install.8
+ exeinto /usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use sysusers; then
+ set_rpath systemd-sysusers
+ dobin systemd-sysusers
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ set_rpath systemd-tmpfiles
+ dobin systemd-tmpfiles
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ set_rpath udevadm systemd-hwdb
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm /usr/lib/systemd/systemd-udevd
+
+ exeinto /usr/lib/udev
+ set_rpath {ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+ doexe {ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ rm -f rules.d/99-systemd.rules
+ insinto /usr/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto /usr/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ doman man/libudev.3
+ doman man/udev_*.3
+ fi
+ if use ukify; then
+ exeinto /usr/lib/systemd
+ doexe ukify
+ doman man/ukify.1
+ fi
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use kernel-install; then
+ exeinto /usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{tmp,x11}.conf
+ doins "${FILESDIR}"/legacy.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto /usr/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto /usr/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto /usr/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use ukify && python_fix_shebang "${ED}"
+ use boot && secureboot_auto_sign
+
+ if use split-usr; then
+ dosym ../usr/lib/systemd /lib/systemd
+ dosym ../usr/lib/udev /lib/udev
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_preinst() {
+ # Migrate /lib/{systemd,udev} to /usr/lib
+ # Symlinks will be installed in the merge phase
+ if use split-usr; then
+ local d
+ for d in systemd udev; do
+ if [[ -e ${EROOT}/lib/${d} && ! -L ${EROOT}/lib/${d} ]]; then
+ cp -rpPT "${EROOT}"/{,usr/}lib/${d} || die
+ rm -r "${EROOT}"/lib/${d} || die
+ fi
+ done
+ fi
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-03-23 19:57 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2024-03-23 19:57 UTC (permalink / raw
To: gentoo-commits
commit: 80ec66195b5a1f8db5fadbed5f3cc19329ce0848
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 19:39:27 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 19:57:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80ec6619
sys-apps/systemd-utils: drop 254.9-r1
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 -
.../systemd-utils/systemd-utils-254.9-r1.ebuild | 583 ---------------------
2 files changed, 584 deletions(-)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 4675d785b8c8..8edb8e267613 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,4 +1,3 @@
DIST systemd-musl-patches-254.3.tar.gz 28640 BLAKE2B 54837f49cdb8cf025e367ad13bab0d0509c2e11ad84d29724bb6baa226c54e0ab97a91035361f66009dd9b1a22f7b3e82f90b1c14adf4aa20d576b9410589d38 SHA512 07d028a57025b2626471d6f48507f2dfc50658db24efaac93bafae9a1d4cdc3ec82e80da426d2a6280c32af2d813565609dab7df5538260ba809b63309a0ffed
DIST systemd-stable-254.10.tar.gz 14428960 BLAKE2B 488c27b9657ec7452f876ab6c18bbfe711f1351afa022801f5a646f2dd1d76d63c17e52e6ebf43b38a76807907287b654a7eaca3afdb0688f5b05839e98ad727 SHA512 0c127d38d0ade8655ae12172c2edbaa8af68bd29f42d965b988d75e74626846ae859bcf0b39b535c9a99ad8c709ad7575ed4d5ea5bc95ce8729e3caafdb32b70
DIST systemd-stable-254.8.tar.gz 14418468 BLAKE2B e5a151ece86e57c7224fc95bda1b4ede1277fce4a2ba28d3605ab0431a2aafe1088f90c49a20e3b53a5b56aeef7c0f1f5da0601db740150f5efdf6eae7bbde80 SHA512 a3f35d9fcafcccd8d9c33ab1047241f226146017be95562a67c7dcc9eeb4b77bded92ad80e92f4767f2bf2009df0172a621d4c54a805e07ed5a5ed03940ec28e
-DIST systemd-stable-254.9.tar.gz 14423806 BLAKE2B ab39c0a00b8451b24b40e39f4bf7ecb912ff23d9cd6f8d30fd0545e895936baa635b1ff63c02a83761682b72f44244aac8338bf6506885c9b07cd0c5247b6693 SHA512 a0300693a044cfe4c76deb0e3e48a927125eb97c3952c07ba68936f1e093c93506d8044b249b534b8e778ade6143b43194f8d6b721a8cd520bc7bb4cb3d3e5c1
diff --git a/sys-apps/systemd-utils/systemd-utils-254.9-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.9-r1.ebuild
deleted file mode 100644
index e0ac974de10f..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-254.9-r1.ebuild
+++ /dev/null
@@ -1,583 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
-inherit python-single-r1 secureboot toolchain-funcs udev
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-254.3"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
-REQUIRED_USE="
- || ( kernel-install tmpfiles sysusers udev )
- boot? ( kernel-install )
- ukify? ( boot )
- ${PYTHON_REQUIRED_USE}
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
-"
-
-PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
-
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- ukify? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep "${PEFILE_DEPEND}")
- )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
- $(python_gen_cond_dep "
- dev-python/jinja[\${PYTHON_USEDEP}]
- dev-python/lxml[\${PYTHON_USEDEP}]
- boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
- ukify? ( test? ( ${PEFILE_DEPEND} ) )
- ")
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
- use boot && secureboot_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
- )
-
- if use elibc_musl; then
- PATCHES+=(
- "${WORKDIR}/${MUSL_PATCHSET}"
- )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot bootloader)
- $(meson_native_use_bool kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
- $(meson_native_use_bool ukify)
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-kernel-install-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- man/bootctl.1
- src/boot/efi/linux$(efi_arch).efi.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use kernel-install; then
- targets+=(
- kernel-install
- 90-loaderentry.install
- man/kernel-install.8
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfile-util )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- man/libudev.3
- man/udev_device_get_syspath.3
- man/udev_device_has_tag.3
- man/udev_device_new_from_syspath.3
- man/udev_enumerate_add_match_subsystem.3
- man/udev_enumerate_new.3
- man/udev_enumerate_scan_devices.3
- man/udev_list_entry.3
- man/udev_monitor_filter_update.3
- man/udev_monitor_new_from_netlink.3
- man/udev_monitor_receive_device.3
- man/udev_new.3
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/60-persistent-storage.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- udev-rule-runner
- )
- fi
- fi
- if use ukify; then
- targets+=(
- ukify
- 60-ukify.install
- man/ukify.1
- )
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfile-util
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl
- doman man/bootctl.1
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use kernel-install; then
- dobin kernel-install
- doman man/kernel-install.8
- # copy the default set of plugins
- cp "${S}/src/kernel-install/"*.install src/kernel-install || die
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- rm -f rules.d/99-systemd.rules
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- doman man/libudev.3
- doman man/udev_*.3
- fi
- if use ukify; then
- exeinto "${rootprefix}"/lib/systemd/
- doexe ukify
- doman man/ukify.1
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{tmp,x11}.conf
- doins "${FILESDIR}"/legacy.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-
- use ukify && python_fix_shebang "${ED}"
- use boot && secureboot_auto_sign
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-
- if use boot; then
- optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
- "sys-kernel/installkernel[systemd-boot]"
- fi
- if use ukify; then
- optfeature "automatically generating an unified kernel image on each kernel installation" \
- "sys-kernel/installkernel[ukify]"
- fi
-}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-03-23 19:57 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2024-03-23 19:57 UTC (permalink / raw
To: gentoo-commits
commit: 55dca8fe4a0bf77e03eb16a5896e93b781c330bc
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 19:54:55 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 19:57:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55dca8fe
sys-apps/systemd-utils: unkeyword 255.4
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-255.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
index 8ce20d0734ec..a92779a24a0c 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-03-23 19:57 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2024-03-23 19:57 UTC (permalink / raw
To: gentoo-commits
commit: 4eb56bda286f2d845477a287d1c69ef1c339b7dd
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 19:37:55 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 19:57:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eb56bda
sys-apps/systemd-utils: fix kernel-install logic
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.10.ebuild | 8 ++++----
sys-apps/systemd-utils/systemd-utils-254.8.ebuild | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.10.ebuild b/sys-apps/systemd-utils/systemd-utils-254.10.ebuild
index e0ac974de10f..93436b880f05 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.10.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.10.ebuild
@@ -446,8 +446,6 @@ multilib_src_install() {
if use kernel-install; then
dobin kernel-install
doman man/kernel-install.8
- # copy the default set of plugins
- cp "${S}/src/kernel-install/"*.install src/kernel-install || die
exeinto usr/lib/kernel/install.d
doexe src/kernel-install/*.install
fi
@@ -503,12 +501,14 @@ multilib_src_install_all() {
einstalldocs
if use boot; then
into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
dobashcomp shell-completion/bash/bootctl
insinto /usr/share/zsh/site-functions
doins shell-completion/zsh/{_bootctl,_kernel-install}
fi
+ if use kernel-install; then
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
if use tmpfiles; then
doinitd "${FILESDIR}"/systemd-tmpfiles-setup
doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
diff --git a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
index af0e5dfe3c6a..b73e1d640a89 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
@@ -446,8 +446,6 @@ multilib_src_install() {
if use kernel-install; then
dobin kernel-install
doman man/kernel-install.8
- # copy the default set of plugins
- cp "${S}/src/kernel-install/"*.install src/kernel-install || die
exeinto usr/lib/kernel/install.d
doexe src/kernel-install/*.install
fi
@@ -504,12 +502,14 @@ multilib_src_install_all() {
einstalldocs
if use boot; then
into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
dobashcomp shell-completion/bash/bootctl
insinto /usr/share/zsh/site-functions
doins shell-completion/zsh/{_bootctl,_kernel-install}
fi
+ if use kernel-install; then
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
if use tmpfiles; then
doinitd "${FILESDIR}"/systemd-tmpfiles-setup
doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-02-28 0:24 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2024-02-28 0:24 UTC (permalink / raw
To: gentoo-commits
commit: a5addf16f477bf3f25d6da9f4e94f030e75f2ca3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 00:23:28 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 00:23:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5addf16
sys-apps/systemd-utils: add 254.10
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-254.10.ebuild | 583 +++++++++++++++++++++
2 files changed, 584 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 6c3789411c3c..4675d785b8c8 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,3 +1,4 @@
DIST systemd-musl-patches-254.3.tar.gz 28640 BLAKE2B 54837f49cdb8cf025e367ad13bab0d0509c2e11ad84d29724bb6baa226c54e0ab97a91035361f66009dd9b1a22f7b3e82f90b1c14adf4aa20d576b9410589d38 SHA512 07d028a57025b2626471d6f48507f2dfc50658db24efaac93bafae9a1d4cdc3ec82e80da426d2a6280c32af2d813565609dab7df5538260ba809b63309a0ffed
+DIST systemd-stable-254.10.tar.gz 14428960 BLAKE2B 488c27b9657ec7452f876ab6c18bbfe711f1351afa022801f5a646f2dd1d76d63c17e52e6ebf43b38a76807907287b654a7eaca3afdb0688f5b05839e98ad727 SHA512 0c127d38d0ade8655ae12172c2edbaa8af68bd29f42d965b988d75e74626846ae859bcf0b39b535c9a99ad8c709ad7575ed4d5ea5bc95ce8729e3caafdb32b70
DIST systemd-stable-254.8.tar.gz 14418468 BLAKE2B e5a151ece86e57c7224fc95bda1b4ede1277fce4a2ba28d3605ab0431a2aafe1088f90c49a20e3b53a5b56aeef7c0f1f5da0601db740150f5efdf6eae7bbde80 SHA512 a3f35d9fcafcccd8d9c33ab1047241f226146017be95562a67c7dcc9eeb4b77bded92ad80e92f4767f2bf2009df0172a621d4c54a805e07ed5a5ed03940ec28e
DIST systemd-stable-254.9.tar.gz 14423806 BLAKE2B ab39c0a00b8451b24b40e39f4bf7ecb912ff23d9cd6f8d30fd0545e895936baa635b1ff63c02a83761682b72f44244aac8338bf6506885c9b07cd0c5247b6693 SHA512 a0300693a044cfe4c76deb0e3e48a927125eb97c3952c07ba68936f1e093c93506d8044b249b534b8e778ade6143b43194f8d6b721a8cd520bc7bb4cb3d3e5c1
diff --git a/sys-apps/systemd-utils/systemd-utils-254.10.ebuild b/sys-apps/systemd-utils/systemd-utils-254.10.ebuild
new file mode 100644
index 000000000000..e0ac974de10f
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-254.10.ebuild
@@ -0,0 +1,583 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
+inherit python-single-r1 secureboot toolchain-funcs udev
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-254.3"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
+REQUIRED_USE="
+ || ( kernel-install tmpfiles sysusers udev )
+ boot? ( kernel-install )
+ ukify? ( boot )
+ ${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ ukify? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep "${PEFILE_DEPEND}")
+ )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_cond_dep "
+ dev-python/jinja[\${PYTHON_USEDEP}]
+ dev-python/lxml[\${PYTHON_USEDEP}]
+ boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
+ ukify? ( test? ( ${PEFILE_DEPEND} ) )
+ ")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
+ )
+
+ if use elibc_musl; then
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot bootloader)
+ $(meson_native_use_bool kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+ $(meson_native_use_bool ukify)
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-kernel-install-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ man/bootctl.1
+ src/boot/efi/linux$(efi_arch).efi.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use kernel-install; then
+ targets+=(
+ kernel-install
+ 90-loaderentry.install
+ man/kernel-install.8
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfile-util )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/60-persistent-storage.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ udev-rule-runner
+ )
+ fi
+ fi
+ if use ukify; then
+ targets+=(
+ ukify
+ 60-ukify.install
+ man/ukify.1
+ )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfile-util
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl
+ doman man/bootctl.1
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use kernel-install; then
+ dobin kernel-install
+ doman man/kernel-install.8
+ # copy the default set of plugins
+ cp "${S}/src/kernel-install/"*.install src/kernel-install || die
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ rm -f rules.d/99-systemd.rules
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ doman man/libudev.3
+ doman man/udev_*.3
+ fi
+ if use ukify; then
+ exeinto "${rootprefix}"/lib/systemd/
+ doexe ukify
+ doman man/ukify.1
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{tmp,x11}.conf
+ doins "${FILESDIR}"/legacy.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use ukify && python_fix_shebang "${ED}"
+ use boot && secureboot_auto_sign
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+
+ if use boot; then
+ optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
+ "sys-kernel/installkernel[systemd-boot]"
+ fi
+ if use ukify; then
+ optfeature "automatically generating an unified kernel image on each kernel installation" \
+ "sys-kernel/installkernel[ukify]"
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-02-20 5:24 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2024-02-20 5:24 UTC (permalink / raw
To: gentoo-commits
commit: 06e1c7d56ffd46b962aeb3b515570161c056393b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 20 05:16:49 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 20 05:16:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06e1c7d5
sys-apps/systemd-utils: drop 254.5-r2, 254.7
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 2 -
.../systemd-utils/systemd-utils-254.5-r2.ebuild | 584 ---------------------
sys-apps/systemd-utils/systemd-utils-254.7.ebuild | 584 ---------------------
3 files changed, 1170 deletions(-)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index aaa440104f2f..6c3789411c3c 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,5 +1,3 @@
DIST systemd-musl-patches-254.3.tar.gz 28640 BLAKE2B 54837f49cdb8cf025e367ad13bab0d0509c2e11ad84d29724bb6baa226c54e0ab97a91035361f66009dd9b1a22f7b3e82f90b1c14adf4aa20d576b9410589d38 SHA512 07d028a57025b2626471d6f48507f2dfc50658db24efaac93bafae9a1d4cdc3ec82e80da426d2a6280c32af2d813565609dab7df5538260ba809b63309a0ffed
-DIST systemd-stable-254.5.tar.gz 14334696 BLAKE2B 2f63d79ae93add69ac0b56dda9f67019340f84692de4da200557b9f5f1f16bebbad42a9a7e2d6ef7420aa37746d2ede0481fd8e39f03a31576c7e4e48e259ce3 SHA512 cac713670216add9e5473e2c86f04da441015e7cc0ac1500b9e1489a435f9b80c4c6ee24e9b22e4c4213a495bc1a0a908925df2045e344a2170d5aea6aafa16c
-DIST systemd-stable-254.7.tar.gz 14411955 BLAKE2B 1213237a001fb0aef8912637f31d7d77888bc2505e1e8d8d295642a547bdebbc3a786eed095694e6a6fe2665d6e8e45e98cd883186eedeb1b4fd73daf2520dcf SHA512 2e859813f1f52fa693631ce43466875ac2ac42e09872011ee52fe4e44727663c3de9f128a47776899423188c1e99ce73a69059426a9356c930e275037d001685
DIST systemd-stable-254.8.tar.gz 14418468 BLAKE2B e5a151ece86e57c7224fc95bda1b4ede1277fce4a2ba28d3605ab0431a2aafe1088f90c49a20e3b53a5b56aeef7c0f1f5da0601db740150f5efdf6eae7bbde80 SHA512 a3f35d9fcafcccd8d9c33ab1047241f226146017be95562a67c7dcc9eeb4b77bded92ad80e92f4767f2bf2009df0172a621d4c54a805e07ed5a5ed03940ec28e
DIST systemd-stable-254.9.tar.gz 14423806 BLAKE2B ab39c0a00b8451b24b40e39f4bf7ecb912ff23d9cd6f8d30fd0545e895936baa635b1ff63c02a83761682b72f44244aac8338bf6506885c9b07cd0c5247b6693 SHA512 a0300693a044cfe4c76deb0e3e48a927125eb97c3952c07ba68936f1e093c93506d8044b249b534b8e778ade6143b43194f8d6b721a8cd520bc7bb4cb3d3e5c1
diff --git a/sys-apps/systemd-utils/systemd-utils-254.5-r2.ebuild b/sys-apps/systemd-utils/systemd-utils-254.5-r2.ebuild
deleted file mode 100644
index af0e5dfe3c6a..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-254.5-r2.ebuild
+++ /dev/null
@@ -1,584 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
-inherit python-single-r1 secureboot toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-254.3"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
-REQUIRED_USE="
- || ( kernel-install tmpfiles sysusers udev )
- boot? ( kernel-install )
- ukify? ( boot )
- ${PYTHON_REQUIRED_USE}
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
-"
-
-PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
-
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- ukify? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep "${PEFILE_DEPEND}")
- )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
- $(python_gen_cond_dep "
- dev-python/jinja[\${PYTHON_USEDEP}]
- dev-python/lxml[\${PYTHON_USEDEP}]
- boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
- ukify? ( test? ( ${PEFILE_DEPEND} ) )
- ")
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
- use boot && secureboot_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
- )
-
- if use elibc_musl; then
- PATCHES+=(
- "${WORKDIR}/${MUSL_PATCHSET}"
- )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot bootloader)
- $(meson_native_use_bool kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
- $(meson_native_use_bool ukify)
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-kernel-install-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- man/bootctl.1
- src/boot/efi/linux$(efi_arch).efi.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use kernel-install; then
- targets+=(
- kernel-install
- 90-loaderentry.install
- man/kernel-install.8
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfile-util )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- man/libudev.3
- man/udev_device_get_syspath.3
- man/udev_device_has_tag.3
- man/udev_device_new_from_syspath.3
- man/udev_enumerate_add_match_subsystem.3
- man/udev_enumerate_new.3
- man/udev_enumerate_scan_devices.3
- man/udev_list_entry.3
- man/udev_monitor_filter_update.3
- man/udev_monitor_new_from_netlink.3
- man/udev_monitor_receive_device.3
- man/udev_new.3
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/60-persistent-storage.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- udev-rule-runner
- )
- fi
- fi
- if use ukify; then
- targets+=(
- ukify
- 60-ukify.install
- man/ukify.1
- )
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfile-util
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl
- doman man/bootctl.1
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use kernel-install; then
- dobin kernel-install
- doman man/kernel-install.8
- # copy the default set of plugins
- cp "${S}/src/kernel-install/"*.install src/kernel-install || die
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- rm -f rules.d/99-systemd.rules
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- doman man/libudev.3
- doman man/udev_*.3
- fi
- if use ukify; then
- exeinto "${rootprefix}"/lib/systemd/
- doexe ukify
- doman man/ukify.1
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{tmp,x11}.conf
- doins "${FILESDIR}"/legacy.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-
- use ukify && python_fix_shebang "${ED}"
- use boot && secureboot_auto_sign
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-
- if use boot; then
- optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
- "sys-kernel/installkernel[systemd-boot]"
- fi
- if use ukify; then
- optfeature "automatically generating an unified kernel image on each kernel installation" \
- "sys-kernel/installkernel[ukify]"
- fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-254.7.ebuild b/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
deleted file mode 100644
index af0e5dfe3c6a..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
+++ /dev/null
@@ -1,584 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
-inherit python-single-r1 secureboot toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-254.3"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
-REQUIRED_USE="
- || ( kernel-install tmpfiles sysusers udev )
- boot? ( kernel-install )
- ukify? ( boot )
- ${PYTHON_REQUIRED_USE}
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
-"
-
-PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
-
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- ukify? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep "${PEFILE_DEPEND}")
- )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
- $(python_gen_cond_dep "
- dev-python/jinja[\${PYTHON_USEDEP}]
- dev-python/lxml[\${PYTHON_USEDEP}]
- boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
- ukify? ( test? ( ${PEFILE_DEPEND} ) )
- ")
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
- use boot && secureboot_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
- )
-
- if use elibc_musl; then
- PATCHES+=(
- "${WORKDIR}/${MUSL_PATCHSET}"
- )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot bootloader)
- $(meson_native_use_bool kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
- $(meson_native_use_bool ukify)
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-kernel-install-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- man/bootctl.1
- src/boot/efi/linux$(efi_arch).efi.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use kernel-install; then
- targets+=(
- kernel-install
- 90-loaderentry.install
- man/kernel-install.8
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfile-util )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- man/libudev.3
- man/udev_device_get_syspath.3
- man/udev_device_has_tag.3
- man/udev_device_new_from_syspath.3
- man/udev_enumerate_add_match_subsystem.3
- man/udev_enumerate_new.3
- man/udev_enumerate_scan_devices.3
- man/udev_list_entry.3
- man/udev_monitor_filter_update.3
- man/udev_monitor_new_from_netlink.3
- man/udev_monitor_receive_device.3
- man/udev_new.3
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/60-persistent-storage.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- udev-rule-runner
- )
- fi
- fi
- if use ukify; then
- targets+=(
- ukify
- 60-ukify.install
- man/ukify.1
- )
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfile-util
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl
- doman man/bootctl.1
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use kernel-install; then
- dobin kernel-install
- doman man/kernel-install.8
- # copy the default set of plugins
- cp "${S}/src/kernel-install/"*.install src/kernel-install || die
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- rm -f rules.d/99-systemd.rules
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- doman man/libudev.3
- doman man/udev_*.3
- fi
- if use ukify; then
- exeinto "${rootprefix}"/lib/systemd/
- doexe ukify
- doman man/ukify.1
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{tmp,x11}.conf
- doins "${FILESDIR}"/legacy.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-
- use ukify && python_fix_shebang "${ED}"
- use boot && secureboot_auto_sign
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-
- if use boot; then
- optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
- "sys-kernel/installkernel[systemd-boot]"
- fi
- if use ukify; then
- optfeature "automatically generating an unified kernel image on each kernel installation" \
- "sys-kernel/installkernel[ukify]"
- fi
-}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-02-06 22:49 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2024-02-06 22:49 UTC (permalink / raw
To: gentoo-commits
commit: 30235e135141bc279499b601e03550274707dfe7
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Feb 6 07:45:35 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 22:49:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30235e13
sys-apps/systemd-utils: remove usr-ldscript support
Per news item 2024-01-05-usr-initramfs, we no longer support this use
case. It is fragile and hacky and leads to bizarre forms of load errors.
The functionality is, despite being called "split-usr", not really about
split-usr at all.
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{systemd-utils-254.9.ebuild => systemd-utils-254.9-r1.ebuild} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.9.ebuild b/sys-apps/systemd-utils/systemd-utils-254.9-r1.ebuild
similarity index 99%
rename from sys-apps/systemd-utils/systemd-utils-254.9.ebuild
rename to sys-apps/systemd-utils/systemd-utils-254.9-r1.ebuild
index 0f7730c67c88..e0ac974de10f 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.9.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.9-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..12} )
QA_PKGCONFIG_VERSION=$(ver_cut 1)
inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
-inherit python-single-r1 secureboot toolchain-funcs udev usr-ldscript
+inherit python-single-r1 secureboot toolchain-funcs udev
DESCRIPTION="Utilities split out from systemd for OpenRC users"
HOMEPAGE="https://systemd.io/"
@@ -494,7 +494,6 @@ multilib_src_install() {
fi
if use udev; then
meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
insinto "/usr/$(get_libdir)/pkgconfig"
doins src/libudev/libudev.pc
fi
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-02-02 6:28 Andrew Ammerlaan
0 siblings, 0 replies; 252+ messages in thread
From: Andrew Ammerlaan @ 2024-02-02 6:28 UTC (permalink / raw
To: gentoo-commits
commit: cd545283333e436e441b7368381e4b0c252fde3a
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 30 12:56:53 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 2 06:16:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd545283
sys-apps/systemd-utils: add installkernel as optfeature
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.5-r2.ebuild | 15 ++++++++++++---
sys-apps/systemd-utils/systemd-utils-254.7.ebuild | 15 ++++++++++++---
sys-apps/systemd-utils/systemd-utils-254.8.ebuild | 13 +++++++++++--
sys-apps/systemd-utils/systemd-utils-254.9.ebuild | 13 +++++++++++--
4 files changed, 46 insertions(+), 10 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.5-r2.ebuild b/sys-apps/systemd-utils/systemd-utils-254.5-r2.ebuild
index d31c70d4444c..af0e5dfe3c6a 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.5-r2.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,8 +6,8 @@ PYTHON_COMPAT=( python3_{10..12} )
QA_PKGCONFIG_VERSION=$(ver_cut 1)
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-single-r1
-inherit secureboot toolchain-funcs udev usr-ldscript
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
+inherit python-single-r1 secureboot toolchain-funcs udev usr-ldscript
DESCRIPTION="Utilities split out from systemd for OpenRC users"
HOMEPAGE="https://systemd.io/"
@@ -572,4 +572,13 @@ pkg_postinst() {
eend $?
udev_reload
fi
+
+ if use boot; then
+ optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
+ "sys-kernel/installkernel[systemd-boot]"
+ fi
+ if use ukify; then
+ optfeature "automatically generating an unified kernel image on each kernel installation" \
+ "sys-kernel/installkernel[ukify]"
+ fi
}
diff --git a/sys-apps/systemd-utils/systemd-utils-254.7.ebuild b/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
index d31c70d4444c..af0e5dfe3c6a 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,8 +6,8 @@ PYTHON_COMPAT=( python3_{10..12} )
QA_PKGCONFIG_VERSION=$(ver_cut 1)
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-single-r1
-inherit secureboot toolchain-funcs udev usr-ldscript
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
+inherit python-single-r1 secureboot toolchain-funcs udev usr-ldscript
DESCRIPTION="Utilities split out from systemd for OpenRC users"
HOMEPAGE="https://systemd.io/"
@@ -572,4 +572,13 @@ pkg_postinst() {
eend $?
udev_reload
fi
+
+ if use boot; then
+ optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
+ "sys-kernel/installkernel[systemd-boot]"
+ fi
+ if use ukify; then
+ optfeature "automatically generating an unified kernel image on each kernel installation" \
+ "sys-kernel/installkernel[ukify]"
+ fi
}
diff --git a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
index e47cf8444027..af0e5dfe3c6a 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
@@ -6,8 +6,8 @@ PYTHON_COMPAT=( python3_{10..12} )
QA_PKGCONFIG_VERSION=$(ver_cut 1)
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-single-r1
-inherit secureboot toolchain-funcs udev usr-ldscript
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
+inherit python-single-r1 secureboot toolchain-funcs udev usr-ldscript
DESCRIPTION="Utilities split out from systemd for OpenRC users"
HOMEPAGE="https://systemd.io/"
@@ -572,4 +572,13 @@ pkg_postinst() {
eend $?
udev_reload
fi
+
+ if use boot; then
+ optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
+ "sys-kernel/installkernel[systemd-boot]"
+ fi
+ if use ukify; then
+ optfeature "automatically generating an unified kernel image on each kernel installation" \
+ "sys-kernel/installkernel[ukify]"
+ fi
}
diff --git a/sys-apps/systemd-utils/systemd-utils-254.9.ebuild b/sys-apps/systemd-utils/systemd-utils-254.9.ebuild
index d51fec657618..0f7730c67c88 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.9.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.9.ebuild
@@ -6,8 +6,8 @@ PYTHON_COMPAT=( python3_{10..12} )
QA_PKGCONFIG_VERSION=$(ver_cut 1)
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-single-r1
-inherit secureboot toolchain-funcs udev usr-ldscript
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
+inherit python-single-r1 secureboot toolchain-funcs udev usr-ldscript
DESCRIPTION="Utilities split out from systemd for OpenRC users"
HOMEPAGE="https://systemd.io/"
@@ -572,4 +572,13 @@ pkg_postinst() {
eend $?
udev_reload
fi
+
+ if use boot; then
+ optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
+ "sys-kernel/installkernel[systemd-boot]"
+ fi
+ if use ukify; then
+ optfeature "automatically generating an unified kernel image on each kernel installation" \
+ "sys-kernel/installkernel[ukify]"
+ fi
}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-01-27 20:06 Ionen Wolkens
0 siblings, 0 replies; 252+ messages in thread
From: Ionen Wolkens @ 2024-01-27 20:06 UTC (permalink / raw
To: gentoo-commits
commit: 9b82fefe21f6d893a92bf708d76819ee7982cfc6
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Sat Jan 27 18:59:15 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 19:48:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b82fefe
sys-apps/systemd-utils: Stabilize 254.8 ppc64, #921962
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
index e5b2f97d5bc3..602aac36d6a6 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-01-27 20:06 Ionen Wolkens
0 siblings, 0 replies; 252+ messages in thread
From: Ionen Wolkens @ 2024-01-27 20:06 UTC (permalink / raw
To: gentoo-commits
commit: 936bdb9b65bc8439110ca9f9e151d48152f325b8
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Sat Jan 27 19:00:59 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 19:48:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=936bdb9b
sys-apps/systemd-utils: Stabilize 254.8 ppc, #921962
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
index 602aac36d6a6..d2f12c5bc9d9 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-01-27 20:06 Ionen Wolkens
0 siblings, 0 replies; 252+ messages in thread
From: Ionen Wolkens @ 2024-01-27 20:06 UTC (permalink / raw
To: gentoo-commits
commit: f321d97dd221effb38b9e03781603663671a7944
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Sat Jan 27 19:04:37 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 19:48:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f321d97d
sys-apps/systemd-utils: Stabilize 254.8 arm, #921962
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
index d2f12c5bc9d9..e47cf8444027 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-01-27 20:06 Ionen Wolkens
0 siblings, 0 replies; 252+ messages in thread
From: Ionen Wolkens @ 2024-01-27 20:06 UTC (permalink / raw
To: gentoo-commits
commit: 204a0f36bd0cc1f96b51a583445df3dfa8a03aae
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Sat Jan 27 18:55:21 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 19:48:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=204a0f36
sys-apps/systemd-utils: Stabilize 254.8 arm64, #921962
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
index d2dfe7825df2..e5b2f97d5bc3 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-01-27 20:06 Ionen Wolkens
0 siblings, 0 replies; 252+ messages in thread
From: Ionen Wolkens @ 2024-01-27 20:06 UTC (permalink / raw
To: gentoo-commits
commit: a7e663bbd5f4fe7f58a8197fd2e886491be0a566
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Sat Jan 27 18:38:42 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 19:48:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7e663bb
sys-apps/systemd-utils: Stabilize 254.8 amd64, #921962
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
index 54602826ce1d..ffde257bc366 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-01-27 20:06 Ionen Wolkens
0 siblings, 0 replies; 252+ messages in thread
From: Ionen Wolkens @ 2024-01-27 20:06 UTC (permalink / raw
To: gentoo-commits
commit: 8b674bad7c4b2371a25fec3241ea1d058ec7699a
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Sat Jan 27 18:40:46 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 19:48:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b674bad
sys-apps/systemd-utils: Stabilize 254.8 sparc, #921962
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
index ffde257bc366..b613cf6e6fcb 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-01-27 20:06 Ionen Wolkens
0 siblings, 0 replies; 252+ messages in thread
From: Ionen Wolkens @ 2024-01-27 20:06 UTC (permalink / raw
To: gentoo-commits
commit: 8605ae814044648d367ef4a8734b95f50e638e08
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Sat Jan 27 18:30:01 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 19:48:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8605ae81
sys-apps/systemd-utils: Stabilize 254.8 hppa, #921962
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.8.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
index a5364fa98930..54602826ce1d 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-01-27 20:06 Ionen Wolkens
0 siblings, 0 replies; 252+ messages in thread
From: Ionen Wolkens @ 2024-01-27 20:06 UTC (permalink / raw
To: gentoo-commits
commit: f1b2c38dbd8379ec26cd4a1311aee711326755f4
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Sat Jan 27 18:42:08 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 19:48:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1b2c38d
sys-apps/systemd-utils: Stabilize 254.8 x86, #921962
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
index b613cf6e6fcb..d2dfe7825df2 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2024-01-25 5:48 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2024-01-25 5:48 UTC (permalink / raw
To: gentoo-commits
commit: 4c28cf0f71859cf6cdae1f5686afb37147fd0d98
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 25 05:47:53 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 25 05:47:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c28cf0f
sys-apps/systemd-utils: add 254.9
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-254.9.ebuild | 575 ++++++++++++++++++++++
2 files changed, 576 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 0a6a2fbe16af..aaa440104f2f 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -2,3 +2,4 @@ DIST systemd-musl-patches-254.3.tar.gz 28640 BLAKE2B 54837f49cdb8cf025e367ad13ba
DIST systemd-stable-254.5.tar.gz 14334696 BLAKE2B 2f63d79ae93add69ac0b56dda9f67019340f84692de4da200557b9f5f1f16bebbad42a9a7e2d6ef7420aa37746d2ede0481fd8e39f03a31576c7e4e48e259ce3 SHA512 cac713670216add9e5473e2c86f04da441015e7cc0ac1500b9e1489a435f9b80c4c6ee24e9b22e4c4213a495bc1a0a908925df2045e344a2170d5aea6aafa16c
DIST systemd-stable-254.7.tar.gz 14411955 BLAKE2B 1213237a001fb0aef8912637f31d7d77888bc2505e1e8d8d295642a547bdebbc3a786eed095694e6a6fe2665d6e8e45e98cd883186eedeb1b4fd73daf2520dcf SHA512 2e859813f1f52fa693631ce43466875ac2ac42e09872011ee52fe4e44727663c3de9f128a47776899423188c1e99ce73a69059426a9356c930e275037d001685
DIST systemd-stable-254.8.tar.gz 14418468 BLAKE2B e5a151ece86e57c7224fc95bda1b4ede1277fce4a2ba28d3605ab0431a2aafe1088f90c49a20e3b53a5b56aeef7c0f1f5da0601db740150f5efdf6eae7bbde80 SHA512 a3f35d9fcafcccd8d9c33ab1047241f226146017be95562a67c7dcc9eeb4b77bded92ad80e92f4767f2bf2009df0172a621d4c54a805e07ed5a5ed03940ec28e
+DIST systemd-stable-254.9.tar.gz 14423806 BLAKE2B ab39c0a00b8451b24b40e39f4bf7ecb912ff23d9cd6f8d30fd0545e895936baa635b1ff63c02a83761682b72f44244aac8338bf6506885c9b07cd0c5247b6693 SHA512 a0300693a044cfe4c76deb0e3e48a927125eb97c3952c07ba68936f1e093c93506d8044b249b534b8e778ade6143b43194f8d6b721a8cd520bc7bb4cb3d3e5c1
diff --git a/sys-apps/systemd-utils/systemd-utils-254.9.ebuild b/sys-apps/systemd-utils/systemd-utils-254.9.ebuild
new file mode 100644
index 000000000000..d51fec657618
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-254.9.ebuild
@@ -0,0 +1,575 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-single-r1
+inherit secureboot toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-254.3"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
+REQUIRED_USE="
+ || ( kernel-install tmpfiles sysusers udev )
+ boot? ( kernel-install )
+ ukify? ( boot )
+ ${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ ukify? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep "${PEFILE_DEPEND}")
+ )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_cond_dep "
+ dev-python/jinja[\${PYTHON_USEDEP}]
+ dev-python/lxml[\${PYTHON_USEDEP}]
+ boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
+ ukify? ( test? ( ${PEFILE_DEPEND} ) )
+ ")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
+ )
+
+ if use elibc_musl; then
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot bootloader)
+ $(meson_native_use_bool kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+ $(meson_native_use_bool ukify)
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-kernel-install-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ man/bootctl.1
+ src/boot/efi/linux$(efi_arch).efi.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use kernel-install; then
+ targets+=(
+ kernel-install
+ 90-loaderentry.install
+ man/kernel-install.8
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfile-util )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/60-persistent-storage.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ udev-rule-runner
+ )
+ fi
+ fi
+ if use ukify; then
+ targets+=(
+ ukify
+ 60-ukify.install
+ man/ukify.1
+ )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfile-util
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl
+ doman man/bootctl.1
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use kernel-install; then
+ dobin kernel-install
+ doman man/kernel-install.8
+ # copy the default set of plugins
+ cp "${S}/src/kernel-install/"*.install src/kernel-install || die
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ rm -f rules.d/99-systemd.rules
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ doman man/libudev.3
+ doman man/udev_*.3
+ fi
+ if use ukify; then
+ exeinto "${rootprefix}"/lib/systemd/
+ doexe ukify
+ doman man/ukify.1
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{tmp,x11}.conf
+ doins "${FILESDIR}"/legacy.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use ukify && python_fix_shebang "${ED}"
+ use boot && secureboot_auto_sign
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-12-28 3:53 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-12-28 3:53 UTC (permalink / raw
To: gentoo-commits
commit: d51d558b033d511b2c72936bb4049a20f980dee7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 03:52:42 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 03:52:42 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d51d558b
sys-apps/systemd-utils: drop 254.6
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 -
sys-apps/systemd-utils/systemd-utils-254.6.ebuild | 575 ----------------------
2 files changed, 576 deletions(-)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 0b607cc10114..0a6a2fbe16af 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,5 +1,4 @@
DIST systemd-musl-patches-254.3.tar.gz 28640 BLAKE2B 54837f49cdb8cf025e367ad13bab0d0509c2e11ad84d29724bb6baa226c54e0ab97a91035361f66009dd9b1a22f7b3e82f90b1c14adf4aa20d576b9410589d38 SHA512 07d028a57025b2626471d6f48507f2dfc50658db24efaac93bafae9a1d4cdc3ec82e80da426d2a6280c32af2d813565609dab7df5538260ba809b63309a0ffed
DIST systemd-stable-254.5.tar.gz 14334696 BLAKE2B 2f63d79ae93add69ac0b56dda9f67019340f84692de4da200557b9f5f1f16bebbad42a9a7e2d6ef7420aa37746d2ede0481fd8e39f03a31576c7e4e48e259ce3 SHA512 cac713670216add9e5473e2c86f04da441015e7cc0ac1500b9e1489a435f9b80c4c6ee24e9b22e4c4213a495bc1a0a908925df2045e344a2170d5aea6aafa16c
-DIST systemd-stable-254.6.tar.gz 14400611 BLAKE2B 5b23131b8aaabcd386ceb9cfb4ba8e7e1c92c454dbcc2dd907fb459f3022cd324cef86d531fe296ad56349602e487544d60900f71e189aadac6ec0a361a382e3 SHA512 3ebb8c2b931d13cf6efa59842d6d7fb84410fee02f5161061900321497d33750e0b88e2366a4234ba1ab0b89b797da0b1f8b577e0924e560cd9914fde83a1e45
DIST systemd-stable-254.7.tar.gz 14411955 BLAKE2B 1213237a001fb0aef8912637f31d7d77888bc2505e1e8d8d295642a547bdebbc3a786eed095694e6a6fe2665d6e8e45e98cd883186eedeb1b4fd73daf2520dcf SHA512 2e859813f1f52fa693631ce43466875ac2ac42e09872011ee52fe4e44727663c3de9f128a47776899423188c1e99ce73a69059426a9356c930e275037d001685
DIST systemd-stable-254.8.tar.gz 14418468 BLAKE2B e5a151ece86e57c7224fc95bda1b4ede1277fce4a2ba28d3605ab0431a2aafe1088f90c49a20e3b53a5b56aeef7c0f1f5da0601db740150f5efdf6eae7bbde80 SHA512 a3f35d9fcafcccd8d9c33ab1047241f226146017be95562a67c7dcc9eeb4b77bded92ad80e92f4767f2bf2009df0172a621d4c54a805e07ed5a5ed03940ec28e
diff --git a/sys-apps/systemd-utils/systemd-utils-254.6.ebuild b/sys-apps/systemd-utils/systemd-utils-254.6.ebuild
deleted file mode 100644
index a5364fa98930..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-254.6.ebuild
+++ /dev/null
@@ -1,575 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-single-r1
-inherit secureboot toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-254.3"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
-REQUIRED_USE="
- || ( kernel-install tmpfiles sysusers udev )
- boot? ( kernel-install )
- ukify? ( boot )
- ${PYTHON_REQUIRED_USE}
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
-"
-
-PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
-
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- ukify? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep "${PEFILE_DEPEND}")
- )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
- $(python_gen_cond_dep "
- dev-python/jinja[\${PYTHON_USEDEP}]
- dev-python/lxml[\${PYTHON_USEDEP}]
- boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
- ukify? ( test? ( ${PEFILE_DEPEND} ) )
- ")
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
- use boot && secureboot_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
- )
-
- if use elibc_musl; then
- PATCHES+=(
- "${WORKDIR}/${MUSL_PATCHSET}"
- )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot bootloader)
- $(meson_native_use_bool kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
- $(meson_native_use_bool ukify)
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-kernel-install-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- man/bootctl.1
- src/boot/efi/linux$(efi_arch).efi.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use kernel-install; then
- targets+=(
- kernel-install
- 90-loaderentry.install
- man/kernel-install.8
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfile-util )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- man/libudev.3
- man/udev_device_get_syspath.3
- man/udev_device_has_tag.3
- man/udev_device_new_from_syspath.3
- man/udev_enumerate_add_match_subsystem.3
- man/udev_enumerate_new.3
- man/udev_enumerate_scan_devices.3
- man/udev_list_entry.3
- man/udev_monitor_filter_update.3
- man/udev_monitor_new_from_netlink.3
- man/udev_monitor_receive_device.3
- man/udev_new.3
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/60-persistent-storage.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- udev-rule-runner
- )
- fi
- fi
- if use ukify; then
- targets+=(
- ukify
- 60-ukify.install
- man/ukify.1
- )
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfile-util
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl
- doman man/bootctl.1
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use kernel-install; then
- dobin kernel-install
- doman man/kernel-install.8
- # copy the default set of plugins
- cp "${S}/src/kernel-install/"*.install src/kernel-install || die
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- rm -f rules.d/99-systemd.rules
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- doman man/libudev.3
- doman man/udev_*.3
- fi
- if use ukify; then
- exeinto "${rootprefix}"/lib/systemd/
- doexe ukify
- doman man/ukify.1
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{tmp,x11}.conf
- doins "${FILESDIR}"/legacy.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-
- use ukify && python_fix_shebang "${ED}"
- use boot && secureboot_auto_sign
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-12-28 3:53 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-12-28 3:53 UTC (permalink / raw
To: gentoo-commits
commit: 1573498d1d7d735a2392c8623d02897da701cae2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 03:52:23 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 03:52:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1573498d
sys-apps/systemd-utils: drop 253.11-r1, 253.12-r1, 253.13
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 4 -
.../systemd-utils/systemd-utils-253.11-r1.ebuild | 549 ---------------------
.../systemd-utils/systemd-utils-253.12-r1.ebuild | 549 ---------------------
sys-apps/systemd-utils/systemd-utils-253.13.ebuild | 549 ---------------------
4 files changed, 1651 deletions(-)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index e88313b09b91..0b607cc10114 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,8 +1,4 @@
-DIST systemd-musl-patches-253.3.tar.gz 28384 BLAKE2B 2736a4ddc36b2ce087c08c57c0b995db2dcf6f82a4ae6f20b07609657bc5ea1e4a12ec78da1576b364e03260577b4f9fc85fae8c0f7497eca564c6fb857e06d8 SHA512 4b556975f25393cbeb5df495267c68edf14bef0f8baae20955151c900f200d1402b54630cab7dd3a69bbb82bef3f7464869222e2022c60faa2311444fa87ec80
DIST systemd-musl-patches-254.3.tar.gz 28640 BLAKE2B 54837f49cdb8cf025e367ad13bab0d0509c2e11ad84d29724bb6baa226c54e0ab97a91035361f66009dd9b1a22f7b3e82f90b1c14adf4aa20d576b9410589d38 SHA512 07d028a57025b2626471d6f48507f2dfc50658db24efaac93bafae9a1d4cdc3ec82e80da426d2a6280c32af2d813565609dab7df5538260ba809b63309a0ffed
-DIST systemd-stable-253.11.tar.gz 12116691 BLAKE2B bb8d95e77ad970ba642346fd0179384258b13b94aacb9f6ff05d4967f5e13d1c709f8b917e485a227fb126e552429c4e302b959eb4697a69dc88b45836c36646 SHA512 0018a544f924725f1e7664bfbee0c66591514c077e97352ae5d8d90b6dccfd4d07b9876f25923afa9782b57cc17b8e9ab34c7ae627998804751ba38e46558af4
-DIST systemd-stable-253.12.tar.gz 12117485 BLAKE2B 8ed9e5a081c59a304698c8194fd15858ec03e44ca55466b4f07af659582abb9648c081d1756439c5d5cc6eb55783be987c1b801fea64e66c0abe8ef1df140f9b SHA512 dd099160932258f7baf541e52ce7181565096f93f9311e4d3f6383c2035ab3d39765a7de03fb99b83e16a79db301558577fb14859ef24f3da548e8806ef95ea2
-DIST systemd-stable-253.13.tar.gz 12183733 BLAKE2B f0cf127f71a0abe2a02f5421816a665602beb210dea62a22a05b2c2a5ff1e043b3c83bf67b868903736faee677075faa855ba4cf58b90e3eed083d7ed984d545 SHA512 7f603884ee8f49729332ca1e681eed03ee4936f66f96ae8b4e13fcaca2d0d3b8fb8850551f8eb0ca248ce841a8430983680d29399ce911900d3b9bfcbb67faaa
DIST systemd-stable-254.5.tar.gz 14334696 BLAKE2B 2f63d79ae93add69ac0b56dda9f67019340f84692de4da200557b9f5f1f16bebbad42a9a7e2d6ef7420aa37746d2ede0481fd8e39f03a31576c7e4e48e259ce3 SHA512 cac713670216add9e5473e2c86f04da441015e7cc0ac1500b9e1489a435f9b80c4c6ee24e9b22e4c4213a495bc1a0a908925df2045e344a2170d5aea6aafa16c
DIST systemd-stable-254.6.tar.gz 14400611 BLAKE2B 5b23131b8aaabcd386ceb9cfb4ba8e7e1c92c454dbcc2dd907fb459f3022cd324cef86d531fe296ad56349602e487544d60900f71e189aadac6ec0a361a382e3 SHA512 3ebb8c2b931d13cf6efa59842d6d7fb84410fee02f5161061900321497d33750e0b88e2366a4234ba1ab0b89b797da0b1f8b577e0924e560cd9914fde83a1e45
DIST systemd-stable-254.7.tar.gz 14411955 BLAKE2B 1213237a001fb0aef8912637f31d7d77888bc2505e1e8d8d295642a547bdebbc3a786eed095694e6a6fe2665d6e8e45e98cd883186eedeb1b4fd73daf2520dcf SHA512 2e859813f1f52fa693631ce43466875ac2ac42e09872011ee52fe4e44727663c3de9f128a47776899423188c1e99ce73a69059426a9356c930e275037d001685
diff --git a/sys-apps/systemd-utils/systemd-utils-253.11-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-253.11-r1.ebuild
deleted file mode 100644
index 7499ad4455ec..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-253.11-r1.ebuild
+++ /dev/null
@@ -1,549 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
-inherit secureboot toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-253.3"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
- boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
- python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
- use boot && secureboot_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- )
-
- if use elibc_musl; then
- # Applied upstream
- rm "${WORKDIR}/${MUSL_PATCHSET}/0015-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch" || die
- PATCHES+=(
- "${WORKDIR}/${MUSL_PATCHSET}"
- )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool boot kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- kernel-install
- man/bootctl.1
- man/kernel-install.8
- 90-loaderentry.install
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- man/libudev.3
- man/udev_device_get_syspath.3
- man/udev_device_has_tag.3
- man/udev_device_new_from_syspath.3
- man/udev_enumerate_add_match_subsystem.3
- man/udev_enumerate_new.3
- man/udev_enumerate_scan_devices.3
- man/udev_list_entry.3
- man/udev_monitor_filter_update.3
- man/udev_monitor_new_from_netlink.3
- man/udev_monitor_receive_device.3
- man/udev_new.3
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl kernel-install
- doman man/{bootctl.1,kernel-install.8}
- # 90-loaderentry.install is generated from 90-loaderentry.install.in
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- doman man/libudev.3
- doman man/udev_*.3
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{tmp,x11}.conf
- doins "${FILESDIR}"/legacy.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-
- use boot && secureboot_auto_sign
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-253.12-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-253.12-r1.ebuild
deleted file mode 100644
index 636ecc7b503e..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-253.12-r1.ebuild
+++ /dev/null
@@ -1,549 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
-inherit secureboot toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-253.3"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
- boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
- python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
- use boot && secureboot_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- )
-
- if use elibc_musl; then
- # Applied upstream
- rm "${WORKDIR}/${MUSL_PATCHSET}/0015-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch" || die
- PATCHES+=(
- "${WORKDIR}/${MUSL_PATCHSET}"
- )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool boot kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- kernel-install
- man/bootctl.1
- man/kernel-install.8
- 90-loaderentry.install
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- man/libudev.3
- man/udev_device_get_syspath.3
- man/udev_device_has_tag.3
- man/udev_device_new_from_syspath.3
- man/udev_enumerate_add_match_subsystem.3
- man/udev_enumerate_new.3
- man/udev_enumerate_scan_devices.3
- man/udev_list_entry.3
- man/udev_monitor_filter_update.3
- man/udev_monitor_new_from_netlink.3
- man/udev_monitor_receive_device.3
- man/udev_new.3
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl kernel-install
- doman man/{bootctl.1,kernel-install.8}
- # 90-loaderentry.install is generated from 90-loaderentry.install.in
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- doman man/libudev.3
- doman man/udev_*.3
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{tmp,x11}.conf
- doins "${FILESDIR}"/legacy.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-
- use boot && secureboot_auto_sign
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-253.13.ebuild b/sys-apps/systemd-utils/systemd-utils-253.13.ebuild
deleted file mode 100644
index 636ecc7b503e..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-253.13.ebuild
+++ /dev/null
@@ -1,549 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
-inherit secureboot toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-253.3"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
- boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
- python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
- use boot && secureboot_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- )
-
- if use elibc_musl; then
- # Applied upstream
- rm "${WORKDIR}/${MUSL_PATCHSET}/0015-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch" || die
- PATCHES+=(
- "${WORKDIR}/${MUSL_PATCHSET}"
- )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool boot kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- kernel-install
- man/bootctl.1
- man/kernel-install.8
- 90-loaderentry.install
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- man/libudev.3
- man/udev_device_get_syspath.3
- man/udev_device_has_tag.3
- man/udev_device_new_from_syspath.3
- man/udev_enumerate_add_match_subsystem.3
- man/udev_enumerate_new.3
- man/udev_enumerate_scan_devices.3
- man/udev_list_entry.3
- man/udev_monitor_filter_update.3
- man/udev_monitor_new_from_netlink.3
- man/udev_monitor_receive_device.3
- man/udev_new.3
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl kernel-install
- doman man/{bootctl.1,kernel-install.8}
- # 90-loaderentry.install is generated from 90-loaderentry.install.in
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- doman man/libudev.3
- doman man/udev_*.3
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{tmp,x11}.conf
- doins "${FILESDIR}"/legacy.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-
- use boot && secureboot_auto_sign
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-12-24 11:58 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-12-24 11:58 UTC (permalink / raw
To: gentoo-commits
commit: fb8ecab9407d58520dd4c4658879f00e52e26d02
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 24 11:56:26 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 24 11:56:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb8ecab9
sys-apps/systemd-utils: add 254.8
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-254.8.ebuild | 575 ++++++++++++++++++++++
2 files changed, 576 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 53faaa37e819..e88313b09b91 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -6,3 +6,4 @@ DIST systemd-stable-253.13.tar.gz 12183733 BLAKE2B f0cf127f71a0abe2a02f5421816a6
DIST systemd-stable-254.5.tar.gz 14334696 BLAKE2B 2f63d79ae93add69ac0b56dda9f67019340f84692de4da200557b9f5f1f16bebbad42a9a7e2d6ef7420aa37746d2ede0481fd8e39f03a31576c7e4e48e259ce3 SHA512 cac713670216add9e5473e2c86f04da441015e7cc0ac1500b9e1489a435f9b80c4c6ee24e9b22e4c4213a495bc1a0a908925df2045e344a2170d5aea6aafa16c
DIST systemd-stable-254.6.tar.gz 14400611 BLAKE2B 5b23131b8aaabcd386ceb9cfb4ba8e7e1c92c454dbcc2dd907fb459f3022cd324cef86d531fe296ad56349602e487544d60900f71e189aadac6ec0a361a382e3 SHA512 3ebb8c2b931d13cf6efa59842d6d7fb84410fee02f5161061900321497d33750e0b88e2366a4234ba1ab0b89b797da0b1f8b577e0924e560cd9914fde83a1e45
DIST systemd-stable-254.7.tar.gz 14411955 BLAKE2B 1213237a001fb0aef8912637f31d7d77888bc2505e1e8d8d295642a547bdebbc3a786eed095694e6a6fe2665d6e8e45e98cd883186eedeb1b4fd73daf2520dcf SHA512 2e859813f1f52fa693631ce43466875ac2ac42e09872011ee52fe4e44727663c3de9f128a47776899423188c1e99ce73a69059426a9356c930e275037d001685
+DIST systemd-stable-254.8.tar.gz 14418468 BLAKE2B e5a151ece86e57c7224fc95bda1b4ede1277fce4a2ba28d3605ab0431a2aafe1088f90c49a20e3b53a5b56aeef7c0f1f5da0601db740150f5efdf6eae7bbde80 SHA512 a3f35d9fcafcccd8d9c33ab1047241f226146017be95562a67c7dcc9eeb4b77bded92ad80e92f4767f2bf2009df0172a621d4c54a805e07ed5a5ed03940ec28e
diff --git a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
new file mode 100644
index 000000000000..a5364fa98930
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
@@ -0,0 +1,575 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-single-r1
+inherit secureboot toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-254.3"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
+REQUIRED_USE="
+ || ( kernel-install tmpfiles sysusers udev )
+ boot? ( kernel-install )
+ ukify? ( boot )
+ ${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ ukify? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep "${PEFILE_DEPEND}")
+ )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_cond_dep "
+ dev-python/jinja[\${PYTHON_USEDEP}]
+ dev-python/lxml[\${PYTHON_USEDEP}]
+ boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
+ ukify? ( test? ( ${PEFILE_DEPEND} ) )
+ ")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
+ )
+
+ if use elibc_musl; then
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot bootloader)
+ $(meson_native_use_bool kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+ $(meson_native_use_bool ukify)
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-kernel-install-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ man/bootctl.1
+ src/boot/efi/linux$(efi_arch).efi.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use kernel-install; then
+ targets+=(
+ kernel-install
+ 90-loaderentry.install
+ man/kernel-install.8
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfile-util )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/60-persistent-storage.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ udev-rule-runner
+ )
+ fi
+ fi
+ if use ukify; then
+ targets+=(
+ ukify
+ 60-ukify.install
+ man/ukify.1
+ )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfile-util
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl
+ doman man/bootctl.1
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use kernel-install; then
+ dobin kernel-install
+ doman man/kernel-install.8
+ # copy the default set of plugins
+ cp "${S}/src/kernel-install/"*.install src/kernel-install || die
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ rm -f rules.d/99-systemd.rules
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ doman man/libudev.3
+ doman man/udev_*.3
+ fi
+ if use ukify; then
+ exeinto "${rootprefix}"/lib/systemd/
+ doexe ukify
+ doman man/ukify.1
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{tmp,x11}.conf
+ doins "${FILESDIR}"/legacy.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use ukify && python_fix_shebang "${ED}"
+ use boot && secureboot_auto_sign
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-12-22 7:27 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-12-22 7:27 UTC (permalink / raw
To: gentoo-commits
commit: 8cc8ff1857acf7a686ef4052acdbc159f749a7fd
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 07:27:02 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 07:27:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cc8ff18
sys-apps/systemd-utils: Stabilize 254.7 arm, #919109
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.7.ebuild b/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
index f5ce21580014..60cff4d6fcd7 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-12-22 7:27 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-12-22 7:27 UTC (permalink / raw
To: gentoo-commits
commit: 14e4166a4021290cd761e48d557118510187335c
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 07:26:54 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 07:26:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14e4166a
sys-apps/systemd-utils: Stabilize 254.7 x86, #919109
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.7.ebuild b/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
index f5007f487d2e..f5ce21580014 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-12-22 7:27 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-12-22 7:27 UTC (permalink / raw
To: gentoo-commits
commit: 2b160277a8cef24cb3833b5392f1787a3b497300
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 07:27:07 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 07:27:07 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b160277
sys-apps/systemd-utils: Stabilize 254.7 ppc, #919109
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.7.ebuild b/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
index 60cff4d6fcd7..1d8d61e8d294 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-12-22 7:27 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-12-22 7:27 UTC (permalink / raw
To: gentoo-commits
commit: 51e901c356f5e460841687123da7450cf08e91a2
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 07:27:10 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 07:27:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51e901c3
sys-apps/systemd-utils: Stabilize 254.7 ppc64, #919109
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.7.ebuild b/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
index 1d8d61e8d294..d31c70d4444c 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-12-22 7:27 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-12-22 7:27 UTC (permalink / raw
To: gentoo-commits
commit: fbce7291a917690a6c70d63431fb77d948d138c2
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 07:26:52 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 07:26:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbce7291
sys-apps/systemd-utils: Stabilize 254.7 amd64, #919109
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.7.ebuild b/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
index ae78e4616485..f5007f487d2e 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-12-21 0:07 Ionen Wolkens
0 siblings, 0 replies; 252+ messages in thread
From: Ionen Wolkens @ 2023-12-21 0:07 UTC (permalink / raw
To: gentoo-commits
commit: 080dd426024b050e92ee227416bc40b2b55388b8
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Wed Dec 20 05:35:28 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 23:39:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=080dd426
sys-apps/systemd-utils: Stabilize 254.7 arm64, #919109
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.7.ebuild b/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
index 962ca4fb026d..ae78e4616485 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-12-14 4:15 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-12-14 4:15 UTC (permalink / raw
To: gentoo-commits
commit: 13b83b3996cafc1608587b6571420c4ea97cfae3
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Wed Dec 13 16:04:42 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 04:14:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13b83b39
sys-apps/systemd-utils: Stabilize 254.7 hppa, #919109
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.7.ebuild b/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
index a5364fa98930..1fbc435fac45 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
|| ( kernel-install tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-11-30 4:05 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-11-30 4:05 UTC (permalink / raw
To: gentoo-commits
commit: 8896792af466b7f25719c7492a75ea3fef3e65da
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 30 04:04:39 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 30 04:04:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8896792a
sys-apps/systemd-utils: add 254.7
Closes: https://bugs.gentoo.org/917567
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-254.7.ebuild | 575 ++++++++++++++++++++++
2 files changed, 576 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 393d0cfeb0c0..53faaa37e819 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -5,3 +5,4 @@ DIST systemd-stable-253.12.tar.gz 12117485 BLAKE2B 8ed9e5a081c59a304698c8194fd15
DIST systemd-stable-253.13.tar.gz 12183733 BLAKE2B f0cf127f71a0abe2a02f5421816a665602beb210dea62a22a05b2c2a5ff1e043b3c83bf67b868903736faee677075faa855ba4cf58b90e3eed083d7ed984d545 SHA512 7f603884ee8f49729332ca1e681eed03ee4936f66f96ae8b4e13fcaca2d0d3b8fb8850551f8eb0ca248ce841a8430983680d29399ce911900d3b9bfcbb67faaa
DIST systemd-stable-254.5.tar.gz 14334696 BLAKE2B 2f63d79ae93add69ac0b56dda9f67019340f84692de4da200557b9f5f1f16bebbad42a9a7e2d6ef7420aa37746d2ede0481fd8e39f03a31576c7e4e48e259ce3 SHA512 cac713670216add9e5473e2c86f04da441015e7cc0ac1500b9e1489a435f9b80c4c6ee24e9b22e4c4213a495bc1a0a908925df2045e344a2170d5aea6aafa16c
DIST systemd-stable-254.6.tar.gz 14400611 BLAKE2B 5b23131b8aaabcd386ceb9cfb4ba8e7e1c92c454dbcc2dd907fb459f3022cd324cef86d531fe296ad56349602e487544d60900f71e189aadac6ec0a361a382e3 SHA512 3ebb8c2b931d13cf6efa59842d6d7fb84410fee02f5161061900321497d33750e0b88e2366a4234ba1ab0b89b797da0b1f8b577e0924e560cd9914fde83a1e45
+DIST systemd-stable-254.7.tar.gz 14411955 BLAKE2B 1213237a001fb0aef8912637f31d7d77888bc2505e1e8d8d295642a547bdebbc3a786eed095694e6a6fe2665d6e8e45e98cd883186eedeb1b4fd73daf2520dcf SHA512 2e859813f1f52fa693631ce43466875ac2ac42e09872011ee52fe4e44727663c3de9f128a47776899423188c1e99ce73a69059426a9356c930e275037d001685
diff --git a/sys-apps/systemd-utils/systemd-utils-254.7.ebuild b/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
new file mode 100644
index 000000000000..a5364fa98930
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
@@ -0,0 +1,575 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-single-r1
+inherit secureboot toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-254.3"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
+REQUIRED_USE="
+ || ( kernel-install tmpfiles sysusers udev )
+ boot? ( kernel-install )
+ ukify? ( boot )
+ ${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ ukify? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep "${PEFILE_DEPEND}")
+ )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_cond_dep "
+ dev-python/jinja[\${PYTHON_USEDEP}]
+ dev-python/lxml[\${PYTHON_USEDEP}]
+ boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
+ ukify? ( test? ( ${PEFILE_DEPEND} ) )
+ ")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
+ )
+
+ if use elibc_musl; then
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot bootloader)
+ $(meson_native_use_bool kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+ $(meson_native_use_bool ukify)
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-kernel-install-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ man/bootctl.1
+ src/boot/efi/linux$(efi_arch).efi.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use kernel-install; then
+ targets+=(
+ kernel-install
+ 90-loaderentry.install
+ man/kernel-install.8
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfile-util )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/60-persistent-storage.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ udev-rule-runner
+ )
+ fi
+ fi
+ if use ukify; then
+ targets+=(
+ ukify
+ 60-ukify.install
+ man/ukify.1
+ )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfile-util
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl
+ doman man/bootctl.1
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use kernel-install; then
+ dobin kernel-install
+ doman man/kernel-install.8
+ # copy the default set of plugins
+ cp "${S}/src/kernel-install/"*.install src/kernel-install || die
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ rm -f rules.d/99-systemd.rules
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ doman man/libudev.3
+ doman man/udev_*.3
+ fi
+ if use ukify; then
+ exeinto "${rootprefix}"/lib/systemd/
+ doexe ukify
+ doman man/ukify.1
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{tmp,x11}.conf
+ doins "${FILESDIR}"/legacy.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use ukify && python_fix_shebang "${ED}"
+ use boot && secureboot_auto_sign
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-11-10 21:26 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-11-10 21:26 UTC (permalink / raw
To: gentoo-commits
commit: b24712876b5f1c492af847635e3fcd7d9829edab
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 10 21:25:38 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 10 21:25:43 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2471287
sys-apps/systemd-utils: add 254.6
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-254.6.ebuild | 575 ++++++++++++++++++++++
2 files changed, 576 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 3ce26be25472..393d0cfeb0c0 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -4,3 +4,4 @@ DIST systemd-stable-253.11.tar.gz 12116691 BLAKE2B bb8d95e77ad970ba642346fd01793
DIST systemd-stable-253.12.tar.gz 12117485 BLAKE2B 8ed9e5a081c59a304698c8194fd15858ec03e44ca55466b4f07af659582abb9648c081d1756439c5d5cc6eb55783be987c1b801fea64e66c0abe8ef1df140f9b SHA512 dd099160932258f7baf541e52ce7181565096f93f9311e4d3f6383c2035ab3d39765a7de03fb99b83e16a79db301558577fb14859ef24f3da548e8806ef95ea2
DIST systemd-stable-253.13.tar.gz 12183733 BLAKE2B f0cf127f71a0abe2a02f5421816a665602beb210dea62a22a05b2c2a5ff1e043b3c83bf67b868903736faee677075faa855ba4cf58b90e3eed083d7ed984d545 SHA512 7f603884ee8f49729332ca1e681eed03ee4936f66f96ae8b4e13fcaca2d0d3b8fb8850551f8eb0ca248ce841a8430983680d29399ce911900d3b9bfcbb67faaa
DIST systemd-stable-254.5.tar.gz 14334696 BLAKE2B 2f63d79ae93add69ac0b56dda9f67019340f84692de4da200557b9f5f1f16bebbad42a9a7e2d6ef7420aa37746d2ede0481fd8e39f03a31576c7e4e48e259ce3 SHA512 cac713670216add9e5473e2c86f04da441015e7cc0ac1500b9e1489a435f9b80c4c6ee24e9b22e4c4213a495bc1a0a908925df2045e344a2170d5aea6aafa16c
+DIST systemd-stable-254.6.tar.gz 14400611 BLAKE2B 5b23131b8aaabcd386ceb9cfb4ba8e7e1c92c454dbcc2dd907fb459f3022cd324cef86d531fe296ad56349602e487544d60900f71e189aadac6ec0a361a382e3 SHA512 3ebb8c2b931d13cf6efa59842d6d7fb84410fee02f5161061900321497d33750e0b88e2366a4234ba1ab0b89b797da0b1f8b577e0924e560cd9914fde83a1e45
diff --git a/sys-apps/systemd-utils/systemd-utils-254.6.ebuild b/sys-apps/systemd-utils/systemd-utils-254.6.ebuild
new file mode 100644
index 000000000000..a5364fa98930
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-254.6.ebuild
@@ -0,0 +1,575 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-single-r1
+inherit secureboot toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-254.3"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
+REQUIRED_USE="
+ || ( kernel-install tmpfiles sysusers udev )
+ boot? ( kernel-install )
+ ukify? ( boot )
+ ${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ ukify? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep "${PEFILE_DEPEND}")
+ )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_cond_dep "
+ dev-python/jinja[\${PYTHON_USEDEP}]
+ dev-python/lxml[\${PYTHON_USEDEP}]
+ boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
+ ukify? ( test? ( ${PEFILE_DEPEND} ) )
+ ")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
+ )
+
+ if use elibc_musl; then
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot bootloader)
+ $(meson_native_use_bool kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+ $(meson_native_use_bool ukify)
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-kernel-install-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ man/bootctl.1
+ src/boot/efi/linux$(efi_arch).efi.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use kernel-install; then
+ targets+=(
+ kernel-install
+ 90-loaderentry.install
+ man/kernel-install.8
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfile-util )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/60-persistent-storage.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ udev-rule-runner
+ )
+ fi
+ fi
+ if use ukify; then
+ targets+=(
+ ukify
+ 60-ukify.install
+ man/ukify.1
+ )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfile-util
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl
+ doman man/bootctl.1
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use kernel-install; then
+ dobin kernel-install
+ doman man/kernel-install.8
+ # copy the default set of plugins
+ cp "${S}/src/kernel-install/"*.install src/kernel-install || die
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ rm -f rules.d/99-systemd.rules
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ doman man/libudev.3
+ doman man/udev_*.3
+ fi
+ if use ukify; then
+ exeinto "${rootprefix}"/lib/systemd/
+ doexe ukify
+ doman man/ukify.1
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{tmp,x11}.conf
+ doins "${FILESDIR}"/legacy.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use ukify && python_fix_shebang "${ED}"
+ use boot && secureboot_auto_sign
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-11-10 21:26 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-11-10 21:26 UTC (permalink / raw
To: gentoo-commits
commit: 52d3961d812d58904ffc8daf1cd058ce91787072
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 10 21:23:37 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 10 21:25:43 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52d3961d
sys-apps/systemd-utils: add 253.13
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-253.13.ebuild | 549 +++++++++++++++++++++
2 files changed, 550 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 0f97dbfb3b42..3ce26be25472 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -2,4 +2,5 @@ DIST systemd-musl-patches-253.3.tar.gz 28384 BLAKE2B 2736a4ddc36b2ce087c08c57c0b
DIST systemd-musl-patches-254.3.tar.gz 28640 BLAKE2B 54837f49cdb8cf025e367ad13bab0d0509c2e11ad84d29724bb6baa226c54e0ab97a91035361f66009dd9b1a22f7b3e82f90b1c14adf4aa20d576b9410589d38 SHA512 07d028a57025b2626471d6f48507f2dfc50658db24efaac93bafae9a1d4cdc3ec82e80da426d2a6280c32af2d813565609dab7df5538260ba809b63309a0ffed
DIST systemd-stable-253.11.tar.gz 12116691 BLAKE2B bb8d95e77ad970ba642346fd0179384258b13b94aacb9f6ff05d4967f5e13d1c709f8b917e485a227fb126e552429c4e302b959eb4697a69dc88b45836c36646 SHA512 0018a544f924725f1e7664bfbee0c66591514c077e97352ae5d8d90b6dccfd4d07b9876f25923afa9782b57cc17b8e9ab34c7ae627998804751ba38e46558af4
DIST systemd-stable-253.12.tar.gz 12117485 BLAKE2B 8ed9e5a081c59a304698c8194fd15858ec03e44ca55466b4f07af659582abb9648c081d1756439c5d5cc6eb55783be987c1b801fea64e66c0abe8ef1df140f9b SHA512 dd099160932258f7baf541e52ce7181565096f93f9311e4d3f6383c2035ab3d39765a7de03fb99b83e16a79db301558577fb14859ef24f3da548e8806ef95ea2
+DIST systemd-stable-253.13.tar.gz 12183733 BLAKE2B f0cf127f71a0abe2a02f5421816a665602beb210dea62a22a05b2c2a5ff1e043b3c83bf67b868903736faee677075faa855ba4cf58b90e3eed083d7ed984d545 SHA512 7f603884ee8f49729332ca1e681eed03ee4936f66f96ae8b4e13fcaca2d0d3b8fb8850551f8eb0ca248ce841a8430983680d29399ce911900d3b9bfcbb67faaa
DIST systemd-stable-254.5.tar.gz 14334696 BLAKE2B 2f63d79ae93add69ac0b56dda9f67019340f84692de4da200557b9f5f1f16bebbad42a9a7e2d6ef7420aa37746d2ede0481fd8e39f03a31576c7e4e48e259ce3 SHA512 cac713670216add9e5473e2c86f04da441015e7cc0ac1500b9e1489a435f9b80c4c6ee24e9b22e4c4213a495bc1a0a908925df2045e344a2170d5aea6aafa16c
diff --git a/sys-apps/systemd-utils/systemd-utils-253.13.ebuild b/sys-apps/systemd-utils/systemd-utils-253.13.ebuild
new file mode 100644
index 000000000000..636ecc7b503e
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-253.13.ebuild
@@ -0,0 +1,549 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
+inherit secureboot toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-253.3"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+ boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ )
+
+ if use elibc_musl; then
+ # Applied upstream
+ rm "${WORKDIR}/${MUSL_PATCHSET}/0015-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch" || die
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool boot kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ 90-loaderentry.install
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ # 90-loaderentry.install is generated from 90-loaderentry.install.in
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ doman man/libudev.3
+ doman man/udev_*.3
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{tmp,x11}.conf
+ doins "${FILESDIR}"/legacy.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use boot && secureboot_auto_sign
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-11-09 7:29 Andrew Ammerlaan
0 siblings, 0 replies; 252+ messages in thread
From: Andrew Ammerlaan @ 2023-11-09 7:29 UTC (permalink / raw
To: gentoo-commits
commit: f1e66ba9be4868b666298e8d96f423d9465aab65
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 8 12:06:47 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Nov 9 07:27:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1e66ba9
sys-apps/systemd-utils: add USE=kernel-install,ukify
AFAIK there is no reason why we could not use systemd's
kernel-install with other bootloaders then systemd-boot.
The systemd version of kernel-install has the advantage
that its behaviour can be customized with plugins. This
is the first step to make it possible to use Gentoo's
dist-kernels with initrd generators other then Dracut.
Previously it was not possible to use ukify with systemd-utils,
we now also add a flag for this.
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-apps/systemd-utils/metadata.xml | 2 +
...4.5-r1.ebuild => systemd-utils-254.5-r2.ebuild} | 56 +++++++++++++++-------
2 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/sys-apps/systemd-utils/metadata.xml b/sys-apps/systemd-utils/metadata.xml
index a5585a7ca034..e2af023a5096 100644
--- a/sys-apps/systemd-utils/metadata.xml
+++ b/sys-apps/systemd-utils/metadata.xml
@@ -6,10 +6,12 @@
</maintainer>
<use>
<flag name="boot">Enable systemd-boot (UEFI boot manager)</flag>
+ <flag name="kernel-install">Enable kernel-install</flag>
<flag name="kmod">Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag>
<flag name="sysusers">Enable systemd-sysusers</flag>
<flag name="tmpfiles">Enable systemd-tmpfiles</flag>
<flag name="udev">Enable systemd-udev (userspace device manager)</flag>
+ <flag name="ukify">Enable systemd-ukify</flag>
</use>
<upstream>
<remote-id type="github">systemd/systemd</remote-id>
diff --git a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.5-r2.ebuild
similarity index 92%
rename from sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
rename to sys-apps/systemd-utils/systemd-utils-254.5-r2.ebuild
index 12e727d7e3fa..d31c70d4444c 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.5-r2.ebuild
@@ -28,9 +28,11 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
REQUIRED_USE="
- || ( boot tmpfiles sysusers udev )
+ || ( kernel-install tmpfiles sysusers udev )
+ boot? ( kernel-install )
+ ukify? ( boot )
${PYTHON_REQUIRED_USE}
"
RESTRICT="!test? ( test )"
@@ -61,8 +63,8 @@ DEPEND="${COMMON_DEPEND}
PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
RDEPEND="${COMMON_DEPEND}
- boot? (
- !<sys-boot/systemd-boot-250
+ boot? ( !<sys-boot/systemd-boot-250 )
+ ukify? (
${PYTHON_DEPS}
$(python_gen_cond_dep "${PEFILE_DEPEND}")
)
@@ -105,10 +107,8 @@ BDEPEND="
$(python_gen_cond_dep "
dev-python/jinja[\${PYTHON_USEDEP}]
dev-python/lxml[\${PYTHON_USEDEP}]
- boot? (
- >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
- test? ( ${PEFILE_DEPEND} )
- )
+ boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
+ ukify? ( test? ( ${PEFILE_DEPEND} ) )
")
"
@@ -159,11 +159,13 @@ multilib_src_configure() {
-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-Dsysvinit-path=
$(meson_native_use_bool boot bootloader)
+ $(meson_native_use_bool kernel-install)
$(meson_native_use_bool selinux)
$(meson_native_use_bool sysusers)
$(meson_use test tests)
$(meson_native_use_bool tmpfiles)
$(meson_use udev hwdb)
+ $(meson_native_use_bool ukify)
# Link staticly with libsystemd-shared
-Dlink-boot-shared=false
@@ -282,14 +284,18 @@ multilib_src_compile() {
if use boot; then
targets+=(
bootctl
- kernel-install
man/bootctl.1
- man/kernel-install.8
- 90-loaderentry.install
src/boot/efi/linux$(efi_arch).efi.stub
src/boot/efi/systemd-boot$(efi_arch).efi
)
fi
+ if use kernel-install; then
+ targets+=(
+ kernel-install
+ 90-loaderentry.install
+ man/kernel-install.8
+ )
+ fi
if use sysusers; then
targets+=(
systemd-sysusers.standalone
@@ -359,6 +365,13 @@ multilib_src_compile() {
)
fi
fi
+ if use ukify; then
+ targets+=(
+ ukify
+ 60-ukify.install
+ man/ukify.1
+ )
+ fi
fi
if use udev; then
targets+=(
@@ -425,14 +438,19 @@ multilib_src_install() {
if multilib_is_native_abi; then
if use boot; then
into /usr
- dobin bootctl kernel-install
- doman man/{bootctl.1,kernel-install.8}
- # 90-loaderentry.install is generated from 90-loaderentry.install.in
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
+ dobin bootctl
+ doman man/bootctl.1
insinto usr/lib/systemd/boot/efi
doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
fi
+ if use kernel-install; then
+ dobin kernel-install
+ doman man/kernel-install.8
+ # copy the default set of plugins
+ cp "${S}/src/kernel-install/"*.install src/kernel-install || die
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ fi
if use sysusers; then
into "${rootprefix:-/}"
newbin systemd-sysusers{.standalone,}
@@ -468,6 +486,11 @@ multilib_src_install() {
doman man/libudev.3
doman man/udev_*.3
fi
+ if use ukify; then
+ exeinto "${rootprefix}"/lib/systemd/
+ doexe ukify
+ doman man/ukify.1
+ fi
fi
if use udev; then
meson_install --no-rebuild --tags libudev
@@ -524,6 +547,7 @@ multilib_src_install_all() {
doins shell-completion/zsh/_udevadm
fi
+ use ukify && python_fix_shebang "${ED}"
use boot && secureboot_auto_sign
}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-10-24 19:34 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-10-24 19:34 UTC (permalink / raw
To: gentoo-commits
commit: 82902069d3120cd86e36f48fd0296e40892f81f6
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 19:34:10 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 19:34:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82902069
sys-apps/systemd-utils: Stabilize 254.5-r1 amd64, #916073
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
index 9916ee96b58c..d97ccb49374e 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="
|| ( boot tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-10-24 19:34 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-10-24 19:34 UTC (permalink / raw
To: gentoo-commits
commit: 50ec843d408ce4d87c51a376f9b5fb006e8da76f
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 19:34:22 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 19:34:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50ec843d
sys-apps/systemd-utils: Stabilize 254.5-r1 arm, #916073
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
index a6f3a7f6751e..bc8e812b1736 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="
|| ( boot tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-10-24 19:34 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-10-24 19:34 UTC (permalink / raw
To: gentoo-commits
commit: 7fb3b5309f6e263b5862a5fc4000cbc3265cdfee
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 19:34:16 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 19:34:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fb3b530
sys-apps/systemd-utils: Stabilize 254.5-r1 ppc, #916073
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
index e8af7d311b4d..3e3abdf89a88 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="
|| ( boot tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-10-24 19:34 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-10-24 19:34 UTC (permalink / raw
To: gentoo-commits
commit: ab12cfb9303267a1e5ec5ab2edb2b215728bc823
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 19:34:25 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 19:34:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab12cfb9
sys-apps/systemd-utils: Stabilize 254.5-r1 arm64, #916073
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
index bc8e812b1736..3919a7e3b672 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="
|| ( boot tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-10-24 19:34 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-10-24 19:34 UTC (permalink / raw
To: gentoo-commits
commit: e219f22f03974b3b36cd64d5d132fbb371edfff3
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 19:34:31 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 19:34:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e219f22f
sys-apps/systemd-utils: Stabilize 254.5-r1 sparc, #916073
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
index 0470381cb2bb..12e727d7e3fa 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="
|| ( boot tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-10-24 19:34 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-10-24 19:34 UTC (permalink / raw
To: gentoo-commits
commit: 587faaa984a33d8c9128a61524dd8cecd21447fc
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 19:34:28 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 19:34:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=587faaa9
sys-apps/systemd-utils: Stabilize 254.5-r1 hppa, #916073
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
index 3919a7e3b672..0470381cb2bb 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="
|| ( boot tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-10-24 19:34 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-10-24 19:34 UTC (permalink / raw
To: gentoo-commits
commit: c6f47509299af789047f93833c48a4318aeaf1a1
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 19:34:19 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 19:34:19 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6f47509
sys-apps/systemd-utils: Stabilize 254.5-r1 ppc64, #916073
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
index 3e3abdf89a88..a6f3a7f6751e 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="
|| ( boot tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-10-24 19:34 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-10-24 19:34 UTC (permalink / raw
To: gentoo-commits
commit: 329434028292db27e88f73ec9527e458db4ddffb
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 19:34:13 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 19:34:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32943402
sys-apps/systemd-utils: Stabilize 254.5-r1 x86, #916073
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
index d97ccb49374e..e8af7d311b4d 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="
|| ( boot tmpfiles sysusers udev )
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-10-12 20:31 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2023-10-12 20:31 UTC (permalink / raw
To: gentoo-commits
commit: 366c4051d2fd8f572f37ba993c3fea92bd5c17df
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 12 20:30:54 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Oct 12 20:31:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=366c4051
sys-apps/systemd-utils: enable py3.12
Closes: https://bugs.gentoo.org/915630
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
index acd85797cc65..9916ee96b58c 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
QA_PKGCONFIG_VERSION=$(ver_cut 1)
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-10-01 19:12 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2023-10-01 19:12 UTC (permalink / raw
To: gentoo-commits
commit: 35d66e67ccba6342efb8ccaf845a7f9020f01dff
Author: Nathan Du <nathandu <AT> outlook <DOT> com>
AuthorDate: Sun Oct 1 09:35:01 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Oct 1 19:12:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35d66e67
sys-apps/systemd-utils: install libudev man pages
Closes: https://bugs.gentoo.org/915011
Signed-off-by: Nathan Du <nathandu <AT> outlook.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
...-utils-253.11.ebuild => systemd-utils-253.11-r1.ebuild} | 14 ++++++++++++++
...-utils-253.12.ebuild => systemd-utils-253.12-r1.ebuild} | 14 ++++++++++++++
...md-utils-254.5.ebuild => systemd-utils-254.5-r1.ebuild} | 14 ++++++++++++++
3 files changed, 42 insertions(+)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.11.ebuild b/sys-apps/systemd-utils/systemd-utils-253.11-r1.ebuild
similarity index 96%
rename from sys-apps/systemd-utils/systemd-utils-253.11.ebuild
rename to sys-apps/systemd-utils/systemd-utils-253.11-r1.ebuild
index b0af755e370d..de6425e32cf7 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.11-r1.ebuild
@@ -347,6 +347,18 @@ multilib_src_compile() {
targets+=(
udev:shared_library
src/libudev/libudev.pc
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
)
if use test; then
targets+=(
@@ -458,6 +470,8 @@ multilib_src_install() {
gen_usr_ldscript -a udev
insinto "/usr/$(get_libdir)/pkgconfig"
doins src/libudev/libudev.pc
+ doman man/libudev.3
+ doman man/udev_*.3
fi
}
diff --git a/sys-apps/systemd-utils/systemd-utils-253.12.ebuild b/sys-apps/systemd-utils/systemd-utils-253.12-r1.ebuild
similarity index 96%
rename from sys-apps/systemd-utils/systemd-utils-253.12.ebuild
rename to sys-apps/systemd-utils/systemd-utils-253.12-r1.ebuild
index c06d1b1a0d0c..16e6b7cebd76 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.12.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.12-r1.ebuild
@@ -347,6 +347,18 @@ multilib_src_compile() {
targets+=(
udev:shared_library
src/libudev/libudev.pc
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
)
if use test; then
targets+=(
@@ -458,6 +470,8 @@ multilib_src_install() {
gen_usr_ldscript -a udev
insinto "/usr/$(get_libdir)/pkgconfig"
doins src/libudev/libudev.pc
+ doman man/libudev.3
+ doman man/udev_*.3
fi
}
diff --git a/sys-apps/systemd-utils/systemd-utils-254.5.ebuild b/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
similarity index 96%
rename from sys-apps/systemd-utils/systemd-utils-254.5.ebuild
rename to sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
index 849af65cc76c..78bd97986039 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.5.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
@@ -352,6 +352,18 @@ multilib_src_compile() {
targets+=(
udev:shared_library
src/libudev/libudev.pc
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
)
if use test; then
targets+=(
@@ -460,6 +472,8 @@ multilib_src_install() {
gen_usr_ldscript -a udev
insinto "/usr/$(get_libdir)/pkgconfig"
doins src/libudev/libudev.pc
+ doman man/libudev.3
+ doman man/udev_*.3
fi
}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-10-01 19:12 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2023-10-01 19:12 UTC (permalink / raw
To: gentoo-commits
commit: a5e63255fc09e019665714b82053187abbef82dc
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 1 19:10:31 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Oct 1 19:12:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5e63255
sys-apps/systemd-utils: install man pages for native ABI only
Bug: https://bugs.gentoo.org/915011
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../systemd-utils/systemd-utils-253.11-r1.ebuild | 28 +++++++++++-----------
.../systemd-utils/systemd-utils-253.12-r1.ebuild | 28 +++++++++++-----------
.../systemd-utils/systemd-utils-254.5-r1.ebuild | 28 +++++++++++-----------
3 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.11-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-253.11-r1.ebuild
index de6425e32cf7..7499ad4455ec 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.11-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.11-r1.ebuild
@@ -323,6 +323,18 @@ multilib_src_compile() {
man/systemd-hwdb.8
man/systemd-udevd.service.8
man/udevadm.8
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
hwdb.d/60-autosuspend-chromiumos.hwdb
rules.d/50-udev-default.rules
rules.d/64-btrfs.rules
@@ -347,18 +359,6 @@ multilib_src_compile() {
targets+=(
udev:shared_library
src/libudev/libudev.pc
- man/libudev.3
- man/udev_device_get_syspath.3
- man/udev_device_has_tag.3
- man/udev_device_new_from_syspath.3
- man/udev_enumerate_add_match_subsystem.3
- man/udev_enumerate_new.3
- man/udev_enumerate_scan_devices.3
- man/udev_list_entry.3
- man/udev_monitor_filter_update.3
- man/udev_monitor_new_from_netlink.3
- man/udev_monitor_receive_device.3
- man/udev_new.3
)
if use test; then
targets+=(
@@ -463,6 +463,8 @@ multilib_src_install() {
doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
newman man/systemd-udevd.service.8 systemd-udevd.8
+ doman man/libudev.3
+ doman man/udev_*.3
fi
fi
if use udev; then
@@ -470,8 +472,6 @@ multilib_src_install() {
gen_usr_ldscript -a udev
insinto "/usr/$(get_libdir)/pkgconfig"
doins src/libudev/libudev.pc
- doman man/libudev.3
- doman man/udev_*.3
fi
}
diff --git a/sys-apps/systemd-utils/systemd-utils-253.12-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-253.12-r1.ebuild
index 16e6b7cebd76..636ecc7b503e 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.12-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.12-r1.ebuild
@@ -323,6 +323,18 @@ multilib_src_compile() {
man/systemd-hwdb.8
man/systemd-udevd.service.8
man/udevadm.8
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
hwdb.d/60-autosuspend-chromiumos.hwdb
rules.d/50-udev-default.rules
rules.d/64-btrfs.rules
@@ -347,18 +359,6 @@ multilib_src_compile() {
targets+=(
udev:shared_library
src/libudev/libudev.pc
- man/libudev.3
- man/udev_device_get_syspath.3
- man/udev_device_has_tag.3
- man/udev_device_new_from_syspath.3
- man/udev_enumerate_add_match_subsystem.3
- man/udev_enumerate_new.3
- man/udev_enumerate_scan_devices.3
- man/udev_list_entry.3
- man/udev_monitor_filter_update.3
- man/udev_monitor_new_from_netlink.3
- man/udev_monitor_receive_device.3
- man/udev_new.3
)
if use test; then
targets+=(
@@ -463,6 +463,8 @@ multilib_src_install() {
doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
newman man/systemd-udevd.service.8 systemd-udevd.8
+ doman man/libudev.3
+ doman man/udev_*.3
fi
fi
if use udev; then
@@ -470,8 +472,6 @@ multilib_src_install() {
gen_usr_ldscript -a udev
insinto "/usr/$(get_libdir)/pkgconfig"
doins src/libudev/libudev.pc
- doman man/libudev.3
- doman man/udev_*.3
fi
}
diff --git a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
index 78bd97986039..acd85797cc65 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
@@ -331,6 +331,18 @@ multilib_src_compile() {
man/systemd-hwdb.8
man/systemd-udevd.service.8
man/udevadm.8
+ man/libudev.3
+ man/udev_device_get_syspath.3
+ man/udev_device_has_tag.3
+ man/udev_device_new_from_syspath.3
+ man/udev_enumerate_add_match_subsystem.3
+ man/udev_enumerate_new.3
+ man/udev_enumerate_scan_devices.3
+ man/udev_list_entry.3
+ man/udev_monitor_filter_update.3
+ man/udev_monitor_new_from_netlink.3
+ man/udev_monitor_receive_device.3
+ man/udev_new.3
hwdb.d/60-autosuspend-chromiumos.hwdb
rules.d/50-udev-default.rules
rules.d/60-persistent-storage.rules
@@ -352,18 +364,6 @@ multilib_src_compile() {
targets+=(
udev:shared_library
src/libudev/libudev.pc
- man/libudev.3
- man/udev_device_get_syspath.3
- man/udev_device_has_tag.3
- man/udev_device_new_from_syspath.3
- man/udev_enumerate_add_match_subsystem.3
- man/udev_enumerate_new.3
- man/udev_enumerate_scan_devices.3
- man/udev_list_entry.3
- man/udev_monitor_filter_update.3
- man/udev_monitor_new_from_netlink.3
- man/udev_monitor_receive_device.3
- man/udev_new.3
)
if use test; then
targets+=(
@@ -465,6 +465,8 @@ multilib_src_install() {
doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
newman man/systemd-udevd.service.8 systemd-udevd.8
+ doman man/libudev.3
+ doman man/udev_*.3
fi
fi
if use udev; then
@@ -472,8 +474,6 @@ multilib_src_install() {
gen_usr_ldscript -a udev
insinto "/usr/$(get_libdir)/pkgconfig"
doins src/libudev/libudev.pc
- doman man/libudev.3
- doman man/udev_*.3
fi
}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-10-01 19:12 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2023-10-01 19:12 UTC (permalink / raw
To: gentoo-commits
commit: f23e5814d11cdbad2c2ccf3c217cfb91faac343d
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 1 18:20:37 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Oct 1 19:11:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f23e5814
sys-apps/systemd-utils: drop 252.9, 253.6, 254.3, 254.4
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 5 -
sys-apps/systemd-utils/systemd-utils-252.9.ebuild | 525 ---------------------
sys-apps/systemd-utils/systemd-utils-253.6.ebuild | 535 ---------------------
sys-apps/systemd-utils/systemd-utils-254.3.ebuild | 537 ----------------------
sys-apps/systemd-utils/systemd-utils-254.4.ebuild | 537 ----------------------
5 files changed, 2139 deletions(-)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 69128db7529b..0f97dbfb3b42 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,10 +1,5 @@
-DIST systemd-musl-patches-252.4.tar.gz 25053 BLAKE2B 1d75f85ea0c48c788e9199e2d919bac90edce16a9788a349332cf308c32fb9510ac2883f8e09f21e7f37fbac2e557dc39cdf44dcd7a986587c40dedd2d1b5df5 SHA512 1dc8e220eae1869eb4bb50f9c701392542b053099cf9b6bde13f12a2d26fa29984819a8b4ce1b6c57e38a71f86324469a87cf9e22abe0f6d67ac3e84c6b9a3ba
DIST systemd-musl-patches-253.3.tar.gz 28384 BLAKE2B 2736a4ddc36b2ce087c08c57c0b995db2dcf6f82a4ae6f20b07609657bc5ea1e4a12ec78da1576b364e03260577b4f9fc85fae8c0f7497eca564c6fb857e06d8 SHA512 4b556975f25393cbeb5df495267c68edf14bef0f8baae20955151c900f200d1402b54630cab7dd3a69bbb82bef3f7464869222e2022c60faa2311444fa87ec80
DIST systemd-musl-patches-254.3.tar.gz 28640 BLAKE2B 54837f49cdb8cf025e367ad13bab0d0509c2e11ad84d29724bb6baa226c54e0ab97a91035361f66009dd9b1a22f7b3e82f90b1c14adf4aa20d576b9410589d38 SHA512 07d028a57025b2626471d6f48507f2dfc50658db24efaac93bafae9a1d4cdc3ec82e80da426d2a6280c32af2d813565609dab7df5538260ba809b63309a0ffed
-DIST systemd-stable-252.9.tar.gz 11829389 BLAKE2B a45a72bfe113f8cb7424d731692f548c389f59d34b649e874db2f85868943b0a9c33ef62185c83c41a9c220caddd65c44ff328026eff19c3c7efda5efbd73574 SHA512 fa34b9c2f692af8f70dffc5044fe502ff5e21625af5b27cad7fc5e833570b180f53c5d03a0add785e83a5b4e7564117fe4728931df4ef599888c73e92c7f2103
DIST systemd-stable-253.11.tar.gz 12116691 BLAKE2B bb8d95e77ad970ba642346fd0179384258b13b94aacb9f6ff05d4967f5e13d1c709f8b917e485a227fb126e552429c4e302b959eb4697a69dc88b45836c36646 SHA512 0018a544f924725f1e7664bfbee0c66591514c077e97352ae5d8d90b6dccfd4d07b9876f25923afa9782b57cc17b8e9ab34c7ae627998804751ba38e46558af4
DIST systemd-stable-253.12.tar.gz 12117485 BLAKE2B 8ed9e5a081c59a304698c8194fd15858ec03e44ca55466b4f07af659582abb9648c081d1756439c5d5cc6eb55783be987c1b801fea64e66c0abe8ef1df140f9b SHA512 dd099160932258f7baf541e52ce7181565096f93f9311e4d3f6383c2035ab3d39765a7de03fb99b83e16a79db301558577fb14859ef24f3da548e8806ef95ea2
-DIST systemd-stable-253.6.tar.gz 12069024 BLAKE2B 7dfb28127bf6c091180a6cfbae1eb657b99896920cc6b74d1e86586f51bf312d6c2647582a635a479048cadceb0b5ed508918ddff42b2639cec6234a656762f4 SHA512 c81f7ac0cca9073878026d6a3024ebad8bf38c4745fe7bac5a156906ba9fd7b78b90fdc69376821c9927dd60173dd6604684e2ea7dcb55dc2e60a0e20ee01735
-DIST systemd-stable-254.3.tar.gz 14329148 BLAKE2B 10b947e04a4ef9ccaeb7adaa67ac0f391927fb172c0750ffb93d4df69d970fd91f26b052f8bfdfb4f81ae69566d0a3459cbc87cc86b624014cfb8781a2914121 SHA512 a0c361c993ac9a121823bdd58e29ef7bd25ccfd206ae0c3e1eed9833b3ddf24f53afe6f669eb9fbff5078977403236b0e4ef5a5f6fde56c504caed1d411e71fe
-DIST systemd-stable-254.4.tar.gz 14332995 BLAKE2B 2b51ea867e142beeaf332cead5e2daf99b6599a6069d961d19248be2c2b211d25f7e18dd3e1ad2f0588ec121492a1da95e078aa74b7aebed8523ca0512b489ea SHA512 ea2faaa5ba9c8c286c24fba5f47317fa6b26f8678eb1e59c481cf35462b625b605ce18875eaa8cdfdd49ddfeca823e9c571e18bf6df4a62a2421762ab271fb69
DIST systemd-stable-254.5.tar.gz 14334696 BLAKE2B 2f63d79ae93add69ac0b56dda9f67019340f84692de4da200557b9f5f1f16bebbad42a9a7e2d6ef7420aa37746d2ede0481fd8e39f03a31576c7e4e48e259ce3 SHA512 cac713670216add9e5473e2c86f04da441015e7cc0ac1500b9e1489a435f9b80c4c6ee24e9b22e4c4213a495bc1a0a908925df2045e344a2170d5aea6aafa16c
diff --git a/sys-apps/systemd-utils/systemd-utils-252.9.ebuild b/sys-apps/systemd-utils/systemd-utils-252.9.ebuild
deleted file mode 100644
index 88a1650b54c0..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-252.9.ebuild
+++ /dev/null
@@ -1,525 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
-inherit toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-252.4"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
- boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
- python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- local PATCHES=(
- )
-
- if use elibc_musl; then
- PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool boot kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- kernel-install
- man/bootctl.1
- man/kernel-install.8
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl kernel-install
- doman man/{bootctl.1,kernel-install.8}
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{tmp,x11}.conf
- doins "${FILESDIR}"/legacy.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
deleted file mode 100644
index b0af755e370d..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
+++ /dev/null
@@ -1,535 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
-inherit secureboot toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-253.3"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
- boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
- python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
- use boot && secureboot_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- )
-
- if use elibc_musl; then
- # Applied upstream
- rm "${WORKDIR}/${MUSL_PATCHSET}/0015-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch" || die
- PATCHES+=(
- "${WORKDIR}/${MUSL_PATCHSET}"
- )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool boot kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- kernel-install
- man/bootctl.1
- man/kernel-install.8
- 90-loaderentry.install
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl kernel-install
- doman man/{bootctl.1,kernel-install.8}
- # 90-loaderentry.install is generated from 90-loaderentry.install.in
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{tmp,x11}.conf
- doins "${FILESDIR}"/legacy.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-
- use boot && secureboot_auto_sign
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-254.3.ebuild b/sys-apps/systemd-utils/systemd-utils-254.3.ebuild
deleted file mode 100644
index 849af65cc76c..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-254.3.ebuild
+++ /dev/null
@@ -1,537 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-single-r1
-inherit secureboot toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-254.3"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
-REQUIRED_USE="
- || ( boot tmpfiles sysusers udev )
- ${PYTHON_REQUIRED_USE}
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
-"
-
-PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
-
-RDEPEND="${COMMON_DEPEND}
- boot? (
- !<sys-boot/systemd-boot-250
- ${PYTHON_DEPS}
- $(python_gen_cond_dep "${PEFILE_DEPEND}")
- )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
- $(python_gen_cond_dep "
- dev-python/jinja[\${PYTHON_USEDEP}]
- dev-python/lxml[\${PYTHON_USEDEP}]
- boot? (
- >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
- test? ( ${PEFILE_DEPEND} )
- )
- ")
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
- use boot && secureboot_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
- )
-
- if use elibc_musl; then
- PATCHES+=(
- "${WORKDIR}/${MUSL_PATCHSET}"
- )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot bootloader)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-kernel-install-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- kernel-install
- man/bootctl.1
- man/kernel-install.8
- 90-loaderentry.install
- src/boot/efi/linux$(efi_arch).efi.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfile-util )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/60-persistent-storage.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- udev-rule-runner
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfile-util
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl kernel-install
- doman man/{bootctl.1,kernel-install.8}
- # 90-loaderentry.install is generated from 90-loaderentry.install.in
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- rm -f rules.d/99-systemd.rules
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{tmp,x11}.conf
- doins "${FILESDIR}"/legacy.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-
- use boot && secureboot_auto_sign
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-254.4.ebuild b/sys-apps/systemd-utils/systemd-utils-254.4.ebuild
deleted file mode 100644
index 849af65cc76c..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-254.4.ebuild
+++ /dev/null
@@ -1,537 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-single-r1
-inherit secureboot toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-254.3"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
-REQUIRED_USE="
- || ( boot tmpfiles sysusers udev )
- ${PYTHON_REQUIRED_USE}
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
-"
-
-PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
-
-RDEPEND="${COMMON_DEPEND}
- boot? (
- !<sys-boot/systemd-boot-250
- ${PYTHON_DEPS}
- $(python_gen_cond_dep "${PEFILE_DEPEND}")
- )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
- $(python_gen_cond_dep "
- dev-python/jinja[\${PYTHON_USEDEP}]
- dev-python/lxml[\${PYTHON_USEDEP}]
- boot? (
- >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
- test? ( ${PEFILE_DEPEND} )
- )
- ")
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
- use boot && secureboot_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
- )
-
- if use elibc_musl; then
- PATCHES+=(
- "${WORKDIR}/${MUSL_PATCHSET}"
- )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot bootloader)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-kernel-install-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- kernel-install
- man/bootctl.1
- man/kernel-install.8
- 90-loaderentry.install
- src/boot/efi/linux$(efi_arch).efi.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfile-util )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/60-persistent-storage.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- udev-rule-runner
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfile-util
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl kernel-install
- doman man/{bootctl.1,kernel-install.8}
- # 90-loaderentry.install is generated from 90-loaderentry.install.in
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- rm -f rules.d/99-systemd.rules
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{tmp,x11}.conf
- doins "${FILESDIR}"/legacy.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-
- use boot && secureboot_auto_sign
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-09-29 23:08 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-09-29 23:08 UTC (permalink / raw
To: gentoo-commits
commit: 3da39ea3f52fba149b33d9778f085a6d03b669b8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 29 22:49:56 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 29 23:06:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3da39ea3
sys-apps/systemd-utils: add 253.12
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-253.12.ebuild | 535 +++++++++++++++++++++
2 files changed, 536 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 952b06a4ebdc..5e0cb2168a48 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -3,6 +3,7 @@ DIST systemd-musl-patches-253.3.tar.gz 28384 BLAKE2B 2736a4ddc36b2ce087c08c57c0b
DIST systemd-musl-patches-254.3.tar.gz 28640 BLAKE2B 54837f49cdb8cf025e367ad13bab0d0509c2e11ad84d29724bb6baa226c54e0ab97a91035361f66009dd9b1a22f7b3e82f90b1c14adf4aa20d576b9410589d38 SHA512 07d028a57025b2626471d6f48507f2dfc50658db24efaac93bafae9a1d4cdc3ec82e80da426d2a6280c32af2d813565609dab7df5538260ba809b63309a0ffed
DIST systemd-stable-252.9.tar.gz 11829389 BLAKE2B a45a72bfe113f8cb7424d731692f548c389f59d34b649e874db2f85868943b0a9c33ef62185c83c41a9c220caddd65c44ff328026eff19c3c7efda5efbd73574 SHA512 fa34b9c2f692af8f70dffc5044fe502ff5e21625af5b27cad7fc5e833570b180f53c5d03a0add785e83a5b4e7564117fe4728931df4ef599888c73e92c7f2103
DIST systemd-stable-253.11.tar.gz 12116691 BLAKE2B bb8d95e77ad970ba642346fd0179384258b13b94aacb9f6ff05d4967f5e13d1c709f8b917e485a227fb126e552429c4e302b959eb4697a69dc88b45836c36646 SHA512 0018a544f924725f1e7664bfbee0c66591514c077e97352ae5d8d90b6dccfd4d07b9876f25923afa9782b57cc17b8e9ab34c7ae627998804751ba38e46558af4
+DIST systemd-stable-253.12.tar.gz 12117485 BLAKE2B 8ed9e5a081c59a304698c8194fd15858ec03e44ca55466b4f07af659582abb9648c081d1756439c5d5cc6eb55783be987c1b801fea64e66c0abe8ef1df140f9b SHA512 dd099160932258f7baf541e52ce7181565096f93f9311e4d3f6383c2035ab3d39765a7de03fb99b83e16a79db301558577fb14859ef24f3da548e8806ef95ea2
DIST systemd-stable-253.6.tar.gz 12069024 BLAKE2B 7dfb28127bf6c091180a6cfbae1eb657b99896920cc6b74d1e86586f51bf312d6c2647582a635a479048cadceb0b5ed508918ddff42b2639cec6234a656762f4 SHA512 c81f7ac0cca9073878026d6a3024ebad8bf38c4745fe7bac5a156906ba9fd7b78b90fdc69376821c9927dd60173dd6604684e2ea7dcb55dc2e60a0e20ee01735
DIST systemd-stable-254.3.tar.gz 14329148 BLAKE2B 10b947e04a4ef9ccaeb7adaa67ac0f391927fb172c0750ffb93d4df69d970fd91f26b052f8bfdfb4f81ae69566d0a3459cbc87cc86b624014cfb8781a2914121 SHA512 a0c361c993ac9a121823bdd58e29ef7bd25ccfd206ae0c3e1eed9833b3ddf24f53afe6f669eb9fbff5078977403236b0e4ef5a5f6fde56c504caed1d411e71fe
DIST systemd-stable-254.4.tar.gz 14332995 BLAKE2B 2b51ea867e142beeaf332cead5e2daf99b6599a6069d961d19248be2c2b211d25f7e18dd3e1ad2f0588ec121492a1da95e078aa74b7aebed8523ca0512b489ea SHA512 ea2faaa5ba9c8c286c24fba5f47317fa6b26f8678eb1e59c481cf35462b625b605ce18875eaa8cdfdd49ddfeca823e9c571e18bf6df4a62a2421762ab271fb69
diff --git a/sys-apps/systemd-utils/systemd-utils-253.12.ebuild b/sys-apps/systemd-utils/systemd-utils-253.12.ebuild
new file mode 100644
index 000000000000..c06d1b1a0d0c
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-253.12.ebuild
@@ -0,0 +1,535 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
+inherit secureboot toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-253.3"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+ boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ )
+
+ if use elibc_musl; then
+ # Applied upstream
+ rm "${WORKDIR}/${MUSL_PATCHSET}/0015-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch" || die
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool boot kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ 90-loaderentry.install
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ # 90-loaderentry.install is generated from 90-loaderentry.install.in
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{tmp,x11}.conf
+ doins "${FILESDIR}"/legacy.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use boot && secureboot_auto_sign
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-09-29 23:08 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-09-29 23:08 UTC (permalink / raw
To: gentoo-commits
commit: 285635854503d90a2f813f61d1c0c0ab2ba5fa31
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 29 22:51:59 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 29 23:06:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28563585
sys-apps/systemd-utils: add 254.5
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-254.5.ebuild | 537 ++++++++++++++++++++++
2 files changed, 538 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 5e0cb2168a48..69128db7529b 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -7,3 +7,4 @@ DIST systemd-stable-253.12.tar.gz 12117485 BLAKE2B 8ed9e5a081c59a304698c8194fd15
DIST systemd-stable-253.6.tar.gz 12069024 BLAKE2B 7dfb28127bf6c091180a6cfbae1eb657b99896920cc6b74d1e86586f51bf312d6c2647582a635a479048cadceb0b5ed508918ddff42b2639cec6234a656762f4 SHA512 c81f7ac0cca9073878026d6a3024ebad8bf38c4745fe7bac5a156906ba9fd7b78b90fdc69376821c9927dd60173dd6604684e2ea7dcb55dc2e60a0e20ee01735
DIST systemd-stable-254.3.tar.gz 14329148 BLAKE2B 10b947e04a4ef9ccaeb7adaa67ac0f391927fb172c0750ffb93d4df69d970fd91f26b052f8bfdfb4f81ae69566d0a3459cbc87cc86b624014cfb8781a2914121 SHA512 a0c361c993ac9a121823bdd58e29ef7bd25ccfd206ae0c3e1eed9833b3ddf24f53afe6f669eb9fbff5078977403236b0e4ef5a5f6fde56c504caed1d411e71fe
DIST systemd-stable-254.4.tar.gz 14332995 BLAKE2B 2b51ea867e142beeaf332cead5e2daf99b6599a6069d961d19248be2c2b211d25f7e18dd3e1ad2f0588ec121492a1da95e078aa74b7aebed8523ca0512b489ea SHA512 ea2faaa5ba9c8c286c24fba5f47317fa6b26f8678eb1e59c481cf35462b625b605ce18875eaa8cdfdd49ddfeca823e9c571e18bf6df4a62a2421762ab271fb69
+DIST systemd-stable-254.5.tar.gz 14334696 BLAKE2B 2f63d79ae93add69ac0b56dda9f67019340f84692de4da200557b9f5f1f16bebbad42a9a7e2d6ef7420aa37746d2ede0481fd8e39f03a31576c7e4e48e259ce3 SHA512 cac713670216add9e5473e2c86f04da441015e7cc0ac1500b9e1489a435f9b80c4c6ee24e9b22e4c4213a495bc1a0a908925df2045e344a2170d5aea6aafa16c
diff --git a/sys-apps/systemd-utils/systemd-utils-254.5.ebuild b/sys-apps/systemd-utils/systemd-utils-254.5.ebuild
new file mode 100644
index 000000000000..849af65cc76c
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-254.5.ebuild
@@ -0,0 +1,537 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-single-r1
+inherit secureboot toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-254.3"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="
+ || ( boot tmpfiles sysusers udev )
+ ${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+ boot? (
+ !<sys-boot/systemd-boot-250
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep "${PEFILE_DEPEND}")
+ )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_cond_dep "
+ dev-python/jinja[\${PYTHON_USEDEP}]
+ dev-python/lxml[\${PYTHON_USEDEP}]
+ boot? (
+ >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
+ test? ( ${PEFILE_DEPEND} )
+ )
+ ")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
+ )
+
+ if use elibc_musl; then
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot bootloader)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-kernel-install-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ 90-loaderentry.install
+ src/boot/efi/linux$(efi_arch).efi.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfile-util )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/60-persistent-storage.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ udev-rule-runner
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfile-util
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ # 90-loaderentry.install is generated from 90-loaderentry.install.in
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ rm -f rules.d/99-systemd.rules
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{tmp,x11}.conf
+ doins "${FILESDIR}"/legacy.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use boot && secureboot_auto_sign
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-09-26 15:33 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-09-26 15:33 UTC (permalink / raw
To: gentoo-commits
commit: 5b8c3110c8e3212902474f2c72ba4bd24464a2c1
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 15:32:07 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 15:32:07 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b8c3110
sys-apps/systemd-utils: Stabilize 253.11 ppc64, #914611
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-253.11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.11.ebuild b/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
index bced01690407..ada45651019f 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-09-26 15:33 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-09-26 15:33 UTC (permalink / raw
To: gentoo-commits
commit: 89c938ea405f43f841213ae001ff9f5e5271f38a
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 15:32:00 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 15:32:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89c938ea
sys-apps/systemd-utils: Stabilize 253.11 ppc, #914611
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-253.11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.11.ebuild b/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
index f452d7b65c0c..bced01690407 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-09-26 15:33 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-09-26 15:33 UTC (permalink / raw
To: gentoo-commits
commit: ac9e76f75d3b573409c32a42178470f684843644
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 15:32:33 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 15:32:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac9e76f7
sys-apps/systemd-utils: Stabilize 253.11 hppa, #914611
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-253.11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.11.ebuild b/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
index 28a7d2f31d8c..b0af755e370d 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-09-26 15:33 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-09-26 15:33 UTC (permalink / raw
To: gentoo-commits
commit: ecc70f8735b1cde418d29bbe9fb16cb6bd54f1b7
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 15:31:52 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 15:31:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecc70f87
sys-apps/systemd-utils: Stabilize 253.11 arm64, #914611
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-253.11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.11.ebuild b/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
index 07202d688ea5..f452d7b65c0c 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-09-26 15:33 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-09-26 15:33 UTC (permalink / raw
To: gentoo-commits
commit: 31dcf581a07395df7e6a98958522cfaa2b68419f
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 15:32:25 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 15:32:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31dcf581
sys-apps/systemd-utils: Stabilize 253.11 sparc, #914611
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-253.11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.11.ebuild b/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
index 92d0dc6ed8df..28a7d2f31d8c 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-09-26 15:33 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-09-26 15:33 UTC (permalink / raw
To: gentoo-commits
commit: 109453e3784793d2ca24f06fb67a6a015458156b
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 15:32:19 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 15:32:19 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=109453e3
sys-apps/systemd-utils: Stabilize 253.11 x86, #914611
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-253.11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.11.ebuild b/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
index ada45651019f..92d0dc6ed8df 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-09-26 15:33 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-09-26 15:33 UTC (permalink / raw
To: gentoo-commits
commit: f6a519034b322c5ede340b7c3b237818a08fec99
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 15:31:46 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 15:31:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6a51903
sys-apps/systemd-utils: Stabilize 253.11 arm, #914611
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-253.11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.11.ebuild b/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
index b3fc280ac7fb..07202d688ea5 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-09-24 22:29 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-09-24 22:29 UTC (permalink / raw
To: gentoo-commits
commit: fa82e211323630f325f3dcf4434bfb8ce00d42ee
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 22:28:39 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 22:28:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa82e211
sys-apps/systemd-utils: drop 252.10, 253.5, 253.7, 253.8, 253.10
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 5 -
sys-apps/systemd-utils/systemd-utils-252.10.ebuild | 525 --------------------
sys-apps/systemd-utils/systemd-utils-253.10.ebuild | 535 ---------------------
sys-apps/systemd-utils/systemd-utils-253.5.ebuild | 533 --------------------
sys-apps/systemd-utils/systemd-utils-253.7.ebuild | 535 ---------------------
sys-apps/systemd-utils/systemd-utils-253.8.ebuild | 535 ---------------------
6 files changed, 2668 deletions(-)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index a13edc015f6e..952b06a4ebdc 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,13 +1,8 @@
DIST systemd-musl-patches-252.4.tar.gz 25053 BLAKE2B 1d75f85ea0c48c788e9199e2d919bac90edce16a9788a349332cf308c32fb9510ac2883f8e09f21e7f37fbac2e557dc39cdf44dcd7a986587c40dedd2d1b5df5 SHA512 1dc8e220eae1869eb4bb50f9c701392542b053099cf9b6bde13f12a2d26fa29984819a8b4ce1b6c57e38a71f86324469a87cf9e22abe0f6d67ac3e84c6b9a3ba
DIST systemd-musl-patches-253.3.tar.gz 28384 BLAKE2B 2736a4ddc36b2ce087c08c57c0b995db2dcf6f82a4ae6f20b07609657bc5ea1e4a12ec78da1576b364e03260577b4f9fc85fae8c0f7497eca564c6fb857e06d8 SHA512 4b556975f25393cbeb5df495267c68edf14bef0f8baae20955151c900f200d1402b54630cab7dd3a69bbb82bef3f7464869222e2022c60faa2311444fa87ec80
DIST systemd-musl-patches-254.3.tar.gz 28640 BLAKE2B 54837f49cdb8cf025e367ad13bab0d0509c2e11ad84d29724bb6baa226c54e0ab97a91035361f66009dd9b1a22f7b3e82f90b1c14adf4aa20d576b9410589d38 SHA512 07d028a57025b2626471d6f48507f2dfc50658db24efaac93bafae9a1d4cdc3ec82e80da426d2a6280c32af2d813565609dab7df5538260ba809b63309a0ffed
-DIST systemd-stable-252.10.tar.gz 11841052 BLAKE2B 33ebca90ff17ef5983677c08c93a80350908aa4f4f1860d8e69c234ead926f0e21a4c4692c171f061e05e41c94d8fe2ba3a3be75fb7b582b86e851194a1f0203 SHA512 5309d8df51b5cda694e03e2ded574d4e3606916fab5d190b21fcd0284d8d8f56cab8b3423d7d0b90e44cd9775cc62bc26198f3d2a43f8aa545959b5c27b0dd9d
DIST systemd-stable-252.9.tar.gz 11829389 BLAKE2B a45a72bfe113f8cb7424d731692f548c389f59d34b649e874db2f85868943b0a9c33ef62185c83c41a9c220caddd65c44ff328026eff19c3c7efda5efbd73574 SHA512 fa34b9c2f692af8f70dffc5044fe502ff5e21625af5b27cad7fc5e833570b180f53c5d03a0add785e83a5b4e7564117fe4728931df4ef599888c73e92c7f2103
-DIST systemd-stable-253.10.tar.gz 12116663 BLAKE2B 9232067c5fb4ceb3c941d9840a043f34ca3c6eee6e696743715e9f36d47a58e98046ffb6af19084bbd7e8b4edf40c67132a3fa967f37785eb988a18530ca89b1 SHA512 dab45496586a9a78ba46a3c03c02e6bd97a8b832e28f96fdf052ecf1906c8c1bdc55967fc243ca837d0371e81730a92bb230e59a43e2ab6bc1b62fbd42a051d4
DIST systemd-stable-253.11.tar.gz 12116691 BLAKE2B bb8d95e77ad970ba642346fd0179384258b13b94aacb9f6ff05d4967f5e13d1c709f8b917e485a227fb126e552429c4e302b959eb4697a69dc88b45836c36646 SHA512 0018a544f924725f1e7664bfbee0c66591514c077e97352ae5d8d90b6dccfd4d07b9876f25923afa9782b57cc17b8e9ab34c7ae627998804751ba38e46558af4
-DIST systemd-stable-253.5.tar.gz 12015672 BLAKE2B 3b09bc1a63bc3321c51ea05080f95958ab55064596c13ab967a182cdaace302cc85c19e2cdabd9bdc8ba0a1a04999ae588fbce2fe2626c0f792ee22836feddf4 SHA512 39709b485cd9287e26ac8e973fa1692b280bec3b96e1da6667e4a4f2ac2228aa072b22802720a254698d32c82f5306d7feb32229e4b6d54cc0e2b1e2caa4cc2e
DIST systemd-stable-253.6.tar.gz 12069024 BLAKE2B 7dfb28127bf6c091180a6cfbae1eb657b99896920cc6b74d1e86586f51bf312d6c2647582a635a479048cadceb0b5ed508918ddff42b2639cec6234a656762f4 SHA512 c81f7ac0cca9073878026d6a3024ebad8bf38c4745fe7bac5a156906ba9fd7b78b90fdc69376821c9927dd60173dd6604684e2ea7dcb55dc2e60a0e20ee01735
-DIST systemd-stable-253.7.tar.gz 12111722 BLAKE2B 2007653c264d615fbef52cd91d173597f175ba05c1b961c6035d51c1a28ff663151a72d858115536c316a2644d880dfe94e6d00809bf3a2abe3e2f5532df565b SHA512 6935508f511930d6e980a7f0a3319295acbbc482cbce4f8f407af399259fe04b095dabd470f8825d84328a7d0f39efe6d5926022c1bdf18ec7fffe43b2586aa1
-DIST systemd-stable-253.8.tar.gz 12112413 BLAKE2B 0edf5d2fdb47ef4c2fd9257642a719cb3cf70096d74ae0002f4df2696f3efd591ddf239f2ac9762aa53ebcee5bf31295739f8176313b8260e97fe99cc51722f6 SHA512 628db658ccf01e6cf09c6832735ad08c3d0dd906798e3366d42621fb08ad8b72aa7a51ae4874d76acf6c56282c63dc5fdce677cde3d4e102ce0036571ccabcc4
DIST systemd-stable-254.3.tar.gz 14329148 BLAKE2B 10b947e04a4ef9ccaeb7adaa67ac0f391927fb172c0750ffb93d4df69d970fd91f26b052f8bfdfb4f81ae69566d0a3459cbc87cc86b624014cfb8781a2914121 SHA512 a0c361c993ac9a121823bdd58e29ef7bd25ccfd206ae0c3e1eed9833b3ddf24f53afe6f669eb9fbff5078977403236b0e4ef5a5f6fde56c504caed1d411e71fe
DIST systemd-stable-254.4.tar.gz 14332995 BLAKE2B 2b51ea867e142beeaf332cead5e2daf99b6599a6069d961d19248be2c2b211d25f7e18dd3e1ad2f0588ec121492a1da95e078aa74b7aebed8523ca0512b489ea SHA512 ea2faaa5ba9c8c286c24fba5f47317fa6b26f8678eb1e59c481cf35462b625b605ce18875eaa8cdfdd49ddfeca823e9c571e18bf6df4a62a2421762ab271fb69
diff --git a/sys-apps/systemd-utils/systemd-utils-252.10.ebuild b/sys-apps/systemd-utils/systemd-utils-252.10.ebuild
deleted file mode 100644
index 8660e0fc4c57..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-252.10.ebuild
+++ /dev/null
@@ -1,525 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
-inherit toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-252.4"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
- boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
- python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- local PATCHES=(
- )
-
- if use elibc_musl; then
- PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool boot kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- kernel-install
- man/bootctl.1
- man/kernel-install.8
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl kernel-install
- doman man/{bootctl.1,kernel-install.8}
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{tmp,x11}.conf
- doins "${FILESDIR}"/legacy.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-253.10.ebuild b/sys-apps/systemd-utils/systemd-utils-253.10.ebuild
deleted file mode 100644
index c06d1b1a0d0c..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-253.10.ebuild
+++ /dev/null
@@ -1,535 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
-inherit secureboot toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-253.3"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
- boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
- python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
- use boot && secureboot_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- )
-
- if use elibc_musl; then
- # Applied upstream
- rm "${WORKDIR}/${MUSL_PATCHSET}/0015-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch" || die
- PATCHES+=(
- "${WORKDIR}/${MUSL_PATCHSET}"
- )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool boot kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- kernel-install
- man/bootctl.1
- man/kernel-install.8
- 90-loaderentry.install
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl kernel-install
- doman man/{bootctl.1,kernel-install.8}
- # 90-loaderentry.install is generated from 90-loaderentry.install.in
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{tmp,x11}.conf
- doins "${FILESDIR}"/legacy.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-
- use boot && secureboot_auto_sign
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-253.5.ebuild b/sys-apps/systemd-utils/systemd-utils-253.5.ebuild
deleted file mode 100644
index fe557dadef3c..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-253.5.ebuild
+++ /dev/null
@@ -1,533 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
-inherit secureboot toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-253.3"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
- boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
- python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
- use boot && secureboot_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- )
-
- if use elibc_musl; then
- PATCHES+=(
- "${WORKDIR}/${MUSL_PATCHSET}"
- )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool boot kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- kernel-install
- man/bootctl.1
- man/kernel-install.8
- 90-loaderentry.install
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl kernel-install
- doman man/{bootctl.1,kernel-install.8}
- # 90-loaderentry.install is generated from 90-loaderentry.install.in
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{tmp,x11}.conf
- doins "${FILESDIR}"/legacy.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-
- use boot && secureboot_auto_sign
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-253.7.ebuild b/sys-apps/systemd-utils/systemd-utils-253.7.ebuild
deleted file mode 100644
index c06d1b1a0d0c..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-253.7.ebuild
+++ /dev/null
@@ -1,535 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
-inherit secureboot toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-253.3"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
- boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
- python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
- use boot && secureboot_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- )
-
- if use elibc_musl; then
- # Applied upstream
- rm "${WORKDIR}/${MUSL_PATCHSET}/0015-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch" || die
- PATCHES+=(
- "${WORKDIR}/${MUSL_PATCHSET}"
- )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool boot kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- kernel-install
- man/bootctl.1
- man/kernel-install.8
- 90-loaderentry.install
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl kernel-install
- doman man/{bootctl.1,kernel-install.8}
- # 90-loaderentry.install is generated from 90-loaderentry.install.in
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{tmp,x11}.conf
- doins "${FILESDIR}"/legacy.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-
- use boot && secureboot_auto_sign
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-253.8.ebuild b/sys-apps/systemd-utils/systemd-utils-253.8.ebuild
deleted file mode 100644
index c06d1b1a0d0c..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-253.8.ebuild
+++ /dev/null
@@ -1,535 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
-inherit secureboot toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-253.3"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
- boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
- python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
- use boot && secureboot_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- )
-
- if use elibc_musl; then
- # Applied upstream
- rm "${WORKDIR}/${MUSL_PATCHSET}/0015-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch" || die
- PATCHES+=(
- "${WORKDIR}/${MUSL_PATCHSET}"
- )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool boot kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- kernel-install
- man/bootctl.1
- man/kernel-install.8
- 90-loaderentry.install
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl kernel-install
- doman man/{bootctl.1,kernel-install.8}
- # 90-loaderentry.install is generated from 90-loaderentry.install.in
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{tmp,x11}.conf
- doins "${FILESDIR}"/legacy.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-
- use boot && secureboot_auto_sign
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-09-24 18:35 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-09-24 18:35 UTC (permalink / raw
To: gentoo-commits
commit: 43b1c0c6da511a7e100542c40d2335a4b57e6e35
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 18:35:10 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 18:35:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43b1c0c6
sys-apps/systemd-utils: Stabilize 253.11 amd64, #914611
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-253.11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.11.ebuild b/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
index c06d1b1a0d0c..b3fc280ac7fb 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-09-21 7:38 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-09-21 7:38 UTC (permalink / raw
To: gentoo-commits
commit: dcdee4dc44a431162c01b18a21956e705e3d6217
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 21 06:57:51 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 21 07:38:37 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcdee4dc
sys-apps/systemd-utils: add 253.11
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-253.11.ebuild | 535 +++++++++++++++++++++
2 files changed, 536 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 285c8dbc2eff..e9c00d2d1f58 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -4,6 +4,7 @@ DIST systemd-musl-patches-254.3.tar.gz 28640 BLAKE2B 54837f49cdb8cf025e367ad13ba
DIST systemd-stable-252.10.tar.gz 11841052 BLAKE2B 33ebca90ff17ef5983677c08c93a80350908aa4f4f1860d8e69c234ead926f0e21a4c4692c171f061e05e41c94d8fe2ba3a3be75fb7b582b86e851194a1f0203 SHA512 5309d8df51b5cda694e03e2ded574d4e3606916fab5d190b21fcd0284d8d8f56cab8b3423d7d0b90e44cd9775cc62bc26198f3d2a43f8aa545959b5c27b0dd9d
DIST systemd-stable-252.9.tar.gz 11829389 BLAKE2B a45a72bfe113f8cb7424d731692f548c389f59d34b649e874db2f85868943b0a9c33ef62185c83c41a9c220caddd65c44ff328026eff19c3c7efda5efbd73574 SHA512 fa34b9c2f692af8f70dffc5044fe502ff5e21625af5b27cad7fc5e833570b180f53c5d03a0add785e83a5b4e7564117fe4728931df4ef599888c73e92c7f2103
DIST systemd-stable-253.10.tar.gz 12116663 BLAKE2B 9232067c5fb4ceb3c941d9840a043f34ca3c6eee6e696743715e9f36d47a58e98046ffb6af19084bbd7e8b4edf40c67132a3fa967f37785eb988a18530ca89b1 SHA512 dab45496586a9a78ba46a3c03c02e6bd97a8b832e28f96fdf052ecf1906c8c1bdc55967fc243ca837d0371e81730a92bb230e59a43e2ab6bc1b62fbd42a051d4
+DIST systemd-stable-253.11.tar.gz 12116691 BLAKE2B bb8d95e77ad970ba642346fd0179384258b13b94aacb9f6ff05d4967f5e13d1c709f8b917e485a227fb126e552429c4e302b959eb4697a69dc88b45836c36646 SHA512 0018a544f924725f1e7664bfbee0c66591514c077e97352ae5d8d90b6dccfd4d07b9876f25923afa9782b57cc17b8e9ab34c7ae627998804751ba38e46558af4
DIST systemd-stable-253.5.tar.gz 12015672 BLAKE2B 3b09bc1a63bc3321c51ea05080f95958ab55064596c13ab967a182cdaace302cc85c19e2cdabd9bdc8ba0a1a04999ae588fbce2fe2626c0f792ee22836feddf4 SHA512 39709b485cd9287e26ac8e973fa1692b280bec3b96e1da6667e4a4f2ac2228aa072b22802720a254698d32c82f5306d7feb32229e4b6d54cc0e2b1e2caa4cc2e
DIST systemd-stable-253.6.tar.gz 12069024 BLAKE2B 7dfb28127bf6c091180a6cfbae1eb657b99896920cc6b74d1e86586f51bf312d6c2647582a635a479048cadceb0b5ed508918ddff42b2639cec6234a656762f4 SHA512 c81f7ac0cca9073878026d6a3024ebad8bf38c4745fe7bac5a156906ba9fd7b78b90fdc69376821c9927dd60173dd6604684e2ea7dcb55dc2e60a0e20ee01735
DIST systemd-stable-253.7.tar.gz 12111722 BLAKE2B 2007653c264d615fbef52cd91d173597f175ba05c1b961c6035d51c1a28ff663151a72d858115536c316a2644d880dfe94e6d00809bf3a2abe3e2f5532df565b SHA512 6935508f511930d6e980a7f0a3319295acbbc482cbce4f8f407af399259fe04b095dabd470f8825d84328a7d0f39efe6d5926022c1bdf18ec7fffe43b2586aa1
diff --git a/sys-apps/systemd-utils/systemd-utils-253.11.ebuild b/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
new file mode 100644
index 000000000000..c06d1b1a0d0c
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-253.11.ebuild
@@ -0,0 +1,535 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
+inherit secureboot toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-253.3"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+ boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ )
+
+ if use elibc_musl; then
+ # Applied upstream
+ rm "${WORKDIR}/${MUSL_PATCHSET}/0015-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch" || die
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool boot kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ 90-loaderentry.install
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ # 90-loaderentry.install is generated from 90-loaderentry.install.in
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{tmp,x11}.conf
+ doins "${FILESDIR}"/legacy.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use boot && secureboot_auto_sign
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-09-21 7:38 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-09-21 7:38 UTC (permalink / raw
To: gentoo-commits
commit: 9d0331e0a1fef4d9271adea38757ca93bbaeff63
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 21 07:02:27 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 21 07:38:37 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d0331e0
sys-apps/systemd-utils: add 254.4
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-254.4.ebuild | 537 ++++++++++++++++++++++
2 files changed, 538 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index e9c00d2d1f58..a13edc015f6e 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -10,3 +10,4 @@ DIST systemd-stable-253.6.tar.gz 12069024 BLAKE2B 7dfb28127bf6c091180a6cfbae1eb6
DIST systemd-stable-253.7.tar.gz 12111722 BLAKE2B 2007653c264d615fbef52cd91d173597f175ba05c1b961c6035d51c1a28ff663151a72d858115536c316a2644d880dfe94e6d00809bf3a2abe3e2f5532df565b SHA512 6935508f511930d6e980a7f0a3319295acbbc482cbce4f8f407af399259fe04b095dabd470f8825d84328a7d0f39efe6d5926022c1bdf18ec7fffe43b2586aa1
DIST systemd-stable-253.8.tar.gz 12112413 BLAKE2B 0edf5d2fdb47ef4c2fd9257642a719cb3cf70096d74ae0002f4df2696f3efd591ddf239f2ac9762aa53ebcee5bf31295739f8176313b8260e97fe99cc51722f6 SHA512 628db658ccf01e6cf09c6832735ad08c3d0dd906798e3366d42621fb08ad8b72aa7a51ae4874d76acf6c56282c63dc5fdce677cde3d4e102ce0036571ccabcc4
DIST systemd-stable-254.3.tar.gz 14329148 BLAKE2B 10b947e04a4ef9ccaeb7adaa67ac0f391927fb172c0750ffb93d4df69d970fd91f26b052f8bfdfb4f81ae69566d0a3459cbc87cc86b624014cfb8781a2914121 SHA512 a0c361c993ac9a121823bdd58e29ef7bd25ccfd206ae0c3e1eed9833b3ddf24f53afe6f669eb9fbff5078977403236b0e4ef5a5f6fde56c504caed1d411e71fe
+DIST systemd-stable-254.4.tar.gz 14332995 BLAKE2B 2b51ea867e142beeaf332cead5e2daf99b6599a6069d961d19248be2c2b211d25f7e18dd3e1ad2f0588ec121492a1da95e078aa74b7aebed8523ca0512b489ea SHA512 ea2faaa5ba9c8c286c24fba5f47317fa6b26f8678eb1e59c481cf35462b625b605ce18875eaa8cdfdd49ddfeca823e9c571e18bf6df4a62a2421762ab271fb69
diff --git a/sys-apps/systemd-utils/systemd-utils-254.4.ebuild b/sys-apps/systemd-utils/systemd-utils-254.4.ebuild
new file mode 100644
index 000000000000..849af65cc76c
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-254.4.ebuild
@@ -0,0 +1,537 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-single-r1
+inherit secureboot toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-254.3"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="
+ || ( boot tmpfiles sysusers udev )
+ ${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+ boot? (
+ !<sys-boot/systemd-boot-250
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep "${PEFILE_DEPEND}")
+ )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_cond_dep "
+ dev-python/jinja[\${PYTHON_USEDEP}]
+ dev-python/lxml[\${PYTHON_USEDEP}]
+ boot? (
+ >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
+ test? ( ${PEFILE_DEPEND} )
+ )
+ ")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
+ )
+
+ if use elibc_musl; then
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot bootloader)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-kernel-install-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ 90-loaderentry.install
+ src/boot/efi/linux$(efi_arch).efi.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfile-util )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/60-persistent-storage.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ udev-rule-runner
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfile-util
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ # 90-loaderentry.install is generated from 90-loaderentry.install.in
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ rm -f rules.d/99-systemd.rules
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{tmp,x11}.conf
+ doins "${FILESDIR}"/legacy.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use boot && secureboot_auto_sign
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-09-10 20:14 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2023-09-10 20:14 UTC (permalink / raw
To: gentoo-commits
commit: a168c73580cb12ed577cb2d18490c3ddb16b3ad8
Author: Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Sun Sep 10 18:59:20 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Sep 10 19:51:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a168c735
sys-apps/systemd-utils: Fix test targets
Closes: https://bugs.gentoo.org/913933
Signed-off-by: Violet Purcell <vimproved <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/32715
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.3.ebuild | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.3.ebuild b/sys-apps/systemd-utils/systemd-utils-254.3.ebuild
index 1912fe2b9f6b..9fabbb727904 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.3.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.3.ebuild
@@ -310,7 +310,7 @@ multilib_src_compile() {
tmpfiles.d/{etc,static-nodes-permissions,var}.conf
)
if use test; then
- targets+=( test-tmpfiles )
+ targets+=( test-tmpfile-util )
fi
fi
if use udev; then
@@ -340,8 +340,6 @@ multilib_src_compile() {
targets+=(
# Used by udev-test.pl
systemd-detect-virt
- test/sys
- test-udev
test-fido-id-desc
test-udev-builtin
@@ -381,7 +379,7 @@ multilib_src_test() {
if use tmpfiles; then
tests+=(
test-systemd-tmpfiles.standalone
- test-tmpfiles
+ test-tmpfile-util
)
fi
if use udev; then
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-09-10 20:14 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2023-09-10 20:14 UTC (permalink / raw
To: gentoo-commits
commit: 8291739b1a578f93836f9045246e047c69281c18
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 10 20:13:19 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Sep 10 20:13:19 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8291739b
sys-apps/systemd-utils: more test cleanup
Adjust for 0454cf05 upstream.
Bug: https://bugs.gentoo.org/913933
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.3.ebuild | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.3.ebuild b/sys-apps/systemd-utils/systemd-utils-254.3.ebuild
index 9fabbb727904..849af65cc76c 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.3.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.3.ebuild
@@ -338,14 +338,12 @@ multilib_src_compile() {
)
if use test; then
targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
-
test-fido-id-desc
test-udev-builtin
test-udev-event
test-udev-node
test-udev-util
+ udev-rule-runner
)
fi
fi
@@ -386,16 +384,12 @@ multilib_src_test() {
tests+=(
rule-syntax-check
test-fido-id-desc
+ test-udev
test-udev-builtin
test-udev-event
test-udev-node
test-udev-util
)
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
fi
fi
if use udev; then
@@ -447,6 +441,7 @@ multilib_src_install() {
exeinto "${rootprefix}"/lib/udev
doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+ rm -f rules.d/99-systemd.rules
insinto "${rootprefix}"/lib/udev/rules.d
doins rules.d/*.rules
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-09-09 20:24 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2023-09-09 20:24 UTC (permalink / raw
To: gentoo-commits
commit: 24dc4e093088cb245f1fc6e97635b78e19bc6bcd
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 9 20:21:54 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Sep 9 20:24:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24dc4e09
sys-apps/systemd-utils: update SRC_URI
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-254.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-254.3.ebuild b/sys-apps/systemd-utils/systemd-utils-254.3.ebuild
index 594ed9e2a554..1912fe2b9f6b 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.3.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.3.ebuild
@@ -23,7 +23,7 @@ else
fi
MUSL_PATCHSET="systemd-musl-patches-254.3"
-SRC_URI+=" elibc_musl? ( https://github.com/vimproved/systemd-musl-patches/archive/refs/tags/${MUSL_PATCHSET##*-}.tar.gz -> ${MUSL_PATCHSET}.tar.gz )"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-09-09 1:27 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-09-09 1:27 UTC (permalink / raw
To: gentoo-commits
commit: cca95fe3d670e926099d79a8ee4e78e0061095cc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 9 01:26:08 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 9 01:26:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cca95fe3
sys-apps/systemd-utils: add 253.10
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-253.10.ebuild | 535 +++++++++++++++++++++
2 files changed, 536 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index bbb7f6ffd3df..4f39da4a1f9c 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -2,6 +2,7 @@ DIST systemd-musl-patches-252.4.tar.gz 25053 BLAKE2B 1d75f85ea0c48c788e9199e2d91
DIST systemd-musl-patches-253.3.tar.gz 28384 BLAKE2B 2736a4ddc36b2ce087c08c57c0b995db2dcf6f82a4ae6f20b07609657bc5ea1e4a12ec78da1576b364e03260577b4f9fc85fae8c0f7497eca564c6fb857e06d8 SHA512 4b556975f25393cbeb5df495267c68edf14bef0f8baae20955151c900f200d1402b54630cab7dd3a69bbb82bef3f7464869222e2022c60faa2311444fa87ec80
DIST systemd-stable-252.10.tar.gz 11841052 BLAKE2B 33ebca90ff17ef5983677c08c93a80350908aa4f4f1860d8e69c234ead926f0e21a4c4692c171f061e05e41c94d8fe2ba3a3be75fb7b582b86e851194a1f0203 SHA512 5309d8df51b5cda694e03e2ded574d4e3606916fab5d190b21fcd0284d8d8f56cab8b3423d7d0b90e44cd9775cc62bc26198f3d2a43f8aa545959b5c27b0dd9d
DIST systemd-stable-252.9.tar.gz 11829389 BLAKE2B a45a72bfe113f8cb7424d731692f548c389f59d34b649e874db2f85868943b0a9c33ef62185c83c41a9c220caddd65c44ff328026eff19c3c7efda5efbd73574 SHA512 fa34b9c2f692af8f70dffc5044fe502ff5e21625af5b27cad7fc5e833570b180f53c5d03a0add785e83a5b4e7564117fe4728931df4ef599888c73e92c7f2103
+DIST systemd-stable-253.10.tar.gz 12116663 BLAKE2B 9232067c5fb4ceb3c941d9840a043f34ca3c6eee6e696743715e9f36d47a58e98046ffb6af19084bbd7e8b4edf40c67132a3fa967f37785eb988a18530ca89b1 SHA512 dab45496586a9a78ba46a3c03c02e6bd97a8b832e28f96fdf052ecf1906c8c1bdc55967fc243ca837d0371e81730a92bb230e59a43e2ab6bc1b62fbd42a051d4
DIST systemd-stable-253.5.tar.gz 12015672 BLAKE2B 3b09bc1a63bc3321c51ea05080f95958ab55064596c13ab967a182cdaace302cc85c19e2cdabd9bdc8ba0a1a04999ae588fbce2fe2626c0f792ee22836feddf4 SHA512 39709b485cd9287e26ac8e973fa1692b280bec3b96e1da6667e4a4f2ac2228aa072b22802720a254698d32c82f5306d7feb32229e4b6d54cc0e2b1e2caa4cc2e
DIST systemd-stable-253.6.tar.gz 12069024 BLAKE2B 7dfb28127bf6c091180a6cfbae1eb657b99896920cc6b74d1e86586f51bf312d6c2647582a635a479048cadceb0b5ed508918ddff42b2639cec6234a656762f4 SHA512 c81f7ac0cca9073878026d6a3024ebad8bf38c4745fe7bac5a156906ba9fd7b78b90fdc69376821c9927dd60173dd6604684e2ea7dcb55dc2e60a0e20ee01735
DIST systemd-stable-253.7.tar.gz 12111722 BLAKE2B 2007653c264d615fbef52cd91d173597f175ba05c1b961c6035d51c1a28ff663151a72d858115536c316a2644d880dfe94e6d00809bf3a2abe3e2f5532df565b SHA512 6935508f511930d6e980a7f0a3319295acbbc482cbce4f8f407af399259fe04b095dabd470f8825d84328a7d0f39efe6d5926022c1bdf18ec7fffe43b2586aa1
diff --git a/sys-apps/systemd-utils/systemd-utils-253.10.ebuild b/sys-apps/systemd-utils/systemd-utils-253.10.ebuild
new file mode 100644
index 000000000000..c06d1b1a0d0c
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-253.10.ebuild
@@ -0,0 +1,535 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
+inherit secureboot toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-253.3"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+ boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ )
+
+ if use elibc_musl; then
+ # Applied upstream
+ rm "${WORKDIR}/${MUSL_PATCHSET}/0015-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch" || die
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool boot kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ 90-loaderentry.install
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ # 90-loaderentry.install is generated from 90-loaderentry.install.in
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{tmp,x11}.conf
+ doins "${FILESDIR}"/legacy.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use boot && secureboot_auto_sign
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-08-18 10:54 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-08-18 10:54 UTC (permalink / raw
To: gentoo-commits
commit: df8e5c3eef098554b4201b616f4bf5c8c8d5b045
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 18 10:53:18 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 18 10:53:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df8e5c3e
sys-apps/systemd-utils: disable py3.12
See the discussion in bug #911418.
Bug: https://bugs.gentoo.org/911418
Bug: https://bugs.gentoo.org/911990
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-253.5.ebuild | 2 +-
sys-apps/systemd-utils/systemd-utils-253.6.ebuild | 2 +-
sys-apps/systemd-utils/systemd-utils-253.7.ebuild | 2 +-
sys-apps/systemd-utils/systemd-utils-253.8.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.5.ebuild b/sys-apps/systemd-utils/systemd-utils-253.5.ebuild
index ce13ed37ce57..fe557dadef3c 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.5.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.5.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..11} )
QA_PKGCONFIG_VERSION=$(ver_cut 1)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
index 6a42f0fff537..b0af755e370d 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..11} )
QA_PKGCONFIG_VERSION=$(ver_cut 1)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.7.ebuild b/sys-apps/systemd-utils/systemd-utils-253.7.ebuild
index 49d0f39faa66..c06d1b1a0d0c 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.7.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..11} )
QA_PKGCONFIG_VERSION=$(ver_cut 1)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.8.ebuild b/sys-apps/systemd-utils/systemd-utils-253.8.ebuild
index 49d0f39faa66..c06d1b1a0d0c 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.8.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.8.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..11} )
QA_PKGCONFIG_VERSION=$(ver_cut 1)
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-08-09 22:46 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-08-09 22:46 UTC (permalink / raw
To: gentoo-commits
commit: 39702b75a21647b8053d4c982e5ab987695425df
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 9 22:44:46 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 9 22:44:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39702b75
sys-apps/systemd-utils: add 253.8
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-253.8.ebuild | 535 ++++++++++++++++++++++
2 files changed, 536 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 3ba04fb064fd..bbb7f6ffd3df 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -5,3 +5,4 @@ DIST systemd-stable-252.9.tar.gz 11829389 BLAKE2B a45a72bfe113f8cb7424d731692f54
DIST systemd-stable-253.5.tar.gz 12015672 BLAKE2B 3b09bc1a63bc3321c51ea05080f95958ab55064596c13ab967a182cdaace302cc85c19e2cdabd9bdc8ba0a1a04999ae588fbce2fe2626c0f792ee22836feddf4 SHA512 39709b485cd9287e26ac8e973fa1692b280bec3b96e1da6667e4a4f2ac2228aa072b22802720a254698d32c82f5306d7feb32229e4b6d54cc0e2b1e2caa4cc2e
DIST systemd-stable-253.6.tar.gz 12069024 BLAKE2B 7dfb28127bf6c091180a6cfbae1eb657b99896920cc6b74d1e86586f51bf312d6c2647582a635a479048cadceb0b5ed508918ddff42b2639cec6234a656762f4 SHA512 c81f7ac0cca9073878026d6a3024ebad8bf38c4745fe7bac5a156906ba9fd7b78b90fdc69376821c9927dd60173dd6604684e2ea7dcb55dc2e60a0e20ee01735
DIST systemd-stable-253.7.tar.gz 12111722 BLAKE2B 2007653c264d615fbef52cd91d173597f175ba05c1b961c6035d51c1a28ff663151a72d858115536c316a2644d880dfe94e6d00809bf3a2abe3e2f5532df565b SHA512 6935508f511930d6e980a7f0a3319295acbbc482cbce4f8f407af399259fe04b095dabd470f8825d84328a7d0f39efe6d5926022c1bdf18ec7fffe43b2586aa1
+DIST systemd-stable-253.8.tar.gz 12112413 BLAKE2B 0edf5d2fdb47ef4c2fd9257642a719cb3cf70096d74ae0002f4df2696f3efd591ddf239f2ac9762aa53ebcee5bf31295739f8176313b8260e97fe99cc51722f6 SHA512 628db658ccf01e6cf09c6832735ad08c3d0dd906798e3366d42621fb08ad8b72aa7a51ae4874d76acf6c56282c63dc5fdce677cde3d4e102ce0036571ccabcc4
diff --git a/sys-apps/systemd-utils/systemd-utils-253.8.ebuild b/sys-apps/systemd-utils/systemd-utils-253.8.ebuild
new file mode 100644
index 000000000000..49d0f39faa66
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-253.8.ebuild
@@ -0,0 +1,535 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
+inherit secureboot toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-253.3"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+ boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+ use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+ local PATCHES=(
+ )
+
+ if use elibc_musl; then
+ # Applied upstream
+ rm "${WORKDIR}/${MUSL_PATCHSET}/0015-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch" || die
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool boot kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ 90-loaderentry.install
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ # 90-loaderentry.install is generated from 90-loaderentry.install.in
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{tmp,x11}.conf
+ doins "${FILESDIR}"/legacy.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+
+ use boot && secureboot_auto_sign
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-08-08 3:17 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-08-08 3:17 UTC (permalink / raw
To: gentoo-commits
commit: 920c535bf42bf547ac0407c03a262b04e6c91114
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 8 03:16:01 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 8 03:16:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=920c535b
sys-apps/systemd-utils: Stabilize 253.6 arm64, #910413
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-253.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
index 6fa8fae417f1..34080df27b05 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-08-08 3:17 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-08-08 3:17 UTC (permalink / raw
To: gentoo-commits
commit: 83d12687ce190703ac191c99532735f54141df14
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 8 03:16:07 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 8 03:16:07 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83d12687
sys-apps/systemd-utils: Stabilize 253.6 ppc, #910413
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-253.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
index 65ab2ea835cb..f811868a17c5 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-08-08 3:17 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-08-08 3:17 UTC (permalink / raw
To: gentoo-commits
commit: f8da2dc453d91be3d2247d3aabd1bbdce767546f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 8 03:15:58 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 8 03:15:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8da2dc4
sys-apps/systemd-utils: Stabilize 253.6 arm, #910413
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-253.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
index 794a24b4d0f1..6fa8fae417f1 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-08-08 3:17 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-08-08 3:17 UTC (permalink / raw
To: gentoo-commits
commit: 92af81916e0680563dd61c8e3747e30f99179d9c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 8 03:16:09 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 8 03:16:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92af8191
sys-apps/systemd-utils: Stabilize 253.6 ppc64, #910413
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-253.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
index f811868a17c5..3eb7e5d2c1aa 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-08-08 3:17 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-08-08 3:17 UTC (permalink / raw
To: gentoo-commits
commit: 8f806297ecf1669c3cac693f0cba2fe74e9c241f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 8 03:16:12 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 8 03:16:12 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f806297
sys-apps/systemd-utils: Stabilize 253.6 sparc, #910413
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-253.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
index 3eb7e5d2c1aa..6a42f0fff537 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-08-08 3:17 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-08-08 3:17 UTC (permalink / raw
To: gentoo-commits
commit: 20f569338f802ad7e7080d058094d877efaaca75
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 8 03:16:04 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 8 03:16:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20f56933
sys-apps/systemd-utils: Stabilize 253.6 hppa, #910413
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-253.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
index 34080df27b05..65ab2ea835cb 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-07-20 11:33 Andrew Ammerlaan
0 siblings, 0 replies; 252+ messages in thread
From: Andrew Ammerlaan @ 2023-07-20 11:33 UTC (permalink / raw
To: gentoo-commits
commit: fcd87f99c2ab84aae5c9cd823a76e54f3503ddcb
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 11 17:37:06 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Jul 20 11:32:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcd87f99
sys-apps/systemd-utils: use secureboot.eclass to sign efi files
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-253.5.ebuild | 5 ++++-
sys-apps/systemd-utils/systemd-utils-253.6.ebuild | 5 ++++-
sys-apps/systemd-utils/systemd-utils-253.7.ebuild | 5 ++++-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.5.ebuild b/sys-apps/systemd-utils/systemd-utils-253.5.ebuild
index 697439c0ae54..ce13ed37ce57 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.5.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.5.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..12} )
QA_PKGCONFIG_VERSION=$(ver_cut 1)
inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
-inherit toolchain-funcs udev usr-ldscript
+inherit secureboot toolchain-funcs udev usr-ldscript
DESCRIPTION="Utilities split out from systemd for OpenRC users"
HOMEPAGE="https://systemd.io/"
@@ -113,6 +113,7 @@ pkg_setup() {
if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
linux-info_pkg_setup
fi
+ use boot && secureboot_pkg_setup
}
src_prepare() {
@@ -504,6 +505,8 @@ multilib_src_install_all() {
insinto /usr/share/zsh/site-functions
doins shell-completion/zsh/_udevadm
fi
+
+ use boot && secureboot_auto_sign
}
add_service() {
diff --git a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
index 6b7204dfdb49..794a24b4d0f1 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..12} )
QA_PKGCONFIG_VERSION=$(ver_cut 1)
inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
-inherit toolchain-funcs udev usr-ldscript
+inherit secureboot toolchain-funcs udev usr-ldscript
DESCRIPTION="Utilities split out from systemd for OpenRC users"
HOMEPAGE="https://systemd.io/"
@@ -113,6 +113,7 @@ pkg_setup() {
if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
linux-info_pkg_setup
fi
+ use boot && secureboot_pkg_setup
}
src_prepare() {
@@ -506,6 +507,8 @@ multilib_src_install_all() {
insinto /usr/share/zsh/site-functions
doins shell-completion/zsh/_udevadm
fi
+
+ use boot && secureboot_auto_sign
}
add_service() {
diff --git a/sys-apps/systemd-utils/systemd-utils-253.7.ebuild b/sys-apps/systemd-utils/systemd-utils-253.7.ebuild
index 831a19ae7a53..49d0f39faa66 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.7.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..12} )
QA_PKGCONFIG_VERSION=$(ver_cut 1)
inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
-inherit toolchain-funcs udev usr-ldscript
+inherit secureboot toolchain-funcs udev usr-ldscript
DESCRIPTION="Utilities split out from systemd for OpenRC users"
HOMEPAGE="https://systemd.io/"
@@ -113,6 +113,7 @@ pkg_setup() {
if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
linux-info_pkg_setup
fi
+ use boot && secureboot_pkg_setup
}
src_prepare() {
@@ -506,6 +507,8 @@ multilib_src_install_all() {
insinto /usr/share/zsh/site-functions
doins shell-completion/zsh/_udevadm
fi
+
+ use boot && secureboot_auto_sign
}
add_service() {
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-07-18 18:15 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-07-18 18:15 UTC (permalink / raw
To: gentoo-commits
commit: a63de6e7b9753f4acab59198f1c9a192183ffc7f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 18 18:15:01 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 18:15:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a63de6e7
sys-apps/systemd-utils: Stabilize 253.6 amd64, #910413
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-253.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
index 831a19ae7a53..7b7dfa2defae 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-07-18 18:15 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-07-18 18:15 UTC (permalink / raw
To: gentoo-commits
commit: b5bfed6e9560ebc0d90086ca4dacea704c75871f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 18 18:15:04 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 18:15:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5bfed6e
sys-apps/systemd-utils: Stabilize 253.6 x86, #910413
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-253.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
index 7b7dfa2defae..6b7204dfdb49 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-07-17 20:46 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-07-17 20:46 UTC (permalink / raw
To: gentoo-commits
commit: 2d0e861a5c25fa6f57b21bda66c11390119ebb76
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 17 20:46:46 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 17 20:46:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d0e861a
sys-apps/systemd-utils: add 253.7
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-253.7.ebuild | 532 ++++++++++++++++++++++
2 files changed, 533 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index a424a285ade2..3ba04fb064fd 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -4,3 +4,4 @@ DIST systemd-stable-252.10.tar.gz 11841052 BLAKE2B 33ebca90ff17ef5983677c08c93a8
DIST systemd-stable-252.9.tar.gz 11829389 BLAKE2B a45a72bfe113f8cb7424d731692f548c389f59d34b649e874db2f85868943b0a9c33ef62185c83c41a9c220caddd65c44ff328026eff19c3c7efda5efbd73574 SHA512 fa34b9c2f692af8f70dffc5044fe502ff5e21625af5b27cad7fc5e833570b180f53c5d03a0add785e83a5b4e7564117fe4728931df4ef599888c73e92c7f2103
DIST systemd-stable-253.5.tar.gz 12015672 BLAKE2B 3b09bc1a63bc3321c51ea05080f95958ab55064596c13ab967a182cdaace302cc85c19e2cdabd9bdc8ba0a1a04999ae588fbce2fe2626c0f792ee22836feddf4 SHA512 39709b485cd9287e26ac8e973fa1692b280bec3b96e1da6667e4a4f2ac2228aa072b22802720a254698d32c82f5306d7feb32229e4b6d54cc0e2b1e2caa4cc2e
DIST systemd-stable-253.6.tar.gz 12069024 BLAKE2B 7dfb28127bf6c091180a6cfbae1eb657b99896920cc6b74d1e86586f51bf312d6c2647582a635a479048cadceb0b5ed508918ddff42b2639cec6234a656762f4 SHA512 c81f7ac0cca9073878026d6a3024ebad8bf38c4745fe7bac5a156906ba9fd7b78b90fdc69376821c9927dd60173dd6604684e2ea7dcb55dc2e60a0e20ee01735
+DIST systemd-stable-253.7.tar.gz 12111722 BLAKE2B 2007653c264d615fbef52cd91d173597f175ba05c1b961c6035d51c1a28ff663151a72d858115536c316a2644d880dfe94e6d00809bf3a2abe3e2f5532df565b SHA512 6935508f511930d6e980a7f0a3319295acbbc482cbce4f8f407af399259fe04b095dabd470f8825d84328a7d0f39efe6d5926022c1bdf18ec7fffe43b2586aa1
diff --git a/sys-apps/systemd-utils/systemd-utils-253.7.ebuild b/sys-apps/systemd-utils/systemd-utils-253.7.ebuild
new file mode 100644
index 000000000000..831a19ae7a53
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-253.7.ebuild
@@ -0,0 +1,532 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
+inherit toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-253.3"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+ boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ local PATCHES=(
+ )
+
+ if use elibc_musl; then
+ # Applied upstream
+ rm "${WORKDIR}/${MUSL_PATCHSET}/0015-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch" || die
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool boot kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ 90-loaderentry.install
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ # 90-loaderentry.install is generated from 90-loaderentry.install.in
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{tmp,x11}.conf
+ doins "${FILESDIR}"/legacy.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-07-13 16:18 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2023-07-13 16:18 UTC (permalink / raw
To: gentoo-commits
commit: 288ebfcaf320e666807b242a66bcb4293069572c
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 16:17:51 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 16:17:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=288ebfca
sys-apps/systemd-utils: skip musl patch applied upstream
Closes: https://bugs.gentoo.org/910301
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-253.6.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
index 697439c0ae54..831a19ae7a53 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
@@ -120,6 +120,8 @@ src_prepare() {
)
if use elibc_musl; then
+ # Applied upstream
+ rm "${WORKDIR}/${MUSL_PATCHSET}/0015-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch" || die
PATCHES+=(
"${WORKDIR}/${MUSL_PATCHSET}"
)
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-07-12 4:59 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-07-12 4:59 UTC (permalink / raw
To: gentoo-commits
commit: 801272c84d1eff8fa42ef4e0a8b95d58e0838beb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 12 04:58:55 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 12 04:59:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=801272c8
sys-apps/systemd-utils: add 253.6
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-253.6.ebuild | 530 ++++++++++++++++++++++
2 files changed, 531 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 205566eb4ea7..a424a285ade2 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -3,3 +3,4 @@ DIST systemd-musl-patches-253.3.tar.gz 28384 BLAKE2B 2736a4ddc36b2ce087c08c57c0b
DIST systemd-stable-252.10.tar.gz 11841052 BLAKE2B 33ebca90ff17ef5983677c08c93a80350908aa4f4f1860d8e69c234ead926f0e21a4c4692c171f061e05e41c94d8fe2ba3a3be75fb7b582b86e851194a1f0203 SHA512 5309d8df51b5cda694e03e2ded574d4e3606916fab5d190b21fcd0284d8d8f56cab8b3423d7d0b90e44cd9775cc62bc26198f3d2a43f8aa545959b5c27b0dd9d
DIST systemd-stable-252.9.tar.gz 11829389 BLAKE2B a45a72bfe113f8cb7424d731692f548c389f59d34b649e874db2f85868943b0a9c33ef62185c83c41a9c220caddd65c44ff328026eff19c3c7efda5efbd73574 SHA512 fa34b9c2f692af8f70dffc5044fe502ff5e21625af5b27cad7fc5e833570b180f53c5d03a0add785e83a5b4e7564117fe4728931df4ef599888c73e92c7f2103
DIST systemd-stable-253.5.tar.gz 12015672 BLAKE2B 3b09bc1a63bc3321c51ea05080f95958ab55064596c13ab967a182cdaace302cc85c19e2cdabd9bdc8ba0a1a04999ae588fbce2fe2626c0f792ee22836feddf4 SHA512 39709b485cd9287e26ac8e973fa1692b280bec3b96e1da6667e4a4f2ac2228aa072b22802720a254698d32c82f5306d7feb32229e4b6d54cc0e2b1e2caa4cc2e
+DIST systemd-stable-253.6.tar.gz 12069024 BLAKE2B 7dfb28127bf6c091180a6cfbae1eb657b99896920cc6b74d1e86586f51bf312d6c2647582a635a479048cadceb0b5ed508918ddff42b2639cec6234a656762f4 SHA512 c81f7ac0cca9073878026d6a3024ebad8bf38c4745fe7bac5a156906ba9fd7b78b90fdc69376821c9927dd60173dd6604684e2ea7dcb55dc2e60a0e20ee01735
diff --git a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
new file mode 100644
index 000000000000..697439c0ae54
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
@@ -0,0 +1,530 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
+inherit toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-253.3"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+ boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ local PATCHES=(
+ )
+
+ if use elibc_musl; then
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool boot kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ 90-loaderentry.install
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ # 90-loaderentry.install is generated from 90-loaderentry.install.in
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{tmp,x11}.conf
+ doins "${FILESDIR}"/legacy.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-07-12 4:59 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-07-12 4:59 UTC (permalink / raw
To: gentoo-commits
commit: 48c4abdd9f058c659479c47ca1ff7c35d12930c0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 12 04:56:27 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 12 04:59:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48c4abdd
sys-apps/systemd-utils: fix tests
test-udev-netlink was dropped upstream in 5bbcfbaa11a92732f9bbc8d5f77e9311e6ac3d56.
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-253.5.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.5.ebuild b/sys-apps/systemd-utils/systemd-utils-253.5.ebuild
index 3a4487c75a7c..697439c0ae54 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.5.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.5.ebuild
@@ -378,7 +378,6 @@ multilib_src_test() {
test-fido-id-desc
test-udev-builtin
test-udev-event
- test-udev-netlink
test-udev-node
test-udev-util
)
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-06-05 5:15 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-06-05 5:15 UTC (permalink / raw
To: gentoo-commits
commit: e66858fc6a98d199f7fc7e02d26695308b7080cb
Author: Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Sun Jun 4 18:45:10 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 5 05:12:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e66858fc
sys-apps/systemd-utils: enable py3.12
Signed-off-by: Violet Purcell <vimproved <AT> inventati.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-253.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.5.ebuild b/sys-apps/systemd-utils/systemd-utils-253.5.ebuild
index 501135f61291..3a4487c75a7c 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.5.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.5.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
QA_PKGCONFIG_VERSION=$(ver_cut 1)
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-06-03 14:17 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2023-06-03 14:17 UTC (permalink / raw
To: gentoo-commits
commit: e847fef0dd6e05dbf510eae5aa4939130bed0c34
Author: Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Sat Jun 3 06:13:52 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jun 3 14:16:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e847fef0
sys-apps/systemd-utils: remove lfs patch for 253.5
Signed-off-by: Violet Purcell <vimproved <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/31280
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-253.5.ebuild | 3 ---
1 file changed, 3 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.5.ebuild b/sys-apps/systemd-utils/systemd-utils-253.5.ebuild
index f196ebea3aa4..501135f61291 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.5.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.5.ebuild
@@ -122,9 +122,6 @@ src_prepare() {
if use elibc_musl; then
PATCHES+=(
"${WORKDIR}/${MUSL_PATCHSET}"
- # The LFS patch should be fine unconditionally but
- # let's keep it conditional until merged upstream.
- "${FILESDIR}"/${PN}-253.4-musl-lfs.patch
)
fi
default
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-06-02 2:39 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-06-02 2:39 UTC (permalink / raw
To: gentoo-commits
commit: 0434917c554c94b115cff9313cf6af87bf678a8e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 2 02:38:44 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 2 02:38:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0434917c
sys-apps/systemd-utils: add 253.5
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-253.5.ebuild | 534 ++++++++++++++++++++++
2 files changed, 535 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 32c8b6a3dc4b..a5e2dfea0514 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -3,3 +3,4 @@ DIST systemd-musl-patches-253.3.tar.gz 28384 BLAKE2B 2736a4ddc36b2ce087c08c57c0b
DIST systemd-stable-252.10.tar.gz 11841052 BLAKE2B 33ebca90ff17ef5983677c08c93a80350908aa4f4f1860d8e69c234ead926f0e21a4c4692c171f061e05e41c94d8fe2ba3a3be75fb7b582b86e851194a1f0203 SHA512 5309d8df51b5cda694e03e2ded574d4e3606916fab5d190b21fcd0284d8d8f56cab8b3423d7d0b90e44cd9775cc62bc26198f3d2a43f8aa545959b5c27b0dd9d
DIST systemd-stable-252.9.tar.gz 11829389 BLAKE2B a45a72bfe113f8cb7424d731692f548c389f59d34b649e874db2f85868943b0a9c33ef62185c83c41a9c220caddd65c44ff328026eff19c3c7efda5efbd73574 SHA512 fa34b9c2f692af8f70dffc5044fe502ff5e21625af5b27cad7fc5e833570b180f53c5d03a0add785e83a5b4e7564117fe4728931df4ef599888c73e92c7f2103
DIST systemd-stable-253.4.tar.gz 12010733 BLAKE2B 166ce3f089a9fc3d5d374566258d05ddc9ad1e6a06f5d171ee4e3462e30dd996ed45eccac9e27a8ce75ddf591d81ad2af8ce3bd214709cc0b816422f3960f52a SHA512 cbd572330871fe938307cdead57637e9a03fcdb95b62dd12506f13f48fddcacfaf1e7b179bc9e1c1889a07d3bf21f840aafc773df3a1ab05b37d28950cb94ee1
+DIST systemd-stable-253.5.tar.gz 12015672 BLAKE2B 3b09bc1a63bc3321c51ea05080f95958ab55064596c13ab967a182cdaace302cc85c19e2cdabd9bdc8ba0a1a04999ae588fbce2fe2626c0f792ee22836feddf4 SHA512 39709b485cd9287e26ac8e973fa1692b280bec3b96e1da6667e4a4f2ac2228aa072b22802720a254698d32c82f5306d7feb32229e4b6d54cc0e2b1e2caa4cc2e
diff --git a/sys-apps/systemd-utils/systemd-utils-253.5.ebuild b/sys-apps/systemd-utils/systemd-utils-253.5.ebuild
new file mode 100644
index 000000000000..f196ebea3aa4
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-253.5.ebuild
@@ -0,0 +1,534 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
+inherit toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-253.3"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+ boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ local PATCHES=(
+ )
+
+ if use elibc_musl; then
+ PATCHES+=(
+ "${WORKDIR}/${MUSL_PATCHSET}"
+ # The LFS patch should be fine unconditionally but
+ # let's keep it conditional until merged upstream.
+ "${FILESDIR}"/${PN}-253.4-musl-lfs.patch
+ )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool boot kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ 90-loaderentry.install
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ # 90-loaderentry.install is generated from 90-loaderentry.install.in
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{tmp,x11}.conf
+ doins "${FILESDIR}"/legacy.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-05-12 1:00 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-05-12 1:00 UTC (permalink / raw
To: gentoo-commits
commit: ac60912193f3a50953946c79ad10e71e209d836f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 12 00:59:37 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 12 01:00:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac609121
sys-apps/systemd-utils: install 90-loaderentry.install for USE=boot
This fixes installkernel/kernel-install with systemd-utils-253[boot]:
```
* CMP: =sys-apps/systemd-utils-253.4 with sys-apps/systemd-utils-253.4/image
* FILES:+usr/lib/kernel/install.d/90-loaderentry.install
* SIZE: 62.81MiB -> 62.82MiB, 119 -> 120 files
* ------> FILES(+1) SIZE(+0.00%)
```
90-loaderentry.install is generated from 90-loaderentry.install.in so it's
in the build dir, not the source dir, so we didn't pick it up. Also add it
to the targets as it's a custom_target.
Without this, 'kernel' wouldn't be installed to /boot, just 'initrd'.
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{systemd-utils-253.4.ebuild => systemd-utils-253.4-r1.ebuild} | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.4.ebuild b/sys-apps/systemd-utils/systemd-utils-253.4-r1.ebuild
similarity index 98%
rename from sys-apps/systemd-utils/systemd-utils-253.4.ebuild
rename to sys-apps/systemd-utils/systemd-utils-253.4-r1.ebuild
index ad372c33f20e..f196ebea3aa4 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.4.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.4-r1.ebuild
@@ -277,6 +277,7 @@ multilib_src_compile() {
kernel-install
man/bootctl.1
man/kernel-install.8
+ 90-loaderentry.install
src/boot/efi/linux$(efi_arch).{efi,elf}.stub
src/boot/efi/systemd-boot$(efi_arch).efi
)
@@ -414,6 +415,9 @@ multilib_src_install() {
into /usr
dobin bootctl kernel-install
doman man/{bootctl.1,kernel-install.8}
+ # 90-loaderentry.install is generated from 90-loaderentry.install.in
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
insinto usr/lib/systemd/boot/efi
doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
fi
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-05-08 18:27 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2023-05-08 18:27 UTC (permalink / raw
To: gentoo-commits
commit: f38ecf791fe36b3f65494b85920e4e414f2bf704
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon May 8 18:27:31 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon May 8 18:27:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f38ecf79
sys-apps/systemd-utils: disable py3.9
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-253.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.4.ebuild b/sys-apps/systemd-utils/systemd-utils-253.4.ebuild
index 6d640894d4a9..4dc4e15bbe49 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.4.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.4.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
QA_PKGCONFIG_VERSION=$(ver_cut 1)
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-05-07 18:12 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2023-05-07 18:12 UTC (permalink / raw
To: gentoo-commits
commit: 8b0744648e87789306b30d0c9deeaa58799506de
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun May 7 18:05:57 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun May 7 18:06:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b074464
sys-apps/systemd-utils: add 253.4
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 2 +
sys-apps/systemd-utils/systemd-utils-253.4.ebuild | 525 ++++++++++++++++++++++
2 files changed, 527 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 8d4b8b30003d..32c8b6a3dc4b 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,3 +1,5 @@
DIST systemd-musl-patches-252.4.tar.gz 25053 BLAKE2B 1d75f85ea0c48c788e9199e2d919bac90edce16a9788a349332cf308c32fb9510ac2883f8e09f21e7f37fbac2e557dc39cdf44dcd7a986587c40dedd2d1b5df5 SHA512 1dc8e220eae1869eb4bb50f9c701392542b053099cf9b6bde13f12a2d26fa29984819a8b4ce1b6c57e38a71f86324469a87cf9e22abe0f6d67ac3e84c6b9a3ba
+DIST systemd-musl-patches-253.3.tar.gz 28384 BLAKE2B 2736a4ddc36b2ce087c08c57c0b995db2dcf6f82a4ae6f20b07609657bc5ea1e4a12ec78da1576b364e03260577b4f9fc85fae8c0f7497eca564c6fb857e06d8 SHA512 4b556975f25393cbeb5df495267c68edf14bef0f8baae20955151c900f200d1402b54630cab7dd3a69bbb82bef3f7464869222e2022c60faa2311444fa87ec80
DIST systemd-stable-252.10.tar.gz 11841052 BLAKE2B 33ebca90ff17ef5983677c08c93a80350908aa4f4f1860d8e69c234ead926f0e21a4c4692c171f061e05e41c94d8fe2ba3a3be75fb7b582b86e851194a1f0203 SHA512 5309d8df51b5cda694e03e2ded574d4e3606916fab5d190b21fcd0284d8d8f56cab8b3423d7d0b90e44cd9775cc62bc26198f3d2a43f8aa545959b5c27b0dd9d
DIST systemd-stable-252.9.tar.gz 11829389 BLAKE2B a45a72bfe113f8cb7424d731692f548c389f59d34b649e874db2f85868943b0a9c33ef62185c83c41a9c220caddd65c44ff328026eff19c3c7efda5efbd73574 SHA512 fa34b9c2f692af8f70dffc5044fe502ff5e21625af5b27cad7fc5e833570b180f53c5d03a0add785e83a5b4e7564117fe4728931df4ef599888c73e92c7f2103
+DIST systemd-stable-253.4.tar.gz 12010733 BLAKE2B 166ce3f089a9fc3d5d374566258d05ddc9ad1e6a06f5d171ee4e3462e30dd996ed45eccac9e27a8ce75ddf591d81ad2af8ce3bd214709cc0b816422f3960f52a SHA512 cbd572330871fe938307cdead57637e9a03fcdb95b62dd12506f13f48fddcacfaf1e7b179bc9e1c1889a07d3bf21f840aafc773df3a1ab05b37d28950cb94ee1
diff --git a/sys-apps/systemd-utils/systemd-utils-253.4.ebuild b/sys-apps/systemd-utils/systemd-utils-253.4.ebuild
new file mode 100644
index 000000000000..6d640894d4a9
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-253.4.ebuild
@@ -0,0 +1,525 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
+inherit toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-253.3"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+ boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ local PATCHES=(
+ )
+
+ if use elibc_musl; then
+ PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool boot kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{tmp,x11}.conf
+ doins "${FILESDIR}"/legacy.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-05-05 4:13 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-05-05 4:13 UTC (permalink / raw
To: gentoo-commits
commit: b754a62c245ca62c0d3c50915d0b9b36df55b79f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 5 03:56:43 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 5 04:11:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b754a62c
sys-apps/systemd-utils: drop 251.10-r1, 252.6, 252.7, 252.8
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 5 -
.../systemd-utils/systemd-utils-251.10-r1.ebuild | 549 ---------------------
sys-apps/systemd-utils/systemd-utils-252.6.ebuild | 525 --------------------
sys-apps/systemd-utils/systemd-utils-252.7.ebuild | 525 --------------------
sys-apps/systemd-utils/systemd-utils-252.8.ebuild | 525 --------------------
5 files changed, 2129 deletions(-)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index cca330771e36..8d4b8b30003d 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,8 +1,3 @@
-DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2fb2484af718d0f282129957236ce241fbe8538a90d507a96c7c3d86f4f408ab784a6888b37486405d3276e7734a1bd5aa9680 SHA512 6e56b62234ac54929faea5a7cad699d0b932f869b48e3ba4e1f349a88653b7c787efec24a09b00290c3dc566614e3c1dc2f3c04f04e943f513108a91eca1be82
DIST systemd-musl-patches-252.4.tar.gz 25053 BLAKE2B 1d75f85ea0c48c788e9199e2d919bac90edce16a9788a349332cf308c32fb9510ac2883f8e09f21e7f37fbac2e557dc39cdf44dcd7a986587c40dedd2d1b5df5 SHA512 1dc8e220eae1869eb4bb50f9c701392542b053099cf9b6bde13f12a2d26fa29984819a8b4ce1b6c57e38a71f86324469a87cf9e22abe0f6d67ac3e84c6b9a3ba
-DIST systemd-stable-251.10.tar.gz 11461671 BLAKE2B a351b6dd9fc307e4bdcf0323b16e7f58c714392cfa466180a81196309c289b54767bfe5d03037eb1bd6b273d7eb8f6f42b927aabaa1310be04266675d1a3dd06 SHA512 49e33dbbc1b2ebe123b2f722070c87524b3126d1e605fb3e24a3f9f328ab67de506dc4588a92caf157428c21b9c73c3884726c4a5b1f67bb997d4a68bb871e5b
DIST systemd-stable-252.10.tar.gz 11841052 BLAKE2B 33ebca90ff17ef5983677c08c93a80350908aa4f4f1860d8e69c234ead926f0e21a4c4692c171f061e05e41c94d8fe2ba3a3be75fb7b582b86e851194a1f0203 SHA512 5309d8df51b5cda694e03e2ded574d4e3606916fab5d190b21fcd0284d8d8f56cab8b3423d7d0b90e44cd9775cc62bc26198f3d2a43f8aa545959b5c27b0dd9d
-DIST systemd-stable-252.6.tar.gz 11823064 BLAKE2B 0c260685c929b5271efba13d6ba84bc99211ead7d080b5e9b0d68428fe46a8a8a556b140787dd21f7b19e1454a78f15bf407038b3dc02a4d3db2336f3d881255 SHA512 948cb3f7c6a4bbc2bcc3ebe4f36afac304c9d694dadac7e363bbdb79f111eb5d69fd501433ba6719d79d833206a019cb40a37b16a92c8d22acbdd9736cdbdd37
-DIST systemd-stable-252.7.tar.gz 11825226 BLAKE2B 81ef2f6cbe7902014a92702c0eae740d18fc24355c186f51a0467668bb225d358a422fd02eec4c38063a3f65a9f1b1ebf88036c4e5cd0bfc50857d2818a42178 SHA512 691caea30d759afd3a1ad11495f7531c04238b080281617dceb1671ea3e27c7a6a4859961a81d29ecefb94b7a764e40283f39294e34beb63e0862777f5a8d34f
-DIST systemd-stable-252.8.tar.gz 11829615 BLAKE2B 483c49ee0f96305d0c5bc9fef0bb8d093de4a1d2b1e418ace23d855ca0c07cb713d897e4917dba012abef5440a08d82be8449603ee695e3f9fd703925e125490 SHA512 d5112c50b60268513cfd04dc5bc12b696cd2336b1f73cfb13d3a555c3f49a899692b0b5fcca9128b2118670469b86f51a96b99ee9da1e5abab3918285b36ac5b
DIST systemd-stable-252.9.tar.gz 11829389 BLAKE2B a45a72bfe113f8cb7424d731692f548c389f59d34b649e874db2f85868943b0a9c33ef62185c83c41a9c220caddd65c44ff328026eff19c3c7efda5efbd73574 SHA512 fa34b9c2f692af8f70dffc5044fe502ff5e21625af5b27cad7fc5e833570b180f53c5d03a0add785e83a5b4e7564117fe4728931df4ef599888c73e92c7f2103
diff --git a/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild
deleted file mode 100644
index 711bb3bae0b1..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild
+++ /dev/null
@@ -1,549 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-if [[ ${PV} != 25[12].* ]] ; then
- # The F_S=3 issues should be fixed in 253.
- # - https://github.com/systemd/systemd/issues/22801
- # - https://github.com/systemd/systemd/pull/25967
- # - https://github.com/systemd/systemd/commit/7929e180aa47a2692ad4f053afac2857d7198758
- # - https://github.com/systemd/systemd/commit/4f79f545b3c46c358666c9f5f2b384fe50aac4b4
- die "Please remove the FORTIFY_SOURCE hacks in src_configure."
-fi
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
-inherit toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-251.2"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
- boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
- python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/251-gpt-auto-no-cryptsetup.patch"
- "${FILESDIR}/251-tmpfiles-ub.patch"
- )
-
- if use elibc_musl; then
- PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
- # Applied upstream in 251.3
- rm "${WORKDIR}/${MUSL_PATCHSET}/0001-Add-sys-file.h-for-LOCK_.patch" || die
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootlibexecdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- # Broken with FORTIFY_SOURCE=3: bug #841770.
- #
- # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
- # to unset F_S first, then explicitly set 2, to negate any default
- # and anything set by the user if they're choosing 3 (or if they've
- # modified GCC to set 3).
- #
- if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
- # We can't unconditionally do this b/c we fortify needs
- # some level of optimisation.
- filter-flags -D_FORTIFY_SOURCE=3
- append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
- fi
-
- multilib-minimal_src_configure
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool boot kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- kernel-install
- man/bootctl.1
- man/kernel-install.8
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl kernel-install
- doman man/{bootctl.1,kernel-install.8}
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-252.6.ebuild b/sys-apps/systemd-utils/systemd-utils-252.6.ebuild
deleted file mode 100644
index f70a496cddc0..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-252.6.ebuild
+++ /dev/null
@@ -1,525 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
-inherit toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-252.4"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
- boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
- python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- local PATCHES=(
- )
-
- if use elibc_musl; then
- PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool boot kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- kernel-install
- man/bootctl.1
- man/kernel-install.8
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl kernel-install
- doman man/{bootctl.1,kernel-install.8}
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{tmp,x11}.conf
- doins "${FILESDIR}"/legacy.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-252.7.ebuild b/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
deleted file mode 100644
index 88a1650b54c0..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
+++ /dev/null
@@ -1,525 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
-inherit toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-252.4"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
- boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
- python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- local PATCHES=(
- )
-
- if use elibc_musl; then
- PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool boot kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- kernel-install
- man/bootctl.1
- man/kernel-install.8
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl kernel-install
- doman man/{bootctl.1,kernel-install.8}
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{tmp,x11}.conf
- doins "${FILESDIR}"/legacy.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-252.8.ebuild b/sys-apps/systemd-utils/systemd-utils-252.8.ebuild
deleted file mode 100644
index f70a496cddc0..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-252.8.ebuild
+++ /dev/null
@@ -1,525 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
-inherit toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-252.4"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
- boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
- python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- local PATCHES=(
- )
-
- if use elibc_musl; then
- PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- python_setup
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool boot kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- kernel-install
- man/bootctl.1
- man/kernel-install.8
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl kernel-install
- doman man/{bootctl.1,kernel-install.8}
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{tmp,x11}.conf
- doins "${FILESDIR}"/legacy.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-05-05 4:13 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-05-05 4:13 UTC (permalink / raw
To: gentoo-commits
commit: 41dbc24d69ee0668ae5e5b72d0f1f920fa4f78fd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 5 03:55:51 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 5 04:11:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41dbc24d
sys-apps/systemd-utils: add 252.10
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-252.10.ebuild | 525 +++++++++++++++++++++
2 files changed, 526 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 506e298ce75e..cca330771e36 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,6 +1,7 @@
DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2fb2484af718d0f282129957236ce241fbe8538a90d507a96c7c3d86f4f408ab784a6888b37486405d3276e7734a1bd5aa9680 SHA512 6e56b62234ac54929faea5a7cad699d0b932f869b48e3ba4e1f349a88653b7c787efec24a09b00290c3dc566614e3c1dc2f3c04f04e943f513108a91eca1be82
DIST systemd-musl-patches-252.4.tar.gz 25053 BLAKE2B 1d75f85ea0c48c788e9199e2d919bac90edce16a9788a349332cf308c32fb9510ac2883f8e09f21e7f37fbac2e557dc39cdf44dcd7a986587c40dedd2d1b5df5 SHA512 1dc8e220eae1869eb4bb50f9c701392542b053099cf9b6bde13f12a2d26fa29984819a8b4ce1b6c57e38a71f86324469a87cf9e22abe0f6d67ac3e84c6b9a3ba
DIST systemd-stable-251.10.tar.gz 11461671 BLAKE2B a351b6dd9fc307e4bdcf0323b16e7f58c714392cfa466180a81196309c289b54767bfe5d03037eb1bd6b273d7eb8f6f42b927aabaa1310be04266675d1a3dd06 SHA512 49e33dbbc1b2ebe123b2f722070c87524b3126d1e605fb3e24a3f9f328ab67de506dc4588a92caf157428c21b9c73c3884726c4a5b1f67bb997d4a68bb871e5b
+DIST systemd-stable-252.10.tar.gz 11841052 BLAKE2B 33ebca90ff17ef5983677c08c93a80350908aa4f4f1860d8e69c234ead926f0e21a4c4692c171f061e05e41c94d8fe2ba3a3be75fb7b582b86e851194a1f0203 SHA512 5309d8df51b5cda694e03e2ded574d4e3606916fab5d190b21fcd0284d8d8f56cab8b3423d7d0b90e44cd9775cc62bc26198f3d2a43f8aa545959b5c27b0dd9d
DIST systemd-stable-252.6.tar.gz 11823064 BLAKE2B 0c260685c929b5271efba13d6ba84bc99211ead7d080b5e9b0d68428fe46a8a8a556b140787dd21f7b19e1454a78f15bf407038b3dc02a4d3db2336f3d881255 SHA512 948cb3f7c6a4bbc2bcc3ebe4f36afac304c9d694dadac7e363bbdb79f111eb5d69fd501433ba6719d79d833206a019cb40a37b16a92c8d22acbdd9736cdbdd37
DIST systemd-stable-252.7.tar.gz 11825226 BLAKE2B 81ef2f6cbe7902014a92702c0eae740d18fc24355c186f51a0467668bb225d358a422fd02eec4c38063a3f65a9f1b1ebf88036c4e5cd0bfc50857d2818a42178 SHA512 691caea30d759afd3a1ad11495f7531c04238b080281617dceb1671ea3e27c7a6a4859961a81d29ecefb94b7a764e40283f39294e34beb63e0862777f5a8d34f
DIST systemd-stable-252.8.tar.gz 11829615 BLAKE2B 483c49ee0f96305d0c5bc9fef0bb8d093de4a1d2b1e418ace23d855ca0c07cb713d897e4917dba012abef5440a08d82be8449603ee695e3f9fd703925e125490 SHA512 d5112c50b60268513cfd04dc5bc12b696cd2336b1f73cfb13d3a555c3f49a899692b0b5fcca9128b2118670469b86f51a96b99ee9da1e5abab3918285b36ac5b
diff --git a/sys-apps/systemd-utils/systemd-utils-252.10.ebuild b/sys-apps/systemd-utils/systemd-utils-252.10.ebuild
new file mode 100644
index 000000000000..8660e0fc4c57
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-252.10.ebuild
@@ -0,0 +1,525 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
+inherit toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-252.4"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+ boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ local PATCHES=(
+ )
+
+ if use elibc_musl; then
+ PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool boot kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{tmp,x11}.conf
+ doins "${FILESDIR}"/legacy.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-04-05 18:58 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-04-05 18:58 UTC (permalink / raw
To: gentoo-commits
commit: b3aa1cd0e605043fcdb5b126d984dce7d6a9f9ad
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 5 18:57:36 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 5 18:58:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3aa1cd0
sys-apps/systemd-utils: add 252.9
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-252.9.ebuild | 525 ++++++++++++++++++++++
2 files changed, 526 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 91306a1203ee..506e298ce75e 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -4,3 +4,4 @@ DIST systemd-stable-251.10.tar.gz 11461671 BLAKE2B a351b6dd9fc307e4bdcf0323b16e7
DIST systemd-stable-252.6.tar.gz 11823064 BLAKE2B 0c260685c929b5271efba13d6ba84bc99211ead7d080b5e9b0d68428fe46a8a8a556b140787dd21f7b19e1454a78f15bf407038b3dc02a4d3db2336f3d881255 SHA512 948cb3f7c6a4bbc2bcc3ebe4f36afac304c9d694dadac7e363bbdb79f111eb5d69fd501433ba6719d79d833206a019cb40a37b16a92c8d22acbdd9736cdbdd37
DIST systemd-stable-252.7.tar.gz 11825226 BLAKE2B 81ef2f6cbe7902014a92702c0eae740d18fc24355c186f51a0467668bb225d358a422fd02eec4c38063a3f65a9f1b1ebf88036c4e5cd0bfc50857d2818a42178 SHA512 691caea30d759afd3a1ad11495f7531c04238b080281617dceb1671ea3e27c7a6a4859961a81d29ecefb94b7a764e40283f39294e34beb63e0862777f5a8d34f
DIST systemd-stable-252.8.tar.gz 11829615 BLAKE2B 483c49ee0f96305d0c5bc9fef0bb8d093de4a1d2b1e418ace23d855ca0c07cb713d897e4917dba012abef5440a08d82be8449603ee695e3f9fd703925e125490 SHA512 d5112c50b60268513cfd04dc5bc12b696cd2336b1f73cfb13d3a555c3f49a899692b0b5fcca9128b2118670469b86f51a96b99ee9da1e5abab3918285b36ac5b
+DIST systemd-stable-252.9.tar.gz 11829389 BLAKE2B a45a72bfe113f8cb7424d731692f548c389f59d34b649e874db2f85868943b0a9c33ef62185c83c41a9c220caddd65c44ff328026eff19c3c7efda5efbd73574 SHA512 fa34b9c2f692af8f70dffc5044fe502ff5e21625af5b27cad7fc5e833570b180f53c5d03a0add785e83a5b4e7564117fe4728931df4ef599888c73e92c7f2103
diff --git a/sys-apps/systemd-utils/systemd-utils-252.9.ebuild b/sys-apps/systemd-utils/systemd-utils-252.9.ebuild
new file mode 100644
index 000000000000..f70a496cddc0
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-252.9.ebuild
@@ -0,0 +1,525 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
+inherit toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-252.4"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+ boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ local PATCHES=(
+ )
+
+ if use elibc_musl; then
+ PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool boot kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{tmp,x11}.conf
+ doins "${FILESDIR}"/legacy.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-03-30 22:02 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-03-30 22:02 UTC (permalink / raw
To: gentoo-commits
commit: 736367eff1e92ab4d8ba3ac8e91de072c32b12c3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 22:01:41 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 22:02:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=736367ef
sys-apps/systemd-utils: add 252.8
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-252.8.ebuild | 525 ++++++++++++++++++++++
2 files changed, 526 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 25386a1fbd0d..91306a1203ee 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -3,3 +3,4 @@ DIST systemd-musl-patches-252.4.tar.gz 25053 BLAKE2B 1d75f85ea0c48c788e9199e2d91
DIST systemd-stable-251.10.tar.gz 11461671 BLAKE2B a351b6dd9fc307e4bdcf0323b16e7f58c714392cfa466180a81196309c289b54767bfe5d03037eb1bd6b273d7eb8f6f42b927aabaa1310be04266675d1a3dd06 SHA512 49e33dbbc1b2ebe123b2f722070c87524b3126d1e605fb3e24a3f9f328ab67de506dc4588a92caf157428c21b9c73c3884726c4a5b1f67bb997d4a68bb871e5b
DIST systemd-stable-252.6.tar.gz 11823064 BLAKE2B 0c260685c929b5271efba13d6ba84bc99211ead7d080b5e9b0d68428fe46a8a8a556b140787dd21f7b19e1454a78f15bf407038b3dc02a4d3db2336f3d881255 SHA512 948cb3f7c6a4bbc2bcc3ebe4f36afac304c9d694dadac7e363bbdb79f111eb5d69fd501433ba6719d79d833206a019cb40a37b16a92c8d22acbdd9736cdbdd37
DIST systemd-stable-252.7.tar.gz 11825226 BLAKE2B 81ef2f6cbe7902014a92702c0eae740d18fc24355c186f51a0467668bb225d358a422fd02eec4c38063a3f65a9f1b1ebf88036c4e5cd0bfc50857d2818a42178 SHA512 691caea30d759afd3a1ad11495f7531c04238b080281617dceb1671ea3e27c7a6a4859961a81d29ecefb94b7a764e40283f39294e34beb63e0862777f5a8d34f
+DIST systemd-stable-252.8.tar.gz 11829615 BLAKE2B 483c49ee0f96305d0c5bc9fef0bb8d093de4a1d2b1e418ace23d855ca0c07cb713d897e4917dba012abef5440a08d82be8449603ee695e3f9fd703925e125490 SHA512 d5112c50b60268513cfd04dc5bc12b696cd2336b1f73cfb13d3a555c3f49a899692b0b5fcca9128b2118670469b86f51a96b99ee9da1e5abab3918285b36ac5b
diff --git a/sys-apps/systemd-utils/systemd-utils-252.8.ebuild b/sys-apps/systemd-utils/systemd-utils-252.8.ebuild
new file mode 100644
index 000000000000..f70a496cddc0
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-252.8.ebuild
@@ -0,0 +1,525 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
+inherit toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-252.4"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+ boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ local PATCHES=(
+ )
+
+ if use elibc_musl; then
+ PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool boot kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{tmp,x11}.conf
+ doins "${FILESDIR}"/legacy.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-03-07 16:33 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-03-07 16:33 UTC (permalink / raw
To: gentoo-commits
commit: b8c1fb8bc1e13630461189329b5a9367e3fb599b
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 7 16:33:12 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 7 16:33:12 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8c1fb8b
sys-apps/systemd-utils: Stabilize 252.7 ppc64, #899946
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-252.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-252.7.ebuild b/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
index 46ae695a8d4f..88a1650b54c0 100644
--- a/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-03-07 16:33 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-03-07 16:33 UTC (permalink / raw
To: gentoo-commits
commit: ee8589cbe4e0dfb26de2d09917b909e3982875e4
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 7 16:32:57 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 7 16:32:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee8589cb
sys-apps/systemd-utils: Stabilize 252.7 sparc, #899946
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-252.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-252.7.ebuild b/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
index f1a76bd38967..9ce152e31305 100644
--- a/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-03-07 16:33 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-03-07 16:33 UTC (permalink / raw
To: gentoo-commits
commit: 2bf7cddb3eedf8e4b11cd545b6794c6485c951cd
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 7 16:33:09 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 7 16:33:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bf7cddb
sys-apps/systemd-utils: Stabilize 252.7 arm64, #899946
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-252.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-252.7.ebuild b/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
index edb5073d62fe..46ae695a8d4f 100644
--- a/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-03-07 16:33 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-03-07 16:33 UTC (permalink / raw
To: gentoo-commits
commit: 0490685a06ab83df118acc34eb829fa0dbba60ef
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 7 16:33:03 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 7 16:33:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0490685a
sys-apps/systemd-utils: Stabilize 252.7 ppc, #899946
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-252.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-252.7.ebuild b/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
index c11cc8708b93..da49062463e7 100644
--- a/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-03-07 16:33 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-03-07 16:33 UTC (permalink / raw
To: gentoo-commits
commit: 80f811bb7613dc65631ea0094b8b1657eefa6332
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 7 16:32:51 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 7 16:32:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80f811bb
sys-apps/systemd-utils: Stabilize 252.7 amd64, #899946
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-252.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-252.7.ebuild b/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
index f70a496cddc0..59078498fe95 100644
--- a/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-03-07 16:33 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-03-07 16:33 UTC (permalink / raw
To: gentoo-commits
commit: bb57b4f923d1a2ed444df24b8661488e3df10881
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 7 16:33:06 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 7 16:33:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb57b4f9
sys-apps/systemd-utils: Stabilize 252.7 arm, #899946
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-252.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-252.7.ebuild b/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
index da49062463e7..edb5073d62fe 100644
--- a/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-03-07 16:33 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-03-07 16:33 UTC (permalink / raw
To: gentoo-commits
commit: e3cb6a0a363a07b389005503bed5b8a894853065
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 7 16:33:00 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 7 16:33:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3cb6a0a
sys-apps/systemd-utils: Stabilize 252.7 hppa, #899946
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-252.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-252.7.ebuild b/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
index 9ce152e31305..c11cc8708b93 100644
--- a/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-03-07 16:33 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-03-07 16:33 UTC (permalink / raw
To: gentoo-commits
commit: ec5e6736b0c4e5d8a2d7c5cdf80625254647b2aa
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 7 16:32:54 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 7 16:32:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec5e6736
sys-apps/systemd-utils: Stabilize 252.7 x86, #899946
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-252.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-252.7.ebuild b/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
index 59078498fe95..f1a76bd38967 100644
--- a/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-03-05 3:24 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2023-03-05 3:24 UTC (permalink / raw
To: gentoo-commits
commit: 220b04352f5151b15575b0fd06874c1037013e80
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 5 03:22:13 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Mar 5 03:24:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=220b0435
sys-apps/systemd-utils: call python_setup
Closes: https://bugs.gentoo.org/899622
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild | 5 +++++
sys-apps/systemd-utils/systemd-utils-252.6.ebuild | 5 +++++
sys-apps/systemd-utils/systemd-utils-252.7.ebuild | 5 +++++
3 files changed, 15 insertions(+)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild
index 2b52117a1fb0..711bb3bae0b1 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild
@@ -159,6 +159,11 @@ src_configure() {
multilib-minimal_src_configure
}
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
multilib_src_configure() {
local emesonargs=(
$(meson_use split-usr)
diff --git a/sys-apps/systemd-utils/systemd-utils-252.6.ebuild b/sys-apps/systemd-utils/systemd-utils-252.6.ebuild
index 35fbaaa92fd2..f70a496cddc0 100644
--- a/sys-apps/systemd-utils/systemd-utils-252.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-252.6.ebuild
@@ -130,6 +130,11 @@ src_prepare() {
sed -i -e "/${rpath_pattern}/d" meson.build || die
}
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
multilib_src_configure() {
local emesonargs=(
$(meson_use split-usr)
diff --git a/sys-apps/systemd-utils/systemd-utils-252.7.ebuild b/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
index 35fbaaa92fd2..f70a496cddc0 100644
--- a/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
@@ -130,6 +130,11 @@ src_prepare() {
sed -i -e "/${rpath_pattern}/d" meson.build || die
}
+src_configure() {
+ python_setup
+ meson-multilib_src_configure
+}
+
multilib_src_configure() {
local emesonargs=(
$(meson_use split-usr)
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-03-04 1:25 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-03-04 1:25 UTC (permalink / raw
To: gentoo-commits
commit: aaf17c251d1161d5a63a197b040235fe1353783c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 4 01:19:27 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 4 01:24:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaf17c25
sys-apps/systemd-utils: add 252.7
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-252.7.ebuild | 520 ++++++++++++++++++++++
2 files changed, 521 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 977a6aa71ff8..25386a1fbd0d 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -2,3 +2,4 @@ DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2
DIST systemd-musl-patches-252.4.tar.gz 25053 BLAKE2B 1d75f85ea0c48c788e9199e2d919bac90edce16a9788a349332cf308c32fb9510ac2883f8e09f21e7f37fbac2e557dc39cdf44dcd7a986587c40dedd2d1b5df5 SHA512 1dc8e220eae1869eb4bb50f9c701392542b053099cf9b6bde13f12a2d26fa29984819a8b4ce1b6c57e38a71f86324469a87cf9e22abe0f6d67ac3e84c6b9a3ba
DIST systemd-stable-251.10.tar.gz 11461671 BLAKE2B a351b6dd9fc307e4bdcf0323b16e7f58c714392cfa466180a81196309c289b54767bfe5d03037eb1bd6b273d7eb8f6f42b927aabaa1310be04266675d1a3dd06 SHA512 49e33dbbc1b2ebe123b2f722070c87524b3126d1e605fb3e24a3f9f328ab67de506dc4588a92caf157428c21b9c73c3884726c4a5b1f67bb997d4a68bb871e5b
DIST systemd-stable-252.6.tar.gz 11823064 BLAKE2B 0c260685c929b5271efba13d6ba84bc99211ead7d080b5e9b0d68428fe46a8a8a556b140787dd21f7b19e1454a78f15bf407038b3dc02a4d3db2336f3d881255 SHA512 948cb3f7c6a4bbc2bcc3ebe4f36afac304c9d694dadac7e363bbdb79f111eb5d69fd501433ba6719d79d833206a019cb40a37b16a92c8d22acbdd9736cdbdd37
+DIST systemd-stable-252.7.tar.gz 11825226 BLAKE2B 81ef2f6cbe7902014a92702c0eae740d18fc24355c186f51a0467668bb225d358a422fd02eec4c38063a3f65a9f1b1ebf88036c4e5cd0bfc50857d2818a42178 SHA512 691caea30d759afd3a1ad11495f7531c04238b080281617dceb1671ea3e27c7a6a4859961a81d29ecefb94b7a764e40283f39294e34beb63e0862777f5a8d34f
diff --git a/sys-apps/systemd-utils/systemd-utils-252.7.ebuild b/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
new file mode 100644
index 000000000000..35fbaaa92fd2
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
@@ -0,0 +1,520 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
+inherit toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-252.4"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+ boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ local PATCHES=(
+ )
+
+ if use elibc_musl; then
+ PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool boot kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{tmp,x11}.conf
+ doins "${FILESDIR}"/legacy.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-02-23 18:19 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2023-02-23 18:19 UTC (permalink / raw
To: gentoo-commits
commit: 5ba631f7a98d0ce3e5c8d3c6c780c11c27cb1610
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 18:19:08 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 18:19:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ba631f7
sys-apps/systemd-utils: move kernel config check behind udev USE flag
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild | 2 +-
sys-apps/systemd-utils/systemd-utils-252.6.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild
index 6d94fe6ec771..2b52117a1fb0 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild
@@ -117,7 +117,7 @@ CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]]; then
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
linux-info_pkg_setup
fi
}
diff --git a/sys-apps/systemd-utils/systemd-utils-252.6.ebuild b/sys-apps/systemd-utils/systemd-utils-252.6.ebuild
index 85a489584485..35fbaaa92fd2 100644
--- a/sys-apps/systemd-utils/systemd-utils-252.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-252.6.ebuild
@@ -110,7 +110,7 @@ CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]]; then
+ if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
linux-info_pkg_setup
fi
}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-02-23 18:01 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2023-02-23 18:01 UTC (permalink / raw
To: gentoo-commits
commit: eceb20461be19188894dd5d1edb54ddf73aacc2c
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 18:00:03 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 18:00:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eceb2046
sys-apps/systemd-utils: drop 252.4, 252.5
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 2 -
sys-apps/systemd-utils/systemd-utils-252.4.ebuild | 536 ----------------------
sys-apps/systemd-utils/systemd-utils-252.5.ebuild | 510 --------------------
3 files changed, 1048 deletions(-)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index b3c7e19a4325..977a6aa71ff8 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,6 +1,4 @@
DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2fb2484af718d0f282129957236ce241fbe8538a90d507a96c7c3d86f4f408ab784a6888b37486405d3276e7734a1bd5aa9680 SHA512 6e56b62234ac54929faea5a7cad699d0b932f869b48e3ba4e1f349a88653b7c787efec24a09b00290c3dc566614e3c1dc2f3c04f04e943f513108a91eca1be82
DIST systemd-musl-patches-252.4.tar.gz 25053 BLAKE2B 1d75f85ea0c48c788e9199e2d919bac90edce16a9788a349332cf308c32fb9510ac2883f8e09f21e7f37fbac2e557dc39cdf44dcd7a986587c40dedd2d1b5df5 SHA512 1dc8e220eae1869eb4bb50f9c701392542b053099cf9b6bde13f12a2d26fa29984819a8b4ce1b6c57e38a71f86324469a87cf9e22abe0f6d67ac3e84c6b9a3ba
DIST systemd-stable-251.10.tar.gz 11461671 BLAKE2B a351b6dd9fc307e4bdcf0323b16e7f58c714392cfa466180a81196309c289b54767bfe5d03037eb1bd6b273d7eb8f6f42b927aabaa1310be04266675d1a3dd06 SHA512 49e33dbbc1b2ebe123b2f722070c87524b3126d1e605fb3e24a3f9f328ab67de506dc4588a92caf157428c21b9c73c3884726c4a5b1f67bb997d4a68bb871e5b
-DIST systemd-stable-252.4.tar.gz 11753300 BLAKE2B 8819ca6d3a64c110e5a245ae0369dc431079556e200d13d8edfc64fc35b2b04f1cdc215b81d9bf126245f315be3662ebd2c094167f88d2465f0dce25aa1fd196 SHA512 d4e99a67c59091dae78f654433a6c5e114ae66256b72d9d43292c43a986ee6a58e2d06f12866cbd7ec821b61580ec003af1725f60fd4b038b4a981b3ca839ee2
-DIST systemd-stable-252.5.tar.gz 11762414 BLAKE2B c9560ad5e49b7ff33ebcf2e553fa1824131e84bb7c40e5b04135bcdce9ad2ef32194382a501a1853a28e02b7f434bf1fb53edd6e9272d432c23fb116015d751f SHA512 f3359e0496b673033d6c8da5c117890e0dc26c9db51003b28f629ac751d9bae117be32d9f54c377eb2d5a7c2d36ac0dbdc2116498698e993550fbdd9aae535b9
DIST systemd-stable-252.6.tar.gz 11823064 BLAKE2B 0c260685c929b5271efba13d6ba84bc99211ead7d080b5e9b0d68428fe46a8a8a556b140787dd21f7b19e1454a78f15bf407038b3dc02a4d3db2336f3d881255 SHA512 948cb3f7c6a4bbc2bcc3ebe4f36afac304c9d694dadac7e363bbdb79f111eb5d69fd501433ba6719d79d833206a019cb40a37b16a92c8d22acbdd9736cdbdd37
diff --git a/sys-apps/systemd-utils/systemd-utils-252.4.ebuild b/sys-apps/systemd-utils/systemd-utils-252.4.ebuild
deleted file mode 100644
index 191d25923fb0..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-252.4.ebuild
+++ /dev/null
@@ -1,536 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-if [[ ${PV} != 25[12].* ]] ; then
- # The F_S=3 issues should be fixed in 253.
- # - https://github.com/systemd/systemd/issues/22801
- # - https://github.com/systemd/systemd/pull/25967
- # - https://github.com/systemd/systemd/commit/7929e180aa47a2692ad4f053afac2857d7198758
- # - https://github.com/systemd/systemd/commit/4f79f545b3c46c358666c9f5f2b384fe50aac4b4
- die "Please remove the FORTIFY_SOURCE hacks in src_configure."
-fi
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-252.4"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
- boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
- python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/251-tmpfiles-ub.patch"
- )
-
- if use elibc_musl; then
- PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- # Broken with FORTIFY_SOURCE=3: bug #841770.
- #
- # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
- # to unset F_S first, then explicitly set 2, to negate any default
- # and anything set by the user if they're choosing 3 (or if they've
- # modified GCC to set 3).
- #
- if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
- # We can't unconditionally do this b/c we fortify needs
- # some level of optimisation.
- filter-flags -D_FORTIFY_SOURCE=3
- append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
- fi
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool boot kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- kernel-install
- man/bootctl.1
- man/kernel-install.8
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl kernel-install
- doman man/{bootctl.1,kernel-install.8}
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{tmp,x11}.conf
- doins "${FILESDIR}"/legacy.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-252.5.ebuild b/sys-apps/systemd-utils/systemd-utils-252.5.ebuild
deleted file mode 100644
index eb4b47dc0124..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-252.5.ebuild
+++ /dev/null
@@ -1,510 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-252.4"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
- boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/floppy
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/usb
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
- python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-src_prepare() {
- local PATCHES=(
- )
-
- if use elibc_musl; then
- PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootpkglibdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool boot kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- kernel-install
- man/bootctl.1
- man/kernel-install.8
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl kernel-install
- doman man/{bootctl.1,kernel-install.8}
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- insinto /usr/lib/tmpfiles.d
- doins tmpfiles.d/{tmp,x11}.conf
- doins "${FILESDIR}"/legacy.conf
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-02-23 18:01 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2023-02-23 18:01 UTC (permalink / raw
To: gentoo-commits
commit: b429044cac33a600475d2db84c18367c54e8da24
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 17:59:31 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 17:59:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b429044c
sys-apps/systemd-utils: add kernel config check
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild | 12 +++++++++++-
sys-apps/systemd-utils/systemd-utils-252.6.ebuild | 12 +++++++++++-
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild
index 311ff8be859c..6d94fe6ec771 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild
@@ -15,7 +15,8 @@ fi
QA_PKGCONFIG_VERSION=$(ver_cut 1)
-inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
+inherit toolchain-funcs udev usr-ldscript
DESCRIPTION="Utilities split out from systemd for OpenRC users"
HOMEPAGE="https://systemd.io/"
@@ -112,6 +113,15 @@ python_check_deps() {
QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ linux-info_pkg_setup
+ fi
+}
+
src_prepare() {
local PATCHES=(
"${FILESDIR}/251-gpt-auto-no-cryptsetup.patch"
diff --git a/sys-apps/systemd-utils/systemd-utils-252.6.ebuild b/sys-apps/systemd-utils/systemd-utils-252.6.ebuild
index eb4b47dc0124..85a489584485 100644
--- a/sys-apps/systemd-utils/systemd-utils-252.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-252.6.ebuild
@@ -6,7 +6,8 @@ PYTHON_COMPAT=( python3_{9..11} )
QA_PKGCONFIG_VERSION=$(ver_cut 1)
-inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
+inherit toolchain-funcs udev usr-ldscript
DESCRIPTION="Utilities split out from systemd for OpenRC users"
HOMEPAGE="https://systemd.io/"
@@ -105,6 +106,15 @@ python_check_deps() {
QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ linux-info_pkg_setup
+ fi
+}
+
src_prepare() {
local PATCHES=(
)
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-02-17 3:07 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-02-17 3:07 UTC (permalink / raw
To: gentoo-commits
commit: 931f5fdcac657248ab247b95ee0ec7c1c5ef65ba
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 17 03:03:01 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 03:03:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=931f5fdc
sys-apps/systemd-utils: add 252.6
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-252.6.ebuild | 510 ++++++++++++++++++++++
2 files changed, 511 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index f0880851f64f..b3c7e19a4325 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -3,3 +3,4 @@ DIST systemd-musl-patches-252.4.tar.gz 25053 BLAKE2B 1d75f85ea0c48c788e9199e2d91
DIST systemd-stable-251.10.tar.gz 11461671 BLAKE2B a351b6dd9fc307e4bdcf0323b16e7f58c714392cfa466180a81196309c289b54767bfe5d03037eb1bd6b273d7eb8f6f42b927aabaa1310be04266675d1a3dd06 SHA512 49e33dbbc1b2ebe123b2f722070c87524b3126d1e605fb3e24a3f9f328ab67de506dc4588a92caf157428c21b9c73c3884726c4a5b1f67bb997d4a68bb871e5b
DIST systemd-stable-252.4.tar.gz 11753300 BLAKE2B 8819ca6d3a64c110e5a245ae0369dc431079556e200d13d8edfc64fc35b2b04f1cdc215b81d9bf126245f315be3662ebd2c094167f88d2465f0dce25aa1fd196 SHA512 d4e99a67c59091dae78f654433a6c5e114ae66256b72d9d43292c43a986ee6a58e2d06f12866cbd7ec821b61580ec003af1725f60fd4b038b4a981b3ca839ee2
DIST systemd-stable-252.5.tar.gz 11762414 BLAKE2B c9560ad5e49b7ff33ebcf2e553fa1824131e84bb7c40e5b04135bcdce9ad2ef32194382a501a1853a28e02b7f434bf1fb53edd6e9272d432c23fb116015d751f SHA512 f3359e0496b673033d6c8da5c117890e0dc26c9db51003b28f629ac751d9bae117be32d9f54c377eb2d5a7c2d36ac0dbdc2116498698e993550fbdd9aae535b9
+DIST systemd-stable-252.6.tar.gz 11823064 BLAKE2B 0c260685c929b5271efba13d6ba84bc99211ead7d080b5e9b0d68428fe46a8a8a556b140787dd21f7b19e1454a78f15bf407038b3dc02a4d3db2336f3d881255 SHA512 948cb3f7c6a4bbc2bcc3ebe4f36afac304c9d694dadac7e363bbdb79f111eb5d69fd501433ba6719d79d833206a019cb40a37b16a92c8d22acbdd9736cdbdd37
diff --git a/sys-apps/systemd-utils/systemd-utils-252.6.ebuild b/sys-apps/systemd-utils/systemd-utils-252.6.ebuild
new file mode 100644
index 000000000000..eb4b47dc0124
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-252.6.ebuild
@@ -0,0 +1,510 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-252.4"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+ boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/floppy
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/usb
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+ local PATCHES=(
+ )
+
+ if use elibc_musl; then
+ PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool boot kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{tmp,x11}.conf
+ doins "${FILESDIR}"/legacy.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-02-12 18:11 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2023-02-12 18:11 UTC (permalink / raw
To: gentoo-commits
commit: 02552957608a7e568c208265c924d4666fa3d9e9
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 18:11:06 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 18:11:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02552957
sys-apps/systemd-utils: depend on floppy and usb groups
Used in 40-gentoo.rules.
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-252.5.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sys-apps/systemd-utils/systemd-utils-252.5.ebuild b/sys-apps/systemd-utils/systemd-utils-252.5.ebuild
index 58f76c9f4afc..eb4b47dc0124 100644
--- a/sys-apps/systemd-utils/systemd-utils-252.5.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-252.5.ebuild
@@ -62,6 +62,7 @@ RDEPEND="${COMMON_DEPEND}
acct-group/cdrom
acct-group/dialout
acct-group/disk
+ acct-group/floppy
acct-group/input
acct-group/kmem
acct-group/kvm
@@ -70,6 +71,7 @@ RDEPEND="${COMMON_DEPEND}
acct-group/sgx
acct-group/tape
acct-group/tty
+ acct-group/usb
acct-group/video
!sys-apps/gentoo-systemd-integration
!sys-apps/hwids[udev]
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-01-30 0:55 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-01-30 0:55 UTC (permalink / raw
To: gentoo-commits
commit: c0f66891a0dbcf460a568e6edd12f93515727b6c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 00:47:54 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 00:55:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0f66891
sys-apps/systemd-utils: add 252.5
The F_S=3 fixes got backported to 252.x in this release.
Bug: https://bugs.gentoo.org/841770
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-252.5.ebuild | 508 ++++++++++++++++++++++
2 files changed, 509 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index c0b0ebb1d8cd..f0880851f64f 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -2,3 +2,4 @@ DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2
DIST systemd-musl-patches-252.4.tar.gz 25053 BLAKE2B 1d75f85ea0c48c788e9199e2d919bac90edce16a9788a349332cf308c32fb9510ac2883f8e09f21e7f37fbac2e557dc39cdf44dcd7a986587c40dedd2d1b5df5 SHA512 1dc8e220eae1869eb4bb50f9c701392542b053099cf9b6bde13f12a2d26fa29984819a8b4ce1b6c57e38a71f86324469a87cf9e22abe0f6d67ac3e84c6b9a3ba
DIST systemd-stable-251.10.tar.gz 11461671 BLAKE2B a351b6dd9fc307e4bdcf0323b16e7f58c714392cfa466180a81196309c289b54767bfe5d03037eb1bd6b273d7eb8f6f42b927aabaa1310be04266675d1a3dd06 SHA512 49e33dbbc1b2ebe123b2f722070c87524b3126d1e605fb3e24a3f9f328ab67de506dc4588a92caf157428c21b9c73c3884726c4a5b1f67bb997d4a68bb871e5b
DIST systemd-stable-252.4.tar.gz 11753300 BLAKE2B 8819ca6d3a64c110e5a245ae0369dc431079556e200d13d8edfc64fc35b2b04f1cdc215b81d9bf126245f315be3662ebd2c094167f88d2465f0dce25aa1fd196 SHA512 d4e99a67c59091dae78f654433a6c5e114ae66256b72d9d43292c43a986ee6a58e2d06f12866cbd7ec821b61580ec003af1725f60fd4b038b4a981b3ca839ee2
+DIST systemd-stable-252.5.tar.gz 11762414 BLAKE2B c9560ad5e49b7ff33ebcf2e553fa1824131e84bb7c40e5b04135bcdce9ad2ef32194382a501a1853a28e02b7f434bf1fb53edd6e9272d432c23fb116015d751f SHA512 f3359e0496b673033d6c8da5c117890e0dc26c9db51003b28f629ac751d9bae117be32d9f54c377eb2d5a7c2d36ac0dbdc2116498698e993550fbdd9aae535b9
diff --git a/sys-apps/systemd-utils/systemd-utils-252.5.ebuild b/sys-apps/systemd-utils/systemd-utils-252.5.ebuild
new file mode 100644
index 000000000000..58f76c9f4afc
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-252.5.ebuild
@@ -0,0 +1,508 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-252.4"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+ boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+ local PATCHES=(
+ )
+
+ if use elibc_musl; then
+ PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootpkglibdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool boot kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/{tmp,x11}.conf
+ doins "${FILESDIR}"/legacy.conf
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-01-28 0:53 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2023-01-28 0:53 UTC (permalink / raw
To: gentoo-commits
commit: be1e4d944e703302b4579ad0b8a5b072b7247a3b
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 00:53:03 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 00:53:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be1e4d94
sys-apps/systemd-utils: stabilize 251.10-r1
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild
index 3a45e88ae760..311ff8be859c 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild
@@ -35,7 +35,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-01-28 0:53 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2023-01-28 0:53 UTC (permalink / raw
To: gentoo-commits
commit: f45e79b1ee3f99212c81b7341abea6b517f0c5e6
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 00:53:16 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 00:53:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f45e79b1
sys-apps/systemd-utils: drop 251.10
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.10.ebuild | 524 ---------------------
1 file changed, 524 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.10.ebuild b/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
deleted file mode 100644
index 39d1af44049f..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
+++ /dev/null
@@ -1,524 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-251.2"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
- boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
- python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/251-gpt-auto-no-cryptsetup.patch"
- )
-
- if use elibc_musl; then
- PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
- # Applied upstream in 251.3
- rm "${WORKDIR}/${MUSL_PATCHSET}/0001-Add-sys-file.h-for-LOCK_.patch" || die
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootlibexecdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- # Broken with FORTIFY_SOURCE=3: bug #841770.
- #
- # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
- # to unset F_S first, then explicitly set 2, to negate any default
- # and anything set by the user if they're choosing 3 (or if they've
- # modified GCC to set 3).
- #
- if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
- # We can't unconditionally do this b/c we fortify needs
- # some level of optimisation.
- filter-flags -D_FORTIFY_SOURCE=3
- append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
- fi
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool boot kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbpf-framework=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- kernel-install
- man/bootctl.1
- man/kernel-install.8
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl kernel-install
- doman man/{bootctl.1,kernel-install.8}
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- exeinto /etc/cron.daily
- doexe "${FILESDIR}"/systemd-tmpfiles-clean
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-01-13 12:19 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-01-13 12:19 UTC (permalink / raw
To: gentoo-commits
commit: 4871da3b599d1f4c3874fd2b563f3ca972232fa4
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 12:18:44 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 12:18:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4871da3b
sys-apps/systemd-utils: Stabilize 251.10 arm64, #887751
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.10.ebuild b/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
index 6fb28195c1f3..ae816b8281b7 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-01-13 12:19 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-01-13 12:19 UTC (permalink / raw
To: gentoo-commits
commit: ee79df301336c3ef02a08659e1cfb7e562a8febe
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 12:18:54 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 12:18:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee79df30
sys-apps/systemd-utils: Stabilize 251.10 x86, #887751
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.10.ebuild b/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
index 2f8d6485812d..9cf2ea83f3e1 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-01-13 12:19 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-01-13 12:19 UTC (permalink / raw
To: gentoo-commits
commit: 34ab18c3c797cabeeb0c3da6ed56c3af55769811
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 12:18:41 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 12:18:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34ab18c3
sys-apps/systemd-utils: Stabilize 251.10 arm, #887751
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.10.ebuild b/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
index 56287d786ea7..6fb28195c1f3 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-01-13 12:19 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-01-13 12:19 UTC (permalink / raw
To: gentoo-commits
commit: c5d0e01a33fb4c501a95aabf9cedc7ae60cdbb1d
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 12:18:50 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 12:18:50 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5d0e01a
sys-apps/systemd-utils: Stabilize 251.10 sparc, #887751
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.10.ebuild b/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
index ede61d11e259..2f8d6485812d 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-01-13 12:19 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-01-13 12:19 UTC (permalink / raw
To: gentoo-commits
commit: a64df6463280e1de6a889c011585f76e01a97e0a
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 12:18:47 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 12:18:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a64df646
sys-apps/systemd-utils: Stabilize 251.10 hppa, #887751
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.10.ebuild b/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
index ae816b8281b7..ede61d11e259 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-01-13 12:18 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-01-13 12:18 UTC (permalink / raw
To: gentoo-commits
commit: 0991f564cb03608b73a854e504fdb28c2cf77a54
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 12:18:09 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 12:18:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0991f564
sys-apps/systemd-utils: Stabilize 251.10 ppc64, #887751
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.10.ebuild b/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
index b589dcddb59d..80942ce1b0ff 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-01-13 12:18 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2023-01-13 12:18 UTC (permalink / raw
To: gentoo-commits
commit: 6980100480b45866e87a06fdbe98a2515415810a
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 12:18:12 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 12:18:12 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69801004
sys-apps/systemd-utils: Stabilize 251.10 ppc, #887751
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.10.ebuild b/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
index 80942ce1b0ff..56287d786ea7 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-01-11 7:50 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-01-11 7:50 UTC (permalink / raw
To: gentoo-commits
commit: 2da823e00fce128d20b098ab5abef4838084e24f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 07:37:26 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 07:49:43 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2da823e0
sys-apps/systemd-utils: add note re FORTIFY_SOURCE=3 in 251.10-r1
Bug: https://bugs.gentoo.org/841770
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild
index bab8984fc18e..4eddaff04164 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild
@@ -4,6 +4,15 @@
EAPI=8
PYTHON_COMPAT=( python3_{8..11} )
+if [[ ${PV} != 25[12].* ]] ; then
+ # The F_S=3 issues should be fixed in 253.
+ # - https://github.com/systemd/systemd/issues/22801
+ # - https://github.com/systemd/systemd/pull/25967
+ # - https://github.com/systemd/systemd/commit/7929e180aa47a2692ad4f053afac2857d7198758
+ # - https://github.com/systemd/systemd/commit/4f79f545b3c46c358666c9f5f2b384fe50aac4b4
+ die "Please remove the FORTIFY_SOURCE hacks in src_configure."
+fi
+
QA_PKGCONFIG_VERSION=$(ver_cut 1)
inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2023-01-03 6:23 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2023-01-03 6:23 UTC (permalink / raw
To: gentoo-commits
commit: 5013bc7720ecf9c02fafac4b862d33c122429cd6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 3 06:22:01 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 3 06:22:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5013bc77
sys-apps/systemd-utils: Stabilize 251.10 amd64, #887751
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.10.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.10.ebuild b/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
index e3565a14d72b..b589dcddb59d 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-12-21 1:25 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-12-21 1:25 UTC (permalink / raw
To: gentoo-commits
commit: 72d241ec3d0f47cc09e35133bfb929dc89f30f52
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 21 01:24:36 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 01:24:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72d241ec
sys-apps/systemd-utils: add 251.10
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-251.10.ebuild | 524 +++++++++++++++++++++
2 files changed, 525 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 5ac1dc5b59fc..fe5d34db75c7 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,4 +1,5 @@
DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2fb2484af718d0f282129957236ce241fbe8538a90d507a96c7c3d86f4f408ab784a6888b37486405d3276e7734a1bd5aa9680 SHA512 6e56b62234ac54929faea5a7cad699d0b932f869b48e3ba4e1f349a88653b7c787efec24a09b00290c3dc566614e3c1dc2f3c04f04e943f513108a91eca1be82
+DIST systemd-stable-251.10.tar.gz 11461671 BLAKE2B a351b6dd9fc307e4bdcf0323b16e7f58c714392cfa466180a81196309c289b54767bfe5d03037eb1bd6b273d7eb8f6f42b927aabaa1310be04266675d1a3dd06 SHA512 49e33dbbc1b2ebe123b2f722070c87524b3126d1e605fb3e24a3f9f328ab67de506dc4588a92caf157428c21b9c73c3884726c4a5b1f67bb997d4a68bb871e5b
DIST systemd-stable-251.7.tar.gz 11448429 BLAKE2B 959ac7944d778c8e6d7a3c67ea6adc89e5e7ac1cc3b163e2af2a582211b91316da5ffba37b854978b7b2a5b3f9aae3651701a23e4391da6676e078747df1a37b SHA512 a4c06b2d25c47af58abb1e1dc85737b2fb0eb394f09d2bb7c6b7b716cb4b1383a145885bbc8e5ffcdc26611fd44d362fba2152c4dd0ead6a03a93965b82bb9a4
DIST systemd-stable-251.8.tar.gz 11457551 BLAKE2B d4ca799a5b22164362fa8948bbec95215d6ebc04380f13f755916c4bfd4e1cc43a82177c21d2c56aa9d8440b44872b773f21682fc127c7f6d2b3542661c27d80 SHA512 c337fad3cf2beef11401850ddd6418efef035d4ec6405049084302738042f77ac1f8bfd7eb3611668a13038878389c9617e63278ec0b37782b3e0242e69c4843
DIST systemd-stable-251.9.tar.gz 11461131 BLAKE2B ba8fa2d70cc992ded3d1aa354e36d9815c6ae87a6f438f8879771e9e5ae9f7d10591956cf8c617ba0c5c13fdc229bc23a7ea173aa9849bfdf6476cc0721d62be SHA512 27df2076445a826911274101286a3555528ebd0894a5c32f2dea71a075b5fcde3931f4d04f5726c5b39d482357939d2fbd2b52ac9a894b6853f48833984f4c17
diff --git a/sys-apps/systemd-utils/systemd-utils-251.10.ebuild b/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
new file mode 100644
index 000000000000..e3565a14d72b
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-251.10.ebuild
@@ -0,0 +1,524 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-251.2"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+ boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/251-gpt-auto-no-cryptsetup.patch"
+ )
+
+ if use elibc_musl; then
+ PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+ # Applied upstream in 251.3
+ rm "${WORKDIR}/${MUSL_PATCHSET}/0001-Add-sys-file.h-for-LOCK_.patch" || die
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootlibexecdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ # Broken with FORTIFY_SOURCE=3: bug #841770.
+ #
+ # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+ # to unset F_S first, then explicitly set 2, to negate any default
+ # and anything set by the user if they're choosing 3 (or if they've
+ # modified GCC to set 3).
+ #
+ if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+ # We can't unconditionally do this b/c we fortify needs
+ # some level of optimisation.
+ filter-flags -D_FORTIFY_SOURCE=3
+ append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool boot kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-12-15 4:42 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-12-15 4:42 UTC (permalink / raw
To: gentoo-commits
commit: 0014981c5d236c25ce4c6f81049e32e59f535846
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 04:42:51 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 04:42:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0014981c
sys-apps/systemd-utils: Stabilize 251.8-r1 x86, #885041
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
index 439c58f9f960..108c86967156 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-12-15 4:42 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-12-15 4:42 UTC (permalink / raw
To: gentoo-commits
commit: 8a38ae85822e5ad3dfcc0272d5dcd47b680a89cc
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 04:41:44 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 04:41:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a38ae85
sys-apps/systemd-utils: Stabilize 251.8-r1 ppc64, #885041
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
index f836938395c7..439c58f9f960 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-12-15 4:42 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-12-15 4:42 UTC (permalink / raw
To: gentoo-commits
commit: 0f074bf6e2b7b82998a2d32852e3917f932ca370
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 04:41:42 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 04:41:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f074bf6
sys-apps/systemd-utils: Stabilize 251.8-r1 ppc, #885041
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
index b4e916d3dc4d..f836938395c7 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-12-15 4:42 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-12-15 4:42 UTC (permalink / raw
To: gentoo-commits
commit: cb696acc2b41ffb009c43451c13819522e870ad4
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 04:41:39 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 04:41:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb696acc
sys-apps/systemd-utils: Stabilize 251.8-r1 hppa, #885041
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
index 44aea1efed2a..b4e916d3dc4d 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-12-15 4:42 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-12-15 4:42 UTC (permalink / raw
To: gentoo-commits
commit: 13e2e02f238249d981fad36ecb23b115d13867eb
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 04:41:31 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 04:41:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13e2e02f
sys-apps/systemd-utils: Stabilize 251.8-r1 amd64, #885041
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
index f7886685a5bd..799133a3e2ac 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-12-15 4:42 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-12-15 4:42 UTC (permalink / raw
To: gentoo-commits
commit: a3cf38f1397c3e9c6680b929db46a5949390e61b
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 04:41:33 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 04:41:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3cf38f1
sys-apps/systemd-utils: Stabilize 251.8-r1 arm, #885041
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
index 799133a3e2ac..bc87e3de2e8f 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-12-15 4:42 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-12-15 4:42 UTC (permalink / raw
To: gentoo-commits
commit: c2551406b6c68ecceaeaf1458ac9878bcdb49f23
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 04:41:36 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 04:41:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2551406
sys-apps/systemd-utils: Stabilize 251.8-r1 arm64, #885041
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
index bc87e3de2e8f..44aea1efed2a 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-12-15 4:00 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-12-15 4:00 UTC (permalink / raw
To: gentoo-commits
commit: 2d5599bd2546726240381b47317d83cb590c016b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 03:17:35 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 03:43:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d5599bd
sys-apps/systemd-utils: add 251.9
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-251.9.ebuild | 524 ++++++++++++++++++++++
2 files changed, 525 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 1f601dac7b7d..5ac1dc5b59fc 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,3 +1,4 @@
DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2fb2484af718d0f282129957236ce241fbe8538a90d507a96c7c3d86f4f408ab784a6888b37486405d3276e7734a1bd5aa9680 SHA512 6e56b62234ac54929faea5a7cad699d0b932f869b48e3ba4e1f349a88653b7c787efec24a09b00290c3dc566614e3c1dc2f3c04f04e943f513108a91eca1be82
DIST systemd-stable-251.7.tar.gz 11448429 BLAKE2B 959ac7944d778c8e6d7a3c67ea6adc89e5e7ac1cc3b163e2af2a582211b91316da5ffba37b854978b7b2a5b3f9aae3651701a23e4391da6676e078747df1a37b SHA512 a4c06b2d25c47af58abb1e1dc85737b2fb0eb394f09d2bb7c6b7b716cb4b1383a145885bbc8e5ffcdc26611fd44d362fba2152c4dd0ead6a03a93965b82bb9a4
DIST systemd-stable-251.8.tar.gz 11457551 BLAKE2B d4ca799a5b22164362fa8948bbec95215d6ebc04380f13f755916c4bfd4e1cc43a82177c21d2c56aa9d8440b44872b773f21682fc127c7f6d2b3542661c27d80 SHA512 c337fad3cf2beef11401850ddd6418efef035d4ec6405049084302738042f77ac1f8bfd7eb3611668a13038878389c9617e63278ec0b37782b3e0242e69c4843
+DIST systemd-stable-251.9.tar.gz 11461131 BLAKE2B ba8fa2d70cc992ded3d1aa354e36d9815c6ae87a6f438f8879771e9e5ae9f7d10591956cf8c617ba0c5c13fdc229bc23a7ea173aa9849bfdf6476cc0721d62be SHA512 27df2076445a826911274101286a3555528ebd0894a5c32f2dea71a075b5fcde3931f4d04f5726c5b39d482357939d2fbd2b52ac9a894b6853f48833984f4c17
diff --git a/sys-apps/systemd-utils/systemd-utils-251.9.ebuild b/sys-apps/systemd-utils/systemd-utils-251.9.ebuild
new file mode 100644
index 000000000000..e3565a14d72b
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-251.9.ebuild
@@ -0,0 +1,524 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-251.2"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+ boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/251-gpt-auto-no-cryptsetup.patch"
+ )
+
+ if use elibc_musl; then
+ PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+ # Applied upstream in 251.3
+ rm "${WORKDIR}/${MUSL_PATCHSET}/0001-Add-sys-file.h-for-LOCK_.patch" || die
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootlibexecdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ # Broken with FORTIFY_SOURCE=3: bug #841770.
+ #
+ # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+ # to unset F_S first, then explicitly set 2, to negate any default
+ # and anything set by the user if they're choosing 3 (or if they've
+ # modified GCC to set 3).
+ #
+ if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+ # We can't unconditionally do this b/c we fortify needs
+ # some level of optimisation.
+ filter-flags -D_FORTIFY_SOURCE=3
+ append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool boot kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/systemd-tmpfiles-clean
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-12-11 18:23 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-12-11 18:23 UTC (permalink / raw
To: gentoo-commits
commit: 000594794c353cb21c66923636fab8213038de53
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 18:22:54 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 18:22:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00059479
sys-apps/systemd-utils: Stabilize 251.8-r1 sparc, #885041
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
index e3565a14d72b..f7886685a5bd 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-12-10 4:24 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-12-10 4:24 UTC (permalink / raw
To: gentoo-commits
commit: 65656708bf53111967a49d09db9d79e0e4c818ba
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 04:23:50 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 04:23:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65656708
sys-apps/systemd-utils: drop 251.4-r2
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 -
.../systemd-utils/systemd-utils-251.4-r2.ebuild | 527 ---------------------
2 files changed, 528 deletions(-)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 0d5c0e23ebb8..1f601dac7b7d 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,4 +1,3 @@
DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2fb2484af718d0f282129957236ce241fbe8538a90d507a96c7c3d86f4f408ab784a6888b37486405d3276e7734a1bd5aa9680 SHA512 6e56b62234ac54929faea5a7cad699d0b932f869b48e3ba4e1f349a88653b7c787efec24a09b00290c3dc566614e3c1dc2f3c04f04e943f513108a91eca1be82
-DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
DIST systemd-stable-251.7.tar.gz 11448429 BLAKE2B 959ac7944d778c8e6d7a3c67ea6adc89e5e7ac1cc3b163e2af2a582211b91316da5ffba37b854978b7b2a5b3f9aae3651701a23e4391da6676e078747df1a37b SHA512 a4c06b2d25c47af58abb1e1dc85737b2fb0eb394f09d2bb7c6b7b716cb4b1383a145885bbc8e5ffcdc26611fd44d362fba2152c4dd0ead6a03a93965b82bb9a4
DIST systemd-stable-251.8.tar.gz 11457551 BLAKE2B d4ca799a5b22164362fa8948bbec95215d6ebc04380f13f755916c4bfd4e1cc43a82177c21d2c56aa9d8440b44872b773f21682fc127c7f6d2b3542661c27d80 SHA512 c337fad3cf2beef11401850ddd6418efef035d4ec6405049084302738042f77ac1f8bfd7eb3611668a13038878389c9617e63278ec0b37782b3e0242e69c4843
diff --git a/sys-apps/systemd-utils/systemd-utils-251.4-r2.ebuild b/sys-apps/systemd-utils/systemd-utils-251.4-r2.ebuild
deleted file mode 100644
index f5bf60312050..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-251.4-r2.ebuild
+++ /dev/null
@@ -1,527 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-251.2"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
- boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
- python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-src_prepare() {
- local PATCHES=(
- # Breaks Clang. Revert the commit for now and force off F_S=3.
- "${FILESDIR}/251-revert-fortify-source-3-fix.patch"
- )
-
- if use elibc_musl; then
- PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
- # Applied upstream in 251.3
- rm "${WORKDIR}/${MUSL_PATCHSET}/0001-Add-sys-file.h-for-LOCK_.patch" || die
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootlibexecdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- # When bumping to 251, please keep this, but add the revert patch
- # like in sys-apps/systemd!
- #
- # Broken with FORTIFY_SOURCE=3 without a patch. And the patch
- # wasn't backported to 250.x, but it turns out to break Clang
- # anyway: bug #841770.
- #
- # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
- # to unset F_S first, then explicitly set 2, to negate any default
- # and anything set by the user if they're choosing 3 (or if they've
- # modified GCC to set 3).
- #
- if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
- # We can't unconditionally do this b/c we fortify needs
- # some level of optimisation.
- filter-flags -D_FORTIFY_SOURCE=3
- append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
- fi
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool boot kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- kernel-install
- man/bootctl.1
- man/kernel-install.8
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl kernel-install
- doman man/{bootctl.1,kernel-install.8}
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-12-02 17:23 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-12-02 17:23 UTC (permalink / raw
To: gentoo-commits
commit: 5275ec28aa309f07a9059a8eed87903b07d7d031
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 2 17:23:15 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 2 17:23:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5275ec28
sys-apps/systemd-utils: Stabilize 251.7 x86, #880215
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
index f5da23b8808d..71637af6ed33 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-11-25 4:49 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-11-25 4:49 UTC (permalink / raw
To: gentoo-commits
commit: 410bfe6b5e10c0a6b50249b9cd1fcbbb3de31a29
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 25 04:49:13 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 04:49:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=410bfe6b
sys-apps/systemd-utils: Stabilize 251.7 amd64, #880215
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
index d59ee0e84472..f5da23b8808d 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-11-21 16:00 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2022-11-21 16:00 UTC (permalink / raw
To: gentoo-commits
commit: 238a652babbbfb38d69c9eccf7074f56aea18a2a
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 15:57:57 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 15:57:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=238a652b
sys-apps/systemd-utils: fix install paths for USE="-split-usr"
Closes: https://bugs.gentoo.org/882005
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.4-r2.ebuild | 4 ++--
sys-apps/systemd-utils/systemd-utils-251.7.ebuild | 4 ++--
sys-apps/systemd-utils/systemd-utils-251.8.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.4-r2.ebuild b/sys-apps/systemd-utils/systemd-utils-251.4-r2.ebuild
index 9aa951a441cd..f5bf60312050 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.4-r2.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.4-r2.ebuild
@@ -489,11 +489,11 @@ multilib_src_install_all() {
# Remove to avoid conflict with elogind
# https://bugs.gentoo.org/856433
rm rules.d/70-power-switch.rules || die
- insinto /lib/udev/rules.d
+ insinto "${rootprefix}"/lib/udev/rules.d
doins rules.d/*.rules
doins "${FILESDIR}"/40-gentoo.rules
- insinto /lib/udev/hwdb.d
+ insinto "${rootprefix}"/lib/udev/hwdb.d
doins hwdb.d/*.hwdb
dobashcomp shell-completion/bash/udevadm
diff --git a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
index 127cb6f59444..d59ee0e84472 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
@@ -489,11 +489,11 @@ multilib_src_install_all() {
# Remove to avoid conflict with elogind
# https://bugs.gentoo.org/856433
rm rules.d/70-power-switch.rules || die
- insinto /lib/udev/rules.d
+ insinto "${rootprefix}"/lib/udev/rules.d
doins rules.d/*.rules
doins "${FILESDIR}"/40-gentoo.rules
- insinto /lib/udev/hwdb.d
+ insinto "${rootprefix}"/lib/udev/hwdb.d
doins hwdb.d/*.hwdb
dobashcomp shell-completion/bash/udevadm
diff --git a/sys-apps/systemd-utils/systemd-utils-251.8.ebuild b/sys-apps/systemd-utils/systemd-utils-251.8.ebuild
index d0d59018d975..46f587532a13 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.8.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.8.ebuild
@@ -484,11 +484,11 @@ multilib_src_install_all() {
# Remove to avoid conflict with elogind
# https://bugs.gentoo.org/856433
rm rules.d/70-power-switch.rules || die
- insinto /lib/udev/rules.d
+ insinto "${rootprefix}"/lib/udev/rules.d
doins rules.d/*.rules
doins "${FILESDIR}"/40-gentoo.rules
- insinto /lib/udev/hwdb.d
+ insinto "${rootprefix}"/lib/udev/hwdb.d
doins hwdb.d/*.hwdb
dobashcomp shell-completion/bash/udevadm
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-11-18 18:05 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-11-18 18:05 UTC (permalink / raw
To: gentoo-commits
commit: 57a8a5d113e955becaa4a45a16f7e0b584a6cac8
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 18 18:05:22 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 18 18:05:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57a8a5d1
sys-apps/systemd-utils: Stabilize 251.7 sparc, #880215
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
index 8d7a91be6404..127cb6f59444 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-11-18 18:04 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-11-18 18:04 UTC (permalink / raw
To: gentoo-commits
commit: 1d5a28f314e4ce6bed00a8b48bde0cb4ed2935d4
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 18 18:03:42 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 18 18:03:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d5a28f3
sys-apps/systemd-utils: Stabilize 251.7 hppa, #880215
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
index 17364c0417fa..daf9d2011666 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-11-18 18:04 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-11-18 18:04 UTC (permalink / raw
To: gentoo-commits
commit: be132add84eac3f0a4a85031533ee77b31ec6a2f
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 18 18:03:45 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 18 18:03:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be132add
sys-apps/systemd-utils: Stabilize 251.7 ppc, #880215
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
index daf9d2011666..57fca9cef5af 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-11-18 18:04 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-11-18 18:04 UTC (permalink / raw
To: gentoo-commits
commit: aac8cfd2fa57c128323ffda790e6e78ac6fa61fe
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 18 18:03:48 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 18 18:03:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aac8cfd2
sys-apps/systemd-utils: Stabilize 251.7 ppc64, #880215
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
index 57fca9cef5af..8d7a91be6404 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-11-12 15:51 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-11-12 15:51 UTC (permalink / raw
To: gentoo-commits
commit: b80beaea1d4217c41d101738bfba8d561f30f896
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 12 15:51:26 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 15:51:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b80beaea
sys-apps/systemd-utils: Stabilize 251.7 arm64, #880215
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
index 88cf55f5eb82..17364c0417fa 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-11-08 20:21 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-11-08 20:21 UTC (permalink / raw
To: gentoo-commits
commit: 51db57d5c56d185a6e3560ed3caa52dfb6a4775a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 8 19:40:37 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 8 20:20:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51db57d5
sys-apps/systemd-utils: add 251.8
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-251.8.ebuild | 522 ++++++++++++++++++++++
2 files changed, 523 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 0369cfe5808a..0d5c0e23ebb8 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,3 +1,4 @@
DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2fb2484af718d0f282129957236ce241fbe8538a90d507a96c7c3d86f4f408ab784a6888b37486405d3276e7734a1bd5aa9680 SHA512 6e56b62234ac54929faea5a7cad699d0b932f869b48e3ba4e1f349a88653b7c787efec24a09b00290c3dc566614e3c1dc2f3c04f04e943f513108a91eca1be82
DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
DIST systemd-stable-251.7.tar.gz 11448429 BLAKE2B 959ac7944d778c8e6d7a3c67ea6adc89e5e7ac1cc3b163e2af2a582211b91316da5ffba37b854978b7b2a5b3f9aae3651701a23e4391da6676e078747df1a37b SHA512 a4c06b2d25c47af58abb1e1dc85737b2fb0eb394f09d2bb7c6b7b716cb4b1383a145885bbc8e5ffcdc26611fd44d362fba2152c4dd0ead6a03a93965b82bb9a4
+DIST systemd-stable-251.8.tar.gz 11457551 BLAKE2B d4ca799a5b22164362fa8948bbec95215d6ebc04380f13f755916c4bfd4e1cc43a82177c21d2c56aa9d8440b44872b773f21682fc127c7f6d2b3542661c27d80 SHA512 c337fad3cf2beef11401850ddd6418efef035d4ec6405049084302738042f77ac1f8bfd7eb3611668a13038878389c9617e63278ec0b37782b3e0242e69c4843
diff --git a/sys-apps/systemd-utils/systemd-utils-251.8.ebuild b/sys-apps/systemd-utils/systemd-utils-251.8.ebuild
new file mode 100644
index 000000000000..d0d59018d975
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-251.8.ebuild
@@ -0,0 +1,522 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-251.2"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+ boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/251-gpt-auto-no-cryptsetup.patch"
+ )
+
+ if use elibc_musl; then
+ PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+ # Applied upstream in 251.3
+ rm "${WORKDIR}/${MUSL_PATCHSET}/0001-Add-sys-file.h-for-LOCK_.patch" || die
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootlibexecdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ # Broken with FORTIFY_SOURCE=3: bug #841770.
+ #
+ # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+ # to unset F_S first, then explicitly set 2, to negate any default
+ # and anything set by the user if they're choosing 3 (or if they've
+ # modified GCC to set 3).
+ #
+ if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+ # We can't unconditionally do this b/c we fortify needs
+ # some level of optimisation.
+ filter-flags -D_FORTIFY_SOURCE=3
+ append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool boot kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbpf-framework=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto /lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto /lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-11-08 2:54 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-11-08 2:54 UTC (permalink / raw
To: gentoo-commits
commit: 86c41f8c0b116af1b9e685457620181757bf8732
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 8 02:54:08 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 8 02:54:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86c41f8c
sys-apps/systemd-utils: drop 251.5, 251.6
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 2 -
sys-apps/systemd-utils/systemd-utils-251.5.ebuild | 524 ---------------------
sys-apps/systemd-utils/systemd-utils-251.6.ebuild | 525 ----------------------
3 files changed, 1051 deletions(-)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 8edad85fb86c..0369cfe5808a 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,5 +1,3 @@
DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2fb2484af718d0f282129957236ce241fbe8538a90d507a96c7c3d86f4f408ab784a6888b37486405d3276e7734a1bd5aa9680 SHA512 6e56b62234ac54929faea5a7cad699d0b932f869b48e3ba4e1f349a88653b7c787efec24a09b00290c3dc566614e3c1dc2f3c04f04e943f513108a91eca1be82
DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
-DIST systemd-stable-251.5.tar.gz 11444428 BLAKE2B 96df35dae789b11ead1960e1139046972a29c41f74ca800e0fafd84e6a8c238f8d4a30e2991ee94e07e866bc0c3137774ee116f276ac1203cca85254ccf91913 SHA512 2c645a694d45a2670920115529c5f34001153dafe26e5c4e65f8d1a37922a351569d056fc002f1af72dfc173988f93e11893460f64b497e3d5fc339083dcb2fa
-DIST systemd-stable-251.6.tar.gz 11448383 BLAKE2B 987ea88ea23662fd4119e3c796cc2e5f428fcce6cf0b033a5f8da7974c0026d41851f517e489354bbc22973b33c3932ac7280c56527f03a1fcbce3092148b638 SHA512 2da41ac7e939a893ada3ce682a6fe7dd326e8e0132221589da3d2b1d994e1a879118e0c6025f03351dac6567d754223a5f5401d64a5ca9256ab95512800370f8
DIST systemd-stable-251.7.tar.gz 11448429 BLAKE2B 959ac7944d778c8e6d7a3c67ea6adc89e5e7ac1cc3b163e2af2a582211b91316da5ffba37b854978b7b2a5b3f9aae3651701a23e4391da6676e078747df1a37b SHA512 a4c06b2d25c47af58abb1e1dc85737b2fb0eb394f09d2bb7c6b7b716cb4b1383a145885bbc8e5ffcdc26611fd44d362fba2152c4dd0ead6a03a93965b82bb9a4
diff --git a/sys-apps/systemd-utils/systemd-utils-251.5.ebuild b/sys-apps/systemd-utils/systemd-utils-251.5.ebuild
deleted file mode 100644
index 9350a1bda9be..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-251.5.ebuild
+++ /dev/null
@@ -1,524 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-251.2"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
- boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
- python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-src_prepare() {
- local PATCHES=(
- # Breaks Clang. Revert the commit for now and force off F_S=3.
- "${FILESDIR}/251-revert-fortify-source-3-fix.patch"
- )
-
- if use elibc_musl; then
- PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
- # Applied upstream in 251.3
- rm "${WORKDIR}/${MUSL_PATCHSET}/0001-Add-sys-file.h-for-LOCK_.patch" || die
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootlibexecdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- # Broken with FORTIFY_SOURCE=3 without a patch. And the patch
- # wasn't backported to 250.x, but it turns out to break Clang
- # anyway: bug #841770.
- #
- # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
- # to unset F_S first, then explicitly set 2, to negate any default
- # and anything set by the user if they're choosing 3 (or if they've
- # modified GCC to set 3).
- #
- if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
- # We can't unconditionally do this b/c we fortify needs
- # some level of optimisation.
- filter-flags -D_FORTIFY_SOURCE=3
- append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
- fi
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool boot kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- kernel-install
- man/bootctl.1
- man/kernel-install.8
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl kernel-install
- doman man/{bootctl.1,kernel-install.8}
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto /lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto /lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-251.6.ebuild b/sys-apps/systemd-utils/systemd-utils-251.6.ebuild
deleted file mode 100644
index a59e868762b9..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-251.6.ebuild
+++ /dev/null
@@ -1,525 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-251.2"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- elibc_musl? ( >=sys-libs/musl-1.2.3 )
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.11
- boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
- python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-src_prepare() {
- local PATCHES=(
- # Breaks Clang. Revert the commit for now and force off F_S=3.
- "${FILESDIR}/251-revert-fortify-source-3-fix.patch"
- "${FILESDIR}/251-gpt-auto-no-cryptsetup.patch"
- )
-
- if use elibc_musl; then
- PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
- # Applied upstream in 251.3
- rm "${WORKDIR}/${MUSL_PATCHSET}/0001-Add-sys-file.h-for-LOCK_.patch" || die
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootlibexecdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
- # Broken with FORTIFY_SOURCE=3 without a patch. And the patch
- # wasn't backported to 250.x, but it turns out to break Clang
- # anyway: bug #841770.
- #
- # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
- # to unset F_S first, then explicitly set 2, to negate any default
- # and anything set by the user if they're choosing 3 (or if they've
- # modified GCC to set 3).
- #
- if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
- # We can't unconditionally do this b/c we fortify needs
- # some level of optimisation.
- filter-flags -D_FORTIFY_SOURCE=3
- append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
- fi
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use split-usr)
- $(meson_use split-usr split-bin)
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool boot kernel-install)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- kernel-install
- man/bootctl.1
- man/kernel-install.8
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-src_install() {
- local rootprefix="$(usex split-usr '' /usr)"
- meson-multilib_src_install
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl kernel-install
- doman man/{bootctl.1,kernel-install.8}
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into "${rootprefix:-/}"
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into "${rootprefix:-/}"
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- fi
- if use udev; then
- into "${rootprefix:-/}"
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
- exeinto "${rootprefix}"/lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
- insinto "${rootprefix}"/lib/udev/rules.d
- doins rules.d/*.rules
-
- insinto "${rootprefix}"/lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
-
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
- fi
- fi
- if use udev; then
- meson_install --no-rebuild --tags libudev
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- fi
- if use udev; then
- doheader src/libudev/libudev.h
-
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
-
- insinto "${rootprefix}"/lib/systemd/network
- doins network/99-default.link
-
- # Remove to avoid conflict with elogind
- # https://bugs.gentoo.org/856433
- rm rules.d/70-power-switch.rules || die
- insinto /lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto /lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
-
- dobashcomp shell-completion/bash/udevadm
-
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-11-07 17:28 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-11-07 17:28 UTC (permalink / raw
To: gentoo-commits
commit: 10c329eac3db7b0442c23c91fbb19f39964741de
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 7 17:27:57 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 7 17:27:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10c329ea
sys-apps/systemd-utils: Stabilize 251.7 arm, #880215
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
index 3f1741e3035d..88cf55f5eb82 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-10-31 17:39 Matt Turner
0 siblings, 0 replies; 252+ messages in thread
From: Matt Turner @ 2022-10-31 17:39 UTC (permalink / raw
To: gentoo-commits
commit: 0f3f8cf80d2c47ff650e0ed6456b66815ecc439a
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 16:59:41 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 17:39:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f3f8cf8
sys-apps/systemd-utils: Explicitly disable bpf-framework
BPF is not used by systemd-utils, only by components that are part of
the full systemd installation. In Gentoo this change is a no-op. It only
serves to skip some configure tests, which happen to use unprefixed
'clang', which is not allowed in ChromeOS.
Closes: https://github.com/gentoo/gentoo/pull/28053
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.7.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
index a59e868762b9..46a55e226ca4 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
@@ -175,6 +175,7 @@ multilib_src_configure() {
-Daudit=false
-Dbacklight=false
-Dbinfmt=false
+ -Dbpf-framework=false
-Dbzip2=false
-Dcoredump=false
-Ddbus=false
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-10-25 5:53 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-10-25 5:53 UTC (permalink / raw
To: gentoo-commits
commit: bc10f4b653fab6f4775ebf3623ba1775b797f9c5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 05:46:47 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 05:51:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc10f4b6
sys-apps/systemd-utils: add 251.7
Closes: https://bugs.gentoo.org/877259
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-251.7.ebuild | 525 ++++++++++++++++++++++
2 files changed, 526 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 6652b985f843..8edad85fb86c 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -2,3 +2,4 @@ DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2
DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
DIST systemd-stable-251.5.tar.gz 11444428 BLAKE2B 96df35dae789b11ead1960e1139046972a29c41f74ca800e0fafd84e6a8c238f8d4a30e2991ee94e07e866bc0c3137774ee116f276ac1203cca85254ccf91913 SHA512 2c645a694d45a2670920115529c5f34001153dafe26e5c4e65f8d1a37922a351569d056fc002f1af72dfc173988f93e11893460f64b497e3d5fc339083dcb2fa
DIST systemd-stable-251.6.tar.gz 11448383 BLAKE2B 987ea88ea23662fd4119e3c796cc2e5f428fcce6cf0b033a5f8da7974c0026d41851f517e489354bbc22973b33c3932ac7280c56527f03a1fcbce3092148b638 SHA512 2da41ac7e939a893ada3ce682a6fe7dd326e8e0132221589da3d2b1d994e1a879118e0c6025f03351dac6567d754223a5f5401d64a5ca9256ab95512800370f8
+DIST systemd-stable-251.7.tar.gz 11448429 BLAKE2B 959ac7944d778c8e6d7a3c67ea6adc89e5e7ac1cc3b163e2af2a582211b91316da5ffba37b854978b7b2a5b3f9aae3651701a23e4391da6676e078747df1a37b SHA512 a4c06b2d25c47af58abb1e1dc85737b2fb0eb394f09d2bb7c6b7b716cb4b1383a145885bbc8e5ffcdc26611fd44d362fba2152c4dd0ead6a03a93965b82bb9a4
diff --git a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
new file mode 100644
index 000000000000..a59e868762b9
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
@@ -0,0 +1,525 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-251.2"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+ boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+ local PATCHES=(
+ # Breaks Clang. Revert the commit for now and force off F_S=3.
+ "${FILESDIR}/251-revert-fortify-source-3-fix.patch"
+ "${FILESDIR}/251-gpt-auto-no-cryptsetup.patch"
+ )
+
+ if use elibc_musl; then
+ PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+ # Applied upstream in 251.3
+ rm "${WORKDIR}/${MUSL_PATCHSET}/0001-Add-sys-file.h-for-LOCK_.patch" || die
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootlibexecdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ # Broken with FORTIFY_SOURCE=3 without a patch. And the patch
+ # wasn't backported to 250.x, but it turns out to break Clang
+ # anyway: bug #841770.
+ #
+ # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+ # to unset F_S first, then explicitly set 2, to negate any default
+ # and anything set by the user if they're choosing 3 (or if they've
+ # modified GCC to set 3).
+ #
+ if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+ # We can't unconditionally do this b/c we fortify needs
+ # some level of optimisation.
+ filter-flags -D_FORTIFY_SOURCE=3
+ append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool boot kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto /lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto /lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-10-02 3:00 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-10-02 3:00 UTC (permalink / raw
To: gentoo-commits
commit: f47e02c5a78a0751aec16a952a485e43581f518d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 2 03:00:05 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 2 03:00:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f47e02c5
sys-apps/systemd-utils: add 251.5
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-251.5.ebuild | 524 ++++++++++++++++++++++
2 files changed, 525 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 00326fafab24..794bd4bfb8d0 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,2 +1,3 @@
DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2fb2484af718d0f282129957236ce241fbe8538a90d507a96c7c3d86f4f408ab784a6888b37486405d3276e7734a1bd5aa9680 SHA512 6e56b62234ac54929faea5a7cad699d0b932f869b48e3ba4e1f349a88653b7c787efec24a09b00290c3dc566614e3c1dc2f3c04f04e943f513108a91eca1be82
DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
+DIST systemd-stable-251.5.tar.gz 11444428 BLAKE2B 96df35dae789b11ead1960e1139046972a29c41f74ca800e0fafd84e6a8c238f8d4a30e2991ee94e07e866bc0c3137774ee116f276ac1203cca85254ccf91913 SHA512 2c645a694d45a2670920115529c5f34001153dafe26e5c4e65f8d1a37922a351569d056fc002f1af72dfc173988f93e11893460f64b497e3d5fc339083dcb2fa
diff --git a/sys-apps/systemd-utils/systemd-utils-251.5.ebuild b/sys-apps/systemd-utils/systemd-utils-251.5.ebuild
new file mode 100644
index 000000000000..9350a1bda9be
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-251.5.ebuild
@@ -0,0 +1,524 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-251.2"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+ boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+ local PATCHES=(
+ # Breaks Clang. Revert the commit for now and force off F_S=3.
+ "${FILESDIR}/251-revert-fortify-source-3-fix.patch"
+ )
+
+ if use elibc_musl; then
+ PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+ # Applied upstream in 251.3
+ rm "${WORKDIR}/${MUSL_PATCHSET}/0001-Add-sys-file.h-for-LOCK_.patch" || die
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootlibexecdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+ # Broken with FORTIFY_SOURCE=3 without a patch. And the patch
+ # wasn't backported to 250.x, but it turns out to break Clang
+ # anyway: bug #841770.
+ #
+ # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+ # to unset F_S first, then explicitly set 2, to negate any default
+ # and anything set by the user if they're choosing 3 (or if they've
+ # modified GCC to set 3).
+ #
+ if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+ # We can't unconditionally do this b/c we fortify needs
+ # some level of optimisation.
+ filter-flags -D_FORTIFY_SOURCE=3
+ append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool boot kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto /lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto /lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-09-17 6:11 Agostino Sarubbo
0 siblings, 0 replies; 252+ messages in thread
From: Agostino Sarubbo @ 2022-09-17 6:11 UTC (permalink / raw
To: gentoo-commits
commit: dbc6df8fa9555cbbbcead6a886458ba869ce0d50
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 17 06:11:21 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 06:11:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbc6df8f
sys-apps/systemd-utils: Stabilize 251.4-r1 x86, #870268
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
index 38444c7a8349..9cb9d0cb2ceb 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-09-16 18:41 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-09-16 18:41 UTC (permalink / raw
To: gentoo-commits
commit: 8eae3a7311cedc4b43b27fc664ce79b033b768e0
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 18:41:34 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 18:41:34 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eae3a73
sys-apps/systemd-utils: Stabilize 251.4-r1 ppc, #870268
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
index 3ac90abe9da1..38444c7a8349 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-09-16 18:25 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-09-16 18:25 UTC (permalink / raw
To: gentoo-commits
commit: 0c8d726efbec239d1facfafe5877ec70e488bb13
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 18:25:01 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 18:25:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c8d726e
sys-apps/systemd-utils: Stabilize 251.4-r1 ppc64, #870268
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
index 7dd703e001c6..3ac90abe9da1 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-09-16 10:47 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-09-16 10:47 UTC (permalink / raw
To: gentoo-commits
commit: 4ab4d8ec442f8da4e815c61c11b33e420aa6ce0e
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 10:47:19 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 10:47:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ab4d8ec
sys-apps/systemd-utils: Stabilize 251.4-r1 hppa, #870268
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
index 8cdd5cb36fee..7dd703e001c6 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-09-16 6:50 Agostino Sarubbo
0 siblings, 0 replies; 252+ messages in thread
From: Agostino Sarubbo @ 2022-09-16 6:50 UTC (permalink / raw
To: gentoo-commits
commit: 0c05958ebd8717794ffb93c4fb14e003c75adede
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 06:50:15 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 06:50:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c05958e
sys-apps/systemd-utils: Stabilize 251.4-r1 arm64, #870268
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
index b73ab1cc63ab..8cdd5cb36fee 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-09-16 6:50 Agostino Sarubbo
0 siblings, 0 replies; 252+ messages in thread
From: Agostino Sarubbo @ 2022-09-16 6:50 UTC (permalink / raw
To: gentoo-commits
commit: 22f94f9c2f2f3a87b4284378dd97c7dbbea34ccb
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 06:49:49 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 06:49:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22f94f9c
sys-apps/systemd-utils: Stabilize 251.4-r1 arm, #870268
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
index a48d713647b5..b73ab1cc63ab 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-09-15 21:24 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-09-15 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 1da517ef330fda8f1f42586f6745e4dba33f36d3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 21:24:23 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 21:24:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1da517ef
sys-apps/systemd-utils: Stabilize 251.4-r1 sparc, #870268
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
index 656ac9dce92b..a48d713647b5 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-09-15 21:24 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-09-15 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 8c7ceb2e7f5623d2a70f57c2c84f512f65dfd7d2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 21:23:41 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 21:23:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c7ceb2e
sys-apps/systemd-utils: Stabilize 251.4-r1 amd64, #870268
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
index 0c5976d85e1e..656ac9dce92b 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-09-04 2:02 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-09-04 2:02 UTC (permalink / raw
To: gentoo-commits
commit: 8bb8075201fb1d052fc1d12ce9d8bd6c72055955
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 4 01:57:59 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 4 01:58:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bb80752
sys-apps/systemd-utils: keyword 251.4-r1
Works on a USE=-split-usr machine.
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
index 4bd77d7b1486..0c5976d85e1e 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-09-04 1:23 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-09-04 1:23 UTC (permalink / raw
To: gentoo-commits
commit: 4a00e8d3c521c10f8c41568009b5bdaa98ec4515
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 4 01:22:54 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 4 01:22:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a00e8d3
sys-apps/systemd-utils: Stabilize 251.3 amd64, #863233
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
index 129945493866..7aeb8a9076f5 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-09-03 23:38 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2022-09-03 23:38 UTC (permalink / raw
To: gentoo-commits
commit: add2a52de31f54cc206d44daf6cd189df88d9fc5
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 3 23:37:51 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Sep 3 23:38:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=add2a52d
Revert "sys-apps/systemd-utils: add '-b' to python_has_version"
python_has_version defaults to '-b'.
Reverts: 5954010bcc3128dd2bbae6cf66f6b26e542c7e27
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild | 2 +-
sys-apps/systemd-utils/systemd-utils-251.4.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
index 00ba1bb19c82..4bd77d7b1486 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
@@ -97,7 +97,7 @@ TMPFILES_OPTIONAL=1
UDEV_OPTIONAL=1
python_check_deps() {
- python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
}
QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
diff --git a/sys-apps/systemd-utils/systemd-utils-251.4.ebuild b/sys-apps/systemd-utils/systemd-utils-251.4.ebuild
index eb3b2e6e12e6..d66f463cc001 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.4.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.4.ebuild
@@ -97,7 +97,7 @@ TMPFILES_OPTIONAL=1
UDEV_OPTIONAL=1
python_check_deps() {
- python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
}
QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-09-03 23:33 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2022-09-03 23:33 UTC (permalink / raw
To: gentoo-commits
commit: b89bf7e58b5123ae528650a9ea8ef103367d2737
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 3 23:29:14 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Sep 3 23:29:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b89bf7e5
sys-apps/systemd-utils: wire up 'split-usr' USE flag
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../systemd-utils/systemd-utils-251.4-r1.ebuild | 521 +++++++++++++++++++++
1 file changed, 521 insertions(+)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
new file mode 100644
index 000000000000..4bd77d7b1486
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
@@ -0,0 +1,521 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-251.2"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+ boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+ local PATCHES=(
+ )
+
+ if use elibc_musl; then
+ PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+ # Applied upstream in 251.3
+ rm "${WORKDIR}/${MUSL_PATCHSET}/0001-Add-sys-file.h-for-LOCK_.patch" || die
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootlibexecdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+multilib_src_configure() {
+ # When bumping to 251, please keep this, but add the revert patch
+ # like in sys-apps/systemd!
+ #
+ # Broken with FORTIFY_SOURCE=3 without a patch. And the patch
+ # wasn't backported to 250.x, but it turns out to break Clang
+ # anyway: bug #841770.
+ #
+ # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+ # to unset F_S first, then explicitly set 2, to negate any default
+ # and anything set by the user if they're choosing 3 (or if they've
+ # modified GCC to set 3).
+ #
+ if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+ # We can't unconditionally do this b/c we fortify needs
+ # some level of optimisation.
+ filter-flags -D_FORTIFY_SOURCE=3
+ append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+ fi
+
+ local emesonargs=(
+ $(meson_use split-usr)
+ $(meson_use split-usr split-bin)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool boot kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+src_install() {
+ local rootprefix="$(usex split-usr '' /usr)"
+ meson-multilib_src_install
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into "${rootprefix:-/}"
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into "${rootprefix:-/}"
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ fi
+ if use udev; then
+ into "${rootprefix:-/}"
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+ exeinto "${rootprefix}"/lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ insinto "${rootprefix}"/lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto "${rootprefix}"/lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto "${rootprefix}"/lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto /lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto /lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-09-03 23:33 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2022-09-03 23:33 UTC (permalink / raw
To: gentoo-commits
commit: 5954010bcc3128dd2bbae6cf66f6b26e542c7e27
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 3 23:32:38 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Sep 3 23:32:38 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5954010b
sys-apps/systemd-utils: add '-b' to python_has_version
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild | 2 +-
sys-apps/systemd-utils/systemd-utils-251.4.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
index 4bd77d7b1486..00ba1bb19c82 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild
@@ -97,7 +97,7 @@ TMPFILES_OPTIONAL=1
UDEV_OPTIONAL=1
python_check_deps() {
- python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+ python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
}
QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
diff --git a/sys-apps/systemd-utils/systemd-utils-251.4.ebuild b/sys-apps/systemd-utils/systemd-utils-251.4.ebuild
index d66f463cc001..eb3b2e6e12e6 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.4.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.4.ebuild
@@ -97,7 +97,7 @@ TMPFILES_OPTIONAL=1
UDEV_OPTIONAL=1
python_check_deps() {
- python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+ python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
}
QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-08-19 4:13 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-08-19 4:13 UTC (permalink / raw
To: gentoo-commits
commit: 06c68720adcf87151128ad9e057a50c22909f66c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 19 04:13:10 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 19 04:13:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06c68720
sys-apps/systemd-utils: add github upstream metadata
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/metadata.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sys-apps/systemd-utils/metadata.xml b/sys-apps/systemd-utils/metadata.xml
index 5f3934d37331..a5585a7ca034 100644
--- a/sys-apps/systemd-utils/metadata.xml
+++ b/sys-apps/systemd-utils/metadata.xml
@@ -11,4 +11,8 @@
<flag name="tmpfiles">Enable systemd-tmpfiles</flag>
<flag name="udev">Enable systemd-udev (userspace device manager)</flag>
</use>
+ <upstream>
+ <remote-id type="github">systemd/systemd</remote-id>
+ <remote-id type="github">systemd/systemd-stable</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 252+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-08-16 18:51 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-08-16 18:51 UTC (permalink / raw
To: gentoo-commits
commit: 2fdc3e91effdde6badcdb2b9d815794ed0829f8b
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 16 18:50:35 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 18:50:35 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fdc3e91
sys-apps/systemd-utils: Stabilize 251.3 hppa, #863233
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
index 894f374cc91f..129945493866 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-08-03 17:30 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-08-03 17:30 UTC (permalink / raw
To: gentoo-commits
commit: 9a229d5c37eb277bdc186ece949b545cbf4d60ab
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 3 17:28:28 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 3 17:30:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a229d5c
sys-apps/systemd-utils: Stabilize 251.3 sparc, #863233
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
index c6130d04ccb6..6976b6e822a5 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-08-03 17:30 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-08-03 17:30 UTC (permalink / raw
To: gentoo-commits
commit: 5675548f96db157586b275dc599ca6d56258df9b
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 3 17:28:42 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 3 17:30:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5675548f
sys-apps/systemd-utils: Stabilize 251.3 x86, #863233
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
index 88a6e52e00ec..894f374cc91f 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-08-03 17:30 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-08-03 17:30 UTC (permalink / raw
To: gentoo-commits
commit: 2a691a17f45ae37be11e0ea8bb217b437c619861
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 3 17:28:36 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 3 17:30:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a691a17
sys-apps/systemd-utils: Stabilize 251.3 ppc, #863233
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
index 6976b6e822a5..88a6e52e00ec 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-08-03 4:45 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-08-03 4:45 UTC (permalink / raw
To: gentoo-commits
commit: 7b1bd589a0b683d1e5e4bd4447b6ed725336c7ed
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 3 04:44:56 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 3 04:44:56 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b1bd589
sys-apps/systemd-utils: Stabilize 251.3 ppc64, #863233
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
index 56cfeaac8039..c6130d04ccb6 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-08-03 4:45 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-08-03 4:45 UTC (permalink / raw
To: gentoo-commits
commit: 59ef3624380b3d1ae6a1af30b3cfe179a4778a63
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 3 04:44:49 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 3 04:44:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59ef3624
sys-apps/systemd-utils: Stabilize 251.3 arm64, #863233
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
index 277f36c6be9c..4b53938ff969 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-08-03 4:45 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-08-03 4:45 UTC (permalink / raw
To: gentoo-commits
commit: a2cf8123aa3c4d6d64ed30866a47880c9a85e5a4
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 3 04:44:52 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 3 04:44:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2cf8123
sys-apps/systemd-utils: Stabilize 251.3 arm, #863233
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
index 4b53938ff969..56cfeaac8039 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-07-16 0:26 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2022-07-16 0:26 UTC (permalink / raw
To: gentoo-commits
commit: e154c80b21275d9307379ddbfc8f84aba04160fc
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 16 00:24:48 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 00:24:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e154c80b
sys-apps/systemd-utils: skip 0001-Add-sys-file.h-for-LOCK_.patch
Applied upstream.
Closes: https://bugs.gentoo.org/858281
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-251.3.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
index 357c32eb616c..21ec7a6de8f9 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
@@ -108,6 +108,8 @@ src_prepare() {
)
if use elibc_musl; then
PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+ # Applied upstream in 251.3
+ rm "${WORKDIR}/${MUSL_PATCHSET}/0001-Add-sys-file.h-for-LOCK_.patch" || die
fi
default
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-07-15 5:24 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-07-15 5:24 UTC (permalink / raw
To: gentoo-commits
commit: 1960a1f5484e89e3f845bb9c6959546329e1227b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 05:22:29 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 05:22:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1960a1f5
sys-apps/systemd-utils: add 250.8
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-250.8.ebuild | 500 ++++++++++++++++++++++
2 files changed, 501 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 537ae3243581..cac0064cdc99 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,4 +1,5 @@
DIST systemd-musl-patches-250.4.tar.gz 28065 BLAKE2B b8366c4bb29705e3f41f07d0105c4d252d543aaac178e968663660eeb573da034813aa50a96c74ac78ae5efeea379e00df33c5a039ec828cf93450ed23786252 SHA512 66e41fab1873021913c32e3f43300ea7babd18a36e6543838ab7fab4c44f5590c6a7414dd50c7ee81e5513b0e5aa01cb6df4231e8e06c609d63011a32b524213
DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2fb2484af718d0f282129957236ce241fbe8538a90d507a96c7c3d86f4f408ab784a6888b37486405d3276e7734a1bd5aa9680 SHA512 6e56b62234ac54929faea5a7cad699d0b932f869b48e3ba4e1f349a88653b7c787efec24a09b00290c3dc566614e3c1dc2f3c04f04e943f513108a91eca1be82
DIST systemd-stable-250.7.tar.gz 11214975 BLAKE2B 5d94b4b1f8b0cd6e8284a89ac0d4bd373eccdad2c3d6e6c453df79c8df47ee0f9cfbde764b72b1f9d172d07e2d9f1f1f41c1ab254cf4abd0722469ebc3ad7cf8 SHA512 99bc6f0c9757b280cb694f3fb4d6fe04d5ce55583eb2bae5ddeb324bb5ee9930c1720fcc27293d90cddba188473653ec541a471ae8115710a5850c26d0ba215d
+DIST systemd-stable-250.8.tar.gz 11215608 BLAKE2B 2a66a2d8cb70f265b59640ace907b8d927018fe11c8977e134a33d67683f06b26c1eb3fd5afe40431bc2c15827ba60c46a37ff1a0a4c716dd24b73aca1583d00 SHA512 653f527f10779a31213da06f7587a3617bd4b823bd3e5a43d626c5a4a7301e4a0fb42cf1fd056d28af6d87e52f258da59d5f0d4a2d98076905f9d3fcda6d18fd
DIST systemd-stable-251.2.tar.gz 11434645 BLAKE2B a7e118649a7d27b789206ea9f6f2d0314e44561367506ee763a9e98fb97579b3fc49c7a402c8da142945dc98444558f0e311557f52c50863cebc7532c17c651f SHA512 0c4011b685a1e8d535af123cbaf79ab53d59ea665ca5350ab1077ad4e962b49c1fd5b1b5bb3f28c3e28145dfd02aa83023f78de5edec15afe84e3e06e742a67c
diff --git a/sys-apps/systemd-utils/systemd-utils-250.8.ebuild b/sys-apps/systemd-utils/systemd-utils-250.8.ebuild
new file mode 100644
index 000000000000..9afc4a2e8c10
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-250.8.ebuild
@@ -0,0 +1,500 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-250.4"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ boot? (
+ >=sys-boot/gnu-efi-3.0.2
+ )
+ >=sys-kernel/linux-headers-3.11
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/250.4-test-systemd-tmpfiles.standalone.patch"
+ )
+ if use elibc_musl; then
+ PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootlibexecdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+multilib_src_configure() {
+ # When bumping to 251, please keep this, but add the revert patch
+ # like in sys-apps/systemd!
+ #
+ # Broken with FORTIFY_SOURCE=3 without a patch. And the patch
+ # wasn't backported to 250.x, but it turns out to break Clang
+ # anyway: bug #841770.
+ #
+ # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+ # to unset F_S first, then explicitly set 2, to negate any default
+ # and anything set by the user if they're choosing 3 (or if they've
+ # modified GCC to set 3).
+ #
+ if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+ # We can't unconditionally do this b/c we fortify needs
+ # some level of optimisation.
+ filter-flags -D_FORTIFY_SOURCE=3
+ append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+ fi
+
+ local emesonargs=(
+ -Drootprefix="${EPREFIX:-/}"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dkernel-install=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ man/bootctl.1
+ man/kernel-install.8
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl
+ doman man/{bootctl.1,kernel-install.8}
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into /
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into /
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ fi
+ if use udev; then
+ into /
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm /lib/systemd/systemd-udevd
+ exeinto /lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+ insinto /lib/udev/rules.d
+ doins rules.d/*.rules
+ insinto /lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+
+ fi
+ fi
+ if use udev; then
+ into /usr
+ dolib.so "$(readlink libudev.so.1)" libudev.so{.1,}
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ dobin src/kernel-install/kernel-install
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+ insinto /lib/systemd/network
+ doins network/99-default.link
+ insinto /lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+ insinto /lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+ dobashcomp shell-completion/bash/udevadm
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-07-15 5:24 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-07-15 5:24 UTC (permalink / raw
To: gentoo-commits
commit: 27448f87aaff6807762e0a1558b3d5b2146af24e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 05:23:48 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 05:23:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27448f87
sys-apps/systemd-utils: add 251.3
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-251.3.ebuild | 511 ++++++++++++++++++++++
2 files changed, 512 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index cac0064cdc99..3ad23a287f3f 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -3,3 +3,4 @@ DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2
DIST systemd-stable-250.7.tar.gz 11214975 BLAKE2B 5d94b4b1f8b0cd6e8284a89ac0d4bd373eccdad2c3d6e6c453df79c8df47ee0f9cfbde764b72b1f9d172d07e2d9f1f1f41c1ab254cf4abd0722469ebc3ad7cf8 SHA512 99bc6f0c9757b280cb694f3fb4d6fe04d5ce55583eb2bae5ddeb324bb5ee9930c1720fcc27293d90cddba188473653ec541a471ae8115710a5850c26d0ba215d
DIST systemd-stable-250.8.tar.gz 11215608 BLAKE2B 2a66a2d8cb70f265b59640ace907b8d927018fe11c8977e134a33d67683f06b26c1eb3fd5afe40431bc2c15827ba60c46a37ff1a0a4c716dd24b73aca1583d00 SHA512 653f527f10779a31213da06f7587a3617bd4b823bd3e5a43d626c5a4a7301e4a0fb42cf1fd056d28af6d87e52f258da59d5f0d4a2d98076905f9d3fcda6d18fd
DIST systemd-stable-251.2.tar.gz 11434645 BLAKE2B a7e118649a7d27b789206ea9f6f2d0314e44561367506ee763a9e98fb97579b3fc49c7a402c8da142945dc98444558f0e311557f52c50863cebc7532c17c651f SHA512 0c4011b685a1e8d535af123cbaf79ab53d59ea665ca5350ab1077ad4e962b49c1fd5b1b5bb3f28c3e28145dfd02aa83023f78de5edec15afe84e3e06e742a67c
+DIST systemd-stable-251.3.tar.gz 11435458 BLAKE2B 544238536848ab390b2476d5ad95d33998674be50020b8db0627bb9d0c86be6576c404ce786b01ceec86f1c75b174c6fc2d7e0d7fbab802a78f48c9d0915c2b8 SHA512 fb5b8dc1742562ef95469e90d406cfb6dfcb337860ad1208b460414b88ff0565071bde797d195faa62761206abc881829de6b1009e5d727cad2dfe0764310d5f
diff --git a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
new file mode 100644
index 000000000000..357c32eb616c
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
@@ -0,0 +1,511 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-251.2"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+ boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+ local PATCHES=(
+ )
+ if use elibc_musl; then
+ PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootlibexecdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+multilib_src_configure() {
+ # When bumping to 251, please keep this, but add the revert patch
+ # like in sys-apps/systemd!
+ #
+ # Broken with FORTIFY_SOURCE=3 without a patch. And the patch
+ # wasn't backported to 250.x, but it turns out to break Clang
+ # anyway: bug #841770.
+ #
+ # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+ # to unset F_S first, then explicitly set 2, to negate any default
+ # and anything set by the user if they're choosing 3 (or if they've
+ # modified GCC to set 3).
+ #
+ if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+ # We can't unconditionally do this b/c we fortify needs
+ # some level of optimisation.
+ filter-flags -D_FORTIFY_SOURCE=3
+ append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+ fi
+
+ local emesonargs=(
+ -Drootprefix="${EPREFIX:-/}"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool boot kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into /
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into /
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ fi
+ if use udev; then
+ into /
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm /lib/systemd/systemd-udevd
+
+ exeinto /lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ insinto /lib/udev/rules.d
+ doins rules.d/*.rules
+
+ insinto /lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto /lib/systemd/network
+ doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
+ insinto /lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+
+ insinto /lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-07-04 20:44 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2022-07-04 20:44 UTC (permalink / raw
To: gentoo-commits
commit: c547cecbf6d46f399bb1ec5b360b8e4a0cde1b7c
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 4 20:42:46 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jul 4 20:44:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c547cecb
sys-apps/systemd-utils: do not install 70-power-switch.rules
In meson, this is gated behind enable_logind.
Closes: https://bugs.gentoo.org/856433
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
...md-utils-251.2.ebuild => systemd-utils-251.2-r1.ebuild} | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/sys-apps/systemd-utils/systemd-utils-251.2.ebuild b/sys-apps/systemd-utils/systemd-utils-251.2-r1.ebuild
similarity index 98%
rename from sys-apps/systemd-utils/systemd-utils-251.2.ebuild
rename to sys-apps/systemd-utils/systemd-utils-251.2-r1.ebuild
index 6d6a29224efa..357c32eb616c 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.2.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.2-r1.ebuild
@@ -419,14 +419,19 @@ multilib_src_install() {
into /
dobin udevadm systemd-hwdb
dosym ../../bin/udevadm /lib/systemd/systemd-udevd
+
exeinto /lib/udev
doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
insinto /lib/udev/rules.d
doins rules.d/*.rules
+
insinto /lib/udev/hwdb.d
doins hwdb.d/*.hwdb
+
insinto /usr/share/pkgconfig
doins src/udev/udev.pc
+
doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
newman man/systemd-udevd.service.8 systemd-udevd.8
fi
@@ -457,17 +462,26 @@ multilib_src_install_all() {
fi
if use udev; then
doheader src/libudev/libudev.h
+
insinto /etc/udev
doins src/udev/udev.conf
keepdir /etc/udev/{hwdb.d,rules.d}
+
insinto /lib/systemd/network
doins network/99-default.link
+
+ # Remove to avoid conflict with elogind
+ # https://bugs.gentoo.org/856433
+ rm rules.d/70-power-switch.rules || die
insinto /lib/udev/rules.d
doins rules.d/*.rules
doins "${FILESDIR}"/40-gentoo.rules
+
insinto /lib/udev/hwdb.d
doins hwdb.d/*.hwdb
+
dobashcomp shell-completion/bash/udevadm
+
insinto /usr/share/zsh/site-functions
doins shell-completion/zsh/_udevadm
fi
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-07-04 18:47 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2022-07-04 18:47 UTC (permalink / raw
To: gentoo-commits
commit: b89e4d307ea8448e3cadada7d469dc57b2a3b732
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 4 18:46:04 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jul 4 18:47:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b89e4d30
sys-apps/systemd-utils: add 251.2
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 2 +
sys-apps/systemd-utils/systemd-utils-251.2.ebuild | 497 ++++++++++++++++++++++
2 files changed, 499 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 72e7b0b8e23e..0c70734cd8e9 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,3 +1,5 @@
DIST systemd-musl-patches-250.4.tar.gz 28065 BLAKE2B b8366c4bb29705e3f41f07d0105c4d252d543aaac178e968663660eeb573da034813aa50a96c74ac78ae5efeea379e00df33c5a039ec828cf93450ed23786252 SHA512 66e41fab1873021913c32e3f43300ea7babd18a36e6543838ab7fab4c44f5590c6a7414dd50c7ee81e5513b0e5aa01cb6df4231e8e06c609d63011a32b524213
+DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2fb2484af718d0f282129957236ce241fbe8538a90d507a96c7c3d86f4f408ab784a6888b37486405d3276e7734a1bd5aa9680 SHA512 6e56b62234ac54929faea5a7cad699d0b932f869b48e3ba4e1f349a88653b7c787efec24a09b00290c3dc566614e3c1dc2f3c04f04e943f513108a91eca1be82
DIST systemd-stable-250.6.tar.gz 11212534 BLAKE2B faf065dbe5c02d9d3311202f93b9ad8984c4c9d127d32c17f305b81046f9e29cfc731cdd4abbd073965f448f4e1dff81d80313896b346548d2640939ad509365 SHA512 b625d5fb419370d238cf72f2e59c8fa6782972d94746835bde3a64a7746edd1d5fad901bbb01311f858b7dbdff6d759518b615708bb835a81964c16878d5644e
DIST systemd-stable-250.7.tar.gz 11214975 BLAKE2B 5d94b4b1f8b0cd6e8284a89ac0d4bd373eccdad2c3d6e6c453df79c8df47ee0f9cfbde764b72b1f9d172d07e2d9f1f1f41c1ab254cf4abd0722469ebc3ad7cf8 SHA512 99bc6f0c9757b280cb694f3fb4d6fe04d5ce55583eb2bae5ddeb324bb5ee9930c1720fcc27293d90cddba188473653ec541a471ae8115710a5850c26d0ba215d
+DIST systemd-stable-251.2.tar.gz 11434645 BLAKE2B a7e118649a7d27b789206ea9f6f2d0314e44561367506ee763a9e98fb97579b3fc49c7a402c8da142945dc98444558f0e311557f52c50863cebc7532c17c651f SHA512 0c4011b685a1e8d535af123cbaf79ab53d59ea665ca5350ab1077ad4e962b49c1fd5b1b5bb3f28c3e28145dfd02aa83023f78de5edec15afe84e3e06e742a67c
diff --git a/sys-apps/systemd-utils/systemd-utils-251.2.ebuild b/sys-apps/systemd-utils/systemd-utils-251.2.ebuild
new file mode 100644
index 000000000000..6d6a29224efa
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-251.2.ebuild
@@ -0,0 +1,497 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-251.2"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ elibc_musl? ( >=sys-libs/musl-1.2.3 )
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-3.11
+ boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+ local PATCHES=(
+ )
+ if use elibc_musl; then
+ PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootlibexecdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+multilib_src_configure() {
+ # When bumping to 251, please keep this, but add the revert patch
+ # like in sys-apps/systemd!
+ #
+ # Broken with FORTIFY_SOURCE=3 without a patch. And the patch
+ # wasn't backported to 250.x, but it turns out to break Clang
+ # anyway: bug #841770.
+ #
+ # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+ # to unset F_S first, then explicitly set 2, to negate any default
+ # and anything set by the user if they're choosing 3 (or if they've
+ # modified GCC to set 3).
+ #
+ if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+ # We can't unconditionally do this b/c we fortify needs
+ # some level of optimisation.
+ filter-flags -D_FORTIFY_SOURCE=3
+ append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+ fi
+
+ local emesonargs=(
+ -Drootprefix="${EPREFIX:-/}"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool boot kernel-install)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ kernel-install
+ man/bootctl.1
+ man/kernel-install.8
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl kernel-install
+ doman man/{bootctl.1,kernel-install.8}
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into /
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into /
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ fi
+ if use udev; then
+ into /
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm /lib/systemd/systemd-udevd
+ exeinto /lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+ insinto /lib/udev/rules.d
+ doins rules.d/*.rules
+ insinto /lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+ fi
+ fi
+ if use udev; then
+ meson_install --no-rebuild --tags libudev
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+ insinto /lib/systemd/network
+ doins network/99-default.link
+ insinto /lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+ insinto /lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+ dobashcomp shell-completion/bash/udevadm
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-07-04 18:47 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2022-07-04 18:47 UTC (permalink / raw
To: gentoo-commits
commit: 63a49765ce935eac79bae232ce5fabdb51122a52
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 4 18:46:29 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jul 4 18:47:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63a49765
sys-apps/systemd-utils: drop 250.6
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 -
sys-apps/systemd-utils/systemd-utils-250.6.ebuild | 500 ----------------------
2 files changed, 501 deletions(-)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 0c70734cd8e9..537ae3243581 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,5 +1,4 @@
DIST systemd-musl-patches-250.4.tar.gz 28065 BLAKE2B b8366c4bb29705e3f41f07d0105c4d252d543aaac178e968663660eeb573da034813aa50a96c74ac78ae5efeea379e00df33c5a039ec828cf93450ed23786252 SHA512 66e41fab1873021913c32e3f43300ea7babd18a36e6543838ab7fab4c44f5590c6a7414dd50c7ee81e5513b0e5aa01cb6df4231e8e06c609d63011a32b524213
DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2fb2484af718d0f282129957236ce241fbe8538a90d507a96c7c3d86f4f408ab784a6888b37486405d3276e7734a1bd5aa9680 SHA512 6e56b62234ac54929faea5a7cad699d0b932f869b48e3ba4e1f349a88653b7c787efec24a09b00290c3dc566614e3c1dc2f3c04f04e943f513108a91eca1be82
-DIST systemd-stable-250.6.tar.gz 11212534 BLAKE2B faf065dbe5c02d9d3311202f93b9ad8984c4c9d127d32c17f305b81046f9e29cfc731cdd4abbd073965f448f4e1dff81d80313896b346548d2640939ad509365 SHA512 b625d5fb419370d238cf72f2e59c8fa6782972d94746835bde3a64a7746edd1d5fad901bbb01311f858b7dbdff6d759518b615708bb835a81964c16878d5644e
DIST systemd-stable-250.7.tar.gz 11214975 BLAKE2B 5d94b4b1f8b0cd6e8284a89ac0d4bd373eccdad2c3d6e6c453df79c8df47ee0f9cfbde764b72b1f9d172d07e2d9f1f1f41c1ab254cf4abd0722469ebc3ad7cf8 SHA512 99bc6f0c9757b280cb694f3fb4d6fe04d5ce55583eb2bae5ddeb324bb5ee9930c1720fcc27293d90cddba188473653ec541a471ae8115710a5850c26d0ba215d
DIST systemd-stable-251.2.tar.gz 11434645 BLAKE2B a7e118649a7d27b789206ea9f6f2d0314e44561367506ee763a9e98fb97579b3fc49c7a402c8da142945dc98444558f0e311557f52c50863cebc7532c17c651f SHA512 0c4011b685a1e8d535af123cbaf79ab53d59ea665ca5350ab1077ad4e962b49c1fd5b1b5bb3f28c3e28145dfd02aa83023f78de5edec15afe84e3e06e742a67c
diff --git a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
deleted file mode 100644
index dc655fae7a8c..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
+++ /dev/null
@@ -1,500 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-250.4"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- boot? (
- >=sys-boot/gnu-efi-3.0.2
- )
- >=sys-kernel/linux-headers-3.11
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
- has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/250.4-test-systemd-tmpfiles.standalone.patch"
- )
- if use elibc_musl; then
- PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootlibexecdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-multilib_src_configure() {
- # When bumping to 251, please keep this, but add the revert patch
- # like in sys-apps/systemd!
- #
- # Broken with FORTIFY_SOURCE=3 without a patch. And the patch
- # wasn't backported to 250.x, but it turns out to break Clang
- # anyway: bug #841770.
- #
- # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
- # to unset F_S first, then explicitly set 2, to negate any default
- # and anything set by the user if they're choosing 3 (or if they've
- # modified GCC to set 3).
- #
- if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
- # We can't unconditionally do this b/c we fortify needs
- # some level of optimisation.
- filter-flags -D_FORTIFY_SOURCE=3
- append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
- fi
-
- local emesonargs=(
- -Drootprefix="${EPREFIX:-/}"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dkernel-install=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- man/bootctl.1
- man/kernel-install.8
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl
- doman man/{bootctl.1,kernel-install.8}
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into /
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into /
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- fi
- if use udev; then
- into /
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm /lib/systemd/systemd-udevd
- exeinto /lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
- insinto /lib/udev/rules.d
- doins rules.d/*.rules
- insinto /lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
-
- fi
- fi
- if use udev; then
- into /usr
- dolib.so "$(readlink libudev.so.1)" libudev.so{.1,}
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- dobin src/kernel-install/kernel-install
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- fi
- if use udev; then
- doheader src/libudev/libudev.h
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
- insinto /lib/systemd/network
- doins network/99-default.link
- insinto /lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
- insinto /lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
- dobashcomp shell-completion/bash/udevadm
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- udev_reload
- fi
-}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-06-28 4:34 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-06-28 4:34 UTC (permalink / raw
To: gentoo-commits
commit: 9b32a1b0e6ce53336d4746b9a422e80dd5647192
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 28 04:33:52 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 04:33:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b32a1b0
sys-apps/systemd-utils: Stabilize 250.7 x86, #850928
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
index 6892a880e75d..7c1f1c2f6a75 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-06-28 4:34 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-06-28 4:34 UTC (permalink / raw
To: gentoo-commits
commit: bb8e5d3810471d058aad1c4fd302267797c0cd86
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 28 04:33:48 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 04:33:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb8e5d38
sys-apps/systemd-utils: Stabilize 250.7 hppa, #850928
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
index cf1dfea5be71..6892a880e75d 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-06-25 9:55 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-06-25 9:55 UTC (permalink / raw
To: gentoo-commits
commit: 038a504d0feecf55ee1ed6d53f150a0dda3505c1
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 09:54:45 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 09:54:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=038a504d
sys-apps/systemd-utils: Stabilize 250.7 sparc, #850928
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
index b465182a81e3..946d501987dc 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-06-25 9:55 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-06-25 9:55 UTC (permalink / raw
To: gentoo-commits
commit: f1097040b24c7099f3a0ff45cf9b09cc2e7bcba3
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 09:54:41 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 09:54:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1097040
sys-apps/systemd-utils: Stabilize 250.7 ppc64, #850928
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
index 6817e26d98a2..b465182a81e3 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-06-25 9:55 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-06-25 9:55 UTC (permalink / raw
To: gentoo-commits
commit: 23151f6c465dfc627275b6ca6a2d2b34bfbd0714
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 09:54:49 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 09:54:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23151f6c
sys-apps/systemd-utils: Stabilize 250.7 amd64, #850928
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
index 946d501987dc..cf1dfea5be71 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-06-25 9:55 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-06-25 9:55 UTC (permalink / raw
To: gentoo-commits
commit: e412cf0cd28265544c4a90b0f61ad7395df18d92
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 09:54:31 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 09:54:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e412cf0c
sys-apps/systemd-utils: Stabilize 250.7 arm, #850928
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
index 9afc4a2e8c10..f598165669fe 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-06-25 9:55 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-06-25 9:55 UTC (permalink / raw
To: gentoo-commits
commit: 0d0b139a8e2a3279ff27cbd025e42f30e0c0c4b3
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 09:54:34 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 09:54:34 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d0b139a
sys-apps/systemd-utils: Stabilize 250.7 arm64, #850928
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
index f598165669fe..fe35c68d1c45 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-06-25 9:55 Arthur Zamarin
0 siblings, 0 replies; 252+ messages in thread
From: Arthur Zamarin @ 2022-06-25 9:55 UTC (permalink / raw
To: gentoo-commits
commit: af300f9f40da24800fdaea553b049fa8109ccf47
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 09:54:37 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 09:54:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af300f9f
sys-apps/systemd-utils: Stabilize 250.7 ppc, #850928
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
index fe35c68d1c45..6817e26d98a2 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-06-14 15:27 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2022-06-14 15:27 UTC (permalink / raw
To: gentoo-commits
commit: affe9b4a4b4468ff54a9e90f6209071f99251180
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 15:25:46 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 15:25:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=affe9b4a
sys-apps/systemd-utils: set TMPFILES_OPTIONAL and UDEV_OPTIONAL
Closes: https://bugs.gentoo.org/851882
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.6.ebuild | 3 +++
sys-apps/systemd-utils/systemd-utils-250.7.ebuild | 3 +++
2 files changed, 6 insertions(+)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
index 9cc1a18823ff..dc655fae7a8c 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
@@ -94,6 +94,9 @@ BDEPEND="
virtual/pkgconfig
"
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
python_check_deps() {
has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
}
diff --git a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
index 93edcbe9fa2c..9afc4a2e8c10 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
@@ -94,6 +94,9 @@ BDEPEND="
virtual/pkgconfig
"
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
python_check_deps() {
has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-06-04 2:21 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-06-04 2:21 UTC (permalink / raw
To: gentoo-commits
commit: b20d2bf4213a6e940a01b827fca06a6d8c8704a5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 4 02:20:52 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 4 02:20:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b20d2bf4
sys-apps/systemd-utils: Stabilize 250.6 sparc, #848435
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
index 547c36bcca0f..9cc1a18823ff 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-06-03 7:05 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-06-03 7:05 UTC (permalink / raw
To: gentoo-commits
commit: a363ae5fade7f24abda49c7c6994948d429c01aa
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 3 07:05:07 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 3 07:05:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a363ae5f
sys-apps/systemd-utils: Stabilize 250.6 hppa, #848435
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
index 6c0a538bb2c7..547c36bcca0f 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-06-03 2:38 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-06-03 2:38 UTC (permalink / raw
To: gentoo-commits
commit: 995d90f56e1d5eb3b5342ba4ed5243c93f27286a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 3 02:38:26 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 3 02:38:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=995d90f5
sys-apps/systemd-utils: add Python 3.11
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
index 21922a535e32..93edcbe9fa2c 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
QA_PKGCONFIG_VERSION=$(ver_cut 1)
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-06-03 2:32 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-06-03 2:32 UTC (permalink / raw
To: gentoo-commits
commit: 2613c01e901545227cd5b8c9154649c8bea27178
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 3 02:31:32 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 3 02:31:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2613c01e
sys-apps/systemd-utils: drop 250.4-r3, 250.5
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 2 -
.../systemd-utils/systemd-utils-250.4-r3.ebuild | 475 ---------------------
sys-apps/systemd-utils/systemd-utils-250.5.ebuild | 475 ---------------------
3 files changed, 952 deletions(-)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index cc709cbac9ae..72e7b0b8e23e 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,5 +1,3 @@
DIST systemd-musl-patches-250.4.tar.gz 28065 BLAKE2B b8366c4bb29705e3f41f07d0105c4d252d543aaac178e968663660eeb573da034813aa50a96c74ac78ae5efeea379e00df33c5a039ec828cf93450ed23786252 SHA512 66e41fab1873021913c32e3f43300ea7babd18a36e6543838ab7fab4c44f5590c6a7414dd50c7ee81e5513b0e5aa01cb6df4231e8e06c609d63011a32b524213
-DIST systemd-stable-250.4.tar.gz 11132786 BLAKE2B 8fdfe1bad76e572dc1be0955f3d1c4080f2beb81a2f9670f80827899f5406ab8ed8675400c2f5e8ccef44cf1bceff42ceae12a42e1b67d46c0deb523e6495f25 SHA512 307ed0920da660b6c45d909fea66864fb98db8b2f6905d629fb2012fc4bf64dd25fd61168c22bf4098200be541be9b0e815fbde98806a99c85cb33d49d8b63d0
-DIST systemd-stable-250.5.tar.gz 11212059 BLAKE2B b7dbcb9e82c51e966db20a92ccd59ac19309702c481dd575c4e6367ca5ade10fe4b689925416ce1169682380cbf22d7d692b2378ef091f3007c16891992e3f92 SHA512 ad864b67bd5e2f5fd5705b636467827e4735142cefba150d24bb8e51ac0263650b2b0e53d4426eb509d1db59b83dc3b4c4bf157cc355fc2b7524db6bc4a9b5cd
DIST systemd-stable-250.6.tar.gz 11212534 BLAKE2B faf065dbe5c02d9d3311202f93b9ad8984c4c9d127d32c17f305b81046f9e29cfc731cdd4abbd073965f448f4e1dff81d80313896b346548d2640939ad509365 SHA512 b625d5fb419370d238cf72f2e59c8fa6782972d94746835bde3a64a7746edd1d5fad901bbb01311f858b7dbdff6d759518b615708bb835a81964c16878d5644e
DIST systemd-stable-250.7.tar.gz 11214975 BLAKE2B 5d94b4b1f8b0cd6e8284a89ac0d4bd373eccdad2c3d6e6c453df79c8df47ee0f9cfbde764b72b1f9d172d07e2d9f1f1f41c1ab254cf4abd0722469ebc3ad7cf8 SHA512 99bc6f0c9757b280cb694f3fb4d6fe04d5ce55583eb2bae5ddeb324bb5ee9930c1720fcc27293d90cddba188473653ec541a471ae8115710a5850c26d0ba215d
diff --git a/sys-apps/systemd-utils/systemd-utils-250.4-r3.ebuild b/sys-apps/systemd-utils/systemd-utils-250.4-r3.ebuild
deleted file mode 100644
index 1a7f5f5fb352..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-250.4-r3.ebuild
+++ /dev/null
@@ -1,475 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs usr-ldscript
-
-DESCRIPTION="Utilities taken from systemd"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-250.4"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- boot? (
- >=sys-boot/gnu-efi-3.0.2
- )
- >=sys-kernel/linux-headers-3.11
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-python_check_deps() {
- has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/250.4-test-systemd-tmpfiles.standalone.patch"
- )
- if use elibc_musl; then
- PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootlibexecdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-multilib_src_configure() {
- local emesonargs=(
- -Drootprefix="${EPREFIX:-/}"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dkernel-install=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- man/bootctl.1
- man/kernel-install.8
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl
- doman man/{bootctl.1,kernel-install.8}
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into /
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into /
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- fi
- if use udev; then
- into /
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm /lib/systemd/systemd-udevd
- exeinto /lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
- insinto /lib/udev/rules.d
- doins rules.d/*.rules
- insinto /lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
-
- fi
- fi
- if use udev; then
- into /usr
- dolib.so "$(readlink libudev.so.1)" libudev.so{.1,}
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- dobin src/kernel-install/kernel-install
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- fi
- if use udev; then
- doheader src/libudev/libudev.h
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
- insinto /lib/systemd/network
- doins network/99-default.link
- insinto /lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
- insinto /lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
- dobashcomp shell-completion/bash/udevadm
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-250.5.ebuild b/sys-apps/systemd-utils/systemd-utils-250.5.ebuild
deleted file mode 100644
index 1a7f5f5fb352..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-250.5.ebuild
+++ /dev/null
@@ -1,475 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs usr-ldscript
-
-DESCRIPTION="Utilities taken from systemd"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-250.4"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- boot? (
- >=sys-boot/gnu-efi-3.0.2
- )
- >=sys-kernel/linux-headers-3.11
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-python_check_deps() {
- has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/250.4-test-systemd-tmpfiles.standalone.patch"
- )
- if use elibc_musl; then
- PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootlibexecdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-multilib_src_configure() {
- local emesonargs=(
- -Drootprefix="${EPREFIX:-/}"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dkernel-install=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- man/bootctl.1
- man/kernel-install.8
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl
- doman man/{bootctl.1,kernel-install.8}
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into /
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into /
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- fi
- if use udev; then
- into /
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm /lib/systemd/systemd-udevd
- exeinto /lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
- insinto /lib/udev/rules.d
- doins rules.d/*.rules
- insinto /lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
-
- fi
- fi
- if use udev; then
- into /usr
- dolib.so "$(readlink libudev.so.1)" libudev.so{.1,}
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- dobin src/kernel-install/kernel-install
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- fi
- if use udev; then
- doheader src/libudev/libudev.h
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
- insinto /lib/systemd/network
- doins network/99-default.link
- insinto /lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
- insinto /lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
- dobashcomp shell-completion/bash/udevadm
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- fi
-}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-06-03 0:52 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-06-03 0:52 UTC (permalink / raw
To: gentoo-commits
commit: 096fbdbb92954f93ac05b7debe2f98bd97d04ede
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 3 00:52:14 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 3 00:52:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=096fbdbb
sys-apps/systemd-utils: Stabilize 250.6 ppc64, #848435
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
index bff3c5f0a6a0..6c0a538bb2c7 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-06-03 0:52 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-06-03 0:52 UTC (permalink / raw
To: gentoo-commits
commit: 8022cbbd170555993f0a65aaed00ea543ca18237
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 3 00:52:06 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 3 00:52:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8022cbbd
sys-apps/systemd-utils: Stabilize 250.6 ppc, #848435
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
index 6ea3c99845ad..bff3c5f0a6a0 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-06-03 0:37 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-06-03 0:37 UTC (permalink / raw
To: gentoo-commits
commit: d96ce145080c08f9f7fb182d44b0fb3cf212c0b0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 3 00:34:18 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 3 00:34:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d96ce145
sys-apps/systemd-utils: add 250.7
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-250.7.ebuild | 497 ++++++++++++++++++++++
2 files changed, 498 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 1a079391ca00..cc709cbac9ae 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -2,3 +2,4 @@ DIST systemd-musl-patches-250.4.tar.gz 28065 BLAKE2B b8366c4bb29705e3f41f07d0105
DIST systemd-stable-250.4.tar.gz 11132786 BLAKE2B 8fdfe1bad76e572dc1be0955f3d1c4080f2beb81a2f9670f80827899f5406ab8ed8675400c2f5e8ccef44cf1bceff42ceae12a42e1b67d46c0deb523e6495f25 SHA512 307ed0920da660b6c45d909fea66864fb98db8b2f6905d629fb2012fc4bf64dd25fd61168c22bf4098200be541be9b0e815fbde98806a99c85cb33d49d8b63d0
DIST systemd-stable-250.5.tar.gz 11212059 BLAKE2B b7dbcb9e82c51e966db20a92ccd59ac19309702c481dd575c4e6367ca5ade10fe4b689925416ce1169682380cbf22d7d692b2378ef091f3007c16891992e3f92 SHA512 ad864b67bd5e2f5fd5705b636467827e4735142cefba150d24bb8e51ac0263650b2b0e53d4426eb509d1db59b83dc3b4c4bf157cc355fc2b7524db6bc4a9b5cd
DIST systemd-stable-250.6.tar.gz 11212534 BLAKE2B faf065dbe5c02d9d3311202f93b9ad8984c4c9d127d32c17f305b81046f9e29cfc731cdd4abbd073965f448f4e1dff81d80313896b346548d2640939ad509365 SHA512 b625d5fb419370d238cf72f2e59c8fa6782972d94746835bde3a64a7746edd1d5fad901bbb01311f858b7dbdff6d759518b615708bb835a81964c16878d5644e
+DIST systemd-stable-250.7.tar.gz 11214975 BLAKE2B 5d94b4b1f8b0cd6e8284a89ac0d4bd373eccdad2c3d6e6c453df79c8df47ee0f9cfbde764b72b1f9d172d07e2d9f1f1f41c1ab254cf4abd0722469ebc3ad7cf8 SHA512 99bc6f0c9757b280cb694f3fb4d6fe04d5ce55583eb2bae5ddeb324bb5ee9930c1720fcc27293d90cddba188473653ec541a471ae8115710a5850c26d0ba215d
diff --git a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
new file mode 100644
index 000000000000..21922a535e32
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
@@ -0,0 +1,497 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-250.4"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ boot? (
+ >=sys-boot/gnu-efi-3.0.2
+ )
+ >=sys-kernel/linux-headers-3.11
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+python_check_deps() {
+ has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/250.4-test-systemd-tmpfiles.standalone.patch"
+ )
+ if use elibc_musl; then
+ PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootlibexecdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+multilib_src_configure() {
+ # When bumping to 251, please keep this, but add the revert patch
+ # like in sys-apps/systemd!
+ #
+ # Broken with FORTIFY_SOURCE=3 without a patch. And the patch
+ # wasn't backported to 250.x, but it turns out to break Clang
+ # anyway: bug #841770.
+ #
+ # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+ # to unset F_S first, then explicitly set 2, to negate any default
+ # and anything set by the user if they're choosing 3 (or if they've
+ # modified GCC to set 3).
+ #
+ if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+ # We can't unconditionally do this b/c we fortify needs
+ # some level of optimisation.
+ filter-flags -D_FORTIFY_SOURCE=3
+ append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+ fi
+
+ local emesonargs=(
+ -Drootprefix="${EPREFIX:-/}"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dkernel-install=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ man/bootctl.1
+ man/kernel-install.8
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl
+ doman man/{bootctl.1,kernel-install.8}
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into /
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into /
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ fi
+ if use udev; then
+ into /
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm /lib/systemd/systemd-udevd
+ exeinto /lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+ insinto /lib/udev/rules.d
+ doins rules.d/*.rules
+ insinto /lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+
+ fi
+ fi
+ if use udev; then
+ into /usr
+ dolib.so "$(readlink libudev.so.1)" libudev.so{.1,}
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ dobin src/kernel-install/kernel-install
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+ insinto /lib/systemd/network
+ doins network/99-default.link
+ insinto /lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+ insinto /lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+ dobashcomp shell-completion/bash/udevadm
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-06-03 0:37 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-06-03 0:37 UTC (permalink / raw
To: gentoo-commits
commit: 389a2b3ebd5fb671837a11fc535aadee0fb5585f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 3 00:37:14 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 3 00:37:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=389a2b3e
sys-apps/systemd-utils: Stabilize 250.6 arm, #848435
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
index 01d543e642c0..6ea3c99845ad 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-06-02 1:52 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-06-02 1:52 UTC (permalink / raw
To: gentoo-commits
commit: 06c305fdbab77c7c58649cb23c702cbd5f23d416
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 2 01:51:53 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 2 01:51:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06c305fd
sys-apps/systemd-utils: Stabilize 250.6 arm64, #848435
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
index 94a727137410..01d543e642c0 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-06-02 1:52 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-06-02 1:52 UTC (permalink / raw
To: gentoo-commits
commit: 305a88059567b90aac8bcb82c3aa628c5f88f1cc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 2 01:51:45 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 2 01:51:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=305a8805
sys-apps/systemd-utils: Stabilize 250.6 x86, #848435
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
index fd0c93da4bf8..94a727137410 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-05-30 23:30 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-05-30 23:30 UTC (permalink / raw
To: gentoo-commits
commit: c2a3f86ac0c573206a6a46062b4f6f4e39a736af
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 23:30:50 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 30 23:30:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2a3f86a
sys-apps/systemd-utils: clarify for OpenRC users
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
index 675ea51ff46a..fd0c93da4bf8 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
@@ -8,7 +8,7 @@ QA_PKGCONFIG_VERSION=$(ver_cut 1)
inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
-DESCRIPTION="Utilities taken from systemd"
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
HOMEPAGE="https://systemd.io/"
if [[ ${PV} == *.* ]]; then
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-05-30 7:15 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-05-30 7:15 UTC (permalink / raw
To: gentoo-commits
commit: c6298d8e7e2300cbcfec0932c3f88be7357f87a1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 07:12:14 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 30 07:14:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6298d8e
sys-apps/systemd-utils: Stabilize 250.6 amd64, #848435
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
index 9e395b363772..675ea51ff46a 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-05-29 23:50 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2022-05-29 23:50 UTC (permalink / raw
To: gentoo-commits
commit: 6df04002659fc028670918c7156a88198b5ddef2
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 23:48:36 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun May 29 23:49:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6df04002
sys-apps/systemd-utils: call udev_reload
Closes: https://bugs.gentoo.org/848048
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.6.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
index ce351b7aa23d..9e395b363772 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python3_{8..10} )
QA_PKGCONFIG_VERSION=$(ver_cut 1)
-inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs usr-ldscript
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
DESCRIPTION="Utilities taken from systemd"
HOMEPAGE="https://systemd.io/"
@@ -492,5 +492,6 @@ pkg_postinst() {
ebegin "Updating hwdb"
systemd-hwdb --root="${ROOT}" update
eend $?
+ udev_reload
fi
}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-05-29 1:11 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-05-29 1:11 UTC (permalink / raw
To: gentoo-commits
commit: 53f537d9ca4ea909abb6a435417604dbbe99c3bc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 01:06:00 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 29 01:11:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53f537d9
sys-apps/systemd-utils: add 250.6
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-250.6.ebuild | 496 ++++++++++++++++++++++
2 files changed, 497 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 80f1888fd280..1a079391ca00 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,3 +1,4 @@
DIST systemd-musl-patches-250.4.tar.gz 28065 BLAKE2B b8366c4bb29705e3f41f07d0105c4d252d543aaac178e968663660eeb573da034813aa50a96c74ac78ae5efeea379e00df33c5a039ec828cf93450ed23786252 SHA512 66e41fab1873021913c32e3f43300ea7babd18a36e6543838ab7fab4c44f5590c6a7414dd50c7ee81e5513b0e5aa01cb6df4231e8e06c609d63011a32b524213
DIST systemd-stable-250.4.tar.gz 11132786 BLAKE2B 8fdfe1bad76e572dc1be0955f3d1c4080f2beb81a2f9670f80827899f5406ab8ed8675400c2f5e8ccef44cf1bceff42ceae12a42e1b67d46c0deb523e6495f25 SHA512 307ed0920da660b6c45d909fea66864fb98db8b2f6905d629fb2012fc4bf64dd25fd61168c22bf4098200be541be9b0e815fbde98806a99c85cb33d49d8b63d0
DIST systemd-stable-250.5.tar.gz 11212059 BLAKE2B b7dbcb9e82c51e966db20a92ccd59ac19309702c481dd575c4e6367ca5ade10fe4b689925416ce1169682380cbf22d7d692b2378ef091f3007c16891992e3f92 SHA512 ad864b67bd5e2f5fd5705b636467827e4735142cefba150d24bb8e51ac0263650b2b0e53d4426eb509d1db59b83dc3b4c4bf157cc355fc2b7524db6bc4a9b5cd
+DIST systemd-stable-250.6.tar.gz 11212534 BLAKE2B faf065dbe5c02d9d3311202f93b9ad8984c4c9d127d32c17f305b81046f9e29cfc731cdd4abbd073965f448f4e1dff81d80313896b346548d2640939ad509365 SHA512 b625d5fb419370d238cf72f2e59c8fa6782972d94746835bde3a64a7746edd1d5fad901bbb01311f858b7dbdff6d759518b615708bb835a81964c16878d5644e
diff --git a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
new file mode 100644
index 000000000000..ce351b7aa23d
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
@@ -0,0 +1,496 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs usr-ldscript
+
+DESCRIPTION="Utilities taken from systemd"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-250.4"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ boot? (
+ >=sys-boot/gnu-efi-3.0.2
+ )
+ >=sys-kernel/linux-headers-3.11
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+python_check_deps() {
+ has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/250.4-test-systemd-tmpfiles.standalone.patch"
+ )
+ if use elibc_musl; then
+ PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootlibexecdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+multilib_src_configure() {
+ # When bumping to 251, please keep this, but add the revert patch
+ # like in sys-apps/systemd!
+ #
+ # Broken with FORTIFY_SOURCE=3 without a patch. And the patch
+ # wasn't backported to 250.x, but it turns out to break Clang
+ # anyway: bug #841770.
+ #
+ # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+ # to unset F_S first, then explicitly set 2, to negate any default
+ # and anything set by the user if they're choosing 3 (or if they've
+ # modified GCC to set 3).
+ #
+ if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+ # We can't unconditionally do this b/c we fortify needs
+ # some level of optimisation.
+ filter-flags -D_FORTIFY_SOURCE=3
+ append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+ fi
+
+ local emesonargs=(
+ -Drootprefix="${EPREFIX:-/}"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dkernel-install=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ man/bootctl.1
+ man/kernel-install.8
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl
+ doman man/{bootctl.1,kernel-install.8}
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into /
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into /
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ fi
+ if use udev; then
+ into /
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm /lib/systemd/systemd-udevd
+ exeinto /lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+ insinto /lib/udev/rules.d
+ doins rules.d/*.rules
+ insinto /lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+
+ fi
+ fi
+ if use udev; then
+ into /usr
+ dolib.so "$(readlink libudev.so.1)" libudev.so{.1,}
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ dobin src/kernel-install/kernel-install
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+ insinto /lib/systemd/network
+ doins network/99-default.link
+ insinto /lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+ insinto /lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+ dobashcomp shell-completion/bash/udevadm
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-04-30 18:47 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2022-04-30 18:47 UTC (permalink / raw
To: gentoo-commits
commit: 7f9731e8a4b14f1cec75f065bc0f2b42c0ff201f
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 18:47:21 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 18:47:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f9731e8
sys-apps/systemd-utils: keyword 250.5 for ~loong
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.5.ebuild b/sys-apps/systemd-utils/systemd-utils-250.5.ebuild
index f6bc25624f70..1a7f5f5fb352 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.5.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.5.ebuild
@@ -24,7 +24,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-04-29 7:39 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-04-29 7:39 UTC (permalink / raw
To: gentoo-commits
commit: a3f8863faf761426c2942368ffdcacb5f72f188b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 07:38:51 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 07:38:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3f8863f
sys-apps/systemd-utils: add 250.5
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/Manifest | 1 +
sys-apps/systemd-utils/systemd-utils-250.5.ebuild | 475 ++++++++++++++++++++++
2 files changed, 476 insertions(+)
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 36c4e1be52e1..80f1888fd280 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,2 +1,3 @@
DIST systemd-musl-patches-250.4.tar.gz 28065 BLAKE2B b8366c4bb29705e3f41f07d0105c4d252d543aaac178e968663660eeb573da034813aa50a96c74ac78ae5efeea379e00df33c5a039ec828cf93450ed23786252 SHA512 66e41fab1873021913c32e3f43300ea7babd18a36e6543838ab7fab4c44f5590c6a7414dd50c7ee81e5513b0e5aa01cb6df4231e8e06c609d63011a32b524213
DIST systemd-stable-250.4.tar.gz 11132786 BLAKE2B 8fdfe1bad76e572dc1be0955f3d1c4080f2beb81a2f9670f80827899f5406ab8ed8675400c2f5e8ccef44cf1bceff42ceae12a42e1b67d46c0deb523e6495f25 SHA512 307ed0920da660b6c45d909fea66864fb98db8b2f6905d629fb2012fc4bf64dd25fd61168c22bf4098200be541be9b0e815fbde98806a99c85cb33d49d8b63d0
+DIST systemd-stable-250.5.tar.gz 11212059 BLAKE2B b7dbcb9e82c51e966db20a92ccd59ac19309702c481dd575c4e6367ca5ade10fe4b689925416ce1169682380cbf22d7d692b2378ef091f3007c16891992e3f92 SHA512 ad864b67bd5e2f5fd5705b636467827e4735142cefba150d24bb8e51ac0263650b2b0e53d4426eb509d1db59b83dc3b4c4bf157cc355fc2b7524db6bc4a9b5cd
diff --git a/sys-apps/systemd-utils/systemd-utils-250.5.ebuild b/sys-apps/systemd-utils/systemd-utils-250.5.ebuild
new file mode 100644
index 000000000000..f6bc25624f70
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-250.5.ebuild
@@ -0,0 +1,475 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs usr-ldscript
+
+DESCRIPTION="Utilities taken from systemd"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-250.4"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ boot? (
+ >=sys-boot/gnu-efi-3.0.2
+ )
+ >=sys-kernel/linux-headers-3.11
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+python_check_deps() {
+ has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/250.4-test-systemd-tmpfiles.standalone.patch"
+ )
+ if use elibc_musl; then
+ PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootlibexecdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Drootprefix="${EPREFIX:-/}"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dkernel-install=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ man/bootctl.1
+ man/kernel-install.8
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl
+ doman man/{bootctl.1,kernel-install.8}
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into /
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into /
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ fi
+ if use udev; then
+ into /
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm /lib/systemd/systemd-udevd
+ exeinto /lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+ insinto /lib/udev/rules.d
+ doins rules.d/*.rules
+ insinto /lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+
+ fi
+ fi
+ if use udev; then
+ into /usr
+ dolib.so "$(readlink libudev.so.1)" libudev.so{.1,}
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ dobin src/kernel-install/kernel-install
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+ insinto /lib/systemd/network
+ doins network/99-default.link
+ insinto /lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+ insinto /lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+ dobashcomp shell-completion/bash/udevadm
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ fi
+}
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-04-17 20:13 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2022-04-17 20:13 UTC (permalink / raw
To: gentoo-commits
commit: c2a15ba6bee21fa3564d602c8cc5a9d9f125df67
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 20:12:01 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 20:13:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2a15ba6
sys-apps/systemd-utils: add 'acl' and 'kmod' USE flags
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/metadata.xml | 1 +
...stemd-utils-250.4-r1.ebuild => systemd-utils-250.4-r2.ebuild} | 9 ++++++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/sys-apps/systemd-utils/metadata.xml b/sys-apps/systemd-utils/metadata.xml
index efdb151f4069..5f3934d37331 100644
--- a/sys-apps/systemd-utils/metadata.xml
+++ b/sys-apps/systemd-utils/metadata.xml
@@ -6,6 +6,7 @@
</maintainer>
<use>
<flag name="boot">Enable systemd-boot (UEFI boot manager)</flag>
+ <flag name="kmod">Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag>
<flag name="sysusers">Enable systemd-sysusers</flag>
<flag name="tmpfiles">Enable systemd-tmpfiles</flag>
<flag name="udev">Enable systemd-udev (userspace device manager)</flag>
diff --git a/sys-apps/systemd-utils/systemd-utils-250.4-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-250.4-r2.ebuild
similarity index 98%
rename from sys-apps/systemd-utils/systemd-utils-250.4-r1.ebuild
rename to sys-apps/systemd-utils/systemd-utils-250.4-r2.ebuild
index 024c61072a28..f81737003eb0 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.4-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.4-r2.ebuild
@@ -25,18 +25,21 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="boot selinux sysusers +tmpfiles test +udev"
+IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
COMMON_DEPEND="
- sys-apps/acl:0=
- >=sys-apps/kmod-15:0=
selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
udev? (
>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
sys-libs/libcap:0=[${MULTILIB_USEDEP}]
virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
)
!udev? (
>=sys-apps/util-linux-2.30:0=
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-04-17 14:33 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2022-04-17 14:33 UTC (permalink / raw
To: gentoo-commits
commit: c2318993fac0cdc54dddc3892816dc7992bb0902
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 14:32:47 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 14:33:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2318993
sys-apps/systemd-utils: enable kmod for udev
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../{systemd-utils-250.4.ebuild => systemd-utils-250.4-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.4.ebuild b/sys-apps/systemd-utils/systemd-utils-250.4-r1.ebuild
similarity index 99%
rename from sys-apps/systemd-utils/systemd-utils-250.4.ebuild
rename to sys-apps/systemd-utils/systemd-utils-250.4-r1.ebuild
index aee6304e1eaa..024c61072a28 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.4.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.4-r1.ebuild
@@ -123,6 +123,7 @@ multilib_src_configure() {
$(meson_use test tests)
$(meson_native_use_bool tmpfiles)
$(meson_use udev hwdb)
+ $(meson_native_use_bool udev kmod)
-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
@@ -157,7 +158,6 @@ multilib_src_configure() {
-Dinitrd=false
-Dfirstboot=false
-Dkernel-install=false
- -Dkmod=false
-Dldconfig=false
-Dlibcryptsetup=false
-Dlibcurl=false
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-04-17 13:27 Mike Gilbert
0 siblings, 0 replies; 252+ messages in thread
From: Mike Gilbert @ 2022-04-17 13:27 UTC (permalink / raw
To: gentoo-commits
commit: e9d129de50f0c49c927433c4df83367b3e666482
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 13:24:21 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 13:24:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9d129de
sys-apps/systemd-utils: block sys-fs/eudev when udev is enabled
Bug: https://bugs.gentoo.org/838874
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.4.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.4.ebuild b/sys-apps/systemd-utils/systemd-utils-250.4.ebuild
index db1f23ff9072..cda7180f1b83 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.4.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.4.ebuild
@@ -70,6 +70,7 @@ RDEPEND="${COMMON_DEPEND}
!sys-apps/gentoo-systemd-integration
!sys-apps/hwids[udev]
!<sys-fs/udev-250
+ !sys-fs/eudev
)
!sys-apps/systemd
"
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-04-17 10:10 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-04-17 10:10 UTC (permalink / raw
To: gentoo-commits
commit: bed2dd5598c461b64ac263617ce2dc5d99edef1f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 10:09:56 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 10:10:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bed2dd55
sys-apps/systemd-utils: fix tmpfiles test typo
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.4.ebuild b/sys-apps/systemd-utils/systemd-utils-250.4.ebuild
index 53b14ae2f918..db1f23ff9072 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.4.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.4.ebuild
@@ -324,7 +324,7 @@ multilib_src_test() {
fi
if use tmpfiles; then
tests+=(
- test-systmed-tmpfiles
+ test-systemd-tmpfiles
test-tmpfiles
)
fi
^ permalink raw reply related [flat|nested] 252+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/
@ 2022-04-17 8:16 Sam James
0 siblings, 0 replies; 252+ messages in thread
From: Sam James @ 2022-04-17 8:16 UTC (permalink / raw
To: gentoo-commits
commit: 5b2d9d5abaaba285182425b46b2ac07efb498d03
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 08:13:52 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 08:15:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b2d9d5a
sys-apps/systemd-utils: don't enable boot, sysusers by default
- boot ends up dragging in dependencies like gnu-efi
- sysusers, while tiny, isn't really likely to be used by people on
non-systemd installations anyway
Aim is to try be non-invasive with the migration to systemd-utils
(which is being done because maintaining udev, tmpfiles, boot, etc
separately was difficult to keep in sync, esp. with patches), so
making this as small a transition/noop as possible for users is
preferable.
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/systemd-utils/systemd-utils-250.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/systemd-utils/systemd-utils-250.4.ebuild b/sys-apps/systemd-utils/systemd-utils-250.4.ebuild
index a31cb2e5308a..53b14ae2f918 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.4.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.4.ebuild
@@ -25,7 +25,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+boot selinux +sysusers +tmpfiles test +udev"
+IUSE="boot selinux sysusers +tmpfiles test +udev"
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 252+ messages in thread
end of thread, other threads:[~2024-09-17 16:08 UTC | newest]
Thread overview: 252+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-17 20:20 [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/ Mike Gilbert
-- strict thread matches above, loose matches on Subject: below --
2024-09-17 16:08 Arthur Zamarin
2024-09-17 16:08 Arthur Zamarin
2024-09-17 16:08 Arthur Zamarin
2024-09-17 16:08 Arthur Zamarin
2024-09-17 16:08 Arthur Zamarin
2024-09-17 16:08 Arthur Zamarin
2024-08-31 21:51 Sam James
2024-08-31 21:51 Sam James
2024-07-28 4:20 Sam James
2024-07-28 4:20 Sam James
2024-07-28 4:13 Sam James
2024-07-28 4:13 Sam James
2024-07-15 3:34 Sam James
2024-07-15 3:34 Sam James
2024-07-15 3:28 Sam James
2024-07-15 3:28 Sam James
2024-07-03 0:02 Sam James
2024-07-03 0:02 Sam James
2024-06-12 17:11 Mike Gilbert
2024-06-11 21:26 Mike Gilbert
2024-06-08 17:34 Mike Gilbert
2024-06-08 17:27 Mike Gilbert
2024-06-08 14:00 Mike Gilbert
2024-06-08 13:59 Mike Gilbert
2024-06-08 13:32 Mike Gilbert
2024-06-07 20:39 Mike Gilbert
2024-06-07 18:08 Mike Gilbert
2024-06-07 18:07 Mike Gilbert
2024-06-07 17:33 Mike Gilbert
2024-06-06 14:48 Mike Gilbert
2024-06-06 14:02 Mike Gilbert
2024-06-05 20:26 Mike Gilbert
2024-06-03 17:42 Arthur Zamarin
2024-06-03 17:42 Arthur Zamarin
2024-06-03 17:42 Arthur Zamarin
2024-06-03 17:42 Arthur Zamarin
2024-06-03 17:42 Arthur Zamarin
2024-06-03 17:42 Arthur Zamarin
2024-06-03 17:42 Arthur Zamarin
2024-06-02 19:37 Mike Gilbert
2024-05-28 0:51 Sam James
2024-05-28 0:51 Sam James
2024-05-09 23:48 Sam James
2024-04-26 17:10 Sam James
2024-04-26 0:14 Sam James
2024-04-19 16:21 Arthur Zamarin
2024-04-19 16:21 Arthur Zamarin
2024-04-19 16:21 Arthur Zamarin
2024-04-19 16:21 Arthur Zamarin
2024-04-19 16:21 Arthur Zamarin
2024-04-19 16:21 Arthur Zamarin
2024-04-19 16:21 Arthur Zamarin
2024-04-16 0:52 Mike Gilbert
2024-04-04 1:07 Sam James
2024-03-26 14:48 Mike Gilbert
2024-03-24 3:39 Mike Gilbert
2024-03-24 3:38 Mike Gilbert
2024-03-23 19:57 Mike Gilbert
2024-03-23 19:57 Mike Gilbert
2024-03-23 19:57 Mike Gilbert
2024-03-23 19:57 Mike Gilbert
2024-02-28 0:24 Sam James
2024-02-20 5:24 Sam James
2024-02-06 22:49 Sam James
2024-02-02 6:28 Andrew Ammerlaan
2024-01-27 20:06 Ionen Wolkens
2024-01-27 20:06 Ionen Wolkens
2024-01-27 20:06 Ionen Wolkens
2024-01-27 20:06 Ionen Wolkens
2024-01-27 20:06 Ionen Wolkens
2024-01-27 20:06 Ionen Wolkens
2024-01-27 20:06 Ionen Wolkens
2024-01-27 20:06 Ionen Wolkens
2024-01-25 5:48 Sam James
2023-12-28 3:53 Sam James
2023-12-28 3:53 Sam James
2023-12-24 11:58 Sam James
2023-12-22 7:27 Arthur Zamarin
2023-12-22 7:27 Arthur Zamarin
2023-12-22 7:27 Arthur Zamarin
2023-12-22 7:27 Arthur Zamarin
2023-12-22 7:27 Arthur Zamarin
2023-12-21 0:07 Ionen Wolkens
2023-12-14 4:15 Sam James
2023-11-30 4:05 Sam James
2023-11-10 21:26 Sam James
2023-11-10 21:26 Sam James
2023-11-09 7:29 Andrew Ammerlaan
2023-10-24 19:34 Arthur Zamarin
2023-10-24 19:34 Arthur Zamarin
2023-10-24 19:34 Arthur Zamarin
2023-10-24 19:34 Arthur Zamarin
2023-10-24 19:34 Arthur Zamarin
2023-10-24 19:34 Arthur Zamarin
2023-10-24 19:34 Arthur Zamarin
2023-10-24 19:34 Arthur Zamarin
2023-10-12 20:31 Mike Gilbert
2023-10-01 19:12 Mike Gilbert
2023-10-01 19:12 Mike Gilbert
2023-10-01 19:12 Mike Gilbert
2023-09-29 23:08 Sam James
2023-09-29 23:08 Sam James
2023-09-26 15:33 Arthur Zamarin
2023-09-26 15:33 Arthur Zamarin
2023-09-26 15:33 Arthur Zamarin
2023-09-26 15:33 Arthur Zamarin
2023-09-26 15:33 Arthur Zamarin
2023-09-26 15:33 Arthur Zamarin
2023-09-26 15:33 Arthur Zamarin
2023-09-24 22:29 Sam James
2023-09-24 18:35 Sam James
2023-09-21 7:38 Sam James
2023-09-21 7:38 Sam James
2023-09-10 20:14 Mike Gilbert
2023-09-10 20:14 Mike Gilbert
2023-09-09 20:24 Mike Gilbert
2023-09-09 1:27 Sam James
2023-08-18 10:54 Sam James
2023-08-09 22:46 Sam James
2023-08-08 3:17 Sam James
2023-08-08 3:17 Sam James
2023-08-08 3:17 Sam James
2023-08-08 3:17 Sam James
2023-08-08 3:17 Sam James
2023-08-08 3:17 Sam James
2023-07-20 11:33 Andrew Ammerlaan
2023-07-18 18:15 Sam James
2023-07-18 18:15 Sam James
2023-07-17 20:46 Sam James
2023-07-13 16:18 Mike Gilbert
2023-07-12 4:59 Sam James
2023-07-12 4:59 Sam James
2023-06-05 5:15 Sam James
2023-06-03 14:17 Mike Gilbert
2023-06-02 2:39 Sam James
2023-05-12 1:00 Sam James
2023-05-08 18:27 Mike Gilbert
2023-05-07 18:12 Mike Gilbert
2023-05-05 4:13 Sam James
2023-05-05 4:13 Sam James
2023-04-05 18:58 Sam James
2023-03-30 22:02 Sam James
2023-03-07 16:33 Arthur Zamarin
2023-03-07 16:33 Arthur Zamarin
2023-03-07 16:33 Arthur Zamarin
2023-03-07 16:33 Arthur Zamarin
2023-03-07 16:33 Arthur Zamarin
2023-03-07 16:33 Arthur Zamarin
2023-03-07 16:33 Arthur Zamarin
2023-03-07 16:33 Arthur Zamarin
2023-03-05 3:24 Mike Gilbert
2023-03-04 1:25 Sam James
2023-02-23 18:19 Mike Gilbert
2023-02-23 18:01 Mike Gilbert
2023-02-23 18:01 Mike Gilbert
2023-02-17 3:07 Sam James
2023-02-12 18:11 Mike Gilbert
2023-01-30 0:55 Sam James
2023-01-28 0:53 Mike Gilbert
2023-01-28 0:53 Mike Gilbert
2023-01-13 12:19 Arthur Zamarin
2023-01-13 12:19 Arthur Zamarin
2023-01-13 12:19 Arthur Zamarin
2023-01-13 12:19 Arthur Zamarin
2023-01-13 12:19 Arthur Zamarin
2023-01-13 12:18 Arthur Zamarin
2023-01-13 12:18 Arthur Zamarin
2023-01-11 7:50 Sam James
2023-01-03 6:23 Sam James
2022-12-21 1:25 Sam James
2022-12-15 4:42 Arthur Zamarin
2022-12-15 4:42 Arthur Zamarin
2022-12-15 4:42 Arthur Zamarin
2022-12-15 4:42 Arthur Zamarin
2022-12-15 4:42 Arthur Zamarin
2022-12-15 4:42 Arthur Zamarin
2022-12-15 4:42 Arthur Zamarin
2022-12-15 4:00 Sam James
2022-12-11 18:23 Arthur Zamarin
2022-12-10 4:24 Sam James
2022-12-02 17:23 Arthur Zamarin
2022-11-25 4:49 Sam James
2022-11-21 16:00 Mike Gilbert
2022-11-18 18:05 Arthur Zamarin
2022-11-18 18:04 Arthur Zamarin
2022-11-18 18:04 Arthur Zamarin
2022-11-18 18:04 Arthur Zamarin
2022-11-12 15:51 Arthur Zamarin
2022-11-08 20:21 Sam James
2022-11-08 2:54 Sam James
2022-11-07 17:28 Arthur Zamarin
2022-10-31 17:39 Matt Turner
2022-10-25 5:53 Sam James
2022-10-02 3:00 Sam James
2022-09-17 6:11 Agostino Sarubbo
2022-09-16 18:41 Arthur Zamarin
2022-09-16 18:25 Arthur Zamarin
2022-09-16 10:47 Arthur Zamarin
2022-09-16 6:50 Agostino Sarubbo
2022-09-16 6:50 Agostino Sarubbo
2022-09-15 21:24 Sam James
2022-09-15 21:24 Sam James
2022-09-04 2:02 Sam James
2022-09-04 1:23 Sam James
2022-09-03 23:38 Mike Gilbert
2022-09-03 23:33 Mike Gilbert
2022-09-03 23:33 Mike Gilbert
2022-08-19 4:13 Sam James
2022-08-16 18:51 Arthur Zamarin
2022-08-03 17:30 Arthur Zamarin
2022-08-03 17:30 Arthur Zamarin
2022-08-03 17:30 Arthur Zamarin
2022-08-03 4:45 Arthur Zamarin
2022-08-03 4:45 Arthur Zamarin
2022-08-03 4:45 Arthur Zamarin
2022-07-16 0:26 Mike Gilbert
2022-07-15 5:24 Sam James
2022-07-15 5:24 Sam James
2022-07-04 20:44 Mike Gilbert
2022-07-04 18:47 Mike Gilbert
2022-07-04 18:47 Mike Gilbert
2022-06-28 4:34 Sam James
2022-06-28 4:34 Sam James
2022-06-25 9:55 Arthur Zamarin
2022-06-25 9:55 Arthur Zamarin
2022-06-25 9:55 Arthur Zamarin
2022-06-25 9:55 Arthur Zamarin
2022-06-25 9:55 Arthur Zamarin
2022-06-25 9:55 Arthur Zamarin
2022-06-14 15:27 Mike Gilbert
2022-06-04 2:21 Sam James
2022-06-03 7:05 Sam James
2022-06-03 2:38 Sam James
2022-06-03 2:32 Sam James
2022-06-03 0:52 Sam James
2022-06-03 0:52 Sam James
2022-06-03 0:37 Sam James
2022-06-03 0:37 Sam James
2022-06-02 1:52 Sam James
2022-06-02 1:52 Sam James
2022-05-30 23:30 Sam James
2022-05-30 7:15 Sam James
2022-05-29 23:50 Mike Gilbert
2022-05-29 1:11 Sam James
2022-04-30 18:47 Mike Gilbert
2022-04-29 7:39 Sam James
2022-04-17 20:13 Mike Gilbert
2022-04-17 14:33 Mike Gilbert
2022-04-17 13:27 Mike Gilbert
2022-04-17 10:10 Sam James
2022-04-17 8:16 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox