Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH 1/7] bitbake.conf: add systemd_unitdir
@ 2012-03-22 11:05 Andreas Müller
  2012-03-22 11:05 ` [PATCH 2/7] avahi.inc: use systemd_unitdir Andreas Müller
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: Andreas Müller @ 2012-03-22 11:05 UTC (permalink / raw)
  To: openembedded-core

Some of oe-core's recipes need to know where systemd units are. Since the
directory might change in the future [1], we set the location once globally to
reduce maintenance efforts

[1] http://www.gossamer-threads.com/lists/gentoo/dev/245758

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta/conf/bitbake.conf |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 07982d7..52802f6 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -39,6 +39,7 @@ export libexecdir = "${exec_prefix}/libexec"
 export libdir = "${exec_prefix}/${baselib}"
 export includedir = "${exec_prefix}/include"
 export oldincludedir = "${exec_prefix}/include"
+export systemd_unitdir = "${base_libdir}/systemd"
 
 # Linkage between native/cross/nativesdk layouts
 base_bindir_native = "/bin"
-- 
1.7.4.4




^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 2/7] avahi.inc: use systemd_unitdir
  2012-03-22 11:05 [PATCH 1/7] bitbake.conf: add systemd_unitdir Andreas Müller
@ 2012-03-22 11:05 ` Andreas Müller
  2012-03-22 11:05 ` [PATCH 3/7] bluez4: " Andreas Müller
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Andreas Müller @ 2012-03-22 11:05 UTC (permalink / raw)
  To: openembedded-core


Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta/recipes-connectivity/avahi/avahi.inc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 0308095..731ad9a 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -14,7 +14,7 @@ SECTION = "network"
 # python scripts are under GPLv2+
 LICENSE = "GPLv2+ & LGPLv2.1+"
 
-INC_PR = "r0"
+INC_PR = "r1"
 
 DEPENDS = "expat libcap libdaemon dbus glib-2.0"
 
@@ -41,7 +41,7 @@ EXTRA_OECONF = "--with-distro=debian \
              --disable-qt4 \
              --disable-python \
              --disable-doxygen-doc \
-             --with-systemdsystemunitdir=${base_libdir}/systemd/system/ \
+             --with-systemdsystemunitdir=${systemd_unitdir}/system/ \
              ${AVAHI_GTK} \
            "
 
@@ -57,7 +57,7 @@ do_configure_prepend() {
 
 PACKAGES =+ "avahi-systemd avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-autoipd avahi-utils"
 
-FILES_avahi-systemd = "${base_libdir}/systemd"
+FILES_avahi-systemd = "${systemd_unitdir}"
 FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
                        ${sysconfdir}/avahi/avahi-autoipd.action \
                        ${sysconfdir}/dhcp3/*/avahi-autoipd"
-- 
1.7.4.4




^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 3/7] bluez4: use systemd_unitdir
  2012-03-22 11:05 [PATCH 1/7] bitbake.conf: add systemd_unitdir Andreas Müller
  2012-03-22 11:05 ` [PATCH 2/7] avahi.inc: use systemd_unitdir Andreas Müller
@ 2012-03-22 11:05 ` Andreas Müller
  2012-03-22 11:05 ` [PATCH 4/7] ofono: " Andreas Müller
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Andreas Müller @ 2012-03-22 11:05 UTC (permalink / raw)
  To: openembedded-core


Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta/recipes-connectivity/bluez/bluez4_4.99.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/bluez/bluez4_4.99.bb b/meta/recipes-connectivity/bluez/bluez4_4.99.bb
index 97c77b4..5033d34 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.99.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.99.bb
@@ -1,6 +1,6 @@
 require bluez4.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "file://bluetooth.conf \
             file://sbc_mmx.patch \
@@ -22,7 +22,7 @@ RDEPENDS_${PN}-dev = "bluez-hcidump"
 PACKAGES =+ "libasound-module-bluez"
 
 FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
-FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${base_libdir}/systemd/"
+FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${systemd_unitdir}/"
 FILES_${PN}-dev += "\
   ${libdir}/bluetooth/plugins/*.la \
   ${libdir}/alsa-lib/*.la \
-- 
1.7.4.4




