[meta-oe][PATCH 0/4] systemd fixes

[meta-oe][PATCH 0/4] systemd fixes

[Otavio Salvador]

The following changes since commit 0368dfd5d8285fe31c853097846e8a6822c7cda0:

  gcc-4.6: Remove the patches that are already applied via oe-core (2011-10-20 19:25:50 +0200)

are available in the git repository at:
  git://github.com/OSSystems/meta-oe master
  https://github.com/OSSystems/meta-oe/tree/master

Otavio Salvador (4):
  systemd: add systemd-initramfs
  systemd: add lock group using useradd.bbclass
  systemd: do not recommend systemd-serialgetty
  systemd-serialgetty: don't require systemd_git.bb

 .../recipes-core/systemd/systemd-serialgetty.bb    |   22 +++++------------
 meta-oe/recipes-core/systemd/systemd_git.bb        |   24 ++++++++++----------
 2 files changed, 19 insertions(+), 27 deletions(-)

-- 
1.7.2.5

[meta-oe][PATCH 1/4] systemd: add systemd-initramfs

[Otavio Salvador]

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..9df3b53 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}/init
 }
 
-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"
 
-- 
1.7.2.5

[meta-oe][PATCH 2/4] systemd: add lock group using useradd.bbclass

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta-oe/recipes-core/systemd/systemd_git.bb |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index 9df3b53..4a640e7 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -14,9 +14,9 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r1"
+PR = "r2"
 
-inherit pkgconfig autotools vala perlnative
+inherit useradd pkgconfig autotools vala perlnative
 
 SRCREV = "64685e0cea62b4937f0804e47ce2cb7929f58223"
 
@@ -59,6 +59,9 @@ do_install() {
 
 PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs"
 
+USERADD_PACKAGES = "${PN}"
+GROUPADD_PARAM_${PN} = "-r lock"
+
 FILES_${PN}-initramfs = "/init"
 RDEPENDS_${PN}-initramfs = "${PN}"
 
@@ -113,12 +116,4 @@ update-alternatives --install ${base_sbindir}/halt halt ${base_bindir}/systemctl
 update-alternatives --install ${base_sbindir}/reboot reboot ${base_bindir}/systemctl 300
 update-alternatives --install ${base_sbindir}/shutdown shutdown ${base_bindir}/systemctl 300
 update-alternatives --install ${base_sbindir}/poweroff poweroff ${base_bindir}/systemctl 300
-
-# can't do this offline, but we need the u-a bits above
-if [ "x$D" != "x" ]; then
-	echo "can't do addgroup offline" ; exit 1
-else
-	grep "^lock:" /etc/group > /dev/null || addgroup lock
-fi
 }
-
-- 
1.7.2.5

[meta-oe][PATCH 3/4] systemd: do not recommend systemd-serialgetty

[Otavio Salvador]

The service ought to be add if need. Not by default on all images.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta-oe/recipes-core/systemd/systemd_git.bb |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index 4a640e7..1c032ec 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 = "r2"
+PR = "r3"
 
 inherit useradd pkgconfig autotools vala perlnative
 
@@ -98,7 +98,6 @@ RDEPENDS_${PN} += "dbus-systemd udev-systemd"
 # And pull in the kernel modules mentioned in INSTALL
 # swapon -p is also not supported by busybox
 RRECOMMENDS_${PN} += "kbd kbd-consolefonts \
-                      systemd-serialgetty \
                       util-linux-agetty \
                       util-linux-swaponoff \
                       util-linux-fsck e2fsprogs-e2fsck \
-- 
1.7.2.5

[meta-oe][PATCH 4/4] systemd-serialgetty: don't require systemd_git.bb

[Otavio Salvador]

Avoids the recompile of this package every time systemd is change.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../recipes-core/systemd/systemd-serialgetty.bb    |   22 ++++++-------------
 1 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/meta-oe/recipes-core/systemd/systemd-serialgetty.bb b/meta-oe/recipes-core/systemd/systemd-serialgetty.bb
