Skip to contentSkip to conversation

PACKAGECONFIG for polkit and foxtrotgps upgrade - added more patches for systemd and sstate

PATCH New Martin Jansa 1 participant 6 messages Feb 23, 2012

lore
Share & tools
lore

Martin Jansa

author
#0 lore raw

cover PACKAGECONFIG for polkit and foxtrotgps upgrade - added more patches for systemd and sstate

First 2 patches are the same,

Added 4 more patches for systemd_unitdir variable and 1 patch for sstate

The following changes since commit 4751336bc02d6881efff1c0c6a1b449a156eb723:

vsftpd: add new package (2012-02-22 12:23:16 +0100)

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 (7):
foxtrotgps: upgrade to 1.1.0
polkit: enable and disable systemd/consolekit support explicitly
postgresql: include Makefile.global in SSTATE_SCAN_FILES
gateone: use systemd_unitdir variable
networkmanager: use systemd_unitdir variable
cloud9: use systemd_unitdir variable
ntp: use systemd_unitdir variable

 .../recipes-connectivity/gateone/gateone_git.bb    |    6 +-
 .../networkmanager/networkmanager_0.9.2.0.bb       |    4 +-
 meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb    |    8 ++--
 .../recipes-extended/polkit/polkit_0.104.bbappend  |    7 ++-
 .../foxtrotgps-1.0.1/remove.unused.header.patch    |   40 --------------------
 .../{foxtrotgps_1.0.1.bb => foxtrotgps_1.1.0.bb}   |    8 +--
 meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb         |   10 ++--
 meta-oe/recipes-support/postgresql/postgresql.inc  |    4 +-
 8 files changed, 25 insertions(+), 62 deletions(-)
 delete mode 100644 meta-oe/recipes-navigation/foxtrotgps/foxtrotgps-1.0.1/remove.unused.header.patch
 rename meta-oe/recipes-navigation/foxtrotgps/{foxtrotgps_1.0.1.bb => foxtrotgps_1.1.0.bb} (61%)
Signature · 1 line
1.7.8.4
author
#1 lore raw

PATCH 3/7 postgresql: include Makefile.global in SSTATE_SCAN_FILES

Signed-off-by Martin Jansa <[email protected]>
---
 meta-oe/recipes-support/postgresql/postgresql.inc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
meta-oe/recipes-support/postgresql/postgresql.inc +3 -1
index 53c38df..ab6aea4 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "PostgreSQL is a powerful, open source relational database system.
 HOMEPAGE = "http://www.postgresql.com"
 LICENSE = "BSD"
 DEPENDS = "zlib readline tzcode-native"
-INC_PR = "r5"
+INC_PR = "r6"
 
 ARM_INSTRUCTION_SET = "arm"
 

@@ -23,6 +23,8 @@ do_compile_append() {
          cp /usr/sbin/zic ${S}/src/timezone/
 }
 
+SSTATE_SCAN_FILES += "Makefile.global"
+
 PACKAGES =+ "${PN}-client ${PN}-server-dev ${PN}-timezone \
              libecpg-compat-dbg libecpg-compat \
              libecpg-dbg libecpg libecpg-dev \
Signature · 1 line
1.7.8.4
author
#2 lore raw

PATCH 4/7 gateone: use systemd_unitdir variable

* maybe we should move systemd_unitdir definition outside systemd.bbclass because it's used in few more recipes which doesn't inherit systemd

Signed-off-by Martin Jansa <[email protected]>
---
 .../recipes-connectivity/gateone/gateone_git.bb    |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
meta-oe/recipes-connectivity/gateone/gateone_git.bb +3 -3
index 4f9684c..aee88f3 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "HTML5 (plugin-free) web-based terminal emulator and SSH client"
 LICENSE = "AGPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=07d5a2790569bd3e3b422b69ccd43bec"
 
-PR = "r15"
+PR = "r16"
 
 PV = "0.9"
 SRCREV = "a68444610efa2892842893dae828a28527e64a6e"