^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 4/7] ofono: use systemd_unitdir
  2012-03-22 11:05 [PATCH 1/7] bitbake.conf: add systemd_unitdir Andreas Müller
  2012-03-22 11:05 ` [PATCH 2/7] avahi.inc: use systemd_unitdir Andreas Müller
  2012-03-22 11:05 ` [PATCH 3/7] bluez4: " Andreas Müller
@ 2012-03-22 11:05 ` Andreas Müller
  2012-03-22 11:06 ` [PATCH 5/7] dbus: " Andreas Müller
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Andreas Müller @ 2012-03-22 11:05 UTC (permalink / raw)
  To: openembedded-core


Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta/recipes-connectivity/ofono/ofono.inc    |    2 +-
 meta/recipes-connectivity/ofono/ofono_1.5.bb |    2 +-
 meta/recipes-connectivity/ofono/ofono_git.bb |    4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index f6cd895..f4b2317 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -19,6 +19,6 @@ do_install_append() {
 
 PACKAGES =+ "${PN}-tests"
 
-FILES_${PN} += "${base_libdir}/udev ${base_libdir}/systemd"
+FILES_${PN} += "${base_libdir}/udev ${systemd_unitdir}"
 FILES_${PN}-tests = "${libdir}/ofono"
 RDEPENDS_${PN}-tests = "python"
diff --git a/meta/recipes-connectivity/ofono/ofono_1.5.bb b/meta/recipes-connectivity/ofono/ofono_1.5.bb
index d0f273b..dad813f 100644
--- a/meta/recipes-connectivity/ofono/ofono_1.5.bb
+++ b/meta/recipes-connectivity/ofono/ofono_1.5.bb
@@ -1,6 +1,6 @@
 require ofono.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI  = "${KERNELORG_MIRROR}/linux/network/ofono/${BPN}-${PV}.tar.bz2 \
 	          file://ofono"
diff --git a/meta/recipes-connectivity/ofono/ofono_git.bb b/meta/recipes-connectivity/ofono/ofono_git.bb
index 966d315..a44b411 100644
--- a/meta/recipes-connectivity/ofono/ofono_git.bb
+++ b/meta/recipes-connectivity/ofono/ofono_git.bb
@@ -1,11 +1,9 @@
 require ofono.inc
 
-PR = "r2"
-
 S	 = "${WORKDIR}/git"
 SRCREV = "14544d5996836f628613c2ce544380ee6fc8f514"
 PV	 = "0.12-git${SRCPV}"
-PR = "r1"
+PR = "r3"
 
 SRC_URI  = "git://git.kernel.org/pub/scm/network/ofono/ofono.git;protocol=git \
 	    file://ofono"
-- 
1.7.4.4




^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 5/7] dbus: use systemd_unitdir
  2012-03-22 11:05 [PATCH 1/7] bitbake.conf: add systemd_unitdir Andreas Müller
                   ` (2 preceding siblings ...)
  2012-03-22 11:05 ` [PATCH 4/7] ofono: " Andreas Müller
@ 2012-03-22 11:06 ` Andreas Müller
  2012-03-22 11:06 ` [PATCH 6/7] alsa-utils: " Andreas Müller
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Andreas Müller @ 2012-03-22 11:06 UTC (permalink / raw)
  To: openembedded-core


Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta/recipes-core/dbus/dbus.inc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 588209f..a75583d 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -10,7 +10,7 @@ DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X
 DEPENDS_virtclass-native = "expat-native virtual/libintl-native"
 DEPENDS_virtclass-nativesdk = "expat-nativesdk virtual/libintl-nativesdk virtual/libx11"
 
-INC_PR = "r2"
+INC_PR = "r3"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
            file://tmpdir.patch; \
@@ -36,7 +36,7 @@ PACKAGES =+ "${PN}-lib ${PN}-systemd ${@base_contains('DISTRO_FEATURES', 'x11',
 FILES_${PN}-x11 = "${bindir}/dbus-launch"
 RDEPENDS_${PN}-x11 = "${PN}"
 
-FILES_${PN}-systemd = "${base_libdir}/systemd/system/"
+FILES_${PN}-systemd = "${systemd_unitdir}/system/"
 
 FILES_${PN} = "${bindir}/dbus-daemon* \
                ${bindir}/dbus-uuidgen \
@@ -67,7 +67,7 @@ EXTRA_OECONF = "--disable-tests \
                 --disable-doxygen-docs \
                 --disable-libaudit \
                 --with-xml=expat \
