diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2012-01-19 14:04:16 +0100 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-01-20 08:24:37 +0100 |
commit | 6cb51af0e1f09e7658cd1bfdc721cb5106ec9dfd (patch) | |
tree | b0c8fd2d131ac93969fa50de527238a0d467ba52 /meta-oe/recipes-core | |
parent | 3767262f9e626c49638dc886adbdf58b167de61c (diff) | |
download | meta-openembedded-6cb51af0e1f09e7658cd1bfdc721cb5106ec9dfd.tar.gz |
systemd: update to v38+git
* This introduces the 'journal' feature.
* Upstream is following the fedora /usr move so EXTRA_OECONF needs to get updated to keep the paths the same for the OE usecase
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-core')
3 files changed, 43 insertions, 40 deletions
diff --git a/meta-oe/recipes-core/systemd/systemd/0001-disable-xsltproc-completely.patch b/meta-oe/recipes-core/systemd/systemd/0001-disable-xsltproc-completely.patch deleted file mode 100644 index 24940c780..000000000 --- a/meta-oe/recipes-core/systemd/systemd/0001-disable-xsltproc-completely.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From 2649787d76cfe7d89abb1b5afab7cb7cd54b601b Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Sun, 2 Oct 2011 19:54:29 +0200 | ||
4 | Subject: [PATCH] docs: fix build without xsltproc | ||
5 | |||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
7 | --- | ||
8 | |||
9 | Upstream-status: Pending | ||
10 | |||
11 | Makefile.am | 2 ++ | ||
12 | 2 files changed, 2 insertions(+), 1 deletions(-) | ||
13 | |||
14 | diff --git a/Makefile.am b/Makefile.am | ||
15 | index f4a17aa..01240a5 100644 | ||
16 | --- a/Makefile.am | ||
17 | +++ b/Makefile.am | ||
18 | @@ -750,6 +750,7 @@ EXTRA_DIST += \ | ||
19 | src/dbus-loop.h \ | ||
20 | src/spawn-agent.h | ||
21 | |||
22 | +if HAVE_XSLTPROC | ||
23 | MANPAGES = \ | ||
24 | man/systemd.1 \ | ||
25 | man/systemctl.1 \ | ||
26 | @@ -844,6 +845,7 @@ EXTRA_DIST += \ | ||
27 | $(XML_IN_FILES) \ | ||
28 | ${nodist_man_MANS:=.in} \ | ||
29 | ${XML_IN_FILES:.xml.in=.html.in} | ||
30 | +endif | ||
31 | |||
32 | systemd_SOURCES = \ | ||
33 | src/main.c | ||
34 | -- | ||
35 | 1.6.6.1 | ||
36 | |||
diff --git a/meta-oe/recipes-core/systemd/systemd/0001-docs-fix-build-without-xsltproc.patch b/meta-oe/recipes-core/systemd/systemd/0001-docs-fix-build-without-xsltproc.patch new file mode 100644 index 000000000..1fec57011 --- /dev/null +++ b/meta-oe/recipes-core/systemd/systemd/0001-docs-fix-build-without-xsltproc.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 97719ec99e3bd0040b616b044ab6ae33ae1cfd15 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Sun, 2 Oct 2011 19:54:29 +0200 | ||
4 | Subject: [PATCH 1/2] docs: fix build without xsltproc | ||
5 | |||
6 | Make would choke on missing rules for man/systemd.1 | ||
7 | |||
8 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
9 | --- | ||
10 | Makefile.am | 5 +++++ | ||
11 | 1 files changed, 5 insertions(+), 0 deletions(-) | ||
12 | |||
13 | diff --git a/Makefile.am b/Makefile.am | ||
14 | index 110a2f4..a5e57b7 100644 | ||
15 | --- a/Makefile.am | ||
16 | +++ b/Makefile.am | ||
17 | @@ -650,6 +650,7 @@ EXTRA_DIST += \ | ||
18 | src/acl-util.h \ | ||
19 | src/logs-show.h | ||
20 | |||
21 | +if HAVE_XSLTPROC | ||
22 | MANPAGES = \ | ||
23 | man/systemd.1 \ | ||
24 | man/systemctl.1 \ | ||
25 | @@ -721,6 +722,10 @@ EXTRA_DIST += \ | ||
26 | $(XML_IN_FILES) \ | ||
27 | ${nodist_man_MANS:=.in} \ | ||
28 | ${XML_IN_FILES:.xml.in=.html.in} | ||
29 | +else | ||
30 | +MANPAGES = | ||
31 | +MANPAGES_ALIAS = | ||
32 | +endif | ||
33 | |||
34 | systemd_SOURCES = \ | ||
35 | src/main.c | ||
36 | -- | ||
37 | 1.7.2.5 | ||
38 | |||
diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb index bdaaf1659..32bdee941 100644 --- a/meta-oe/recipes-core/systemd/systemd_git.bb +++ b/meta-oe/recipes-core/systemd/systemd_git.bb | |||
@@ -14,14 +14,14 @@ inherit gitpkgv | |||
14 | PKGV = "v${GITPKGVTAG}" | 14 | PKGV = "v${GITPKGVTAG}" |
15 | 15 | ||
16 | PV = "git" | 16 | PV = "git" |
17 | PR = "r7" | 17 | PR = "r8" |
18 | 18 | ||
19 | inherit useradd pkgconfig autotools vala perlnative | 19 | inherit useradd pkgconfig autotools vala perlnative |
20 | 20 | ||
21 | SRCREV = "f6cebb3bd5a00d79c8131637c0f6796a75e6af99" | 21 | SRCREV = "a3f914b2a21decb0c4bd7a763ddd3ace215091cb" |
22 | 22 | ||
23 | SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \ | 23 | SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \ |
24 | file://0001-disable-xsltproc-completely.patch \ | 24 | file://0001-docs-fix-build-without-xsltproc.patch \ |
25 | ${UCLIBCPATCHES} \ | 25 | ${UCLIBCPATCHES} \ |
26 | " | 26 | " |
27 | UCLIBCPATCHES = "" | 27 | UCLIBCPATCHES = "" |
@@ -38,7 +38,8 @@ SYSTEMDDISTRO_angstrom = "angstrom" | |||
38 | 38 | ||
39 | # The gtk+ tools should get built as a separate recipe e.g. systemd-tools | 39 | # The gtk+ tools should get built as a separate recipe e.g. systemd-tools |
40 | EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \ | 40 | EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \ |
41 | --with-rootdir=${base_prefix} \ | 41 | --with-rootprefix=${base_prefix} \ |
42 | --with-rootlibdir=${base_libdir} \ | ||
42 | ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ | 43 | ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ |
43 | --disable-gtk \ | 44 | --disable-gtk \ |
44 | " | 45 | " |