From d15a7db25aec8a81efbbd4d89913e8f3edf3688b Mon Sep 17 00:00:00 2001 From: Thilo Fromm Date: Mon, 11 Aug 2025 13:27:01 +0200 Subject: [PATCH] overlaybd ebuild: rework tmpfiles conf generation Co-authored-by: James Le Cuirot --- .../sys-fs/overlaybd/overlaybd-9999.ebuild | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/overlaybd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/overlaybd-9999.ebuild index ae51f09d84..c3f46048eb 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/overlaybd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/overlaybd-9999.ebuild @@ -88,14 +88,12 @@ src_install() { mv "${ED}"/opt/${PN}/* "${ED}"/usr/local/${PN}/ || die mv "${ED}"/etc/${PN}/* "${ED}"/usr/local/${PN}/etc/ || die - # Handle /etc (overlaybd.json), create /opt/opverlaybd and symlink + # Handle /etc (overlaybd.json), create /opt/overlaybd and symlink # all contents of /usr/local/overlaybd to /opt/overlaybd. - elog "Scanning '${ED}/usr/local/${PN}/' and generating tmpfiles symlink entries..." - cp "${FILESDIR}"/10-${PN}.conf "${T}" - local entry - for entry in $(ls -1 "${ED}/usr/local/${PN}/") ; do - echo "L /opt/overlaybd/${entry} - - - - /usr/local/${PN}/${entry}" \ - | tee -a "${T}/10-${PN}.conf" - done - dotmpfiles "${T}"/10-${PN}.conf + elog "Scanning '${ED}/usr/local/${PN}/' and generating tmpfiles symlink entries..." + cat "${FILESDIR}"/10-${PN}.conf <( + for entry in "${ED}"/usr/local/${PN}/*; do + echo "L /opt/overlaybd/${entry##*/} - - - - /usr/local/${PN}/${entry##*/}" + done + ) | tee /dev/stderr | newtmpfiles - 10-${PN}.conf }