[meta-oe][meta-systemd][PATCH 1/2] systemd: add usbutils to DEPENDS

[meta-oe][meta-systemd][PATCH 1/2] systemd: add usbutils to DEPENDS

[Martin Jansa]

* fixes:
  | No package 'usbutils' found
  | configure:16015: error: Package requirements (usbutils >= 0.82) were not met:

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-systemd/recipes-core/systemd/systemd_git.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-systemd/recipes-core/systemd/systemd_git.bb b/meta-systemd/recipes-core/systemd/systemd_git.bb
index 7fccadb..4257660 100644
--- a/meta-systemd/recipes-core/systemd/systemd_git.bb
+++ b/meta-systemd/recipes-core/systemd/systemd_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
 
 PROVIDES = "udev"
 
-DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers"
+DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers usbutils"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
 SERIAL_CONSOLE ?= "115200 /dev/ttyS0"
@@ -19,7 +19,7 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r1"
+PR = "r2"
 
 inherit useradd pkgconfig autotools vala perlnative
 
-- 
1.7.8.6

[meta-oe][meta-systemd][PATCH 2/2] systemd: include /etc/rpm/macros.systemd in PN-dev

[Martin Jansa]

* fixes:
  WARNING: QA Issue: systemd: Files/directories were installed but not shipped
    /etc/rpm
    /etc/rpm/macros.systemd

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-systemd/recipes-core/systemd/systemd_git.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-systemd/recipes-core/systemd/systemd_git.bb b/meta-systemd/recipes-core/systemd/systemd_git.bb
index 4257660..a83b30a 100644
--- a/meta-systemd/recipes-core/systemd/systemd_git.bb
+++ b/meta-systemd/recipes-core/systemd/systemd_git.bb
@@ -19,7 +19,7 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r2"
+PR = "r3"
 
 inherit useradd pkgconfig autotools vala perlnative
 
@@ -147,7 +147,7 @@ FILES_${PN} = " ${base_bindir}/* \
                "
 
 FILES_${PN}-dbg += "${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/"
-FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/"
+FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd"
 
 RDEPENDS_${PN} += "dbus-systemd udev-systemd"
 
-- 
1.7.8.6

Re: [meta-oe][meta-systemd][PATCH 1/2] systemd: add usbutils to DEPENDS

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 20-07-12 11:35, Martin Jansa schreef:
> * fixes: | No package 'usbutils' found | configure:16015: error: Package
> requirements (usbutils >= 0.82) were not met:
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

koen@dominion:/OE/tentacle/sources/meta-openembedded$ sh contrib/pw-am.sh
32697 32699
2012-07-20 11:39:58 URL:http://patches.openembedded.org/patch/32697/mbox/
[1617] -> "pw-am-32697.patch" [1]
Applying: systemd: add usbutils to DEPENDS
error: patch failed: meta-systemd/recipes-core/systemd/systemd_git.bb:19
error: meta-systemd/recipes-core/systemd/systemd_git.bb: patch does not apply
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFQCSerMkyGM64RGpERAoqIAJ0Rt6YFT0K8KCs7+PxGyJxsDs0Q8ACeI3Ga
RQRGiCRllui6tfNwuuzM+d8=
=jKym
-----END PGP SIGNATURE-----