@@ -20,8 +20,8 @@ export prefix = "${localstatedir}/lib"
 do_install_append() {
 	install -d ${D}${localstatedir}/log/${BPN}
 
-	install -m 0755 -d ${D}${base_libdir}/systemd/system
-	install -m 0644 ${WORKDIR}/gateone.service ${D}${base_libdir}/systemd/system/
+	install -m 0755 -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/gateone.service ${D}${systemd_unitdir}/system/
 
 	install -m 0755 -d ${D}${sysconfdir}/avahi/services/
 	install -m 0644 ${WORKDIR}/gateone-avahi.service ${D}${sysconfdir}/avahi/services/
Signature · 1 line
1.7.8.4
author
#3 lore raw

PATCH 5/7 networkmanager: use systemd_unitdir variable

In reply to Martin Jansa

* maybe we should move systemd_unitdir definition outside systemd.bbclass because it's used in few more recipes which doesn't inherit systemd

Signed-off-by Martin Jansa <[email protected]>
---
 .../networkmanager/networkmanager_0.9.2.0.bb       |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb +2 -2
index 1dcc3cf..38fac08 100644
@@ -4,7 +4,7 @@ SECTION = "net/misc"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b"
 
-PR = "r2"
+PR = "r3"
 
 DEPENDS = "systemd libnl dbus dbus-glib udev wireless-tools polkit gnutls util-linux ppp"
 inherit gnome gettext

@@ -70,7 +70,7 @@ FILES_${PN} += " \
 		${datadir}/polkit-1 \
 		${datadir}/dbus-1 \
 		${base_libdir}/udev/* \
-        ${base_libdir}/systemd \
+        ${systemd_unitdir} \
 "
 
 RRECOMMENDS_${PN} += "iptables"
Signature · 1 line
1.7.8.4
author
#4 lore raw

PATCH 6/7 cloud9: use systemd_unitdir variable

In reply to Martin Jansa

* maybe we should move systemd_unitdir definition outside systemd.bbclass because it's used in few more recipes which doesn't inherit systemd

Signed-off-by Martin Jansa <[email protected]>
---
 meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb +4 -4
index 4e95075..7041527 100644
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4784c3bcff601fd8f9515f52a11e7018"
 
 DEPENDS = "libxml2 nodejs-native"
 
-PR = "r13"
+PR = "r14"
 
 SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \
            git://github.com/ajaxorg/o3;destsuffix=o3;name=o3 \

@@ -98,8 +98,8 @@ do_install () {
  install -m 0644 ${WORKDIR}/o3/modules/o3.js ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.js
  install -m 0755 ${WORKDIR}/o3/o3.node ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.node
 
- install -m 0755 -d ${D}${base_libdir}/systemd/system
- install -m 0644 ${WORKDIR}/cloud9.service ${D}${base_libdir}/systemd/system/
+ install -m 0755 -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/cloud9.service ${D}${systemd_unitdir}/system/
 
   install -m 0755 -d ${D}${sysconfdir}/avahi/services/
   install -m 0644 ${WORKDIR}/cloud9-avahi.service ${D}${sysconfdir}/avahi/services/

@@ -109,7 +109,7 @@ FILES_${PN}-dbg += "${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o
                     ${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/.debug \
                    "
 
-FILES_${PN} += "${base_libdir}/systemd/system"
+FILES_${PN} += "${systemd_unitdir}/system"
 RDEPENDS_${PN} = "nodejs gzip"
 
 inherit systemd
Signature · 1 line
1.7.8.4
author
#5 lore raw

PATCH 7/7 ntp: use systemd_unitdir variable

In reply to Martin Jansa

* maybe we should move systemd_unitdir definition outside systemd.bbclass because it's used in few more recipes which doesn't inherit systemd

Signed-off-by Martin Jansa <[email protected]>
---
 meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb +5 -5
index 063d82a..ece8720 100644
@@ -1,6 +1,6 @@
 require ntp.inc
 
-PR = "r4"
+PR = "r5"
 
 inherit systemd
 

@@ -29,14 +29,14 @@ do_install_append() {
 	install -d ${D}/${sysconfdir}/network/if-up.d
 	install -m 755 ${WORKDIR}/ntpdate ${D}/${sysconfdir}/network/if-up.d
 
-	install -d ${D}${base_libdir}/systemd/system
-	install -m 0644 ${WORKDIR}/ntpdate.service ${D}${base_libdir}/systemd/system/
-	install -m 0644 ${WORKDIR}/ntpd.service ${D}${base_libdir}/systemd/system/
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/ntpdate.service ${D}${systemd_unitdir}/system/
+	install -m 0644 ${WORKDIR}/ntpd.service ${D}${systemd_unitdir}/system/
 }
 
 PACKAGES =+ "${PN}-systemd"
 
-FILES_${PN}-systemd = "${base_libdir}/systemd/system/"
+FILES_${PN}-systemd = "${systemd_unitdir}/system/"
 RDEPENDS_${PN}-systemd = "${PN}"
 
 FILES_${PN}-bin = "${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq ${bindir}/ntptime ${bindir}/ntptrace"
Signature · 1 line
1.7.8.4