mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-21 22:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

sys-apps/dbus: Apply local changes from old versions

Browse Source
This commit is contained in:
Michael Marineau 2015-05-13 14:54:44 -07:00 committed by Geoff Levand
parent 414db59b93
commit f233bc994c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.8.16.ebuild → sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.8.16-r1.ebuild vendored
View File

@ -62,6 +62,8 @@ pkg_setup() {
} }
src_prepare() { src_prepare() {
epatch "${FILESDIR}"/${PN}-1.6.x-add-explicit-etc-path.patch
# Tests were restricted because of this # Tests were restricted because of this
sed -i \ sed -i \
-e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \ -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
@ -91,6 +93,7 @@ multilib_src_configure() {
# libaudit is *only* used in DBus wrt SELinux support, so disable it, if # libaudit is *only* used in DBus wrt SELinux support, so disable it, if
# not on an SELinux profile. # not on an SELinux profile.
myconf=( myconf=(
--sysconfdir=/usr/share
--localstatedir="${EPREFIX}/var" --localstatedir="${EPREFIX}/var"
--docdir="${EPREFIX}/usr/share/doc/${PF}" --docdir="${EPREFIX}/usr/share/doc/${PF}"
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
@ -219,11 +222,11 @@ multilib_src_install_all() {
pkg_postinst() { pkg_postinst() {
readme.gentoo_print_elog readme.gentoo_print_elog
# Ensure unique id is generated and put it in /etc wrt #370451 but symlink # Put a "known" machine id into /etc/machine-id so that when we boot,
# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse # if it matches, then we can override it with a unique one.
# dependencies with hardcoded paths (although the known ones got fixed already) # TODO(marineam): Remove this once we double check it is safe to do so.
dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id echo "42000000000000000000000000000042" > "${EROOT}"/etc/machine-id
ln -sf "${EROOT%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id ln -sf ../../../etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
if [[ ${CHOST} == *-darwin* ]]; then if [[ ${CHOST} == *-darwin* ]]; then
local plist="org.freedesktop.dbus-session.plist" local plist="org.freedesktop.dbus-session.plist"