| Submitter | Otavio Salvador |
|---|---|
| Date | Oct. 21, 2011, 1:55 p.m. |
| Message ID | <db76597e3a3c1e747f762e1944363700535512c3.1319205291.git.otavio@ossystems.com.br> |
| Download | mbox | patch |
| Permalink | /patch/13719/ |
| State | Accepted |
| Commit | ca82bc073d164fd49f3b3b830545e879096abc5c |
| Headers | show |
Comments
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Op 21-10-11 15:55, Otavio Salvador schreef: > Includes a /init that points to ${base_sbin}/init that is called so to > avoid having to include post rootfs commands for it. > > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- > meta-oe/recipes-core/systemd/systemd_git.bb | 10 ++++++++-- 1 files > changed, 8 insertions(+), 2 deletions(-) > > diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb > b/meta-oe/recipes-core/systemd/systemd_git.bb index 8faedd0..f9e024b > 100644 --- a/meta-oe/recipes-core/systemd/systemd_git.bb +++ > b/meta-oe/recipes-core/systemd/systemd_git.bb @@ -14,7 +14,7 @@ inherit > gitpkgv PKGV = "v${GITPKGVTAG}" > > PV = "git" -PR = "r0" +PR = "r1" > > inherit pkgconfig autotools vala perlnative > > @@ -52,9 +52,15 @@ do_install() { autotools_do_install # provided by a > seperate recipe rm ${D}${base_libdir}/systemd/system/serial-getty* -f + + > # provide support for initramfs + ln -s ${base_sbindir}/init > ${D}/systemd } I wasn't paying attention, sorry. The above needs to be: ln -s ${base_bindir}/systemd ${D}/init shall I fix it myself or do you want to send a patch? -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (Darwin) Comment: GPGTools - http://gpgtools.org iD8DBQFOoYHPMkyGM64RGpERAtmbAJ42uS1WPeIwDl0SBUC055oZa9gnfACeNNLO V8rl5ePtsBq4ReGOtP8g8Ho= =sQxg -----END PGP SIGNATURE-----
On Fri, Oct 21, 2011 at 12:29, Koen Kooi <koen@dominion.thruhere.net> wrote: ... > ln -s ${base_bindir}/systemd ${D}/init > > shall I fix it myself or do you want to send a patch? If you can amend it and push better, so I just rebase it here and avoid another pull request.
Patch
diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb index 8faedd0..f9e024b 100644 --- a/meta-oe/recipes-core/systemd/systemd_git.bb +++ b/meta-oe/recipes-core/systemd/systemd_git.bb @@ -14,7 +14,7 @@ inherit gitpkgv PKGV = "v${GITPKGVTAG}" PV = "git" -PR = "r0" +PR = "r1" inherit pkgconfig autotools vala perlnative @@ -52,9 +52,15 @@ do_install() { autotools_do_install # provided by a seperate recipe rm ${D}${base_libdir}/systemd/system/serial-getty* -f + + # provide support for initramfs + ln -s ${base_sbindir}/init ${D}/systemd } -PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup" +PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs" + +FILES_${PN}-initramfs = "/init" +RDEPENDS_${PN}-initramfs = "${PN}" FILES_${PN}-gui = "${bindir}/systemadm"
Includes a /init that points to ${base_sbin}/init that is called so to avoid having to include post rootfs commands for it. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- meta-oe/recipes-core/systemd/systemd_git.bb | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)