mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-12-05 09:21:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1475 from flatcar-linux/krnowak/tmpfiles

Browse Source 
Port packages using tmpfiles from systemd eclass to tmpfiles eclass
This commit is contained in:
Krzesimir Nowak 2021-12-17 09:59:24 +01:00 committed by GitHub
commit 0dc4993d4b
25 changed files with 70 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.5.0.ebuild → sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.5.0-r1.ebuild vendored
View File

@ -3,7 +3,8 @@
EAPI=6
inherit systemd
TMPFILES_OPTIONAL=1
inherit systemd tmpfiles
DESCRIPTION="etcd (System Application Container)"
HOMEPAGE="https://github.com/etcd-io/etcd"
@ -31,5 +32,5 @@ src_install() {
sed "s|@ETCD_IMAGE_TAG@|${tag}|g" \
"${FILESDIR}"/etcd-member.service > ${T}/etcd-member.service
systemd_dounit ${T}/etcd-member.service
systemd_dotmpfilesd "${FILESDIR}"/etcd-wrapper.conf
dotmpfiles "${FILESDIR}"/etcd-wrapper.conf
}

10
sdk_container/src/third_party/coreos-overlay/app-crypt/trousers/trousers-0.3.14-r2.ebuild vendored
View File

@ -8,7 +8,8 @@
EAPI=7
inherit autotools linux-info readme.gentoo-r1 systemd udev
TMPFILES_OPTIONAL=1
inherit autotools linux-info readme.gentoo-r1 systemd tmpfiles udev
DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation"
HOMEPAGE="http://trousers.sf.net"
@ -65,8 +66,9 @@ src_install() {
keepdir /var/lib/tpm
use doc && dodoc doc/*
# Flatcar:
# (removed newinitd and newconfd)
# Flatcar: Comment out the openrc stuff.
# newinitd "${FILESDIR}"/tcsd.initd tcsd
# newconfd "${FILESDIR}"/tcsd.confd tcsd
fowners root:tss /etc/tcsd.conf
systemd_dounit "${FILESDIR}"/tcsd.service
@ -85,5 +87,5 @@ src_install() {
doins "${D}"/etc/tcsd.conf
fowners tss:tss /usr/share/trousers/system.data
fowners root:tss /usr/share/trousers/tcsd.conf
systemd_dotmpfilesd "${FILESDIR}"/tmpfiles.d/trousers.conf
dotmpfiles "${FILESDIR}"/tmpfiles.d/trousers.conf
}

5
sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.73-r1.ebuild vendored
View File

@ -3,7 +3,8 @@
EAPI=7
PYTHON_COMPAT=( python3_{6..10} )
inherit python-any-r1 systemd
TMPFILES_OPTIONAL=1
inherit python-any-r1 systemd tmpfiles
RTM_NAME="NSS_${PV//./_}_RTM"
MY_PN="nss"
@ -88,7 +89,7 @@ src_install() {
systemd_dounit "${FILESDIR}/update-ca-certificates.service"
systemd_enable_service sysinit.target clean-ca-certificates.service
systemd_enable_service sysinit.target update-ca-certificates.service
systemd_dotmpfilesd ${PN}.conf
dotmpfiles ${PN}.conf
# Setup initial links in /etc
dodir /etc/ssl/certs

0
sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r4.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r5.ebuild vendored
View File

5
sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild vendored
View File

@ -12,7 +12,8 @@ else
KEYWORDS="amd64 arm64"
fi
inherit autotools flag-o-matic toolchain-funcs cros-workon systemd
TMPFILES_OPTIONAL=1
inherit autotools flag-o-matic toolchain-funcs cros-workon systemd tmpfiles
DESCRIPTION="CoreOS OS Update Engine"
HOMEPAGE="https://github.com/coreos/update_engine"
@ -105,5 +106,5 @@ src_install() {
doins com.coreos.update1.conf
# Install rule to remove old UpdateEngine.conf from /etc
systemd_dotmpfilesd "${FILESDIR}"/update-engine.conf
dotmpfiles "${FILESDIR}"/update-engine.conf
}

5
sdk_container/src/third_party/coreos-overlay/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild vendored
View File

@ -3,7 +3,8 @@
EAPI=7
inherit eutils flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd
TMPFILES_OPTIONAL=1
inherit eutils flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd tmpfiles
SASLAUTHD_CONF_VER="2.1.26"
@ -226,7 +227,7 @@ multilib_src_install_all() {
newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
systemd_dounit "${FILESDIR}/saslauthd.service"
systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
dotmpfiles "${FILESDIR}/${PN}.conf"
# The get_modname bit is important: do not remove the .la files on
# platforms where the lib isn't called .so for cyrus searches the .la to

5
sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/openssl-3.0.0.ebuild vendored
View File

@ -3,7 +3,8 @@
EAPI="7"
inherit flag-o-matic linux-info toolchain-funcs multilib-minimal systemd
TMPFILES_OPTIONAL=1
inherit flag-o-matic linux-info toolchain-funcs multilib-minimal systemd tmpfiles
MY_P=${P/_/-}
@ -286,7 +287,7 @@ multilib_src_install_all() {
dodir /usr/share/ssl
insinto /usr/share/ssl
doins "${S}"/apps/openssl.cnf
systemd_dotmpfilesd "${FILESDIR}"/openssl.conf
dotmpfiles "${FILESDIR}"/openssl.conf
# flatcar changes: package `tmpfiles.d` setup for SDK bootstrapping.
systemd-tmpfiles --create --root="${ED}" "${FILESDIR}"/openssl.conf

5
sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild vendored
View File

@ -3,7 +3,8 @@
EAPI=6
inherit autotools flag-o-matic multilib systemd
TMPFILES_OPTIONAL=1
inherit autotools flag-o-matic multilib systemd tmpfiles
DESCRIPTION="NFS client and server daemons"
HOMEPAGE="http://linux-nfs.org/"
@ -127,7 +128,7 @@ src_install() {
doins id_resolver.conf
fi
systemd_dotmpfilesd "${FILESDIR}"/nfs-utils.conf
dotmpfiles "${FILESDIR}"/nfs-utils.conf
# Provide an empty xtab for compatibility with the old tmpfiles config.
touch "${ED%/}"/usr/$(get_libdir)/nfs/xtab

5
sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.12.9-r3.ebuild → sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.12.9-r2.ebuild vendored
View File

@ -5,7 +5,8 @@ EAPI=7
PYTHON_COMPAT=( python3_{6..10} )
PYTHON_REQ_USE='threads(+),xml(+)'
inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
TMPFILES_OPTIONAL=1
inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
MY_PV="${PV/_rc/rc}"
MY_P="${PN}-${MY_PV}"
@ -284,7 +285,7 @@ multilib_src_install() {
newinitd "${CONFDIR}/samba4.initd-r1" samba
newconfd "${CONFDIR}/samba4.confd" samba
[[ ! use_minimal ]] && systemd_dotmpfilesd "${FILESDIR}"/samba.conf
[[ ! use_minimal ]] && dotmpfiles "${FILESDIR}"/samba.conf
use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
# Preserve functionality for old gentoo-specific unit names

5
sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8_p15.ebuild vendored
View File

@ -3,7 +3,8 @@
EAPI=7
inherit autotools toolchain-funcs flag-o-matic systemd
TMPFILES_OPTIONAL=1
inherit autotools toolchain-funcs flag-o-matic systemd tmpfiles
MY_P=${P/_p/p}
DESCRIPTION="Network Time Protocol suite/programs"
@ -99,7 +100,7 @@ src_install() {
insinto /usr/share/ntp
doins "${FILESDIR}"/ntp.conf
use ipv6 || sed -i '/^restrict .*::1/d' "${ED%/}"/usr/share/ntp/ntp.conf #524726
systemd_newtmpfilesd "${FILESDIR}"/ntp.tmpfiles ntp.conf
newtmpfiles "${FILESDIR}"/ntp.tmpfiles ntp.conf
keepdir /var/lib/ntp
use prefix || fowners ntp:ntp /var/lib/ntp

2
sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords vendored
View File

@ -92,7 +92,7 @@ sys-apps/debianutils *
=sys-fs/quota-4.04-r1 ~arm64
=sys-libs/efivar-31 ~arm64
=sys-libs/libselinux-3.1-r2 ~arm64
=sys-libs/libsemanage-3.1-r2 ~arm64
=sys-libs/libsemanage-3.1-r1 ~arm64
=sys-libs/libsepol-3.1 ~arm64
=sys-power/iasl-20161222 ~arm64
=sys-process/tini-0.18.0 ~arm64

5
sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild vendored
View File

@ -4,7 +4,8 @@
EAPI="7"
# flatcar changes
inherit systemd
TMPFILES_OPTIONAL=1
inherit systemd tmpfiles
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
@ -164,7 +165,7 @@ src_install() {
done
# flatcar changes
systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/selinux-base.conf"
dotmpfiles "${FILESDIR}/tmpfiles.d/selinux-base.conf"
systemd-tmpfiles --root="${D}" --create selinux-base.conf
docinto /

0
sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r3.ebuild → sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r4.ebuild vendored
View File

5
sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild vendored
View File

@ -13,7 +13,8 @@ else
KEYWORDS="amd64 arm arm64 x86"
fi
inherit cros-workon multilib systemd
TMPFILES_OPTIONAL=1
inherit cros-workon multilib systemd tmpfiles
DESCRIPTION="Filesystem baselayout for CoreOS"
HOMEPAGE="http://www.coreos.com/"
@ -131,7 +132,7 @@ src_install() {
fi
if use symlink-usr; then
systemd_dotmpfilesd "${T}/baselayout-usr.conf"
dotmpfiles "${T}/baselayout-usr.conf"
systemd-tmpfiles --root="${D}" --create
fi

5
sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/keyutils-1.6.1.ebuild vendored
View File

@ -3,7 +3,8 @@
EAPI=7
inherit toolchain-funcs linux-info multilib-minimal usr-ldscript systemd
TMPFILES_OPTIONAL=1
inherit toolchain-funcs linux-info multilib-minimal usr-ldscript systemd tmpfiles
DESCRIPTION="Linux Key Management Utilities"
HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git"
@ -112,7 +113,7 @@ multilib_src_test() {
}
multilib_src_install() {
systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/keyutils.conf"
dotmpfiles "${FILESDIR}/tmpfiles.d/keyutils.conf"
# Possibly undo the setting for USE=static (see src_compile).
export NO_ARLIB=$(usex static-libs 0 1)

7
sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.8-r5.ebuild vendored
View File

@ -3,7 +3,8 @@
EAPI=7
inherit autotools libtool pam systemd
TMPFILES_OPTIONAL=1
inherit autotools libtool pam systemd tmpfiles
DESCRIPTION="Utilities to deal with user accounts"
HOMEPAGE="https://github.com/shadow-maint/shadow"
@ -118,8 +119,8 @@ src_install() {
# CoreOS: break shadow.conf into two files so that we only have to apply
# etc-shadow.conf in the initrd.
systemd_dotmpfilesd "${FILESDIR}"/tmpfiles.d/etc-shadow.conf
systemd_dotmpfilesd "${FILESDIR}"/tmpfiles.d/var-shadow.conf
dotmpfiles "${FILESDIR}"/tmpfiles.d/etc-shadow.conf
dotmpfiles "${FILESDIR}"/tmpfiles.d/var-shadow.conf
# Package the symlinks for the SDK and containers.
systemd-tmpfiles --create --root="${ED}" "${FILESDIR}"/tmpfiles.d/*

9
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild vendored
View File

@ -21,7 +21,8 @@ else
fi
# Flatcar: We don't use gen_usr_ldscript so dropping usr-ldscript
inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev user
TMPFILES_OPTIONAL=1
inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev user tmpfiles
DESCRIPTION="System and service manager for Linux"
HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
@ -409,7 +410,7 @@ multilib_src_install_all() {
# directories.
#
# Flatcar: TODO: Consider using that instead of
# systemd_dotmpfilesd "${FILESDIR}"/systemd-flatcar.conf below.
# dotmpfiles "${FILESDIR}"/systemd-flatcar.conf below.
if use hwdb; then
rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
@ -436,11 +437,11 @@ multilib_src_install_all() {
#
# Flatcar: TODO: Upstream probably fixed it in different way -
# it's using some keepdir commands.
systemd_dotmpfilesd "${FILESDIR}"/systemd-flatcar.conf
dotmpfiles "${FILESDIR}"/systemd-flatcar.conf
# Flatcar: Add tmpfiles rule for resolv.conf. This path has
# changed after v213 so it must be handled here instead of
# baselayout now.
systemd_dotmpfilesd "${FILESDIR}"/systemd-resolv.conf
dotmpfiles "${FILESDIR}"/systemd-resolv.conf
# Flatcar: Don't default to graphical.target.
local unitdir=$(builddir_systemd_get_systemunitdir)

5
sdk_container/src/third_party/coreos-overlay/sys-auth/polkit/polkit-0.119-r2.ebuild vendored
View File

@ -3,7 +3,8 @@
EAPI=7
inherit autotools pam pax-utils systemd xdg-utils
TMPFILES_OPTIONAL=1
inherit autotools pam pax-utils systemd xdg-utils tmpfiles
DESCRIPTION="Policy framework for controlling privileges for system-wide services"
HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit https://gitlab.freedesktop.org/polkit/polkit"
@ -127,7 +128,7 @@ src_install() {
rmdir "${D}"/etc/polkit-1/rules.d "${D}"/etc/polkit-1 || die
rmdir "${D}"/etc/pam.d || die
systemd_dotmpfilesd "${FILESDIR}/polkit.conf"
dotmpfiles "${FILESDIR}/polkit.conf"
if use examples; then
docinto examples

5
sdk_container/src/third_party/coreos-overlay/sys-auth/realmd/realmd-0.17.0.ebuild → sdk_container/src/third_party/coreos-overlay/sys-auth/realmd/realmd-0.17.0-r1.ebuild vendored
View File

@ -3,7 +3,8 @@
EAPI=7
inherit autotools systemd
TMPFILES_OPTIONAL=1
inherit autotools systemd tmpfiles
DESCRIPTION="DBus service for configuring kerberos and other online identities"
HOMEPAGE="http://cgit.freedesktop.org/realmd/realmd/"
@ -47,6 +48,6 @@ src_configure() {
}
src_install() {
systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/${PN}.conf"
dotmpfiles "${FILESDIR}/tmpfiles.d/${PN}.conf"
default
}

5
sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r4.ebuild vendored
View File

@ -10,7 +10,8 @@ EAPI=7
PYTHON_COMPAT=( python3_{6..10} )
inherit autotools flag-o-matic linux-info multilib-minimal python-single-r1 pam systemd toolchain-funcs
TMPFILES_OPTIONAL=1
inherit autotools flag-o-matic linux-info multilib-minimal python-single-r1 pam systemd toolchain-funcs tmpfiles
DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
HOMEPAGE="https://github.com/SSSD/sssd"
@ -283,7 +284,7 @@ multilib_src_install_all() {
# Flatcar: delete, remove /var files taken care of by tmpfiles
# Flatcar: add tmpfile directive and remove /etc/rc.d
systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/sssd.conf"
dotmpfiles "${FILESDIR}/tmpfiles.d/sssd.conf"
rm -rf "${D}/etc/rc.d"
# strip empty dirs
if ! use doc ; then

5
sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild vendored
View File

@ -3,7 +3,8 @@
EAPI=7
inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd
TMPFILES_OPTIONAL=1
inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd tmpfiles
DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
HOMEPAGE="http://www.open-iscsi.com/"
@ -103,7 +104,7 @@ src_install() {
systemd_dounit etc/systemd/${unit}
done
systemd_dounit "${FILESDIR}"/iscsi-init.service
systemd_dotmpfilesd "${FILESDIR}"/open-iscsi.conf
dotmpfiles "${FILESDIR}"/open-iscsi.conf
fperms 600 /etc/iscsi/iscsid.conf
rm "${D}"/etc/iscsi/initiatorname.iscsi

6
sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.33-r8.ebuild → sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.33-r7.ebuild vendored
View File

@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6..10} )
TMPFILES_OPTIONAL=1
inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \
multilib systemd multiprocessing
multilib systemd multiprocessing tmpfiles
DESCRIPTION="GNU libc C library"
HOMEPAGE="https://www.gnu.org/software/libc/"
@ -1392,7 +1392,7 @@ glibc_do_src_install() {
sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
use systemd && systemd_dounit nscd/nscd.service
systemd_newtmpfilesd nscd/nscd.tmpfiles nscd.conf
newtmpfiles nscd/nscd.tmpfiles nscd.conf
fi
echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
@ -1421,7 +1421,7 @@ glibc_do_src_install() {
insinto /usr/share/baselayout
if ! in_iuse nscd || use nscd ; then
doins "${S}"/nscd/nscd.conf || die
systemd_newtmpfilesd "${FILESDIR}"/nscd-conf.tmpfiles nscd-conf.conf || die
newtmpfiles "${FILESDIR}"/nscd-conf.tmpfiles nscd-conf.conf || die
fi
# Clean out any default configs.

5
sdk_container/src/third_party/coreos-overlay/sys-libs/libsemanage/libsemanage-3.1-r2.ebuild → sdk_container/src/third_party/coreos-overlay/sys-libs/libsemanage/libsemanage-3.1-r1.ebuild vendored
View File

@ -5,7 +5,8 @@ EAPI=7
PYTHON_COMPAT=( python3_{6..10} )
# flatcar changes
inherit python-r1 toolchain-funcs multilib-minimal systemd
TMPFILES_OPTIONAL=1
inherit python-r1 toolchain-funcs multilib-minimal tmpfiles
MY_P="${P//_/-}"
MY_RELEASEDATE="20200710"
@ -122,7 +123,7 @@ multilib_src_install() {
fi
# flatcar changes
systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/libsemanage.conf"
dotmpfiles "${FILESDIR}/tmpfiles.d/libsemanage.conf"
}
multiib_src_install_all() {

0
sdk_container/src/third_party/coreos-overlay/sys-libs/libsemanage/libsemanage-3.2-r1.ebuild → sdk_container/src/third_party/coreos-overlay/sys-libs/libsemanage/libsemanage-3.2.ebuild vendored
View File

5
sdk_container/src/third_party/coreos-overlay/sys-process/audit/audit-3.0.6.ebuild vendored
View File

@ -6,7 +6,8 @@ EAPI=7
# Flatcar: Support python 3.6.
PYTHON_COMPAT=( python3_{6..10} )
inherit autotools multilib-minimal toolchain-funcs python-r1 linux-info systemd usr-ldscript
TMPFILES_OPTIONAL=1
inherit autotools multilib-minimal toolchain-funcs python-r1 linux-info systemd usr-ldscript tmpfiles
DESCRIPTION="Userspace utilities for storing and processing auditing records"
HOMEPAGE="https://people.redhat.com/sgrubb/audit/"
@ -169,7 +170,7 @@ multilib_src_install_all() {
lockdown_perms "${ED}"
# Flatcar: Our systemd stuff.
systemd_newtmpfilesd "${FILESDIR}"/audit-rules.tmpfiles audit-rules.conf
newtmpfiles "${FILESDIR}"/audit-rules.tmpfiles audit-rules.conf
systemd_dounit "${FILESDIR}"/audit-rules.service
systemd_enable_service multi-user.target audit-rules.service
}