index d7e8571..b4c6880 100644
--- a/meta-oe/recipes-core/systemd/systemd-serialgetty.bb
+++ b/meta-oe/recipes-core/systemd/systemd-serialgetty.bb
@@ -1,19 +1,10 @@
-require systemd_git.bb
-
-SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \
-           file://serial-getty@.service \
-          "
-
 DESCRIPTION = "Systemd serial config"
-SERIAL_CONSOLE ?= "115200 /dev/ttyS0"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
-do_configure() {
-	:
-}
+SERIAL_CONSOLE ?= "115200 /dev/ttyS0"
 
-do_compile() {
-	:
-}
+SRC_URI = "file://serial-getty@.service"
 
 def get_baudrate(bb, d):
     return bb.data.getVar('SERIAL_CONSOLE', d, 1).split()[0]
@@ -27,9 +18,11 @@ do_install() {
 		install -d ${D}${base_libdir}/systemd/system/
 		install -d ${D}${sysconfdir}/systemd/system/getty.target.wants/
 		install ${WORKDIR}/serial-getty@.service ${D}${base_libdir}/systemd/system/
+
+		# enable the service
 		ln -sf ${base_libdir}/systemd/system/serial-getty@.service \
 			${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty@${@get_console(bb, d)}.service
-		fi
+	fi
 }
 
 PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-doc"
@@ -40,4 +33,3 @@ RDEPENDS_${PN} = "systemd"
 # This is a machine specific file
 FILES_${PN} = "${base_libdir}/systemd/system/serial-getty@.service ${sysconfdir}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-- 
1.7.2.5

Re: [meta-oe][PATCH 4/4] systemd-serialgetty: don't require systemd_git.bb

[Koen Kooi]

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

Op 21-10-11 05:34, Otavio Salvador schreef:
> Avoids the recompile of this package every time systemd is change.
> 
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- 
> .../recipes-core/systemd/systemd-serialgetty.bb    |   22 
> ++++++------------- 1 files changed, 7 insertions(+), 15 deletions(-)
> 
> diff --git a/meta-oe/recipes-core/systemd/systemd-serialgetty.bb 
> b/meta-oe/recipes-core/systemd/systemd-serialgetty.bb index 
> d7e8571..b4c6880 100644 --- 
> a/meta-oe/recipes-core/systemd/systemd-serialgetty.bb +++ 
> b/meta-oe/recipes-core/systemd/systemd-serialgetty.bb @@ -1,19 +1,10 @@ 
> -require systemd_git.bb - -SRC_URI = 
> "git://anongit.freedesktop.org/systemd;protocol=git \ - 
> file://serial-getty@.service \ -          " - DESCRIPTION = "Systemd 
> serial config" -SERIAL_CONSOLE ?= "115200 /dev/ttyS0" +LICENSE = "MIT" 
> +LIC_FILES_CHKSUM = 
> "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"

The file is originally from systemd itself, so not MIT.

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFOoQyxMkyGM64RGpERArGSAJkBkdBzKEyxs9aJqR9LCtI8Ss2fFACfRgoi
fcId0k30yaa7Df6S8bHsGps=
=QjIM
-----END PGP SIGNATURE-----

Re: [meta-oe][PATCH 1/4] systemd: add systemd-initramfs

[Koen Kooi]

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

Op 21-10-11 05:34, 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.

lrwxrwxrwx 1 root root 12 Jan  1  1970 /sbin/init -> /bin/systemd

So please symlink /init to /bin/systemd directly.

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFOoQ0OMkyGM64RGpERAmGAAKCg0d+PzTU9EdxpEnPyPuAvRG0NnACcDLhg
c2oS6aSOH3tRpd0T3W9mWbk=
=1HJa
-----END PGP SIGNATURE-----

Re: [meta-oe][PATCH 0/4] systemd fixes

[Koen Kooi]

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

Op 21-10-11 05:34, Otavio Salvador schreef:
> The following changes since commit
> 0368dfd5d8285fe31c853097846e8a6822c7cda0:
> 
> gcc-4.6: Remove the patches that are already applied via oe-core
> (2011-10-20 19:25:50 +0200)
> 
> are available in the git repository at: 
> git://github.com/OSSystems/meta-oe master 
> https://github.com/OSSystems/meta-oe/tree/master
> 
> Otavio Salvador (4): systemd: add systemd-initramfs systemd: do not
> recommend systemd-serialgetty systemd-serialgetty: don't require
> systemd_git.bb

I had comments on those 3

> systemd: add lock group using useradd.bbclass

I'll push that one when the matching oe-core commits gets applied.

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFOoQ1DMkyGM64RGpERAhm6AKC0P0CUWFRCO1Ezn3kmi/vPA6NKPACfcg4+
1RCsXdclw8RxtU3veq4spLQ=
=Xt8t
-----END PGP SIGNATURE-----

Re: [meta-oe][PATCH 1/4] systemd: add systemd-initramfs

[Otavio Salvador]

On Fri, Oct 21, 2011 at 04:11, Koen Kooi <koen@dominion.thruhere.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 21-10-11 05:34, 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.
>
> lrwxrwxrwx 1 root root 12 Jan  1  1970 /sbin/init -> /bin/systemd
>
> So please symlink /init to /bin/systemd directly.

Fixed locally.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [meta-oe][PATCH 4/4] systemd-serialgetty: don't require systemd_git.bb

[Otavio Salvador]

On Fri, Oct 21, 2011 at 04:09, Koen Kooi <koen@dominion.thruhere.net> wrote:
...
>> file://serial-getty@.service \ -          " - DESCRIPTION = "Systemd
>> serial config" -SERIAL_CONSOLE ?= "115200 /dev/ttyS0" +LICENSE = "MIT"
>> +LIC_FILES_CHKSUM =
>> "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
>
> The file is originally from systemd itself, so not MIT.

Fixed locally.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [meta-oe][PATCH 3/4] systemd: do not recommend systemd-serialgetty

[Otavio Salvador]

On Fri, Oct 21, 2011 at 03:55, Koen Kooi <koen@dominion.thruhere.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 21-10-11 05:34, Otavio Salvador schreef:
>> The service ought to be add if need. Not by default on all images.
>
> Hmmm, I disagree. If you're using sysvinit OE will add the getty to inittab
> already, I see no need to make systemd behave differently.

We we don't move it to suggests?

Personally I think it is different and forcing everyone that doesn't
want it to have bad recommendations is wrong.

Someone moving to systemd will need to review everything once again
and it won't hurt to add one package if he really wants to have getty
on serial. Many won't want or use it.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [meta-oe][PATCH 3/4] systemd: do not recommend systemd-serialgetty

[Koen Kooi]

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

Op 21-10-11 14:36, Otavio Salvador schreef:
> On Fri, Oct 21, 2011 at 03:55, Koen Kooi <koen@dominion.thruhere.net>
> wrote:
>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
>> 
>> Op 21-10-11 05:34, Otavio Salvador schreef:
>>> The service ought to be add if need. Not by default on all images.
>> 
>> Hmmm, I disagree. If you're using sysvinit OE will add the getty to
>> inittab already, I see no need to make systemd behave differently.
> 
> We we don't move it to suggests?

Opkg doesn't really support that, so no.

> Personally I think it is different and forcing everyone that doesn't want
> it to have bad recommendations is wrong.
> 
> Someone moving to systemd will need to review everything once again and
> it won't hurt to add one package if he really wants to have getty on
> serial. Many won't want or use it.

They are getting it right now with sysvinit already. What about a 'serial'
MACHINE_FEATURE and move it into task-basic?

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFOoWgrMkyGM64RGpERAu+KAJ9UVC0HoV7IGa8RhhsFwOmOtTVEawCeMI6K
JYepFem+P/wrZpO4NDJneIM=
=VtFO
-----END PGP SIGNATURE-----

Re: [meta-oe][PATCH 3/4] systemd: do not recommend systemd-serialgetty

[Otavio Salvador]

On Fri, Oct 21, 2011 at 10:40, Koen Kooi <koen@dominion.thruhere.net> wrote:
...
>> Someone moving to systemd will need to review everything once again and
>> it won't hurt to add one package if he really wants to have getty on
>> serial. Many won't want or use it.
>
> They are getting it right now with sysvinit already. What about a 'serial'
> MACHINE_FEATURE and move it into task-basic?

Works for me.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br