Skip to contentSkip to conversation

systemd: update to v26

PATCH In review Koen Kooi 2 participants 9 messages May 2, 2011 – May 6, 2011

lore
Share & tools
lore

Koen Kooi

author
#0 lore raw

PATCH 1/1 systemd: update to v26

---
 recipes/systemd/files/disable_xml_generation.patch |   36 --------
 recipes/systemd/files/execute.patch                |   17 ----
 recipes/systemd/files/[email protected]        |   19 ----
 recipes/systemd/files/replace_accpet4.patch        |   26 ------
 recipes/systemd/files/systemadm.patch              |   13 ---
 ...-disable-xml-file-stuff-and-introspection.patch |   93 ++++++++++++++++++++
 recipes/systemd/systemd-v26/execute.patch          |   17 ++++
 recipes/systemd/systemd-v26/[email protected]  |   19 ++++
 recipes/systemd/systemd-v26/replace_accpet4.patch  |   26 ++++++
 recipes/systemd/systemd-v26/systemadm.patch        |   13 +++
 recipes/systemd/systemd_git.bb                     |   26 ++++--
 11 files changed, 185 insertions(+), 120 deletions(-)
 delete mode 100644 recipes/systemd/files/disable_xml_generation.patch
 delete mode 100644 recipes/systemd/files/execute.patch
 delete mode 100644 recipes/systemd/files/[email protected]
 delete mode 100644 recipes/systemd/files/replace_accpet4.patch
 delete mode 100644 recipes/systemd/files/systemadm.patch
 create mode 100644 recipes/systemd/systemd-v26/0001-systemd-disable-xml-file-stuff-and-introspection.patch
 create mode 100644 recipes/systemd/systemd-v26/execute.patch
 create mode 100644 recipes/systemd/systemd-v26/[email protected]
 create mode 100644 recipes/systemd/systemd-v26/replace_accpet4.patch
 create mode 100644 recipes/systemd/systemd-v26/systemadm.patch
recipes/systemd/files/disable_xml_generation.patch deleted +0 -36
deleted file mode 100644
index 47f36b8..0000000
@@ -1,36 +0,0 @@
-Index: git/Makefile.am
-===================================================================
---- git.orig/Makefile.am	2010-06-15 22:58:46.752961117 +0200
-+++ git/Makefile.am	2010-06-15 22:59:22.615040570 +0200
-@@ -75,21 +75,6 @@
- dist_udevrules_DATA = \
- 	src/99-systemd.rules
- 
--dbusinterface_DATA = \
--	org.freedesktop.systemd1.Manager.xml \
--	org.freedesktop.systemd1.Job.xml \
--	org.freedesktop.systemd1.Unit.xml \
--	org.freedesktop.systemd1.Service.xml \
--	org.freedesktop.systemd1.Socket.xml \
--	org.freedesktop.systemd1.Timer.xml \
--	org.freedesktop.systemd1.Target.xml \
--	org.freedesktop.systemd1.Device.xml \
--	org.freedesktop.systemd1.Mount.xml \
--	org.freedesktop.systemd1.Automount.xml \
--	org.freedesktop.systemd1.Snapshot.xml \
--	org.freedesktop.systemd1.Swap.xml \
--	org.freedesktop.systemd1.Path.xml
--
- dist_systemunit_DATA = \
- 	units/emergency.service \
- 	units/basic.target \
-@@ -466,9 +451,6 @@
- 	man/systemd.special.html.in
- endif
- 
--org.freedesktop.systemd1.%.xml: systemd
--	$(AM_V_GEN)./systemd --introspect=${@:.xml=} > $@
--
- CLEANFILES += $(dbusinterface_DATA)
- 
- install-data-hook:
recipes/systemd/files/execute.patch deleted +0 -17
deleted file mode 100644
index c9f88c8..0000000
@@ -1,17 +0,0 @@
-Index: git/src/execute.c
-===================================================================
---- git.orig/src/execute.c	2010-06-15 11:41:02.792856752 +0200
-+++ git/src/execute.c	2010-06-15 11:52:02.899046198 +0200
-@@ -47,6 +47,12 @@
- #include "cgroup.h"
- #include "namespace.h"
- 
-+#ifndef SCHED_RESET_ON_FORK
-+#  define SCHED_RESET_ON_FORK 0x40000000
-+#endif
-+
-+
-+
- /* This assumes there is a 'tty' group */
- #define TTY_MODE 0620
- 
recipes/systemd/files/[email protected] deleted +0 -19
deleted file mode 100644
index 62e4695..0000000
@@ -1,19 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Getty on %I
-Before=getty.target
-After=basic.target
-Conflicts=shutdown.target
-
-[Service]
-Environment=TERM=linux
-ExecStart=/sbin/getty @BAUDRATE@ %I
-Restart=restart-always
-RestartSec=0
-KillMode=process-group
recipes/systemd/files/replace_accpet4.patch deleted +0 -26
deleted file mode 100644
index d57b07a..0000000
@@ -1,26 +0,0 @@
-Index: git/src/logger.c
-===================================================================
---- git.orig/src/logger.c	2010-06-15 23:02:38.212932153 +0200
-+++ git/src/logger.c	2010-06-15 23:02:51.091686447 +0200
-@@ -331,7 +331,7 @@
- 
-         assert(s);
- 
--        if ((fd = accept4(server_fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC)) < 0)
-+        if ((fd = accept(server_fd, NULL, NULL)) < 0)
-                 return -errno;
- 
-         if (s->n_streams >= STREAMS_MAX) {
-Index: git/src/socket.c
-===================================================================
---- git.orig/src/socket.c	2010-06-15 23:02:16.269606647 +0200
-+++ git/src/socket.c	2010-06-15 23:02:31.115021717 +0200
-@@ -1201,7 +1201,7 @@
-         if (w->socket_accept) {
-                 for (;;) {
- 
--                        if ((cfd = accept4(fd, NULL, NULL, SOCK_NONBLOCK)) < 0) {
-+                        if ((cfd = accept(fd, NULL, NULL)) < 0) {
- 
-                                 if (errno == EINTR)
-                                         continue;
recipes/systemd/files/systemadm.patch deleted +0 -13
deleted file mode 100644
index b9c09db..0000000
@@ -1,13 +0,0 @@
-Index: git/src/systemadm.vala
-===================================================================
---- git.orig/src/systemadm.vala	2010-06-15 11:02:35.863509632 +0200
-+++ git/src/systemadm.vala	2010-06-15 11:06:16.305986249 +0200
-@@ -297,7 +297,7 @@
- 
-                 bbox.pack_start(cancel_button, false, true, 0);
- 
--                bus = Bus.get(session ? BusType.SESSION : BusType.SYSTEM);
-+                bus = DBus.Bus.get(session ? DBus.BusType.SESSION : DBus.BusType.SYSTEM);
- 
-                 manager = bus.get_object(
-                                 "org.freedesktop.systemd1",
recipes/systemd/systemd-v26/0001-systemd-disable-xml-file-stuff-and-introspection.patch new file +93 -0

93 lines not on this page · raw message

recipes/systemd/systemd-v26/execute.patch new file +17 -0
new file mode 100644
index 0000000..c9f88c8
@@ -0,0 +1,17 @@
+Index: git/src/execute.c
+===================================================================
+--- git.orig/src/execute.c	2010-06-15 11:41:02.792856752 +0200
++++ git/src/execute.c	2010-06-15 11:52:02.899046198 +0200
+@@ -47,6 +47,12 @@
+ #include "cgroup.h"
+ #include "namespace.h"
+ 
++#ifndef SCHED_RESET_ON_FORK
++#  define SCHED_RESET_ON_FORK 0x40000000
++#endif
++
++
++
+ /* This assumes there is a 'tty' group */
+ #define TTY_MODE 0620
+ 
recipes/systemd/systemd-v26/[email protected] new file +19 -0
new file mode 100644
index 0000000..62e4695
@@ -0,0 +1,19 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Getty on %I
+Before=getty.target
+After=basic.target
+Conflicts=shutdown.target
+
+[Service]
+Environment=TERM=linux
+ExecStart=/sbin/getty @BAUDRATE@ %I
+Restart=restart-always
+RestartSec=0
+KillMode=process-group
recipes/systemd/systemd-v26/replace_accpet4.patch new file +26 -0
new file mode 100644
index 0000000..d57b07a
@@ -0,0 +1,26 @@
+Index: git/src/logger.c
+===================================================================
+--- git.orig/src/logger.c	2010-06-15 23:02:38.212932153 +0200
++++ git/src/logger.c	2010-06-15 23:02:51.091686447 +0200
+@@ -331,7 +331,7 @@
+ 
+         assert(s);
+ 
+-        if ((fd = accept4(server_fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC)) < 0)
++        if ((fd = accept(server_fd, NULL, NULL)) < 0)
+                 return -errno;
+ 
+         if (s->n_streams >= STREAMS_MAX) {
+Index: git/src/socket.c
+===================================================================
+--- git.orig/src/socket.c	2010-06-15 23:02:16.269606647 +0200
++++ git/src/socket.c	2010-06-15 23:02:31.115021717 +0200
+@@ -1201,7 +1201,7 @@
+         if (w->socket_accept) {
+                 for (;;) {
+ 
+-                        if ((cfd = accept4(fd, NULL, NULL, SOCK_NONBLOCK)) < 0) {
++                        if ((cfd = accept(fd, NULL, NULL)) < 0) {
+ 
+                                 if (errno == EINTR)
+                                         continue;
recipes/systemd/systemd-v26/systemadm.patch new file +13 -0
new file mode 100644
index 0000000..b9c09db
@@ -0,0 +1,13 @@
+Index: git/src/systemadm.vala
+===================================================================
+--- git.orig/src/systemadm.vala	2010-06-15 11:02:35.863509632 +0200
++++ git/src/systemadm.vala	2010-06-15 11:06:16.305986249 +0200
+@@ -297,7 +297,7 @@
+ 
+                 bbox.pack_start(cancel_button, false, true, 0);
+ 
+-                bus = Bus.get(session ? BusType.SESSION : BusType.SYSTEM);
++                bus = DBus.Bus.get(session ? DBus.BusType.SESSION : DBus.BusType.SYSTEM);
+ 
+                 manager = bus.get_object(
+                                 "org.freedesktop.systemd1",
recipes/systemd/systemd_git.bb +17 -9
index 5f98e54..7634b22 100644
@@ -1,48 +1,56 @@
 DESCRIPTION = "Systemd a init replacement"
 HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd"
-LICENSE = "GPL"
+LICENSE = "GPLv2+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
+
 DEPENDS = "readline udev dbus libcap2 libcgroup gtk+"
 PRIORITY = "optional"
 SECTION = "base/shell"
 
-PV = "0.0"
-PR_append = "+${SRCPV}"
+PV = "v26"
+#PR_append = "+${SRCPV}"
 
 inherit autotools vala
 
-TAG = "1ebdf2d8793181f31b766b8342391aa1978f9917"
+TAG = "${PV}"
 
 SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git;tag=${TAG} \
            file://execute.patch \
-           file://systemadm.patch \
-           file://disable_xml_generation.patch \
+#           file://systemadm.patch \
+           file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \
            file://replace_accpet4.patch \
            file://[email protected] \
           "
 
 S = "${WORKDIR}/git"
 
+# The gtk+ tools should get built as a seperate recipe e.g. systemd-tools
 EXTRA_OECONF = " --with-distro=debian \
                  --with-rootdir=${base_prefix} \
+                 --disable-gtk \
                "
 
-PACKAGES = "${PN} ${PN}-gui ${PN}-dbg ${PN}-doc"
+PACKAGES =+ "${PN}-gui"
 
 FILES_${PN}-gui = "${bindir}/systemadm"
 
 FILES_${PN} = " ${base_bindir}/* \
                 ${datadir}/dbus-1/services \
                 ${datadir}/dbus-1/system-services \
+                ${datadir}/polkit-1 \
                 ${datadir}/${PN} \
                 ${sysconfdir} \
                 ${base_libdir}/systemd/* \
                 ${base_libdir}/systemd/system/* \
                 ${base_libdir}/udev/rules.d \
+                ${base_libdir}/security/*.so \
                 /cgroup \
-                ${bindir}/systemd-install \
+                ${bindir}/systemd* \
+                ${libdir}/tmpfiles.d/*.conf \
+                ${libdir}/systemd \
                "
 
-FILES_${PN}-dbg += " /lib/systemd/.debug "
+FILES_${PN}-dbg += "${base_libdir}/systemd/.debug ${base_libdir}/systemd/*/.debug"
 
 def get_baudrate(bb, d):
     return bb.data.getVar('SERIAL_CONSOLE', d, 1).split()[0]
Signature · 1 line
1.6.6.1
#1 lore raw

PATCH 1/1 angstrom-2010-preferred-versions.inc: prefer DBus 1.4.1

Date: Mon, 2 May 2011 13:26:24 +0200

---
This patch should go in before [1]

[oe] [PATCH] systemd: update to v26

because otherwise task configure fails with the following error.

| checking for UDEV... yes
| checking for DBUS... configure: error: Package requirements ( dbus-1 >= 1.3.2 ) were not met:
|
| Requested 'dbus-1 >= 1.3.2' but version of dbus is 1.2.24
|
| Consider adjusting the PKG_CONFIG_PATH environment variable if you
| installed software in a non-standard prefix.
|
| Alternatively, you may set the environment variables DBUS_CFLAGS
| and DBUS_LIBS to avoid the need to call pkg-config.
| See the pkg-config man page for more details.
|

NOTE: package systemd-v26-r0: task do_configure: Failed

[1] http://patches.openembedded.org/patch/3061/

---
 .../include/angstrom-2010-preferred-versions.inc   |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
conf/distro/include/angstrom-2010-preferred-versions.inc +1 -1
index 5c28440..ae01b57 100644
@@ -14,7 +14,7 @@ PREFERRED_VERSION_automake = "1.11.1"
 PREFERRED_VERSION_automake-native = "1.11.1"
 PREFERRED_VERSION_busybox 	= "1.18.4"
 PREFERRED_VERSION_cairo		= "1.10.0"
-PREFERRED_VERSION_dbus 		= "1.2.24"
+PREFERRED_VERSION_dbus 		= "1.4.1"
 PREFERRED_VERSION_dropbear      = "0.52"
 PREFERRED_VERSION_fontconfig	= "2.8.0"
 PREFERRED_VERSION_glib-2.0 	= "2.28.0"
Signature · 1 line
1.7.4.4
author
#2 lore raw

Re: [PATCH] angstrom-2010-preferred-versions.inc: prefer DBus 1.4.1

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 5 lines · Paul Menzel

Date: Mon, 2 May 2011 13:26:24 +0200

---
This patch should go in before [1]

I know, I have a similar patch (and others) queued locally.

Quoted 40 lines

[oe] [PATCH] systemd: update to v26

because otherwise task configure fails with the following error.

| checking for UDEV... yes
| checking for DBUS... configure: error: Package requirements ( dbus-1 >= 1.3.2 ) were not met:
|
| Requested 'dbus-1 >= 1.3.2' but version of dbus is 1.2.24
|
| Consider adjusting the PKG_CONFIG_PATH environment variable if you
| installed software in a non-standard prefix.
|
| Alternatively, you may set the environment variables DBUS_CFLAGS
| and DBUS_LIBS to avoid the need to call pkg-config.
| See the pkg-config man page for more details.
|

NOTE: package systemd-v26-r0: task do_configure: Failed

[1] http://patches.openembedded.org/patch/3061/

---
 .../include/angstrom-2010-preferred-versions.inc   |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
conf/distro/include/angstrom-2010-preferred-versions.inc +1 -1
index 5c28440..ae01b57 100644
@@ -14,7 +14,7 @@ PREFERRED_VERSION_automake = "1.11.1"
 PREFERRED_VERSION_automake-native = "1.11.1"
 PREFERRED_VERSION_busybox 	= "1.18.4"
 PREFERRED_VERSION_cairo		= "1.10.0"
-PREFERRED_VERSION_dbus 		= "1.2.24"
+PREFERRED_VERSION_dbus 		= "1.4.1"
 PREFERRED_VERSION_dropbear      = "0.52"
 PREFERRED_VERSION_fontconfig	= "2.8.0"
 PREFERRED_VERSION_glib-2.0 	= "2.28.0"
Quoted 4 lines

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNvqreMkyGM64RGpERAmKIAJ9w0RRThv+MshZMLSCpODjLCSt3DACgqT1w SgIeyg+ZuSMJxRZuT++nyJk=
=TiSC
-----END PGP SIGNATURE-----

#3 lore raw
In reply to Koen Kooi

Am Montag, den 02.05.2011, 10:22 +0200 schrieb Koen Kooi:

Quoted 16 lines
---
 recipes/systemd/files/disable_xml_generation.patch |   36 --------
 recipes/systemd/files/execute.patch                |   17 ----
 recipes/systemd/files/[email protected]        |   19 ----
 recipes/systemd/files/replace_accpet4.patch        |   26 ------
 recipes/systemd/files/systemadm.patch              |   13 ---
 ...-disable-xml-file-stuff-and-introspection.patch |   93 ++++++++++++++++++++
 recipes/systemd/systemd-v26/execute.patch          |   17 ++++
 recipes/systemd/systemd-v26/[email protected]  |   19 ++++
 recipes/systemd/systemd-v26/replace_accpet4.patch  |   26 ++++++
 recipes/systemd/systemd-v26/systemadm.patch        |   13 +++
 recipes/systemd/systemd_git.bb                     |   26 ++++--
 11 files changed, 185 insertions(+), 120 deletions(-)
 delete mode 100644 recipes/systemd/files/disable_xml_generation.patch
 delete mode 100644 recipes/systemd/files/execute.patch
Quoted 8 lines
 delete mode 100644 recipes/systemd/files/[email protected]
 delete mode 100644 recipes/systemd/files/replace_accpet4.patch
 delete mode 100644 recipes/systemd/files/systemadm.patch
 create mode 100644 recipes/systemd/systemd-v26/0001-systemd-disable-xml-file-stuff-and-introspection.patch
 create mode 100644 recipes/systemd/systemd-v26/execute.patch
 create mode 100644 recipes/systemd/systemd-v26/[email protected]
 create mode 100644 recipes/systemd/systemd-v26/replace_accpet4.patch
 create mode 100644 recipes/systemd/systemd-v26/systemadm.patch

git log --stat -M -C -C makes the diff lock much more daunting.

[…]

Quoted 25 lines
recipes/systemd/systemd-v26/systemadm.patch new file +13 -0
@@ -0,0 +1,13 @@
+Index: git/src/systemadm.vala
+===================================================================
+--- git.orig/src/systemadm.vala	2010-06-15 11:02:35.863509632 +0200
++++ git/src/systemadm.vala	2010-06-15 11:06:16.305986249 +0200
+@@ -297,7 +297,7 @@
+ 
+                 bbox.pack_start(cancel_button, false, true, 0);
+ 
+-                bus = Bus.get(session ? BusType.SESSION : BusType.SYSTEM);
++                bus = DBus.Bus.get(session ? DBus.BusType.SESSION : DBus.BusType.SYSTEM);
+ 
+                 manager = bus.get_object(
+                                 "org.freedesktop.systemd1",
recipes/systemd/systemd_git.bb +1 -1
index 5f98e54..7634b22 100644
@@ -1,48 +1,56 @@
 DESCRIPTION = "Systemd a init replacement"
 HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd"
-LICENSE = "GPL"
+LICENSE = "GPLv2+

recipes/systemd/systemd_git.bb line 11

Quoted 10 lines
recipes/systemd/systemd_git.bb +4 -2
+LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
+
 DEPENDS = "readline udev dbus libcap2 libcgroup gtk+"
 PRIORITY = "optional"
 SECTION = "base/shell"
 
-PV = "0.0"
-PR_append = "+${SRCPV}"
+PV = "v26"
+#PR_append = "+${SRCPV}"

Remove the commented line.

recipes/systemd/systemd_git.bb line 19

Quoted 10 lines
recipes/systemd/systemd_git.bb +2 -3
 inherit autotools vala
 
-TAG = "1ebdf2d8793181f31b766b8342391aa1978f9917"
+TAG = "${PV}"
 
 SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git;tag=${TAG} \
            file://execute.patch \
-           file://systemadm.patch \
-           file://disable_xml_generation.patch \
+#           file://systemadm.patch \

Maybe a comment in the recipe or the commit message would be nice, why this is commented. Could it be needed in the future?

recipes/systemd/systemd_git.bb line 27

Quoted 8 lines
recipes/systemd/systemd_git.bb +2 -0
+           file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \
            file://replace_accpet4.patch \
            file://[email protected] \
           "
 
 S = "${WORKDIR}/git"
 
+# The gtk+ tools should get built as a seperate recipe e.g. systemd-tools

s/seperate/separate/

… to not force people to build all gtk+ packages/recipes.

Quoted 22 lines
recipes/systemd/systemd_git.bb +4 -2
 EXTRA_OECONF = " --with-distro=debian \
                  --with-rootdir=${base_prefix} \
+                 --disable-gtk \
                "
 
-PACKAGES = "${PN} ${PN}-gui ${PN}-dbg ${PN}-doc"
+PACKAGES =+ "${PN}-gui"
 
 FILES_${PN}-gui = "${bindir}/systemadm"
 
 FILES_${PN} = " ${base_bindir}/* \
                 ${datadir}/dbus-1/services \
                 ${datadir}/dbus-1/system-services \
+                ${datadir}/polkit-1 \
                 ${datadir}/${PN} \
                 ${sysconfdir} \
                 ${base_libdir}/systemd/* \
                 ${base_libdir}/systemd/system/* \
                 ${base_libdir}/udev/rules.d \
+                ${base_libdir}/security/*.so \
                 /cgroup \
-                ${bindir}/systemd-install \

recipes/systemd/systemd_git.bb line 56

Quoted 10 lines
recipes/systemd/systemd_git.bb +4 -1
+                ${bindir}/systemd* \
+                ${libdir}/tmpfiles.d/*.conf \
+                ${libdir}/systemd \
                "
 
-FILES_${PN}-dbg += " /lib/systemd/.debug "
+FILES_${PN}-dbg += "${base_libdir}/systemd/.debug ${base_libdir}/systemd/*/.debug"
 
 def get_baudrate(bb, d):
     return bb.data.getVar('SERIAL_CONSOLE', d, 1).split()[0]

A split in two commits to fix/improve the recipe and to update to v26 would have been nice.

Anyway, using angstrom-2010.x for MACHINE = "beagleboard" fails with the following error message.

[…]
CCLD systemd-getty-generator
GEN man/systemd.1
I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
warning: failed to load external entity "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" cannot parse http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
make[1]: *** [man/systemd.1] Error 4
make[1]: Leaving directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/systemd-v26-r0/git'
make: *** [all] Error 2
+ die 'oe_runmake failed'
+ oefatal 'oe_runmake failed'
+ echo FATAL: 'oe_runmake failed'
FATAL: oe_runmake failed
+ exit 1

Please find log.do_compile attached.

Thanks,

Paul

+ do_compile
+ base_do_compile
+ '[' -e Makefile -o -e makefile -o -e GNUmakefile ']'
+ oe_runmake
+ oenote make
+ echo NOTE: make
NOTE: make
+ make
make all-am
make[1]: Entering directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/systemd-v26-r0/git'
CC src/libsystemd_basic_la-util.lo
src/util.c: In function 'acquire_terminal':
src/util.c:2484:29: warning: cast increases required alignment of target type [-Wcast-align] src/util.c:2497:37: warning: cast increases required alignment of target type [-Wcast-align]
CC src/libsystemd_basic_la-label.lo
CC src/libsystemd_basic_la-hashmap.lo
src/hashmap.c: In function 'link_entry':
src/hashmap.c:104:26: warning: cast increases required alignment of target type [-Wcast-align] src/hashmap.c:106:13: warning: cast increases required alignment of target type [-Wcast-align] src/hashmap.c:107:17: warning: cast increases required alignment of target type [-Wcast-align] src/hashmap.c:108:9: warning: cast increases required alignment of target type [-Wcast-align] src/hashmap.c: In function 'unlink_entry':
src/hashmap.c:148:17: warning: cast increases required alignment of target type [-Wcast-align] src/hashmap.c: In function 'hash_scan':
src/hashmap.c:198:18: warning: cast increases required alignment of target type [-Wcast-align]

  CC     src/libsystemd_basic_la-set.lo
  CC     src/libsystemd_basic_la-strv.lo
  CC     src/libsystemd_basic_la-conf-parser.lo
  CC     src/libsystemd_basic_la-socket-util.lo
  CC     src/libsystemd_basic_la-log.lo
  CC     src/libsystemd_basic_la-ratelimit.lo
  CC     src/libsystemd_basic_la-exit-status.lo
  CCLD   libsystemd-basic.la
  CC     src/libsystemd_core_la-unit.lo
  CC     src/libsystemd_core_la-job.lo
  CC     src/libsystemd_core_la-manager.lo

src/manager.c: In function 'manager_process_notify_fd':
src/manager.c:1956:25: warning: cast increases required alignment of target type [-Wcast-align]
CC src/libsystemd_core_la-path-lookup.lo
CC src/libsystemd_core_la-load-fragment.lo
src/load-fragment.c: In function 'load_from_path':
src/load-fragment.c:1998:28: warning: cast increases required alignment of target type [-Wcast-align]

  CC     src/libsystemd_core_la-service.lo
  CC     src/libsystemd_core_la-automount.lo
  CC     src/libsystemd_core_la-mount.lo
  CC     src/libsystemd_core_la-swap.lo
  CC     src/libsystemd_core_la-device.lo
  CC     src/libsystemd_core_la-target.lo
  CC     src/libsystemd_core_la-snapshot.lo
  CC     src/libsystemd_core_la-socket.lo
  CC     src/libsystemd_core_la-timer.lo
  CC     src/libsystemd_core_la-path.lo
src/path.c: In function 'path_fd_event':
src/path.c:575:13: warning: cast increases required alignment of target type [-Wcast-align]
src/path.c:587:21: warning: cast increases required alignment of target type [-Wcast-align]
  CC     src/libsystemd_core_la-load-dropin.lo
  CC     src/libsystemd_core_la-execute.lo
  CC     src/libsystemd_core_la-utmp-wtmp.lo
  CC     src/libsystemd_core_la-dbus.lo
  CC     src/libsystemd_core_la-dbus-manager.lo
  CC     src/libsystemd_core_la-dbus-unit.lo
  CC     src/libsystemd_core_la-dbus-job.lo
  CC     src/libsystemd_core_la-dbus-service.lo
  CC     src/libsystemd_core_la-dbus-socket.lo
  CC     src/libsystemd_core_la-dbus-timer.lo
  CC     src/libsystemd_core_la-dbus-target.lo
  CC     src/libsystemd_core_la-dbus-mount.lo
  CC     src/libsystemd_core_la-dbus-automount.lo
  CC     src/libsystemd_core_la-dbus-swap.lo
  CC     src/libsystemd_core_la-dbus-snapshot.lo
  CC     src/libsystemd_core_la-dbus-device.lo
  CC     src/libsystemd_core_la-dbus-execute.lo
  CC     src/libsystemd_core_la-dbus-path.lo
  CC     src/libsystemd_core_la-cgroup.lo
  CC     src/libsystemd_core_la-mount-setup.lo
  CC     src/libsystemd_core_la-hostname-setup.lo
  CC     src/libsystemd_core_la-selinux-setup.lo
  CC     src/libsystemd_core_la-loopback-setup.lo
src/loopback-setup.c: In function 'add_rtattr':
src/loopback-setup.c:50:15: warning: cast increases required alignment of target type [-Wcast-align]
  CC     src/libsystemd_core_la-kmod-setup.lo
  CC     src/libsystemd_core_la-locale-setup.lo
  CC     src/libsystemd_core_la-machine-id-setup.lo
  CC     src/libsystemd_core_la-specifier.lo
  CC     src/libsystemd_core_la-unit-name.lo
  CC     src/libsystemd_core_la-fdset.lo
  CC     src/libsystemd_core_la-namespace.lo
  CC     src/libsystemd_core_la-tcpwrap.lo
  CC     src/libsystemd_core_la-cgroup-util.lo
  CC     src/libsystemd_core_la-condition.lo
  CC     src/libsystemd_core_la-dbus-common.lo
  CCLD   libsystemd-core.la
arm-angstrom-linux-gnueabi-libtool: link: warning: `/oe/build-angstrom-next/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/lib/libpam.la' seems to be moved
  CC     src/sd-daemon.lo
  CCLD   libsystemd-daemon.la
  CC     src/pam_systemd_la-pam-module.lo
  CC     src/pam_systemd_la-cgroup-util.lo
  CCLD   pam_systemd.la
arm-angstrom-linux-gnueabi-libtool: link: warning: `/oe/build-angstrom-next/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/lib/libpam.la' seems to be moved
  CC     src/systemd_cgls-cgls.o
  CC     src/systemd_cgls-cgroup-show.o
  CC     src/systemd_cgls-cgroup-util.o
  CCLD   systemd-cgls
  CC     src/bridge.o
  CCLD   systemd-stdio-bridge
  CC     src/systemd_nspawn-nspawn.o
  CC     src/systemd_nspawn-cgroup-util.o
  CCLD   systemd-nspawn
  CC     src/test_engine-test-engine.o
  CCLD   test-engine
  CC     src/test_job_type-test-job-type.o
  CCLD   test-job-type
  CC     src/test_ns-test-ns.o
  CCLD   test-ns
  CC     src/test-loopback.o
  CC     src/loopback-setup.o
src/loopback-setup.c: In function 'add_rtattr':
src/loopback-setup.c:50:15: warning: cast increases required alignment of target type [-Wcast-align]
  CCLD   test-loopback
  CC     src/test-hostname.o
  CC     src/hostname-setup.o
  CCLD   test-hostname
  CC     src/test-daemon.o
  CCLD   test-daemon
  CC     src/test_cgroup-test-cgroup.o
  CC     src/test_cgroup-cgroup-util.o
  CCLD   test-cgroup
  CC     src/test_env_replace-test-env-replace.o
  CCLD   test-env-replace
  CC     src/test_strv-test-strv.o
  CC     src/test_strv-specifier.o
  CCLD   test-strv
  CC     src/systemd-main.o
  CCLD   systemd
  CC     src/systemctl-systemctl.o
  CC     src/systemctl-utmp-wtmp.o
  CC     src/systemctl-dbus-common.o
  CC     src/systemctl-path-lookup.o
  CC     src/systemctl-cgroup-show.o
  CC     src/systemctl-cgroup-util.o
  CC     src/systemctl-exit-status.o
  CC     src/systemctl-unit-name.o
  CCLD   systemctl
  CC     src/notify.o
  CC     src/sd-readahead.o
  CCLD   systemd-notify
  CC     src/ask-password.o
  CC     src/ask-password-api.o
src/ask-password-api.c: In function 'ask_password_agent':
src/ask-password-api.c:475:25: warning: cast increases required alignment of target type [-Wcast-align]
  CCLD   systemd-ask-password
  CC     src/tty-ask-password-agent.o
  CC     src/utmp-wtmp.o
  CCLD   systemd-tty-ask-password-agent
  CC     src/systemd_tmpfiles-tmpfiles.o
  CCLD   systemd-tmpfiles
  CC     src/systemd_machine_id_setup-machine-id-setup.o
  CC     src/systemd_machine_id_setup-machine-id-main.o
  CCLD   systemd-machine-id-setup
  CC     src/logger.o
src/logger.c: In function 'stream_log':
src/logger.c:164:25: warning: cast increases required alignment of target type [-Wcast-align]
  CC     src/tcpwrap.o
  CCLD   systemd-logger
  CC     src/systemd_cgroups_agent-cgroups-agent.o
  CC     src/systemd_cgroups_agent-dbus-common.o
  CCLD   systemd-cgroups-agent
  CC     src/systemd_initctl-initctl.o
  CC     src/systemd_initctl-dbus-common.o
  CCLD   systemd-initctl
  CC     src/systemd_update_utmp-update-utmp.o
  CC     src/systemd_update_utmp-dbus-common.o
  CC     src/systemd_update_utmp-utmp-wtmp.o
  CCLD   systemd-update-utmp
  CC     src/systemd_random_seed-random-seed.o
  CCLD   systemd-random-seed
  CC     src/systemd_shutdownd-utmp-wtmp.o
  CC     src/systemd_shutdownd-shutdownd.o
src/shutdownd.c: In function 'read_packet':
src/shutdownd.c:85:17: warning: cast increases required alignment of target type [-Wcast-align]
  CCLD   systemd-shutdownd
  CC     src/systemd_shutdown-mount-setup.o
  CC     src/systemd_shutdown-umount.o
  CC     src/systemd_shutdown-shutdown.o
  CCLD   systemd-shutdown
  CC     src/systemd_modules_load-modules-load.o
  CCLD   systemd-modules-load
  CC     src/systemd_remount_api_vfs-remount-api-vfs.o
  CC     src/systemd_remount_api_vfs-mount-setup.o
  CC     src/systemd_remount_api_vfs-exit-status.o
  CCLD   systemd-remount-api-vfs
  CC     src/systemd_kmsg_syslogd-kmsg-syslogd.o
src/kmsg-syslogd.c: In function 'process_event':
src/kmsg-syslogd.c:423:41: warning: cast increases required alignment of target type [-Wcast-align]
  CC     src/systemd_kmsg_syslogd-fdset.o
  CCLD   systemd-kmsg-syslogd
  CC     src/systemd_vconsole_setup-vconsole-setup.o
  CCLD   systemd-vconsole-setup
  CC     src/reply-password.o
  CCLD   systemd-reply-password
  CC     src/systemd_readahead_collect-readahead-collect.o
src/readahead-collect.c: In function 'collect':
src/readahead-collect.c:358:29: warning: cast increases required alignment of target type [-Wcast-align]
src/readahead-collect.c:376:37: warning: cast increases required alignment of target type [-Wcast-align]
  CC     src/systemd_readahead_collect-readahead-common.o
  CCLD   systemd-readahead-collect
  CC     src/systemd_readahead_replay-readahead-replay.o
src/readahead-replay.c: In function 'replay':
src/readahead-replay.c:213:51: warning: cast increases required alignment of target type [-Wcast-align]
src/readahead-replay.c:226:37: warning: cast increases required alignment of target type [-Wcast-align]
  CC     src/systemd_readahead_replay-readahead-common.o
  CCLD   systemd-readahead-replay
  CC     src/systemd_user_sessions-user-sessions.o
  CC     src/systemd_user_sessions-cgroup-util.o
  CCLD   systemd-user-sessions
  CC     src/systemd_fsck-fsck.o
  CC     src/systemd_fsck-dbus-common.o
  CCLD   systemd-fsck
  CC     src/systemd_quotacheck-quotacheck.o
  CCLD   systemd-quotacheck
  CC     src/systemd_timestamp-timestamp.o
  CCLD   systemd-timestamp
  CC     src/systemd_ac_power-ac-power.o
  CCLD   systemd-ac-power
  CC     src/systemd_detect_virt-detect-virt.o
  CCLD   systemd-detect-virt
  CC     src/systemd_sysctl-sysctl.o
  CCLD   systemd-sysctl
  CC     src/systemd_hostnamed-hostnamed.o
  CC     src/systemd_hostnamed-dbus-common.o
  CCLD   systemd-hostnamed
  CC     src/systemd_binfmt-binfmt.o
  CCLD   systemd-binfmt
  CC     src/systemd_getty_generator-getty-generator.o
  CC     src/systemd_getty_generator-unit-name.o
  CCLD   systemd-getty-generator
  GEN    man/systemd.1

I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
warning: failed to load external entity "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" cannot parse http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
make[1]: *** [man/systemd.1] Error 4
make[1]: Leaving directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/systemd-v26-r0/git'
make: *** [all] Error 2
+ die 'oe_runmake failed'
+ oefatal 'oe_runmake failed'
+ echo FATAL: 'oe_runmake failed'
FATAL: oe_runmake failed
+ exit 1

#4 lore raw

Am Montag, den 02.05.2011, 13:50 +0200 schrieb Paul Menzel:

Quoted 42 lines

Am Montag, den 02.05.2011, 10:22 +0200 schrieb Koen Kooi:

Quoted 16 lines
---
 recipes/systemd/files/disable_xml_generation.patch |   36 --------
 recipes/systemd/files/execute.patch                |   17 ----
 recipes/systemd/files/[email protected]        |   19 ----
 recipes/systemd/files/replace_accpet4.patch        |   26 ------
 recipes/systemd/files/systemadm.patch              |   13 ---
 ...-disable-xml-file-stuff-and-introspection.patch |   93 ++++++++++++++++++++
 recipes/systemd/systemd-v26/execute.patch          |   17 ++++
 recipes/systemd/systemd-v26/[email protected]  |   19 ++++
 recipes/systemd/systemd-v26/replace_accpet4.patch  |   26 ++++++
 recipes/systemd/systemd-v26/systemadm.patch        |   13 +++
 recipes/systemd/systemd_git.bb                     |   26 ++++--
 11 files changed, 185 insertions(+), 120 deletions(-)
 delete mode 100644 recipes/systemd/files/disable_xml_generation.patch
 delete mode 100644 recipes/systemd/files/execute.patch
Quoted 8 lines
 delete mode 100644 recipes/systemd/files/[email protected]
 delete mode 100644 recipes/systemd/files/replace_accpet4.patch
 delete mode 100644 recipes/systemd/files/systemadm.patch
 create mode 100644 recipes/systemd/systemd-v26/0001-systemd-disable-xml-file-stuff-and-introspection.patch
 create mode 100644 recipes/systemd/systemd-v26/execute.patch
 create mode 100644 recipes/systemd/systemd-v26/[email protected]
 create mode 100644 recipes/systemd/systemd-v26/replace_accpet4.patch
 create mode 100644 recipes/systemd/systemd-v26/systemadm.patch

git log --stat -M -C -C makes the diff lock much more daunting.

[…]

Quoted 12 lines
recipes/systemd/systemd-v26/systemadm.patch new file +9 -0
@@ -0,0 +1,13 @@
+Index: git/src/systemadm.vala
+===================================================================
+--- git.orig/src/systemadm.vala	2010-06-15 11:02:35.863509632 +0200
++++ git/src/systemadm.vala	2010-06-15 11:06:16.305986249 +0200
+@@ -297,7 +297,7 @@
+ 
+                 bbox.pack_start(cancel_button, false, true, 0);
+ 
+-                bus = Bus.get(session ? BusType.SESSION : BusType.SYSTEM);
Quoted 8 lines

recipes/systemd/systemd_git.bb

Quoted 8 lines
recipes/systemd/systemd-v26/systemadm.patch new file +4 -0
++                bus = DBus.Bus.get(session ? DBus.BusType.SESSION : DBus.BusType.SYSTEM);
+ 
+                 manager = bus.get_object(
+                                 "org.freedesktop.systemd1",
recipes/systemd/systemd_git.bb +0 -0
index 5f98e54..7634b22 100644

Thinking about it, should not this be named system_26.bb to avoid confusion?

Quoted 8 lines

recipes/systemd/systemd_git.bb line 6

Quoted 8 lines
recipes/systemd/systemd_git.bb +3 -1
@@ -1,48 +1,56 @@
 DESCRIPTION = "Systemd a init replacement"
 HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd"
-LICENSE = "GPL"
+LICENSE = "GPLv2+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
+
 DEPENDS = "readline udev dbus libcap2 libcgroup gtk+"

gtk+ should be removed. Actually I would prefer a separate patch including disabling it.

Quoted 91 lines

recipes/systemd/systemd_git.bb line 11

Quoted 7 lines
recipes/systemd/systemd_git.bb +2 -2
 PRIORITY = "optional"
 SECTION = "base/shell"
 
-PV = "0.0"
-PR_append = "+${SRCPV}"
+PV = "v26"
+#PR_append = "+${SRCPV}"

Remove the commented line.

recipes/systemd/systemd_git.bb line 19

Quoted 10 lines
recipes/systemd/systemd_git.bb +2 -3
 inherit autotools vala
 
-TAG = "1ebdf2d8793181f31b766b8342391aa1978f9917"
+TAG = "${PV}"
 
 SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git;tag=${TAG} \
            file://execute.patch \
-           file://systemadm.patch \
-           file://disable_xml_generation.patch \
+#           file://systemadm.patch \

Maybe a comment in the recipe or the commit message would be nice, why this is commented. Could it be needed in the future?

recipes/systemd/systemd_git.bb line 27

Quoted 8 lines
recipes/systemd/systemd_git.bb +2 -0
+           file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \
            file://replace_accpet4.patch \
            file://[email protected] \
           "
 
 S = "${WORKDIR}/git"
 
+# The gtk+ tools should get built as a seperate recipe e.g. systemd-tools

s/seperate/separate/

… to not force people to build all gtk+ packages/recipes.

Quoted 22 lines
recipes/systemd/systemd_git.bb +4 -2
 EXTRA_OECONF = " --with-distro=debian \
                  --with-rootdir=${base_prefix} \
+                 --disable-gtk \
                "
 
-PACKAGES = "${PN} ${PN}-gui ${PN}-dbg ${PN}-doc"
+PACKAGES =+ "${PN}-gui"
 
 FILES_${PN}-gui = "${bindir}/systemadm"
 
 FILES_${PN} = " ${base_bindir}/* \
                 ${datadir}/dbus-1/services \
                 ${datadir}/dbus-1/system-services \
+                ${datadir}/polkit-1 \
                 ${datadir}/${PN} \
                 ${sysconfdir} \
                 ${base_libdir}/systemd/* \
                 ${base_libdir}/systemd/system/* \
                 ${base_libdir}/udev/rules.d \
+                ${base_libdir}/security/*.so \
                 /cgroup \
-                ${bindir}/systemd-install \

recipes/systemd/systemd_git.bb line 56

Quoted 10 lines
recipes/systemd/systemd_git.bb +4 -1
+                ${bindir}/systemd* \
+                ${libdir}/tmpfiles.d/*.conf \
+                ${libdir}/systemd \
                "
 
-FILES_${PN}-dbg += " /lib/systemd/.debug "
+FILES_${PN}-dbg += "${base_libdir}/systemd/.debug ${base_libdir}/systemd/*/.debug"
 
 def get_baudrate(bb, d):
     return bb.data.getVar('SERIAL_CONSOLE', d, 1).split()[0]

A split in two commits to fix/improve the recipe and to update to v26 would have been nice.

Anyway, using angstrom-2010.x for MACHINE = "beagleboard" fails with the following error message.

[…]
CCLD systemd-getty-generator
GEN man/systemd.1
I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
warning: failed to load external entity "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" cannot parse http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
make[1]: *** [man/systemd.1] Error 4
make[1]: Leaving directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/systemd-v26-r0/git'
make: *** [all] Error 2
+ die 'oe_runmake failed'
+ oefatal 'oe_runmake failed'
+ echo FATAL: 'oe_runmake failed'
FATAL: oe_runmake failed
+ exit 1

Quoted 1 line

Please find log.do_compile attached.

Thanks,

Paul

#5 lore raw

Dear Koen,

Am Montag, den 02.05.2011, 14:56 +0200 schrieb Paul Menzel:

Quoted 55 lines

Am Montag, den 02.05.2011, 13:50 +0200 schrieb Paul Menzel:

Quoted 42 lines

Am Montag, den 02.05.2011, 10:22 +0200 schrieb Koen Kooi:

Quoted 16 lines
---
 recipes/systemd/files/disable_xml_generation.patch |   36 --------
 recipes/systemd/files/execute.patch                |   17 ----
 recipes/systemd/files/[email protected]        |   19 ----
 recipes/systemd/files/replace_accpet4.patch        |   26 ------
 recipes/systemd/files/systemadm.patch              |   13 ---
 ...-disable-xml-file-stuff-and-introspection.patch |   93 ++++++++++++++++++++
 recipes/systemd/systemd-v26/execute.patch          |   17 ++++
 recipes/systemd/systemd-v26/[email protected]  |   19 ++++
 recipes/systemd/systemd-v26/replace_accpet4.patch  |   26 ++++++
 recipes/systemd/systemd-v26/systemadm.patch        |   13 +++
 recipes/systemd/systemd_git.bb                     |   26 ++++--
 11 files changed, 185 insertions(+), 120 deletions(-)
 delete mode 100644 recipes/systemd/files/disable_xml_generation.patch
 delete mode 100644 recipes/systemd/files/execute.patch
Quoted 8 lines
 delete mode 100644 recipes/systemd/files/[email protected]
 delete mode 100644 recipes/systemd/files/replace_accpet4.patch
 delete mode 100644 recipes/systemd/files/systemadm.patch
 create mode 100644 recipes/systemd/systemd-v26/0001-systemd-disable-xml-file-stuff-and-introspection.patch
 create mode 100644 recipes/systemd/systemd-v26/execute.patch
 create mode 100644 recipes/systemd/systemd-v26/[email protected]
 create mode 100644 recipes/systemd/systemd-v26/replace_accpet4.patch
 create mode 100644 recipes/systemd/systemd-v26/systemadm.patch

git log --stat -M -C -C makes the diff lock much more daunting.

[…]

Quoted 12 lines
recipes/systemd/systemd-v26/systemadm.patch new file +9 -0
@@ -0,0 +1,13 @@
+Index: git/src/systemadm.vala
+===================================================================
+--- git.orig/src/systemadm.vala	2010-06-15 11:02:35.863509632 +0200
++++ git/src/systemadm.vala	2010-06-15 11:06:16.305986249 +0200
+@@ -297,7 +297,7 @@
+ 
+                 bbox.pack_start(cancel_button, false, true, 0);
+ 
+-                bus = Bus.get(session ? BusType.SESSION : BusType.SYSTEM);
Quoted 8 lines

recipes/systemd/systemd_git.bb

Quoted 8 lines
recipes/systemd/systemd-v26/systemadm.patch new file +4 -0
++                bus = DBus.Bus.get(session ? DBus.BusType.SESSION : DBus.BusType.SYSTEM);
+ 
+                 manager = bus.get_object(
+                                 "org.freedesktop.systemd1",
recipes/systemd/systemd_git.bb +0 -0
index 5f98e54..7634b22 100644

Thinking about it, should not this be named system_26.bb to avoid confusion?

Quoted 104 lines
Quoted 8 lines

recipes/systemd/systemd_git.bb line 6

Quoted 8 lines
recipes/systemd/systemd_git.bb +3 -1
@@ -1,48 +1,56 @@
 DESCRIPTION = "Systemd a init replacement"
 HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd"
-LICENSE = "GPL"
+LICENSE = "GPLv2+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
+
 DEPENDS = "readline udev dbus libcap2 libcgroup gtk+"

gtk+ should be removed. Actually I would prefer a separate patch including disabling it.

Quoted 92 lines

recipes/systemd/systemd_git.bb line 11

Quoted 7 lines
recipes/systemd/systemd_git.bb +2 -2
 PRIORITY = "optional"
 SECTION = "base/shell"
 
-PV = "0.0"
-PR_append = "+${SRCPV}"
+PV = "v26"
+#PR_append = "+${SRCPV}"

Remove the commented line.

recipes/systemd/systemd_git.bb line 19

Quoted 10 lines
recipes/systemd/systemd_git.bb +2 -3
 inherit autotools vala
 
-TAG = "1ebdf2d8793181f31b766b8342391aa1978f9917"
+TAG = "${PV}"
 
 SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git;tag=${TAG} \
            file://execute.patch \
-           file://systemadm.patch \
-           file://disable_xml_generation.patch \
+#           file://systemadm.patch \

Maybe a comment in the recipe or the commit message would be nice, why this is commented. Could it be needed in the future?

recipes/systemd/systemd_git.bb line 27

Quoted 8 lines
recipes/systemd/systemd_git.bb +2 -0
+           file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \
            file://replace_accpet4.patch \
            file://[email protected] \
           "
 
 S = "${WORKDIR}/git"
 
+# The gtk+ tools should get built as a seperate recipe e.g. systemd-tools

s/seperate/separate/

… to not force people to build all gtk+ packages/recipes.

Quoted 22 lines
recipes/systemd/systemd_git.bb +4 -2
 EXTRA_OECONF = " --with-distro=debian \
                  --with-rootdir=${base_prefix} \
+                 --disable-gtk \
                "
 
-PACKAGES = "${PN} ${PN}-gui ${PN}-dbg ${PN}-doc"
+PACKAGES =+ "${PN}-gui"
 
 FILES_${PN}-gui = "${bindir}/systemadm"
 
 FILES_${PN} = " ${base_bindir}/* \
                 ${datadir}/dbus-1/services \
                 ${datadir}/dbus-1/system-services \
+                ${datadir}/polkit-1 \
                 ${datadir}/${PN} \
                 ${sysconfdir} \
                 ${base_libdir}/systemd/* \
                 ${base_libdir}/systemd/system/* \
                 ${base_libdir}/udev/rules.d \
+                ${base_libdir}/security/*.so \
                 /cgroup \
-                ${bindir}/systemd-install \

recipes/systemd/systemd_git.bb line 56

Quoted 10 lines
recipes/systemd/systemd_git.bb +4 -1
+                ${bindir}/systemd* \
+                ${libdir}/tmpfiles.d/*.conf \
+                ${libdir}/systemd \
                "
 
-FILES_${PN}-dbg += " /lib/systemd/.debug "
+FILES_${PN}-dbg += "${base_libdir}/systemd/.debug ${base_libdir}/systemd/*/.debug"
 
 def get_baudrate(bb, d):
     return bb.data.getVar('SERIAL_CONSOLE', d, 1).split()[0]

A split in two commits to fix/improve the recipe and to update to v26 would have been nice.

Anyway, using angstrom-2010.x for MACHINE = "beagleboard" fails with the following error message.

[…]
CCLD systemd-getty-generator
GEN man/systemd.1
I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
warning: failed to load external entity "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" cannot parse http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
make[1]: *** [man/systemd.1] Error 4
make[1]: Leaving directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/systemd-v26-r0/git'
make: *** [all] Error 2
+ die 'oe_runmake failed'
+ oefatal 'oe_runmake failed'
+ echo FATAL: 'oe_runmake failed'
FATAL: oe_runmake failed
+ exit 1

Please find log.do_compile attached.

why did you ignore my comments and pushed anyway in 1f14659d [1]?

Thanks,

Paul

[1] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=1f14659d5e01f1896ed8899900d2d10745993eea

author
#6 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 162 lines · Paul Menzel

Dear Koen,

Am Montag, den 02.05.2011, 14:56 +0200 schrieb Paul Menzel:

Quoted 158 lines

Am Montag, den 02.05.2011, 13:50 +0200 schrieb Paul Menzel:

Quoted 42 lines

Am Montag, den 02.05.2011, 10:22 +0200 schrieb Koen Kooi:

Quoted 16 lines
---
 recipes/systemd/files/disable_xml_generation.patch |   36 --------
 recipes/systemd/files/execute.patch                |   17 ----
 recipes/systemd/files/[email protected]        |   19 ----
 recipes/systemd/files/replace_accpet4.patch        |   26 ------
 recipes/systemd/files/systemadm.patch              |   13 ---
 ...-disable-xml-file-stuff-and-introspection.patch |   93 ++++++++++++++++++++
 recipes/systemd/systemd-v26/execute.patch          |   17 ++++
 recipes/systemd/systemd-v26/[email protected]  |   19 ++++
 recipes/systemd/systemd-v26/replace_accpet4.patch  |   26 ++++++
 recipes/systemd/systemd-v26/systemadm.patch        |   13 +++
 recipes/systemd/systemd_git.bb                     |   26 ++++--
 11 files changed, 185 insertions(+), 120 deletions(-)
 delete mode 100644 recipes/systemd/files/disable_xml_generation.patch
 delete mode 100644 recipes/systemd/files/execute.patch
Quoted 8 lines
 delete mode 100644 recipes/systemd/files/[email protected]
 delete mode 100644 recipes/systemd/files/replace_accpet4.patch
 delete mode 100644 recipes/systemd/files/systemadm.patch
 create mode 100644 recipes/systemd/systemd-v26/0001-systemd-disable-xml-file-stuff-and-introspection.patch
 create mode 100644 recipes/systemd/systemd-v26/execute.patch
 create mode 100644 recipes/systemd/systemd-v26/[email protected]
 create mode 100644 recipes/systemd/systemd-v26/replace_accpet4.patch
 create mode 100644 recipes/systemd/systemd-v26/systemadm.patch

git log --stat -M -C -C makes the diff lock much more daunting.

[…]

Quoted 12 lines
recipes/systemd/systemd-v26/systemadm.patch new file +9 -0
@@ -0,0 +1,13 @@
+Index: git/src/systemadm.vala
+===================================================================
+--- git.orig/src/systemadm.vala	2010-06-15 11:02:35.863509632 +0200
++++ git/src/systemadm.vala	2010-06-15 11:06:16.305986249 +0200
+@@ -297,7 +297,7 @@
+ 
+                 bbox.pack_start(cancel_button, false, true, 0);
+ 
+-                bus = Bus.get(session ? BusType.SESSION : BusType.SYSTEM);
Quoted 8 lines

recipes/systemd/systemd_git.bb

Quoted 8 lines
recipes/systemd/systemd-v26/systemadm.patch new file +4 -0
++                bus = DBus.Bus.get(session ? DBus.BusType.SESSION : DBus.BusType.SYSTEM);
+ 
+                 manager = bus.get_object(
+                                 "org.freedesktop.systemd1",
recipes/systemd/systemd_git.bb +0 -0
index 5f98e54..7634b22 100644

Thinking about it, should not this be named system_26.bb to avoid confusion?

Quoted 8 lines

recipes/systemd/systemd_git.bb line 6

Quoted 8 lines
recipes/systemd/systemd_git.bb +3 -1
@@ -1,48 +1,56 @@
 DESCRIPTION = "Systemd a init replacement"
 HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd"
-LICENSE = "GPL"
+LICENSE = "GPLv2+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
+
 DEPENDS = "readline udev dbus libcap2 libcgroup gtk+"

gtk+ should be removed. Actually I would prefer a separate patch including disabling it.

Quoted 91 lines

recipes/systemd/systemd_git.bb line 11

Quoted 7 lines
recipes/systemd/systemd_git.bb +2 -2
 PRIORITY = "optional"
 SECTION = "base/shell"
 
-PV = "0.0"
-PR_append = "+${SRCPV}"
+PV = "v26"
+#PR_append = "+${SRCPV}"

Remove the commented line.

recipes/systemd/systemd_git.bb line 19

Quoted 10 lines
recipes/systemd/systemd_git.bb +2 -3
 inherit autotools vala
 
-TAG = "1ebdf2d8793181f31b766b8342391aa1978f9917"
+TAG = "${PV}"
 
 SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git;tag=${TAG} \
            file://execute.patch \
-           file://systemadm.patch \
-           file://disable_xml_generation.patch \
+#           file://systemadm.patch \

Maybe a comment in the recipe or the commit message would be nice, why this is commented. Could it be needed in the future?

recipes/systemd/systemd_git.bb line 27

Quoted 8 lines
recipes/systemd/systemd_git.bb +2 -0
+           file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \
            file://replace_accpet4.patch \
            file://[email protected] \
           "
 
 S = "${WORKDIR}/git"
 
+# The gtk+ tools should get built as a seperate recipe e.g. systemd-tools

s/seperate/separate/

… to not force people to build all gtk+ packages/recipes.

Quoted 22 lines
recipes/systemd/systemd_git.bb +4 -2
 EXTRA_OECONF = " --with-distro=debian \
                  --with-rootdir=${base_prefix} \
+                 --disable-gtk \
                "
 
-PACKAGES = "${PN} ${PN}-gui ${PN}-dbg ${PN}-doc"
+PACKAGES =+ "${PN}-gui"
 
 FILES_${PN}-gui = "${bindir}/systemadm"
 
 FILES_${PN} = " ${base_bindir}/* \
                 ${datadir}/dbus-1/services \
                 ${datadir}/dbus-1/system-services \
+                ${datadir}/polkit-1 \
                 ${datadir}/${PN} \
                 ${sysconfdir} \
                 ${base_libdir}/systemd/* \
                 ${base_libdir}/systemd/system/* \
                 ${base_libdir}/udev/rules.d \
+                ${base_libdir}/security/*.so \
                 /cgroup \
-                ${bindir}/systemd-install \

recipes/systemd/systemd_git.bb line 56

Quoted 10 lines
recipes/systemd/systemd_git.bb +4 -1
+                ${bindir}/systemd* \
+                ${libdir}/tmpfiles.d/*.conf \
+                ${libdir}/systemd \
                "
 
-FILES_${PN}-dbg += " /lib/systemd/.debug "
+FILES_${PN}-dbg += "${base_libdir}/systemd/.debug ${base_libdir}/systemd/*/.debug"
 
 def get_baudrate(bb, d):
     return bb.data.getVar('SERIAL_CONSOLE', d, 1).split()[0]

A split in two commits to fix/improve the recipe and to update to v26 would have been nice.

Anyway, using angstrom-2010.x for MACHINE = "beagleboard" fails with the following error message.

[…]
CCLD systemd-getty-generator
GEN man/systemd.1
I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
warning: failed to load external entity "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" cannot parse http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
make[1]: *** [man/systemd.1] Error 4
make[1]: Leaving directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/systemd-v26-r0/git'
make: *** [all] Error 2
+ die 'oe_runmake failed'
+ oefatal 'oe_runmake failed'
+ echo FATAL: 'oe_runmake failed'
FATAL: oe_runmake failed
+ exit 1

Quoted 3 lines
Quoted 1 line
Quoted 1 line

Please find log.do_compile attached.

why did you ignore my comments and pushed anyway in 1f14659d [1]?

You might have noticed that the patch I pushed is quite different from the one I sent to this list.

Anyway, Henning OK'd the patch:

10:00 < koen> woglinde_: OK to commit the patch so you can fix up epoll later?
10:01 < woglinde_> koen its booting
10:01 < woglinde_> so commit it

And since he's the maintainer I pushed it.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNw7+gMkyGM64RGpERAnAwAJ9Hkk3agonPzHzp06YrZzPD2sbBPQCghkEU g0+AycJHMgLgbbj+mR0oIEI=
=9eoo
-----END PGP SIGNATURE-----

#7 lore raw

Am Freitag, den 06.05.2011, 11:30 +0200 schrieb Koen Kooi:

Quoted 1 line · Paul Menzel

[…]

Quoted 4 lines
Quoted 1 line

why did you ignore my comments and pushed anyway in 1f14659d [1]?

You might have noticed that the patch I pushed is quite different from the one I sent to this list.

Right. Still there were parts I had commented on that were the same and you did not fix [1][2].

Quoted 8 lines

Anyway, Henning OK'd the patch:

10:00 < koen> woglinde_: OK to commit the patch so you can fix up epoll later?
10:01 < woglinde_> koen its booting
10:01 < woglinde_> so commit it

And since he's the maintainer I pushed it.

Leaving aside that this is not documented anywhere (please do not get me wrong, I am glad that Henning is the maintainer and you are improving the recipe), you should have put his Acked-by line into the commit message. How should I know otherwise?

Thanks and good night,

Paul

[1] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=b8f1b8e7c876d6171839dfee6e48a2b73df54002
[2] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=ef7114f6ac9145eb31639cc65dfdc7f3615ece9e

#8 lore raw

Recipe for docbook-xsl useful? (was: [PATCH] systemd: update to v26)

In reply to Paul Menzel

Dear OE folks,

Am Montag, den 02.05.2011, 13:50 +0200 schrieb Paul Menzel:

[…]

Quoted 17 lines

Anyway, using angstrom-2010.x for MACHINE = "beagleboard" fails with the following error message.

[…]
CCLD systemd-getty-generator
GEN man/systemd.1
I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
warning: failed to load external entity "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" cannot parse http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
make[1]: *** [man/systemd.1] Error 4
make[1]: Leaving directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/systemd-v26-r0/git'
make: *** [all] Error 2
+ die 'oe_runmake failed'
+ oefatal 'oe_runmake failed'
+ echo FATAL: 'oe_runmake failed'
FATAL: oe_runmake failed
+ exit 1

systemd depends on docbook-xsl to generate the manual pages. I do not have that installed on my build system.

I found a recipe in recipes/nonworking [1] which dates back from the import of the BitKeeper tree into Git and which has just SRC_URI entries.

Basically these are just the XML/XSL files which need to be copied to the correct location and somehow registered using xmlcatalog(?) from libxml2-utils.

Has anyone of you tried to create a recipe for docbook-xsl or was it considered not useful for the effort needed and therefore recommended to install it locally on the build system?

Thanks,

Paul

[1] http://cgit.openembedded.org/cgit.cgi/openembedded/tree/recipes/nonworking/docbook-xsl?id=ef7114f6ac9145eb31639cc65dfdc7f3615ece9e