[meta-oe][PATCH 0/3] Misc fixes

[meta-oe][PATCH 0/3] Misc fixes

[Otavio Salvador]

The following changes since commit 87a35d203278d220e6c730dc551af11a060798cd:

  gdm 2.32.2: add missing source checksums (2011-12-22 10:10:55 +0100)

are available in the git repository at:
  git://github.com/OSSystems/meta-oe master
  https://github.com/OSSystems/meta-oe/tree/master

Otavio Salvador (3):
  pcsc-lite: ccid downgraded to a runtime recommendation
  rsyslog: move systemd support to rsyslog-systemd
  systemd: depends on intltool-native

 meta-oe/recipes-core/systemd/systemd_git.bb        |    4 +-
 meta-oe/recipes-extended/rsyslog/rsyslog.inc       |   23 +++++++-------------
 .../recipes-support/pcsc-lite/pcsc-lite_1.7.2.bb   |    5 ++-
 3 files changed, 13 insertions(+), 19 deletions(-)

-- 
1.7.2.5

[meta-oe][PATCH 1/3] pcsc-lite: ccid downgraded to a runtime recommendation

[Otavio Salvador]

ccid adds more smart-card readers support but it is not a requirement
for pcsc-lite to work thus we change it to a recommendation instead of
a hard dependency.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../recipes-support/pcsc-lite/pcsc-lite_1.7.2.bb   |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.7.2.bb b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.7.2.bb
index de980ff..a4f3fcc 100644
--- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.7.2.bb
+++ b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.7.2.bb
@@ -3,8 +3,7 @@ HOMEPAGE = "http://pcsclite.alioth.debian.org/"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c8e551349dc346258274f0007679e149"
 DEPENDS = "udev"
-RDEPENDS += "ccid"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "https://alioth.debian.org/frs/download.php/3533/pcsc-lite-${PV}.tar.bz2"
 
@@ -23,4 +22,6 @@ S = "${WORKDIR}/pcsc-lite-${PV}"
 
 PACKAGES =+ "${PN}-lib"
 
+RRECOMMENDS_${PN} = "ccid"
+
 FILES_${PN}-lib = "${libdir}/lib*${SOLIBS}"
-- 
1.7.2.5

[meta-oe][PATCH 2/3] rsyslog: move systemd support to rsyslog-systemd

[Otavio Salvador]

This makes the package consistent with others supporting systemd and
also cleans up the recipe using the systemd.bbclass.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta-oe/recipes-extended/rsyslog/rsyslog.inc |   23 ++++++++---------------
 1 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog.inc b/meta-oe/recipes-extended/rsyslog/rsyslog.inc
index 856d965..ea7fa22 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog.inc
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog.inc
@@ -4,32 +4,25 @@ HOMEPAGE = "http://www.rsyslog.com/"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973"
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 SRC_URI = "http://www.rsyslog.com/files/download/rsyslog/${PN}-${PV}.tar.gz \
            file://rsyslog.conf"
            
 
-inherit autotools
+inherit autotools systemd
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "${PN}.service"
 
 do_install_append() {
         install -d ${D}/${sysconfdir}/${PN}
         install ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf
 }
 
+PACKAGES =+ "${PN}-systemd"
 
-pkg_postinst_${PN} () {
-	if test "x$D" != "x"; then
-		exit 1
-	fi
-	systemctl enable rsyslog.service
-}
-
-pkg_prerm_${PN} () {
-	systemctl disable rsyslog.service
-}
-
-RRECOMMENDS_${PN} += "systemd"
 CONFFILES_${PN} = "${sysconfdir}/rsyslog.conf"
-FILES_${PN} += "${base_libdir}/systemd"
 
+FILES_${PN}-systemd += "${base_libdir}/systemd"
+RDEPENDS_${PN}-systemd += "${PN}"
-- 
1.7.2.5

Re: [meta-oe][PATCH 2/3] rsyslog: move systemd support to rsyslog-systemd

[Martin Jansa]

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

On Thu, Dec 22, 2011 at 01:08:23PM +0000, Otavio Salvador wrote:
> This makes the package consistent with others supporting systemd and
> also cleans up the recipe using the systemd.bbclass.

Do you have similar change for xserver-nodm-init? to make it even more
consistent? :)

Cheers,

> 
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>  meta-oe/recipes-extended/rsyslog/rsyslog.inc |   23 ++++++++---------------
>  1 files changed, 8 insertions(+), 15 deletions(-)
> 
> diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog.inc b/meta-oe/recipes-extended/rsyslog/rsyslog.inc
> index 856d965..ea7fa22 100644
> --- a/meta-oe/recipes-extended/rsyslog/rsyslog.inc
> +++ b/meta-oe/recipes-extended/rsyslog/rsyslog.inc
> @@ -4,32 +4,25 @@ HOMEPAGE = "http://www.rsyslog.com/"
>  LICENSE = "GPLv3"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973"
>  
> -INC_PR = "r1"
> +INC_PR = "r2"
>  
>  SRC_URI = "http://www.rsyslog.com/files/download/rsyslog/${PN}-${PV}.tar.gz \
>             file://rsyslog.conf"
>             
>  
> -inherit autotools
> +inherit autotools systemd
> +
> +SYSTEMD_PACKAGES = "${PN}-systemd"
> +SYSTEMD_SERVICE = "${PN}.service"
>  
>  do_install_append() {
>          install -d ${D}/${sysconfdir}/${PN}
>          install ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf
>  }
>  
> +PACKAGES =+ "${PN}-systemd"
>  
> -pkg_postinst_${PN} () {
> -	if test "x$D" != "x"; then
> -		exit 1
> -	fi
> -	systemctl enable rsyslog.service
> -}
> -
> -pkg_prerm_${PN} () {
> -	systemctl disable rsyslog.service
> -}
> -
> -RRECOMMENDS_${PN} += "systemd"
>  CONFFILES_${PN} = "${sysconfdir}/rsyslog.conf"
> -FILES_${PN} += "${base_libdir}/systemd"
>  
> +FILES_${PN}-systemd += "${base_libdir}/systemd"
> +RDEPENDS_${PN}-systemd += "${PN}"
> -- 
> 1.7.2.5
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

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

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

Re: [meta-oe][PATCH 2/3] rsyslog: move systemd support to rsyslog-systemd

[Otavio Salvador]

On Thu, Dec 22, 2011 at 11:19, Martin Jansa <martin.jansa@gmail.com> wrote:

> On Thu, Dec 22, 2011 at 01:08:23PM +0000, Otavio Salvador wrote:
> > This makes the package consistent with others supporting systemd and
> > also cleans up the recipe using the systemd.bbclass.
>
> Do you have similar change for xserver-nodm-init? to make it even more
> consistent? :)
>

Not now but can cook one for later :-) if you can help doing that, it would
be nice.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

[meta-oe][PATCH 3/3] systemd: depends on intltool-native

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta-oe/recipes-core/systemd/systemd_git.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index 228e0e4..2548d10 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
 
-DEPENDS = "docbook-sgml-dtd-4.1-native gperf-native acl readline udev dbus libcap libcgroup tcp-wrappers"
+DEPENDS = "docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline udev dbus libcap libcgroup tcp-wrappers"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
 SERIAL_CONSOLE ?= "115200 /dev/ttyS0"
@@ -14,7 +14,7 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r6"
+PR = "r7"
 
 inherit useradd pkgconfig autotools vala perlnative
 
-- 
1.7.2.5