pull request: rsyslog,gypsy

PATCH Applied Steffen Sledz 2 participants 6 messages Nov 30, 2011 – Dec 1, 2011

lore

Share & tools

lore

Steffen Sledz

author

2011-11-30 09:04 UTC #0 lore raw

cover pull request: rsyslog,gypsy

Hi Tom,

Please pull these 4 commits cherry-picked from oe.dev. The first one fixes the path for additional rsyslog config files. The other ones fix bugs in gypsy application and installation. All of them are well tested in our own environment.

Thx,
Steffen

The following changes since commit 77a5200f2f7405368be243579c77947f4bae5f22:

Revert "gypsy: fix packaging of DBus starter script" (2011-11-30 09:24:02 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded sledz/maintenance
http://cgit.openembedded.org/cgit.cgi/openembedded/log/?h=sledz/maintenance

Steffen Sledz (4):
rsyslog: change path for config includes to /etc/rsyslog.d
gypsy: fix packaging of DBus starter script
gypsy: move generic SRC_URI part to gypsy.inc
gypsy: update to latest upstream version 0.8, and remove version 0.7

 recipes/gypsy/gypsy.inc     |    6 +++++-
 recipes/gypsy/gypsy_0.7.bb  |   10 ----------
 recipes/gypsy/gypsy_0.8.bb  |    6 ++++++
 recipes/rsyslog/rsyslog.inc |    4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 recipes/gypsy/gypsy_0.7.bb
 create mode 100644 recipes/gypsy/gypsy_0.8.bb

Signature · 1 line

1.7.7

Steffen Sledz

author

2011-11-30 09:04 UTC #1 lore raw

PATCH 1/4 rsyslog: change path for config includes to /etc/rsyslog.d

Signed-off-by Steffen Sledz <[email protected]>

---
 recipes/rsyslog/rsyslog.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

recipes/rsyslog/rsyslog.inc +2 -2

index 8f67130..3ab593e 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Rsyslog is an enhanced multi-threaded syslogd"
 DEPENDS = "zlib"
 HOMEPAGE = "http://www.rsyslog.com/"
 LICENSE = "GPLv3"
-INC_PR = "r2"
+INC_PR = "r3"
 
 SRC_URI = "http://www.rsyslog.com/files/download/rsyslog/${PN}-${PV}.tar.gz \
           file://rsyslog.conf \

@@ -12,7 +12,7 @@ SRC_URI = "http://www.rsyslog.com/files/download/rsyslog/${PN}-${PV}.tar.gz \
 inherit autotools
 
 do_install_append() {
-        install -d ${D}/${sysconfdir}/${PN}
+        install -d ${D}/${sysconfdir}/rsyslog.d
         install ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf
         install -d ${D}/${sysconfdir}/init.d
         install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog.${PN}

Signature · 1 line

1.7.7

Steffen Sledz

author

2011-11-30 09:05 UTC #2 lore raw

PATCH 2/4 gypsy: fix packaging of DBus starter script

A wrong path had avoided the packaging of the dbus starter script /usr/share/dbus-1/system-services/org.freedesktop.Gypsy.service.

Signed-off-by Steffen Sledz <[email protected]>

Acked-by Paul Menzel <[email protected]>

---
 recipes/gypsy/gypsy.inc    |    4 +++-
 recipes/gypsy/gypsy_0.7.bb |    2 ++
 2 files changed, 5 insertions(+), 1 deletions(-)

recipes/gypsy/gypsy.inc +3 -1

index eab062c..964e336 100644
@@ -3,6 +3,8 @@ LICENSE = "GPL"
 SECTION = "x11"
 DEPENDS = "glib-2.0 dbus-glib bluez4 libxslt-native"
 
+INC_PR = "r1"
+
 inherit autotools pkgconfig
 
 do_configure_prepend () {

@@ -14,6 +16,6 @@ PACKAGES += "libgypsy libgypsy-dev libgypsy-dbg"
 FILES_lib${PN} = "${libdir}/lib*.so*"
 FILES_lib${PN}-dev = "${includedir}/* ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig"
 FILES_lib${PN}-dbg = "${libdir}/.debug"
-FILES_${PN} = "${datadir}/dbus-1/services/ ${libexecdir}/gypsy-daemon ${sysconfdir}/dbus-1/system.d/*"
+FILES_${PN} = "${datadir}/dbus-1/system-services/* ${libexecdir}/gypsy-daemon ${sysconfdir}/dbus-1/system.d/*"
 FILES_${PN}-dbg ="${libexecdir}/.debug*"
 CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.d/Gypsy.conf"

recipes/gypsy/gypsy_0.7.bb +2 -0

index 8cd8760..054c784 100644
@@ -1,5 +1,7 @@
 require gypsy.inc
 
+PR = "${INC_PR}.0"
+
 SRC_URI = "http://gypsy.freedesktop.org/releases/gypsy-0.7.tar.gz;name=gypsy \
            file://docs-reference-am.patch \
            file://remove-werror.patch \

Signature · 1 line

1.7.7

Steffen Sledz

author

2011-11-30 09:05 UTC #3 lore raw

PATCH 3/4 gypsy: move generic SRC_URI part to gypsy.inc

In reply to Steffen Sledz

Signed-off-by Steffen Sledz <[email protected]>

Acked-by Paul Menzel <[email protected]>

---
 recipes/gypsy/gypsy.inc    |    2 ++
 recipes/gypsy/gypsy_0.7.bb |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

recipes/gypsy/gypsy.inc +2 -0

index 964e336..6c7c942 100644
@@ -5,6 +5,8 @@ DEPENDS = "glib-2.0 dbus-glib bluez4 libxslt-native"
 
 INC_PR = "r1"
 
+SRC_URI = "http://gypsy.freedesktop.org/releases/${PN}-${PV}.tar.gz;name=gypsy"
+
 inherit autotools pkgconfig
 
 do_configure_prepend () {

recipes/gypsy/gypsy_0.7.bb +1 -1

index 054c784..6636961 100644
@@ -2,7 +2,7 @@ require gypsy.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI = "http://gypsy.freedesktop.org/releases/gypsy-0.7.tar.gz;name=gypsy \
+SRC_URI += " \
            file://docs-reference-am.patch \
            file://remove-werror.patch \
 "

Signature · 1 line

1.7.7

Steffen Sledz

author

2011-11-30 09:05 UTC #4 lore raw

PATCH 4/4 gypsy: update to latest upstream version 0.8, and remove version 0.7

In reply to Steffen Sledz

Bug fixes, enhanced logging, a new debugging system, enhanced device discovery.

Signed-off-by Steffen Sledz <[email protected]>

Acked-by Paul Menzel <[email protected]>

---
 recipes/gypsy/gypsy_0.7.bb |   12 ------------
 recipes/gypsy/gypsy_0.8.bb |    6 ++++++
 2 files changed, 6 insertions(+), 12 deletions(-)
 delete mode 100644 recipes/gypsy/gypsy_0.7.bb
 create mode 100644 recipes/gypsy/gypsy_0.8.bb

recipes/gypsy/gypsy_0.7.bb deleted +0 ~~-12~~

deleted file mode 100644
index 6636961..0000000
@@ -1,12 +0,0 @@
-require gypsy.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI += " \
-           file://docs-reference-am.patch \
-           file://remove-werror.patch \
-"
-
-SRC_URI[gypsy.md5sum] = "cde52c121693014efa75d9098fd7de22"
-SRC_URI[gypsy.sha256sum] = "60d9f9ada77c832899df4a164718895addc5015fa48f45fd58dc4bc8a983f205"
-

recipes/gypsy/gypsy_0.8.bb new file +6 -0

new file mode 100644
index 0000000..c5813db
@@ -0,0 +1,6 @@
+require gypsy.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI[gypsy.md5sum] = "32b8db24db86d2dac87b391dd255f4bf"
+SRC_URI[gypsy.sha256sum] = "1986a58189614a950725c3bc7d05faa3b84695f35cb696326f340ef87fc3acaa"

Signature · 1 line

1.7.7

Tom Rini

Applied

2011-12-01 15:07 UTC #5 lore raw

In reply to Steffen Sledz

Quoted 6 lines · Steffen Sledz

Hi Tom,
Please pull these 4 commits cherry-picked from oe.dev. The first one fixes the path for additional rsyslog config files. The other ones fix bugs in gypsy application and installation. All of them are well tested in our own environment.

Applied, thanks!

Signature · 1 line

Tom