systemd: SRC_URI fix + package split

PATCH Superseded Anders Darander 4 participants 9 messages Jan 9, 2012 – Jan 10, 2012

lore

Share & tools

lore

Anders Darander

author

2012-01-09 13:24 UTC #0 lore raw

cover systemd: SRC_URI fix + package split

Systemd's git repo has moved on freedesktop.org, thus fix the SRC_URI.

At least while using rpm-packaging, the systemd package (rpm) got a dependency on python, as systemd-analyze needs this (in the shebang). When trying to create a small image using systemd, this isn't always desirable. Thus the splitting of systemd-analyze to a separate package.

The following changes since commit 9c855444d025a85f28196bfeae25dd48e44510c5:

xf86-video-fbdev: remove, driver is now in oe-core (2012-01-09 10:31:00 +0100)

are available in the git repository at:
git://github.com/darander/meta-oe systemd-move
https://github.com/darander/meta-oe/tree/systemd-move

Anders Darander (2):
systemd: git repo moved
systemd: split out systemd-analyze

 meta-oe/recipes-core/systemd/systemd_git.bb |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

Signature · 1 line

1.7.8.2

Anders Darander

author

2012-01-09 13:27 UTC #1 lore raw

PATCH 1/2 systemd: git repo moved

Freedesktop have reorganized the git repository structure.

Signed-off-by Anders Darander <[email protected]>

---
 meta-oe/recipes-core/systemd/systemd_git.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta-oe/recipes-core/systemd/systemd_git.bb +1 -1

index 2548d10..bdaaf16 100644
@@ -20,7 +20,7 @@ inherit useradd pkgconfig autotools vala perlnative
 
 SRCREV = "f6cebb3bd5a00d79c8131637c0f6796a75e6af99"
 
-SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \
+SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \
            file://0001-disable-xsltproc-completely.patch \
            ${UCLIBCPATCHES} \
           "

Signature · 1 line

1.7.8.2

Anders Darander

author

2012-01-09 13:27 UTC #2 lore raw

PATCH 2/2 systemd: split out systemd-analyze

In reply to Anders Darander

Split systemd-analyze to a separate package, to remove the implicit dependency on python. (At least the rpm-packaging backend created a run-time dependency on python).

Signed-off-by Anders Darander <[email protected]>

---
 meta-oe/recipes-core/systemd/systemd_git.bb |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

meta-oe/recipes-core/systemd/systemd_git.bb +4 -2

index bdaaf16..1d71bb6 100644
@@ -14,7 +14,7 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r7"
+PR = "r8"
 
 inherit useradd pkgconfig autotools vala perlnative

@@ -57,11 +57,13 @@ do_install() {
 	ln -s ${base_bindir}/systemd ${D}/init
 }
 
-PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs"
+PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze"
 
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "-r lock"
 
+FILES_${PN}-analyze = "${bindir}/systemd-analyze"
+
 FILES_${PN}-initramfs = "/init"
 RDEPENDS_${PN}-initramfs = "${PN}"

Signature · 1 line

1.7.8.2

Martin Jansa

2012-01-09 13:35 UTC #3 lore raw

Re: [PATCH 2/2] systemd: split out systemd-analyze

Quoted 23 lines · Anders Darander

Split systemd-analyze to a separate package, to remove the implicit dependency on python. (At least the rpm-packaging backend created a run-time dependency on python).
Signed-off-by Anders Darander <[email protected]>
---
 meta-oe/recipes-core/systemd/systemd_git.bb |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
meta-oe/recipes-core/systemd/systemd_git.bb +1 -1
index bdaaf16..1d71bb6 100644
@@ -14,7 +14,7 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r7"
+PR = "r8"
 
 inherit useradd pkgconfig autotools vala perlnative
 