-                --with-systemdsystemunitdir=${base_libdir}/systemd/system/ \
+                --with-systemdsystemunitdir=${systemd_unitdir}/system/ \
                 ${EXTRA_OECONF_X}"
 
 do_install() {
@@ -96,7 +96,7 @@ do_install() {
 
 	# 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
+	ln -sf /dev/null ${D}/${systemd_unitdir}/system/dbus-1.service
 }
 
 do_install_virtclass-native() {
-- 
1.7.4.4




^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 6/7] alsa-utils: use systemd_unitdir
  2012-03-22 11:05 [PATCH 1/7] bitbake.conf: add systemd_unitdir Andreas Müller
                   ` (3 preceding siblings ...)
  2012-03-22 11:06 ` [PATCH 5/7] dbus: " Andreas Müller
@ 2012-03-22 11:06 ` Andreas Müller
  2012-03-22 11:06 ` [PATCH 7/7] consolekit: " Andreas Müller
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Andreas Müller @ 2012-03-22 11:06 UTC (permalink / raw)
  To: openembedded-core


Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb
index fa11479..597e8b6 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                     file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9"
 DEPENDS = "alsa-lib ncurses libsamplerate0"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
            file://ncursesfix.patch \
@@ -61,7 +61,7 @@ FILES_alsa-utils-midi        = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bind
 FILES_alsa-utils-aconnect    = "${bindir}/aconnect"
 FILES_alsa-utils-aseqnet     = "${bindir}/aseqnet"
 FILES_alsa-utils-iecset      = "${bindir}/iecset"
-FILES_alsa-utils-alsactl     = "${sbindir}/alsactl ${base_libdir}/udev/rules.d ${base_libdir}/systemd ${localstatedir}/lib/alsa ${datadir}/alsa/init/"
+FILES_alsa-utils-alsactl     = "${sbindir}/alsactl ${base_libdir}/udev/rules.d ${systemd_unitdir} ${localstatedir}/lib/alsa ${datadir}/alsa/init/"
 FILES_alsa-utils-aseqdump    = "${bindir}/aseqdump"
 FILES_alsa-utils-alsaconf    = "${sbindir}/alsaconf"
 FILES_alsa-utils-alsaloop    = "${bindir}/alsaloop"
-- 
1.7.4.4




^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 7/7] consolekit: use systemd_unitdir
  2012-03-22 11:05 [PATCH 1/7] bitbake.conf: add systemd_unitdir Andreas Müller
                   ` (4 preceding siblings ...)
  2012-03-22 11:06 ` [PATCH 6/7] alsa-utils: " Andreas Müller
