[meta-oe][PATCH 0/5] Pending patches from O.S. Systems tree

[meta-oe][PATCH 0/5] Pending patches from O.S. Systems tree

[Otavio Salvador]

The following changes since commit 18266de7fc4e87754831c5e0e8ad09ccd94c93b4:

  nodejs-native: clarify dependencies to match updated oe-core parser (2012-01-06 09:33:42 +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 (5):
  xserver-nodm-init: move systemd service to xserver-nodm-init-systemd
  meta-efl: elsa: rconflicts/rreplaces xserver-nodm-init-systemd
  task-x11: use xserver-nodm-init-systemd
  busybox: add systemd support for syslog service
  udisks: disable manpage building

 meta-efl/recipes-efl/efl/elsa_svn.bb               |    6 ++--
 .../busybox/busybox/busybox-klogd.service.in       |    8 +++++
 .../busybox/busybox/busybox-syslog.default         |    1 +
 .../busybox/busybox/busybox-syslog.service.in      |   13 ++++++++
 .../recipes-core/busybox/busybox_1.19.3.bbappend   |   30 ++++++++++++++++++++
 meta-oe/recipes-core/tasks/task-x11_1.0.bb         |    6 ++--
 .../xserver-nodm-init/xserver-nodm-init_2.0.bb     |   30 +++++++++----------
 meta-oe/recipes-support/udisks/udisks_1.0.4.bb     |    4 ++-
 8 files changed, 75 insertions(+), 23 deletions(-)
 create mode 100644 meta-oe/recipes-core/busybox/busybox/busybox-klogd.service.in
 create mode 100644 meta-oe/recipes-core/busybox/busybox/busybox-syslog.default
 create mode 100644 meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
 create mode 100644 meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend

-- 
1.7.2.5

[meta-oe][PATCH 1/5] xserver-nodm-init: move systemd service to xserver-nodm-init-systemd

[Otavio Salvador]

Move systemd service to xserver-nodm-init-systemd to be consistent
with other packages.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../xserver-nodm-init/xserver-nodm-init_2.0.bb     |   30 +++++++++----------
 1 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
index 496b342..2132eab 100644
--- a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
+++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SECTION = "x11"
 
-PR = "r11"
+PR = "r12"
 
 SRC_URI = "file://xserver-nodm \
            file://xserver-nodm.service \
@@ -13,6 +13,15 @@ S = ${WORKDIR}
 
 inherit allarch
 
+inherit update-rc.d systemd
+
+INITSCRIPT_NAME = "xserver-nodm"
+INITSCRIPT_PARAMS = "start 01 5 2 . stop 01 0 1 6 ."
+INITSCRIPT_PARAMS_shr = "start 90 5 2 . stop 90 0 1 6 ."
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE_${PN}-systemd = "xserver-nodm.service"
+
 do_install() {
 	install -d ${D}${sysconfdir}/init.d
 	install xserver-nodm ${D}${sysconfdir}/init.d
@@ -21,20 +30,9 @@ do_install() {
 	install -m 0644 xserver-nodm.service ${D}${base_libdir}/systemd/system/
 }
 
-RDEPENDS_${PN} = "xserver-common (>= 1.30) xinit"
-FILES_${PN} += "${base_libdir}/systemd/system/"
-
-inherit update-rc.d
+PACKAGES += "${PN}-systemd"
 
-INITSCRIPT_NAME = "xserver-nodm"
-INITSCRIPT_PARAMS = "start 01 5 2 . stop 01 0 1 6 ."
-INITSCRIPT_PARAMS_shr = "start 90 5 2 . stop 90 0 1 6 ."
-
-pkg_postinst_${PN}_append () {
-    if [ -e ${base_bindir}/systemctl ] ; then
-        # can't do this offline
-        [ "x$D" != "x" ] && exit 1
+RDEPENDS_${PN} = "xserver-common (>= 1.30) xinit"
 
-        systemctl enable xserver-nodm.service
-    fi
-}
+FILES_${PN}-systemd += "${base_libdir}/systemd/system/"
+RDEPENDS_${PN}-systemd += "xserver-common (>= 1.30) xinit"
-- 
1.7.2.5

[meta-oe][PATCH 2/5] meta-efl: elsa: rconflicts/rreplaces xserver-nodm-init-systemd

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta-efl/recipes-efl/efl/elsa_svn.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-efl/recipes-efl/efl/elsa_svn.bb b/meta-efl/recipes-efl/efl/elsa_svn.bb
index 949c7e1..a079ec0 100644
--- a/meta-efl/recipes-efl/efl/elsa_svn.bb
+++ b/meta-efl/recipes-efl/efl/elsa_svn.bb
@@ -13,7 +13,7 @@ S = "${WORKDIR}/${SRCNAME}"
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}"
 
-PR = "r3"
+PR = "r4"
 PV = "0.0.4+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"
 
@@ -34,5 +34,5 @@ RDEPENDS_${PN} += "${PN}-themes sessreg xauth"
 CONFFILES_${PN} += "${sysconfdir}/elsa.conf"
 RCONFLICTS_${PN} += "xserver-nodm-init"
 RREPLACES_${PN} += "xserver-nodm-init"
-RCONFLICTS_${PN}-systemd += "xserver-nodm-init"
-RREPLACES_${PN}-systemd += "xserver-nodm-init"
+RCONFLICTS_${PN}-systemd += "xserver-nodm-init-systemd"
+RREPLACES_${PN}-systemd += "xserver-nodm-init-systemd"
-- 
1.7.2.5

[meta-oe][PATCH 3/5] task-x11: use xserver-nodm-init-systemd

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta-oe/recipes-core/tasks/task-x11_1.0.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-core/tasks/task-x11_1.0.bb b/meta-oe/recipes-core/tasks/task-x11_1.0.bb
index 67ff93b..681e4f3 100644
--- a/meta-oe/recipes-core/tasks/task-x11_1.0.bb
+++ b/meta-oe/recipes-core/tasks/task-x11_1.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The X Window System -- install this task to get a client/server b
 SECTION = "x11/server"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r9"
+PR = "r10"
 
 inherit task
 
@@ -16,8 +16,8 @@ RRECOMMENDS_${PN} = "\
 # xserver-common, x11-common
 VIRTUAL-RUNTIME_xserver_common ?= "xserver-common"
 
-# elsa, xserver-nodm-init
-VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
+# elsa, xserver-nodm-init or xserver-nodm-init-systemd
+VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init-systemd"
 
 RDEPENDS_${PN}-utils = "\
   ${VIRTUAL-RUNTIME_xserver_common} \
-- 
1.7.2.5

[meta-oe][PATCH 4/5] busybox: add systemd support for syslog service

[Otavio Salvador]

This uses a busybox-syslog default file to pass options to
syslogd. For it, the 'OPTIONS' variable needs to be set.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../busybox/busybox/busybox-klogd.service.in       |    8 +++++
 .../busybox/busybox/busybox-syslog.default         |    1 +
 .../busybox/busybox/busybox-syslog.service.in      |   13 ++++++++
 .../recipes-core/busybox/busybox_1.19.3.bbappend   |   30 ++++++++++++++++++++
 4 files changed, 52 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-core/busybox/busybox/busybox-klogd.service.in
 create mode 100644 meta-oe/recipes-core/busybox/busybox/busybox-syslog.default
 create mode 100644 meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
 create mode 100644 meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend

diff --git a/meta-oe/recipes-core/busybox/busybox/busybox-klogd.service.in b/meta-oe/recipes-core/busybox/busybox/busybox-klogd.service.in
new file mode 100644
index 0000000..d7c7755
--- /dev/null
+++ b/meta-oe/recipes-core/busybox/busybox/busybox-klogd.service.in
@@ -0,0 +1,8 @@
+[Unit]
+Description=Kernel Logging Service
+
+[Service]
+ExecStart=@base_sbindir@/klogd -n
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-oe/recipes-core/busybox/busybox/busybox-syslog.default b/meta-oe/recipes-core/busybox/busybox/busybox-syslog.default
new file mode 100644
index 0000000..8a21e6d
--- /dev/null
+++ b/meta-oe/recipes-core/busybox/busybox/busybox-syslog.default
@@ -0,0 +1 @@
+OPTIONS="-C64"
diff --git a/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in b/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
new file mode 100644
index 0000000..db90082
--- /dev/null
+++ b/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
@@ -0,0 +1,13 @@
+[Unit]
+Description=System Logging Service
+
+[Service]
+ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
+EnvironmentFile=-/etc/default/busybox-syslog
+ExecStart=@base_sbindir@/syslogd -n $OPTIONS
+Sockets=syslog.socket
+Wants=busybox-klogd.service
+
+[Install]
+WantedBy=multi-user.target
+Also=busybox-klogd.service
diff --git a/meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend b/meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend
new file mode 100644
index 0000000..46177e3
--- /dev/null
+++ b/meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend
@@ -0,0 +1,30 @@
+inherit systemd
+
+PRINC := "${@int(PRINC) + 1}"
+
+# look for files in the layer first
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://busybox-syslog.service.in \
+            file://busybox-klogd.service.in \
+            file://busybox-syslog.default"
+
+SYSTEMD_PACKAGES = "${PN}-syslog-systemd"
+SYSTEMD_SERVICE_${PN}-syslog-systemd = "busybox-syslog.service"
+
+do_install_append() {
+	install -m 0644 ${WORKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog
+
+	install -d ${D}${base_libdir}/systemd/system
+	sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \
+	     > ${D}${base_libdir}/systemd/system/busybox-syslog.service
+	sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \
+	     > ${D}${base_libdir}/systemd/system/busybox-klogd.service
+
+	ln -sf /dev/null ${D}${base_libdir}/systemd/system/syslog.service
+}
+
+PACKAGES += "${PN}-syslog-systemd"
+
+RDEPENDS_${PN}-syslog-systemd += "${PN}-syslog"
+FILES_${PN}-syslog-systemd = "${base_libdir}/systemd"
-- 
1.7.2.5

[meta-oe][PATCH 5/5] udisks: disable manpage building

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta-oe/recipes-support/udisks/udisks_1.0.4.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta-oe/recipes-support/udisks/udisks_1.0.4.bb b/meta-oe/recipes-support/udisks/udisks_1.0.4.bb
index c3e2664..55b115e 100644
--- a/meta-oe/recipes-support/udisks/udisks_1.0.4.bb
+++ b/meta-oe/recipes-support/udisks/udisks_1.0.4.bb
@@ -12,13 +12,15 @@ SRC_URI = "http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \
 SRC_URI[udisks.md5sum] = "86c63b2b5484f2060499a052b5b6256b"
 SRC_URI[udisks.sha256sum] = "854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5"
 
-PR = "r1"
+PR = "r2"
 
 inherit autotools systemd
 
 SYSTEMD_PACKAGES = "${PN}-systemd"
 SYSTEMD_SERVICE_${PN}-systemd = "udisks-daemon.service"
 
+EXTRA_OECONF = "--disable-man-pages"
+
 PACKAGES =+ "${PN}-systemd"
 
 FILES_${PN}-systemd = "${base_libdir}/systemd/system/"
-- 
1.7.2.5

Re: [meta-oe][PATCH 5/5] udisks: disable manpage building

[Phil Blundell]

On Fri, 2012-01-06 at 18:59 +0000, Otavio Salvador wrote:
> +EXTRA_OECONF = "--disable-man-pages"

why is this desirable?

p.

Re: [meta-oe][PATCH 5/5] udisks: disable manpage building

[Otavio Salvador]

On Fri, Jan 6, 2012 at 17:57, Phil Blundell <philb@gnu.org> wrote:

> On Fri, 2012-01-06 at 18:59 +0000, Otavio Salvador wrote:
> > +EXTRA_OECONF = "--disable-man-pages"
>
> why is this desirable?
>

Because it was breaking builds for me.

-- 
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

Re: [meta-oe][PATCH 5/5] udisks: disable manpage building

[Mark Hatle]

On 1/6/12 2:10 PM, Otavio Salvador wrote:
> On Fri, Jan 6, 2012 at 17:57, Phil Blundell<philb@gnu.org>  wrote:
>
>> On Fri, 2012-01-06 at 18:59 +0000, Otavio Salvador wrote:
>>> +EXTRA_OECONF = "--disable-man-pages"
>>
>> why is this desirable?
>>
>
> Because it was breaking builds for me.
>

In what way?  Most of the problems I've observed in the past have been docbook 
related, but I think those have been resolved within OE-Core.

Man pages are very desirable for a class of systems, so I'm hesitant to simply 
remove them w/o a reason or replacement (i.e. a static page)

--Mark

Re: [meta-oe][PATCH 5/5] udisks: disable manpage building

[Otavio Salvador]

On Fri, Jan 6, 2012 at 19:13, Mark Hatle <mark.hatle@windriver.com> wrote:

> In what way?  Most of the problems I've observed in the past have been
> docbook related, but I think those have been resolved within OE-Core.
>

Docbook related problems; you prefer if we fix those then?

-- 
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

Re: [meta-oe][PATCH 5/5] udisks: disable manpage building

[Otavio Salvador]

On Fri, Jan 6, 2012 at 19:49, Otavio Salvador <otavio@ossystems.com.br>wrote:

> On Fri, Jan 6, 2012 at 19:13, Mark Hatle <mark.hatle@windriver.com> wrote:
>
>> In what way?  Most of the problems I've observed in the past have been
>> docbook related, but I think those have been resolved within OE-Core.
>>
>
> Docbook related problems; you prefer if we fix those then?
>

It uses xsltproc and there's no native recipe at this moment.

-- 
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

Re: [meta-oe][PATCH 5/5] udisks: disable manpage building

[Mark Hatle]

On 1/6/12 4:21 PM, Otavio Salvador wrote:
> On Fri, Jan 6, 2012 at 19:49, Otavio Salvador<otavio@ossystems.com.br>wrote:
>
>> On Fri, Jan 6, 2012 at 19:13, Mark Hatle<mark.hatle@windriver.com>  wrote:
>>
>>> In what way?  Most of the problems I've observed in the past have been
>>> docbook related, but I think those have been resolved within OE-Core.
>>>
>>
>> Docbook related problems; you prefer if we fix those then?
>>
>
> It uses xsltproc and there's no native recipe at this moment.
>

Hmm, I think the best solution is to fix the docbook problems, but baring that a 
static version of the man pages is the next best alternative.

Advantage to fixing docbook is it will work for the next package.  :)

--Mark

Re: [meta-oe][PATCH 5/5] udisks: disable manpage building

[Otavio Salvador]

On Mon, Jan 9, 2012 at 14:02, Mark Hatle <mark.hatle@windriver.com> wrote:

> Hmm, I think the best solution is to fix the docbook problems, but baring
> that a static version of the man pages is the next best alternative.
>
> Advantage to fixing docbook is it will work for the next package.  :)


