diff options
author | Khem Raj <raj.khem@gmail.com> | 2014-03-04 15:22:15 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-07 14:49:33 +0000 |
commit | fcbb05c248e13726cd8c2c2cf6771ca704309f45 (patch) | |
tree | 45b85ae44142f5d9ef1712b73a2693ca788b3e81 /meta/recipes-core/systemd/systemd_208.bb | |
parent | 229bcde8e445344bd6906cc8fab0088123ba6add (diff) | |
download | poky-fcbb05c248e13726cd8c2c2cf6771ca704309f45.tar.gz |
Upgrade to systemd-stable v208
Additional changes in ptest code since now
we have directories and not only bunch of files
under test/ dir so a simple install does not
work anymore we have to cp the files
(From OE-Core rev: e201f291b269c70d732778b34de01529aca387b5)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd_208.bb')
-rw-r--r-- | meta/recipes-core/systemd/systemd_208.bb | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/meta/recipes-core/systemd/systemd_208.bb b/meta/recipes-core/systemd/systemd_208.bb index 1bcedaa28a..98da15c434 100644 --- a/meta/recipes-core/systemd/systemd_208.bb +++ b/meta/recipes-core/systemd/systemd_208.bb | |||
@@ -17,22 +17,20 @@ SECTION = "base/shell" | |||
17 | 17 | ||
18 | inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest | 18 | inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest |
19 | 19 | ||
20 | SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \ | 20 | SRCREV = "255eb046a7bcb90e60a3a54302bc1250c1aed26a" |
21 | file://0001-Use-bin-mkdir-instead-of-host-mkdir-path.patch \ | 21 | |
22 | PV = "208+git${SRCPV}" | ||
23 | |||
24 | SRC_URI = "git://anongit.freedesktop.org/systemd/systemd-stable;branch=v208-stable;protocol=git \ | ||
22 | file://binfmt-install.patch \ | 25 | file://binfmt-install.patch \ |
23 | file://journald-add-missing-error-check.patch \ | ||
24 | file://journald-fix-minor-memory-leak.patch \ | ||
25 | file://journal-when-appending-to-journal-file-allocate-larg.patch \ | ||
26 | file://journal-file-protect-against-alloca-0.patch \ | ||
27 | file://journal-Add-missing-byte-order-conversions.patch \ | ||
28 | file://touchscreen.rules \ | 26 | file://touchscreen.rules \ |
29 | ${UCLIBCPATCHES} \ | 27 | ${UCLIBCPATCHES} \ |
30 | file://00-create-volatile.conf \ | 28 | file://00-create-volatile.conf \ |
31 | file://init \ | 29 | file://init \ |
32 | file://run-ptest \ | 30 | file://run-ptest \ |
33 | " | 31 | " |
34 | SRC_URI[md5sum] = "df64550d92afbffb4f67a434193ee165" | 32 | |
35 | SRC_URI[sha256sum] = "aa64fa864466fd5727005c55d61c092828b94b4f857272c0b503695022146390" | 33 | S = "${WORKDIR}/git" |
36 | 34 | ||
37 | UCLIBCPATCHES = "" | 35 | UCLIBCPATCHES = "" |
38 | UCLIBCPATCHES_libc-uclibc = "file://systemd-pam-configure-check-uclibc.patch \ | 36 | UCLIBCPATCHES_libc-uclibc = "file://systemd-pam-configure-check-uclibc.patch \ |
@@ -76,7 +74,6 @@ EXTRA_OECONF = " --with-rootprefix=${rootprefix} \ | |||
76 | --disable-manpages \ | 74 | --disable-manpages \ |
77 | --disable-coredump \ | 75 | --disable-coredump \ |
78 | --disable-introspection \ | 76 | --disable-introspection \ |
79 | --disable-tcpwrap \ | ||
80 | --enable-split-usr \ | 77 | --enable-split-usr \ |
81 | --without-python \ | 78 | --without-python \ |
82 | --with-sysvrcnd-path=${sysconfdir} \ | 79 | --with-sysvrcnd-path=${sysconfdir} \ |
@@ -104,8 +101,8 @@ do_install() { | |||
104 | rm ${D}${systemd_unitdir}/system/serial-getty* -f | 101 | rm ${D}${systemd_unitdir}/system/serial-getty* -f |
105 | 102 | ||
106 | # Provide support for initramfs | 103 | # Provide support for initramfs |
107 | ln -s ${rootlibexecdir}/systemd/systemd ${D}/init | 104 | [ ! -e ${D}/init ] && ln -s ${rootlibexecdir}/systemd/systemd ${D}/init |
108 | ln -s ${rootlibexecdir}/systemd/systemd-udevd ${D}/${base_sbindir}/udevd | 105 | [ ! -e ${D}/${base_sbindir}/udevd ] && ln -s ${rootlibexecdir}/systemd/systemd-udevd ${D}/${base_sbindir}/udevd |
109 | 106 | ||
110 | # Create machine-id | 107 | # Create machine-id |
111 | # 20:12 < mezcalero> koen: you have three options: a) run systemd-machine-id-setup at install time, b) have / read-only and an empty file there (for stateless) and c) boot with / writable | 108 | # 20:12 < mezcalero> koen: you have three options: a) run systemd-machine-id-setup at install time, b) have / read-only and an empty file there (for stateless) and c) boot with / writable |
@@ -127,7 +124,7 @@ do_install() { | |||
127 | 124 | ||
128 | do_install_ptest () { | 125 | do_install_ptest () { |
129 | install -d ${D}${PTEST_PATH}/test | 126 | install -d ${D}${PTEST_PATH}/test |
130 | install ${S}/test/* ${D}${PTEST_PATH}/test | 127 | cp -rf ${S}/test/* ${D}${PTEST_PATH}/test |
131 | install -m 0755 ${B}/test-udev ${D}${PTEST_PATH}/ | 128 | install -m 0755 ${B}/test-udev ${D}${PTEST_PATH}/ |
132 | install -d ${D}${PTEST_PATH}/build-aux | 129 | install -d ${D}${PTEST_PATH}/build-aux |
133 | cp ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ | 130 | cp ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ |
@@ -166,6 +163,8 @@ RDEPENDS_${PN}-initramfs = "${PN}" | |||
166 | RDEPENDS_${PN}-ptest += "perl bash" | 163 | RDEPENDS_${PN}-ptest += "perl bash" |
167 | FILES_${PN}-ptest += "${libdir}/udev/rules.d" | 164 | FILES_${PN}-ptest += "${libdir}/udev/rules.d" |
168 | 165 | ||
166 | FILES_${PN}-dbg += "${libdir}/systemd/ptest/.debug" | ||
167 | |||
169 | FILES_${PN}-gui = "${bindir}/systemadm" | 168 | FILES_${PN}-gui = "${bindir}/systemadm" |
170 | 169 | ||
171 | FILES_${PN}-vconsole-setup = "${rootlibexecdir}/systemd/systemd-vconsole-setup \ | 170 | FILES_${PN}-vconsole-setup = "${rootlibexecdir}/systemd/systemd-vconsole-setup \ |