meta-oe/recipes-core/systemd/systemd_git.bb do_install() { · line 65

Quoted 10 lines

meta-oe/recipes-core/systemd/systemd_git.bb +2 -1

@@ -57,11 +57,13 @@ do_install() {
 	ln -s ${base_bindir}/systemd ${D}/init
 }
 
-PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs"
+PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze"
 
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "-r lock"
 
+FILES_${PN}-analyze = "${bindir}/systemd-analyze"

according to your commit message, why not add
RDEPENDS_${PN}-analyze = "python"
here?

and maybe
RSUGGESTS_${PN} += "${PN}-analyze"

Quoted 12 lines

meta-oe/recipes-core/systemd/systemd_git.bb +1 -0

+
 FILES_${PN}-initramfs = "/init"
 RDEPENDS_${PN}-initramfs = "${PN}"

Signature · 7 lines

1.7.8.2


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Anders Darander

author

2012-01-09 13:44 UTC #4 lore raw

Re: [PATCH 2/2] systemd: split out systemd-analyze

Quoted 7 lines · Martin Jansa

Quoted 5 lines · Anders Darander
Split systemd-analyze to a separate package, to remove the implicit dependency on python. (At least the rpm-packaging backend created a run-time dependency on python).
+PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze"

Quoted 8 lines

Quoted 4 lines
USERADD_PACKAGES = "${PN}"
GROUPADD_PARAM_${PN} = "-r lock"
+FILES_${PN}-analyze = "${bindir}/systemd-analyze"
according to your commit message, why not add
RDEPENDS_${PN}-analyze = "python"
here?

Yes, I should probably spin a v2 with:
RDEPENDS_${PN}-analyze = "python-dbus"
as python alone isn't enough to run systemd-analyze.

Missing that as on our larger image, python was always explicitly installed by other packages, and on this smaller one, we didn't want it. Good catch, though!

Quoted 2 lines

and maybe
RSUGGESTS_${PN} += "${PN}-analyze"

Not sure about this one. It should probably be safe to add, although I'm undecided...

Cheers,
Anders

Quoted 3 lines

Quoted 3 lines
+
FILES_${PN}-initramfs = "/init"
RDEPENDS_${PN}-initramfs = "${PN}"

Signature · 2 lines

Anders Darander
ChargeStorm AB / eStorm AB

Anders Darander

author

2012-01-09 13:52 UTC #5 lore raw

Re: [PATCH 2/2] systemd: split out systemd-analyze

Quoted 14 lines · Anders Darander

Quoted 11 lines · Martin Jansa
Quoted 10 lines · Anders Darander
Split systemd-analyze to a separate package, to remove the implicit dependency on python. (At least the rpm-packaging backend created a run-time dependency on python).
meta-oe/recipes-core/systemd/systemd_git.bb +2 -0
+PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze"
 
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "-r lock"
 
+FILES_${PN}-analyze = "${bindir}/systemd-analyze"

Quoted 7 lines

Quoted 3 lines
according to your commit message, why not add
RDEPENDS_${PN}-analyze = "python"
here?
Yes, I should probably spin a v2 with:
RDEPENDS_${PN}-analyze = "python-dbus"
as python alone isn't enough to run systemd-analyze.

Just pushed the above fix to the same systemd-move branch on github.

Cheers,
Anders

Quoted 3 lines

Missing that as on our larger image, python was always explicitly installed by other packages, and on this smaller one, we didn't want it. Good catch, though!

Signature · 2 lines

Anders Darander
ChargeStorm AB / eStorm AB

Otavio Salvador

2012-01-09 14:41 UTC #6 lore raw

Re: [PATCH 2/2] systemd: split out systemd-analyze

Quoted 2 lines · Anders Darander

Just pushed the above fix to the same systemd-move branch on github.

Please send an updated patchset so people can review it.

Signature · 3 lines

Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Koen Kooi

2012-01-10 07:34 UTC #7 lore raw

Re: [PATCH 2/2] systemd: split out systemd-analyze

In reply to Anders Darander

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

Op 09-01-12 14:37, Anders Darander schreef:

Quoted 12 lines · Martin Jansa

Quoted 10 lines · Anders Darander
Quoted 8 lines
Split systemd-analyze to a separate package, to remove the implicit dependency on python. (At least the rpm-packaging backend created a run-time dependency on python).
+PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze"
USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "-r lock"

Quoted 7 lines

Quoted 4 lines
Quoted 1 line
+FILES_${PN}-analyze = "${bindir}/systemd-analyze"
according to your commit message, why not add RDEPENDS_${PN}-analyze = "python" here?
Yes, I should probably spin a v2 with: RDEPENDS_${PN}-analyze = "python-dbus" as python alone isn't enough to run systemd-analyze.

Don't forget python-pycairo for 'systemd-analyze plot'

regards,

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

iEYEARECAAYFAk8L6EMACgkQMkyGM64RGpFsMwCfYYRYu/3dMHcSatOubVTWgz8U i8kAoI8iJsmGCdwTYWz492C5LJMn3uPH
=BrPL
-----END PGP SIGNATURE-----

Anders Darander

author

2012-01-10 08:01 UTC #8 lore raw

Re: [PATCH 2/2] systemd: split out systemd-analyze

Quoted 15 lines · Koen Kooi

Op 09-01-12 14:37, Anders Darander schreef:
Quoted 13 lines · Martin Jansa
Quoted 12 lines · Anders Darander
Quoted 10 lines
Split systemd-analyze to a separate package, to remove the implicit dependency on python. (At least the rpm-packaging backend created a run-time dependency on python).
+PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze"
USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "-r lock"
+FILES_${PN}-analyze = "${bindir}/systemd-analyze"

Quoted 7 lines

Quoted 5 lines
Quoted 2 lines
according to your commit message, why not add RDEPENDS_${PN}-analyze = "python" here?
Yes, I should probably spin a v2 with: RDEPENDS_${PN}-analyze = "python-dbus" as python alone isn't enough to run systemd-analyze.
Don't forget python-pycairo for 'systemd-analyze plot'

Thanks, I'll add it as a RRECOMMENDS and send an updated patch series. (I've only used systemd an headless systems, without any graphics libraries at all, thus never been running systemd-analyze plot)

I'll use RRECOMMENDS as it is not necessary for running systemd-analyze, which python-dbus is. Well, it is necessary for running 'systemd-analyze plot', but not for the other commands in systemd-analyze.

Cheers,
Anders

Signature · 2 lines

Anders Darander
ChargeStorm AB / eStorm AB