[meta-oe][meta-systemd][PATCH 0/3] Pending changes

[meta-oe][meta-systemd][PATCH 0/3] Pending changes

[Martin Jansa]

The following changes since commit ec501e356f52c10967ad8185be1db7b0804a1b5b:

  systemd: include /etc/rpm/macros.systemd in PN-dev (2012-07-20 13:29:48 +0200)

are available in the git repository at:
  git://git.openembedded.org/meta-openembedded-contrib jansa/pull
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull

Martin Jansa (3):
  phonet-utils: package udev rules
  udev-extra-rules: add mount.blacklist to CONFFILES
  systemd: cleanup /var/run on boot and create /var/run/utmp

 .../phonet-utils/phonet-utils_git.bb               |    3 ++-
 meta-oe/recipes-core/udev/udev-extra-rules.bb      |    5 +++--
 .../recipes-core/systemd/systemd/var-run.conf      |    4 ++++
 meta-systemd/recipes-core/systemd/systemd_git.bb   |    5 ++++-
 4 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 meta-systemd/recipes-core/systemd/systemd/var-run.conf

-- 
1.7.8.6

[meta-oe][meta-systemd][PATCH 1/3] phonet-utils: package udev rules

[Martin Jansa]

* fixes:
  WARNING: QA Issue: phonet-utils: Files/directories were installed but not shipped
    /lib
    /lib/udev
    /lib/udev/rules.d
    /lib/udev/rules.d/85-phonet-utils.rulesZZ

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../phonet-utils/phonet-utils_git.bb               |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta-oe/recipes-connectivity/phonet-utils/phonet-utils_git.bb b/meta-oe/recipes-connectivity/phonet-utils/phonet-utils_git.bb
index 257f012..9a3310e 100644
--- a/meta-oe/recipes-connectivity/phonet-utils/phonet-utils_git.bb
+++ b/meta-oe/recipes-connectivity/phonet-utils/phonet-utils_git.bb
@@ -3,7 +3,7 @@ HOMEPAGE = ""
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SRC_URI = "git://gitorious.org/meego-cellular/phonet-utils.git;branch=master;protocol=git"
-PR = "r0"
+PR = "r1"
 S = "${WORKDIR}/git"
 SRCREV = "4acfa720fd37d178a048fc2be17180137d4a70ea"
 PV = "0.0.0+gitr${SRCPV}"
@@ -16,3 +16,4 @@ do_install () {
 	DESTDIR=${D} oe_runmake install
 }
 
+FILES_${PN} += "${base_libdir}/udev/rules.d/85-phonet-utils.rules"
-- 
1.7.8.6

[meta-oe][meta-systemd][PATCH 2/3] udev-extra-rules: add mount.blacklist to CONFFILES

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-core/udev/udev-extra-rules.bb |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-core/udev/udev-extra-rules.bb b/meta-oe/recipes-core/udev/udev-extra-rules.bb
index ec3f017..7f9ca85 100644
--- a/meta-oe/recipes-core/udev/udev-extra-rules.bb
+++ b/meta-oe/recipes-core/udev/udev-extra-rules.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 inherit allarch
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = " \
        file://automount.rules \
@@ -17,7 +17,7 @@ SRC_URI = " \
 
 
 do_install() {
-	install -d ${D}${sysconfdir}/udev/rules.d
+    install -d ${D}${sysconfdir}/udev/rules.d
 
     install -m 0644 ${WORKDIR}/automount.rules     ${D}${sysconfdir}/udev/rules.d/automount.rules
     install -m 0644 ${WORKDIR}/autonet.rules       ${D}${sysconfdir}/udev/rules.d/autonet.rules
@@ -33,3 +33,4 @@ do_install() {
 
 FILES_${PN} = "${sysconfdir}/udev"
 RDEPENDS_${PN} = "udev"
+CONFFILES_${PN} = "${sysconfdir}/udev/mount.blacklist"
-- 
1.7.8.6

[meta-oe][meta-systemd][PATCH 3/3] systemd: cleanup /var/run on boot and create /var/run/utmp

[Martin Jansa]

* Angstrom uses /var/run cleanup because:
  Some apps (e.g. avahi-daemon) to clean up their old-style pid files and fail
  to start every other boot. Se we let systemd clean it on boot.
  Which seems general enough, so lets move var-run.conf from base-files.bbappend
  to systemd recipe.

* /var/run/utmp was created by volatiles before, but without sysvinit installed
  systemd-update-utmp-runlevel.service fails to start without this file

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

diff --git a/meta-systemd/recipes-core/systemd/systemd/var-run.conf b/meta-systemd/recipes-core/systemd/systemd/var-run.conf
new file mode 100644
index 0000000..c2c18e2
--- /dev/null
+++ b/meta-systemd/recipes-core/systemd/systemd/var-run.conf
@@ -0,0 +1,4 @@
+# empty /var/run
+R	/var/run/*	-	-	-	-	-
+# systemd-update-utmp-runlevel.service fails to start without this
+f /var/run/utmp 0644 root root - -
diff --git a/meta-systemd/recipes-core/systemd/systemd_git.bb b/meta-systemd/recipes-core/systemd/systemd_git.bb
index 9cbdd76..3868438 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
 
@@ -29,6 +29,7 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \
            file://gtk-doc.make \
            file://touchscreen.rules \
            file://modprobe.rules \
+           file://var-run.conf \
           "
 LDFLAGS_libc-uclibc_append = " -lrt"
 
@@ -82,6 +83,8 @@ do_install() {
 	touch ${D}${sysconfdir}/machine-id
 
 	install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
+
+	install -m 0644 ${WORKDIR}/var-run.conf ${D}${sysconfdir}/tmpfiles.d/
 }
 
 python populate_packages_prepend (){
-- 
1.7.8.6

[meta-oe][meta-systemd][PATCH 4/4] systemd: add glib-2.0 to DEPENDS

[Martin Jansa]

* | No package 'glib-2.0' found
  | No package 'gobject-2.0' found
  | configure:16371: error: Package requirements (glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0) were not met:
  |
  | No package 'glib-2.0' found
  | No package 'gobject-2.0' found

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 3868438..39b883a 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 usbutils"
+DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers usbutils glib-2.0"
 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 = "r3"
+PR = "r4"
 
 inherit useradd pkgconfig autotools vala perlnative
 
-- 
1.7.8.6