@ 2012-03-22 11:06 ` Andreas Müller
  2012-03-22 14:22 ` [PATCH 1/7] bitbake.conf: add systemd_unitdir Martin Jansa
  2012-03-22 17:57 ` Saul Wold
  7 siblings, 0 replies; 9+ messages in thread
From: Andreas Müller @ 2012-03-22 11:06 UTC (permalink / raw)
  To: openembedded-core


Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-support/consolekit/consolekit_0.4.5.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/consolekit/consolekit_0.4.5.bb b/meta/recipes-support/consolekit/consolekit_0.4.5.bb
index 3a4b04f..d1cc037 100644
--- a/meta/recipes-support/consolekit/consolekit_0.4.5.bb
+++ b/meta/recipes-support/consolekit/consolekit_0.4.5.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "ConsoleKit is a framework for defining and tracking users, login
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit"
 BUGTRACKER="https://bugs.freedesktop.org/buglist.cgi?query_format=specific&product=ConsoleKit"
 
-PR = "r8"
+PR = "r9"
 
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
@@ -25,7 +25,7 @@ SRC_URI[sha256sum] = "43e0780c53078e125efcec3f847e484dc3533e49b408ce6a0ab1b22368
 
 S = "${WORKDIR}/ConsoleKit-${PV}"
 
-EXTRA_OECONF = "${POLKITCONF} --with-systemdsystemunitdir=${base_libdir}/systemd/system/ \
+EXTRA_OECONF = "${POLKITCONF} --with-systemdsystemunitdir=${systemd_unitdir}/system/ \
                 ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam-module --with-pam-module-dir=${base_libdir}/security', '--disable-pam-module', d)} \
                "
 
-- 
1.7.4.4




^ permalink raw reply related	[flat|nested] 9+ messages in thread
* Re: [PATCH 1/7] bitbake.conf: add systemd_unitdir
  2012-03-22 11:05 [PATCH 1/7] bitbake.conf: add systemd_unitdir Andreas Müller
                   ` (5 preceding siblings ...)
  2012-03-22 11:06 ` [PATCH 7/7] consolekit: " Andreas Müller
@ 2012-03-22 14:22 ` Martin Jansa
  2012-03-22 17:57 ` Saul Wold
  7 siblings, 0 replies; 9+ messages in thread
From: Martin Jansa @ 2012-03-22 14:22 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

[-- Attachment #1: Type: text/plain, Size: 1405 bytes --]

On Thu, Mar 22, 2012 at 12:05:56PM +0100, Andreas Müller wrote:
> Some of oe-core's recipes need to know where systemd units are. Since the
> directory might change in the future [1], we set the location once globally to
> reduce maintenance efforts
> 
> [1] http://www.gossamer-threads.com/lists/gentoo/dev/245758

Acked-by: Martin Jansa <Martin.Jansa@gmail.com>

for whole patchset, just lazy to reply on all :)

> 
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  meta/conf/bitbake.conf |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 07982d7..52802f6 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -39,6 +39,7 @@ export libexecdir = "${exec_prefix}/libexec"
>  export libdir = "${exec_prefix}/${baselib}"
>  export includedir = "${exec_prefix}/include"
>  export oldincludedir = "${exec_prefix}/include"
> +export systemd_unitdir = "${base_libdir}/systemd"
>  
>  # Linkage between native/cross/nativesdk layouts
>  base_bindir_native = "/bin"
> -- 
> 1.7.4.4
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH 1/7] bitbake.conf: add systemd_unitdir
  2012-03-22 11:05 [PATCH 1/7] bitbake.conf: add systemd_unitdir Andreas Müller
                   ` (6 preceding siblings ...)
  2012-03-22 14:22 ` [PATCH 1/7] bitbake.conf: add systemd_unitdir Martin Jansa
@ 2012-03-22 17:57 ` Saul Wold
  7 siblings, 0 replies; 9+ messages in thread
From: Saul Wold @ 2012-03-22 17:57 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

On 03/22/2012 04:05 AM, Andreas Müller wrote:
> Some of oe-core's recipes need to know where systemd units are. Since the
> directory might change in the future [1], we set the location once globally to
> reduce maintenance efforts
>
> [1] http://www.gossamer-threads.com/lists/gentoo/dev/245758
>
> Signed-off-by: Andreas Müller<schnitzeltony@googlemail.com>
> ---
>   meta/conf/bitbake.conf |    1 +
>   1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 07982d7..52802f6 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -39,6 +39,7 @@ export libexecdir = "${exec_prefix}/libexec"
>   export libdir = "${exec_prefix}/${baselib}"
>   export includedir = "${exec_prefix}/include"
>   export oldincludedir = "${exec_prefix}/include"
> +export systemd_unitdir = "${base_libdir}/systemd"
>
>   # Linkage between native/cross/nativesdk layouts
>   base_bindir_native = "/bin"

Merged into OE-Core

Thanks
	Sau!



^ permalink raw reply	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-03-22 18:06 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-22 11:05 [PATCH 1/7] bitbake.conf: add systemd_unitdir Andreas Müller
2012-03-22 11:05 ` [PATCH 2/7] avahi.inc: use systemd_unitdir Andreas Müller
2012-03-22 11:05 ` [PATCH 3/7] bluez4: " Andreas Müller
2012-03-22 11:05 ` [PATCH 4/7] ofono: " Andreas Müller
2012-03-22 11:06 ` [PATCH 5/7] dbus: " Andreas Müller
2012-03-22 11:06 ` [PATCH 6/7] alsa-utils: " Andreas Müller
2012-03-22 11:06 ` [PATCH 7/7] consolekit: " Andreas Müller
2012-03-22 14:22 ` [PATCH 1/7] bitbake.conf: add systemd_unitdir Martin Jansa
2012-03-22 17:57 ` Saul Wold

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox