[oe] [PATCH] systemd: update to v26
Paul Menzel
paulepanter at users.sourceforge.net
Mon May 2 11:50:15 UTC 2011
Am Montag, den 02.05.2011, 10:22 +0200 schrieb Koen Kooi:
> Signed-off-by: Koen Kooi <koen at openembedded.org>
> ---
> recipes/systemd/files/disable_xml_generation.patch | 36 --------
> recipes/systemd/files/execute.patch | 17 ----
> recipes/systemd/files/getty-serial at .service | 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/getty-serial at .service | 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/getty-serial at .service
> 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/getty-serial at .service
> 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.
[…]
> --- /dev/null
> +++ b/recipes/systemd/systemd-v26/systemadm.patch
> @@ -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",
> diff --git a/recipes/systemd/systemd_git.bb b/recipes/systemd/systemd_git.bb
> index 5f98e54..7634b22 100644
> --- a/recipes/systemd/systemd_git.bb
> +++ b/recipes/systemd/systemd_git.bb
> @@ -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}"
Remove the commented line.
> 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?
> + file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \
> file://replace_accpet4.patch \
> file://getty-serial@.service \
> "
>
> 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.
> 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]
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
-------------- next part --------------
+ 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20110502/8bad5cb2/attachment-0002.sig>
More information about the Openembedded-devel
mailing list