I fully agree but I am short in time for our deadline so this wasn't an
option thus we choose the shortest route for now.

-- 
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

Re: [meta-oe][PATCH 5/5] udisks: disable manpage building

[Khem Raj]

On (09/01/12 15:19), Otavio Salvador wrote:
> On Mon, Jan 9, 2012 at 14:02, Mark Hatle <mark.hatle@windriver.com> wrote:
> 
> > Hmm, I think the best solution is to fix the docbook problems, but baring
> > that a static version of the man pages is the next best alternative.
> >
> > Advantage to fixing docbook is it will work for the next package.  :)
> 
> 
> I fully agree but I am short in time for our deadline so this wasn't an
> option thus we choose the shortest route for now.

I think if we keep this thing going without addressing underlying
problem it degrades the quility of metadata. Documentation is important
aspect of a package and we should make it possible to generate it as
much

no body is going to remove that option later when xsltproc-native starts
working since this package will be building with or without xslt at that
time. So in my opion fixing it at the same time is more efficient though
a bit more effort I concur.

Re: [meta-oe][PATCH 5/5] udisks: disable manpage building

[Martin Jansa]

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

On Mon, Jan 09, 2012 at 10:02:02AM -0600, Mark Hatle wrote:
> On 1/6/12 4:21 PM, Otavio Salvador wrote:
> > On Fri, Jan 6, 2012 at 19:49, Otavio Salvador<otavio@ossystems.com.br>wrote:
> >
> >> On Fri, Jan 6, 2012 at 19:13, Mark Hatle<mark.hatle@windriver.com>  wrote:
> >>
> >>> In what way?  Most of the problems I've observed in the past have been
> >>> docbook related, but I think those have been resolved within OE-Core.
> >>>
> >>
> >> Docbook related problems; you prefer if we fix those then?
> >>
> >
> > It uses xsltproc and there's no native recipe at this moment.
> >
> 
> Hmm, I think the best solution is to fix the docbook problems, but baring that a 
> static version of the man pages is the next best alternative.
> 
> Advantage to fixing docbook is it will work for the next package.  :)

and for all xorg-* stuff...
http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg23006.html

But right now I'm using patches to disable it for xorg-* too...

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

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