public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Georgy Yakovlev" <gyakovlev@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-tmpfiles/
Date: Mon, 31 May 2021 03:19:05 +0000 (UTC)	[thread overview]
Message-ID: <1622431092.0ff249b92fdabfb4d7ddbfc0dfa5865dec8e4863.gyakovlev@gentoo> (raw)

commit:     0ff249b92fdabfb4d7ddbfc0dfa5865dec8e4863
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon May 31 03:17:26 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon May 31 03:18:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ff249b9

sys-apps/systemd-tmpfiles: add 248.3, unkeyworded

needs more testing, will restore keywords later
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 sys-apps/systemd-tmpfiles/Manifest                 |   2 +
 .../systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild | 224 +++++++++++++++++++++
 2 files changed, 226 insertions(+)

diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index ff1d4d1bf45..c04aac30f3d 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -1,2 +1,4 @@
 DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
+DIST systemd-stable-248.3.tar.gz 10320940 BLAKE2B 725494e0197dd182de55e4967088f4b4b709e6b2242723368b6cd95606582e01a57322b1f18fa194149055140a90993696734ad3c004843bfaceb72cd04a3a84 SHA512 8e7ff0d5e63cc933e4dc23f7e0bef9707fde90396605eb8822d34de90d7abe8fd37e5739e33b657868218aa7281147cc944c096c007324c3e6fb54d833a83485
 DIST systemd-tmpfiles-246-musl.tar.xz 25860 BLAKE2B 87fc4ca37abec9c1a0cee48bf78c575bd53e16a50d427eff338159dc6d5474ffd328af533ccf90a0e1e160a16baa7378070f418f2be0d7f77e00907a5d07d30e SHA512 4a93d9f0cb2df2dd0a2f91820615dd3a95d19583f45dc0589e37ceaedfc2040112310a6e3fc525e28e222e96a91498af2fe8541b5bf86a635c0f52dd1a84deb7
+DIST systemd-tmpfiles-248.3-musl.tar.xz 22904 BLAKE2B a277ce86577644cecbca5dbfde34aec494e3e14075ab4f7fcbb02f9307d714a93ca63f38e346a1e98391ca9c55860c7e90789cd5edb9b196cf638d54bfe1153b SHA512 d3db6a90bed6b6c1a9f6bce138137554742d1bc60da142fbadbd49b64677a562e47d8140b9c413857106e053d740476744b7f7e05af9dd4a1329058c78cef940

diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild
new file mode 100644
index 00000000000..8306be7d3a9
--- /dev/null
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild
@@ -0,0 +1,224 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *.* ]]; then
+	MY_PN=systemd-stable
+else
+	 MY_PN=systemd
+fi
+
+MINKV="3.11"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit meson python-any-r1
+
+DESCRIPTION="Creates, deletes and cleans up volatile and temporary files and directories"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz
+	elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/${P}-musl.tar.xz )"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="selinux test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sys-apps/acl:0=
+	>=sys-apps/util-linux-2.30:0=
+	>=sys-kernel/linux-headers-${MINKV}
+	sys-libs/libcap:0=
+	selinux? ( sys-libs/libselinux:0= )
+"
+RDEPEND="${DEPEND}
+	!sys-apps/opentmpfiles
+	!sys-apps/systemd
+"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	sys-devel/m4
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# musl patchset from:
+	# http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd
+	use elibc_musl && eapply "${WORKDIR}/${P}-musl"
+	default
+
+	# https://bugs.gentoo.org/767403
+	python_fix_shebang src/test/*.py
+	python_fix_shebang tools/*.py
+}
+
+src_configure() {
+	# disable everything until configure says "enabled features: ACL, tmpfiles, standalone-binaries"
+	# and optionally selinux feature can be enabled to make tmpfiles secontext-aware
+	local systemd_disable_options=(
+		adm-group
+		analyze
+		apparmor
+		audit
+		backlight
+		binfmt
+		blkid
+		bzip2
+		coredump
+		dbus
+		efi
+		elfutils
+		environment-d
+		fdisk
+		gcrypt
+		glib
+		gshadow
+		gnutls
+		hibernate
+		hostnamed
+		hwdb
+		idn
+		ima
+		initrd
+		firstboot
+		kernel-install
+		kmod
+		ldconfig
+		libcryptsetup
+		libcurl
+		libfido2
+		libidn
+		libidn2
+		libiptc
+		link-networkd-shared
+		link-systemctl-shared
+		link-timesyncd-shared
+		link-udev-shared
+		localed
+		logind
+		lz4
+		machined
+		microhttpd
+		networkd
+		nscd
+		nss-myhostname
+		nss-resolve
+		nss-systemd
+		oomd
+		openssl
+		p11kit
+		pam
+		pcre2
+		polkit
+		portabled
+		pstore
+		pwquality
+		randomseed
+		resolve
+		rfkill
+		seccomp
+		smack
+		sysext
+		sysusers
+		timedated
+		timesyncd
+		tpm
+		qrencode
+		quotacheck
+		userdb
+		utmp
+		vconsole
+		wheel-group
+		xdg-autostart
+		xkbcommon
+		xz
+		zlib
+		zstd
+	)
+
+	# prepend -D and append =false, e.g. zstd becomes -Dzstd=false
+	systemd_disable_options=( ${systemd_disable_options[@]/#/-D} )
+	systemd_disable_options=( ${systemd_disable_options[@]/%/=false} )
+
+	local emesonargs=(
+		-Dacl=true
+		-Dtmpfiles=true
+		-Dstandalone-binaries=true # this and below option does the magic
+		-Dstatic-libsystemd=true
+		-Dsysvinit-path=''
+		${systemd_disable_options[@]}
+		$(meson_use selinux)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	# tmpfiles and sysusers can be built as standalone, link systemd-shared in statically.
+	# https://github.com/systemd/systemd/pull/16061 original implementation
+	# we just need to pass -Dstandalone-binaries=true and
+	# use <name>.standalone target below.
+	# check meson.build for if have_standalone_binaries condition per target.
+	local mytargets=(
+		systemd-tmpfiles.standalone
+		man/tmpfiles.d.5
+		man/systemd-tmpfiles.8
+	)
+	meson_src_compile "${mytargets[@]}"
+}
+
+src_install() {
+	# lean and mean installation, single binary and man-pages
+	pushd "${BUILD_DIR}" > /dev/null || die
+	into /
+	newbin systemd-tmpfiles.standalone systemd-tmpfiles
+
+	doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+
+	popd > /dev/null || die
+
+	# service files adapter from opentmpfiles
+	newinitd "${FILESDIR}"/stmpfiles-dev.initd stmpfiles-dev
+	newinitd "${FILESDIR}"/stmpfiles-setup.initd stmpfiles-setup
+
+	# same content, but install as different file
+	newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-dev
+	newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-setup
+}
+
+src_test() {
+	# 'meson test' will compile full systemd, but we can still outsmart it
+	"${EPYTHON}" test/test-systemd-tmpfiles.py \
+		"${BUILD_DIR}"/systemd-tmpfiles.standalone || die "${FUNCNAME} failed"
+}
+
+# adapted from opentmpfiles ebuild
+add_service() {
+	local initd=$1
+	local runlevel=$2
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	mkdir -p "${EROOT}/etc/runlevels/${runlevel}"
+	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+}
+
+pkg_postinst() {
+	if [[ -z $REPLACING_VERSIONS ]]; then
+		add_service stmpfiles-dev sysinit
+		add_service stmpfiles-setup boot
+	fi
+}


             reply	other threads:[~2021-05-31  3:19 UTC|newest]

Thread overview: 93+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-31  3:19 Georgy Yakovlev [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-06-04  2:21 [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-tmpfiles/ Sam James
2022-06-03  7:05 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-02  1:52 Sam James
2022-06-02  1:52 Sam James
2022-05-30  7:15 Sam James
2022-04-16 23:13 Mike Gilbert
2022-01-18 22:12 Sam James
2022-01-15 22:07 Georgy Yakovlev
2022-01-15 22:07 Georgy Yakovlev
2022-01-15 22:01 Sam James
2022-01-14 21:27 Sam James
2022-01-14 21:27 Sam James
2022-01-14 21:26 Sam James
2022-01-14 21:25 Sam James
2022-01-13 16:29 Mike Gilbert
2022-01-13  7:18 Sam James
2022-01-13  4:45 Sam James
2022-01-13  0:20 Sam James
2022-01-11  3:49 Sam James
2022-01-11  3:49 Sam James
2022-01-11  3:22 Georgy Yakovlev
2022-01-11  3:10 Georgy Yakovlev
2022-01-11  2:59 Georgy Yakovlev
2022-01-11  2:53 Georgy Yakovlev
2022-01-11  1:22 Mike Gilbert
2022-01-11  1:01 Mike Gilbert
2021-12-14 22:16 Sam James
2021-12-13 22:55 Sam James
2021-12-13 22:54 Sam James
2021-12-13  5:43 Sam James
2021-12-13  5:16 Sam James
2021-12-13  5:16 Sam James
2021-12-13  5:15 Sam James
2021-11-09  1:10 Georgy Yakovlev
2021-11-04  0:48 Georgy Yakovlev
2021-11-04  0:46 Georgy Yakovlev
2021-09-21 17:44 Sam James
2021-09-04 21:39 Sam James
2021-09-04 14:19 Mike Gilbert
2021-09-04 14:19 Mike Gilbert
2021-09-01 18:32 Sam James
2021-09-01 13:39 Agostino Sarubbo
2021-09-01  7:55 Agostino Sarubbo
2021-09-01  7:55 Agostino Sarubbo
2021-09-01  7:54 Agostino Sarubbo
2021-09-01  7:53 Agostino Sarubbo
2021-08-31 15:07 Georgy Yakovlev
2021-08-21 22:15 James Le Cuirot
2021-08-08 23:33 William Hubbs
2021-08-06 11:47 Georgy Yakovlev
2021-08-06  2:30 Georgy Yakovlev
2021-08-04 18:07 Georgy Yakovlev
2021-08-04 18:07 Georgy Yakovlev
2021-07-21  2:50 Sam James
2021-07-13 18:52 Georgy Yakovlev
2021-07-08  6:38 Joshua Kinard
2021-07-07  1:49 Georgy Yakovlev
2021-07-07  1:46 Georgy Yakovlev
2021-07-07  1:39 Georgy Yakovlev
2021-07-06 22:31 Sam James
2021-06-12  3:54 Georgy Yakovlev
2021-05-31  5:28 Georgy Yakovlev
2021-05-31  5:22 Georgy Yakovlev
2021-05-31  4:58 Georgy Yakovlev
2021-04-07 21:38 Georgy Yakovlev
2021-03-01 11:27 Georgy Yakovlev
2021-01-26 20:56 Mikle Kolyada
2020-12-13  0:16 Sam James
2020-12-10 19:19 Georgy Yakovlev
2020-12-10  2:13 Matt Turner
2020-12-02 19:20 Georgy Yakovlev
2020-11-28 11:26 Sergei Trofimovich
2020-11-22 23:59 Sam James
2020-11-22 23:44 Sam James
2020-11-22 20:50 Georgy Yakovlev
2020-11-22 20:50 Georgy Yakovlev
2020-11-22  3:27 Sam James
2020-11-22  3:26 Sam James
2020-11-22  0:31 Thomas Deutschmann
2020-10-30 18:29 Georgy Yakovlev
2020-10-30 12:44 Georgy Yakovlev
2020-10-30  4:35 Georgy Yakovlev
2020-10-30  4:35 Georgy Yakovlev
2020-10-30  2:05 Sam James
2020-10-30  2:04 Sam James
2020-10-30  2:01 Sam James
2020-10-30  1:59 Sam James
2020-10-29 22:24 Georgy Yakovlev
2020-10-29  6:42 Georgy Yakovlev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1622431092.0ff249b92fdabfb4d7ddbfc0dfa5865dec8e4863.gyakovlev@gentoo \
    --to=gyakovlev@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox