From d162ba1860a88062f4cd61f8b52fc303ba0b2991 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Aug 2021 00:16:33 +0100 Subject: gentoo resync : 07.08.2021 --- sys-apps/systemd-tmpfiles/Manifest | 7 +- .../files/249-sys-include-posix.patch | 67 ++++++ .../systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild | 240 ------------------- .../systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild | 254 +++++++++++++++++++++ 4 files changed, 325 insertions(+), 243 deletions(-) create mode 100644 sys-apps/systemd-tmpfiles/files/249-sys-include-posix.patch delete mode 100644 sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild create mode 100644 sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild (limited to 'sys-apps/systemd-tmpfiles') diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest index 5ff3711c08b3..eff0069937ba 100644 --- a/sys-apps/systemd-tmpfiles/Manifest +++ b/sys-apps/systemd-tmpfiles/Manifest @@ -1,12 +1,13 @@ +AUX 249-sys-include-posix.patch 1831 BLAKE2B eaea99f57a189d77789c9b61ed7962f108f1ed733e3ab8d76fb8dd4849faf8f05338f3addaaad97ba2f8796200de0f5079d3838d995ba2519b7d4ea2a568d0d5 SHA512 3d98055f2beb22fe5607125585929fc531b790f489779dcd162541b5461a9da15d76e7a713f6476a3278073e6fd2488bc0af19eca952f6534d90aadb81ef644f AUX musl-1.2.2.patch 656 BLAKE2B 73abdd679bfb99f8085e3341a80059f62e836622c765c89d4d0e8123f8ad391eca5a0eacf006f1a92bcfce278e806bc565972c2cf2b0c08862a4bcda4799d7f1 SHA512 a72ebb54d7f7b2ba9fbfcae1a6d03ff5bc0511923429502e1dd1c19bb57b06b184e0c762a5b9a9d824a72c2a3e293f7805b7f0cd7be9b8b4d9be676b39c7604d AUX stmpfiles-dev.initd 421 BLAKE2B af962a76a2f3985aff460193a9bdcb7d340a3cf0a5c7cb65150dade564dc780d91634028b5f8a87750be66e6c47bbe519088fbc0c46047f180e93c3eabffc16d SHA512 1eac910984bda9ba5d8e9c5b17718c356f90b41ccf22bb68393b4f00901c8999501e1b482decbf22e6a16157f430eee159b3332f6e82a9442423adc884057475 AUX stmpfiles-setup.initd 396 BLAKE2B 54796d5db9fc350a98e467cf763afaa82bc27f547755f0631f5f37f2d6e1382e361878aed80545bbb5ba198b564337e4083c073f73552d8bed4a8732ff6b819f SHA512 12201b6a3d7f4a178ca9504638cbbc7e518c5075ce9a3b2653650960b54225f3516381dd4e0366d13f16aecaa1dec40ad1a41ef1f849b6c45be81c49108bdccd AUX stmpfiles.confd 56 BLAKE2B c26aafd0e47b01354c7f20869cd71d36d7a8560e9013863eca6abb736d78c1eeb3eec00427c6bc8d37ab5b9bb88155d11b9e18809da9110ed40c77a34ebb1a82 SHA512 464cb238b87a8fbeb57e6534d0f2d861e8ade4219be9b7e2faf05c799f717cd2f23d176393bdd3c3b236058aa6f8bda837ad947fbe8f9489405760e9bfedbe40 AUX systemd-tmpfiles-246-musl-mallinfo.patch 2317 BLAKE2B b2d7d82fadfb42273ae37cf57da569421c0ac3334d27e404035fccc0fe70e4bc6b44dc4b5d19c5d95cc9f5761a384497606653a94c8951df9353600da174d989 SHA512 c008e2f6b6a63b36bd582e09c35109093a2883f3fc8b784e15990f5ccdb17f3922d5a6468a89b61ad530bdaed1c667c5c0a6554b23cf80e2bd01812d068d4a59 DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f -DIST systemd-stable-248.3.tar.gz 10320940 BLAKE2B 725494e0197dd182de55e4967088f4b4b709e6b2242723368b6cd95606582e01a57322b1f18fa194149055140a90993696734ad3c004843bfaceb72cd04a3a84 SHA512 8e7ff0d5e63cc933e4dc23f7e0bef9707fde90396605eb8822d34de90d7abe8fd37e5739e33b657868218aa7281147cc944c096c007324c3e6fb54d833a83485 +DIST systemd-musl-patches-249.1-r1.tar.xz 24536 BLAKE2B 25135519112b2a1c638046addb6971ea1997fc7dd8626de90d162a4beb6383b5724df78a14c73be1283df58632fb4a0fcb32f90f50f1886f31a1aded15e9567c SHA512 4655f2a06e1b3310cb27b839360353dfbfdbdaa86f4392aeebf63f63efd441d1953f7ac108be7fed7ea721596d191988ed999e34443e47922afca92db779175a +DIST systemd-stable-249.2.tar.gz 10591728 BLAKE2B fb24c681cf2328aa26fa49a8ba20cccd1ee0fae82ec9f9931a69eaa377fc01b2ece12fdf407444514d494b8ac1418f155b0fceeff4925bebaba691f0b8a2acc8 SHA512 4f42a0b93156529a464545361436fa98193e12a7e0809315b9fdedbcf33b81dd2037acac27fb0dfefcb2679bc49ebb6da4d152ecb4b15db797c81f7ca4588a11 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 EBUILD systemd-tmpfiles-246.ebuild 4802 BLAKE2B cea13522b54ef9644dc274e4ccf3c3f2532f93eec3b7edb467e0505479a42463576dd971377407067f59f34edcc0e6a5f994ed16a6b9a0a532ee23241d80ffde SHA512 1cbf46e13a8a48e9e6659e580dfa81c356337ed63baae7a8ebae055e60932ad83283de1be9922104f57d61fc44dab9750fb7cad37a5e5f4896544e3c932453cd -EBUILD systemd-tmpfiles-248.3.ebuild 5466 BLAKE2B ca9ce4c359614a3b2f632dd482758f87e977aa81a238efd39a70a4d3739888ef5ec763f0dec927aad41b97e72a5b9d8595992484fd43facef0cbf421ee91b45d SHA512 946c0c0127665c715b8986b416d4c08a1bc97953f0501dbfd283e95a5210138f6ebbcd26c8e939b64e614423f4b03b69781c5dc12ab85a8caa9a04028a077192 +EBUILD systemd-tmpfiles-249.2.ebuild 5910 BLAKE2B 040f11ac201f67fad61449f848bd8df4eb14b12fbb77596b88ad074a27372eab05a714e7cea1f3f2eff904555f2fd939b601cf2047f3c03c3efe92f71f1685be SHA512 edff3dd451bd6132b1757100e414bace0e99f241c03be525219e8596ee90c5af7cbcdcd5b6c0c55ce1b54b958fd0912ed1ac7efd13b93f07f54f0774256ac5cf MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9 diff --git a/sys-apps/systemd-tmpfiles/files/249-sys-include-posix.patch b/sys-apps/systemd-tmpfiles/files/249-sys-include-posix.patch new file mode 100644 index 000000000000..6d9e0039b9c9 --- /dev/null +++ b/sys-apps/systemd-tmpfiles/files/249-sys-include-posix.patch @@ -0,0 +1,67 @@ +Silence annoying #warning's on musl + +https://github.com/systemd/systemd/pull/20362 +https://github.com/systemd/systemd/pull/20364 + +From f8d54f7810aeea5ff27a5db03e1aab7ea54c8268 Mon Sep 17 00:00:00 2001 +From: David Seifert +Date: Mon, 2 Aug 2021 12:41:38 +0200 +Subject: [PATCH] Use correct `` include + +* `` is not specified in POSIX +--- + src/basic/fileio.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/basic/fileio.h b/src/basic/fileio.h +index af797cfafdbf..4295b84a85c5 100644 +--- a/src/basic/fileio.h ++++ b/src/basic/fileio.h +@@ -2,11 +2,11 @@ + #pragma once + + #include ++#include + #include + #include + #include + #include +-#include + #include + + #include "macro.h" +From 2b6c0bb2a341c95223ce672249e43c743b03d78c Mon Sep 17 00:00:00 2001 +From: David Seifert +Date: Mon, 2 Aug 2021 16:09:10 +0200 +Subject: [PATCH] Use correct `` include + +* `` is not specified in POSIX +--- + src/shared/nscd-flush.c | 2 +- + src/shared/varlink.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/shared/nscd-flush.c b/src/shared/nscd-flush.c +index dfc47c423441..19e16d93455c 100644 +--- a/src/shared/nscd-flush.c ++++ b/src/shared/nscd-flush.c +@@ -1,5 +1,5 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ +-#include ++#include + + #include "fd-util.h" + #include "io-util.h" +diff --git a/src/shared/varlink.c b/src/shared/varlink.c +index 3a53c16a7242..4033947d3b8c 100644 +--- a/src/shared/varlink.c ++++ b/src/shared/varlink.c +@@ -1,7 +1,7 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + + #include +-#include ++#include + + #include "alloc-util.h" + #include "errno-util.h" diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild deleted file mode 100644 index ff052d6a4b1c..000000000000 --- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild +++ /dev/null @@ -1,240 +0,0 @@ -# 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 flag-o-matic 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 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="selinux test" -RESTRICT="!test? ( test )" - -RDEPEND=" - sys-apps/acl:0= - >=sys-apps/util-linux-2.30:0= - sys-libs/libcap:0= - selinux? ( sys-libs/libselinux:0= ) - !sys-apps/opentmpfiles - !sys-apps/systemd -" - -DEPEND=" - ${RDEPEND} - >=sys-kernel/linux-headers-${MINKV} -" - -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 - >=sys-apps/coreutils-8.16 - sys-devel/gettext - 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 - # check SRC_URI_MUSL in systemd_${PV}.bb file for exact list of musl patches - if use elibc_musl; then - einfo "applying musl patches and workarounds" - eapply "${WORKDIR}/${P}-musl" - - # avoids re-definition of struct ethhdr, also 0006-Include-netinet-if_ether.h.patch - append-cflags '-D__UAPI_DEF_ETHHDR=0' - - # src/basic/rlimit-util.c:46:19: error: format ‘%lu’ expects argument of type ‘long unsigned int’, - # but argument 9 has type ‘rlim_t’ {aka ‘long long unsigned int’} - # not a nice workaround, but it comes from debug messages and we don't really use this component. - append-cflags '-Wno-error=format' - fi - - default - - # https://bugs.gentoo.org/767403 - python_fix_shebang src/test/*.py - python_fix_shebang 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 and link systemd-shared in statically. - # https://github.com/systemd/systemd/pull/16061 original implementation - # we just need to pass -Dstandalone-binaries=true and - # use .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" -} - -# stolen 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 -} diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild new file mode 100644 index 000000000000..66a216552215 --- /dev/null +++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild @@ -0,0 +1,254 @@ +# 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" +MUSL_PATCHSET="${PV%.*}.1-r1" +PYTHON_COMPAT=( python3_{8..10} ) +inherit flag-o-matic 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/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz + https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz + )" + +LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="selinux test" +RESTRICT="!test? ( test )" + +RDEPEND=" + sys-apps/acl:0= + >=sys-apps/util-linux-2.30:0= + sys-libs/libcap:0= + selinux? ( sys-libs/libselinux:0= ) + !sys-apps/opentmpfiles + !sys-apps/systemd +" + +DEPEND=" + ${RDEPEND} + >=sys-kernel/linux-headers-${MINKV} +" + +BDEPEND=" + ${PYTHON_DEPS} + $(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 + >=dev-util/meson-0.46 + >=sys-apps/coreutils-8.16 + sys-devel/gettext + virtual/pkgconfig +" + +S="${WORKDIR}/${MY_PN}-${PV}" + +PATCHES=( + # backport from 250 to silence musl warnings + "${FILESDIR}/249-sys-include-posix.patch" +) + +python_check_deps() { + has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" +} + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_prepare() { + # musl patchset from: + # http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd + # check SRC_URI_MUSL in systemd_${PV}.bb file for exact list of musl patches + # we share patch tarball with sys-fs/udev + if use elibc_musl; then + einfo "applying musl patches and workarounds" + eapply "${WORKDIR}/musl-patches" + + # avoids re-definition of struct ethhdr, also 0006-Include-netinet-if_ether.h.patch + append-cppflags '-D__UAPI_DEF_ETHHDR=0' + + # src/basic/rlimit-util.c:46:19: error: format ‘%lu’ expects argument of type ‘long unsigned int’, + # but argument 9 has type ‘rlim_t’ {aka ‘long long unsigned int’} + # not a nice workaround, but it comes from debug messages and we don't really use this component. + append-cflags '-Wno-error=format' + fi + + default + + # https://bugs.gentoo.org/767403 + python_fix_shebang src/test/*.py + python_fix_shebang test/*.py + python_fix_shebang tools/*.py +} + +src_configure() { + # disable everything until configure says "enabled features: ACL, tmpfiles, standalone-binaries, static-libsystemd(true)" + # 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 and link systemd-shared in statically. + # https://github.com/systemd/systemd/pull/16061 original implementation + # we just need to pass -Dstandalone-binaries=true and + # use .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" +} + +# stolen 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 +} -- cgit v1.2.3