| Submitter | Koen Kooi |
|---|---|
| Date | May 31, 2011, 8:27 a.m. |
| Message ID | <1306830479-6753-1-git-send-email-koen@dominion.thruhere.net> |
| Download | mbox | patch |
| Permalink | /patch/5095/ |
| State | New, archived |
| Headers | show |
Comments
On 05/31/2011 01:27 AM, Koen Kooi wrote: > OE-core uses 'dbus-1' as initscript name, which no other distribution(-buildsys) does, so we have to take special measures. > > Signed-off-by: Koen Kooi<koen@dominion.thruhere.net> > --- > meta/recipes-core/dbus/dbus.inc | 4 ++++ > meta/recipes-core/dbus/dbus_1.4.1.bb | 2 +- > 2 files changed, 5 insertions(+), 1 deletions(-) > > diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc > index 22514e9..fb2f6d4 100644 > --- a/meta/recipes-core/dbus/dbus.inc > +++ b/meta/recipes-core/dbus/dbus.inc > @@ -89,6 +89,10 @@ do_install() { > > install -d ${D}${sysconfdir}/init.d > install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1 > + > + # disable dbus-1 sysv script on systemd installs > + # nearly all distros call the initscript plain 'dbus', but OE-core is different > + ln -sf /dev/null ${D}/${base_libdir}/systemd/system/dbus-1.service > } > > do_install_virtclass-native() { > diff --git a/meta/recipes-core/dbus/dbus_1.4.1.bb b/meta/recipes-core/dbus/dbus_1.4.1.bb > index f65ef35..252d160 100644 > --- a/meta/recipes-core/dbus/dbus_1.4.1.bb > +++ b/meta/recipes-core/dbus/dbus_1.4.1.bb > @@ -1,6 +1,6 @@ > include dbus.inc > > -PR = "r5" > +PR = "r6" > > SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac" > SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd" Merged in oe-core Thanks Sau!
Patch
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 22514e9..fb2f6d4 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -89,6 +89,10 @@ do_install() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1 + + # disable dbus-1 sysv script on systemd installs + # nearly all distros call the initscript plain 'dbus', but OE-core is different + ln -sf /dev/null ${D}/${base_libdir}/systemd/system/dbus-1.service } do_install_virtclass-native() { diff --git a/meta/recipes-core/dbus/dbus_1.4.1.bb b/meta/recipes-core/dbus/dbus_1.4.1.bb index f65ef35..252d160 100644 --- a/meta/recipes-core/dbus/dbus_1.4.1.bb +++ b/meta/recipes-core/dbus/dbus_1.4.1.bb @@ -1,6 +1,6 @@ include dbus.inc -PR = "r5" +PR = "r6" SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac" SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd"
OE-core uses 'dbus-1' as initscript name, which no other distribution(-buildsys) does, so we have to take special measures. Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> --- meta/recipes-core/dbus/dbus.inc | 4 ++++ meta/recipes-core/dbus/dbus_1.4.1.bb | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-)