mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-10-03 19:42:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #499 from flatcar-linux/kai/systemd-hwdb-ebuild

Browse Source 
sys-apps/systemd: Guard deletion of hwdb.d folder behind use flag, sys-apps/baselayout: Work around systemd-tmpfiles not finding libidn2
This commit is contained in:
Kai Lüke 2020-07-29 18:55:40 +02:00 committed by GitHub
commit c39b2f2901
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@ IUSE="cros_host symlink-usr"
# This version of baselayout replaces coreos-base # This version of baselayout replaces coreos-base
DEPEND="sys-apps/systemd DEPEND="sys-apps/systemd
net-dns/libidn2:=
!coreos-base/coreos-base !coreos-base/coreos-base
!<sys-libs/glibc-2.17-r1 !<sys-libs/glibc-2.17-r1
!<=sys-libs/nss-usrfiles-2.18.1_pre" !<=sys-libs/nss-usrfiles-2.18.1_pre"

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

@ -379,7 +379,9 @@ multilib_src_install_all() {
rmdir "${ED}${rootprefix}"/sbin || die rmdir "${ED}${rootprefix}"/sbin || die
fi fi
rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die if use hwdb; then
rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
fi
# Flatcar: Upstream uses keepdir commands to keep some empty # Flatcar: Upstream uses keepdir commands to keep some empty
# directories. # directories.