systemd: split systemd-container
cover systemd: split systemd-container
The following changes since commit da7a2c7b00b40a8759dbe9f4ab6df3e337e3d6b6:
useradd-staticids: use map() instead of imap() (2016-07-12 23:11:57 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib ChenQi/systemd-container
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/systemd-container
Chen Qi (1):
systemd: split systemd-container
meta/recipes-core/systemd/systemd_230.bb | 35 +++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-)
Signature · 1 line
1.9.1
PATCH 1/1 systemd: split systemd-container
Split container/vm related units into a new package, systemd-container.
The split mainly references Fedora 24, with a few differences. Apart from the bash and zsh completion files, the differences include adding [email protected] into the systemd-container package.
[YOCTO #9835]
--- meta/recipes-core/systemd/systemd_230.bb | 35 +++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-)
meta/recipes-core/systemd/systemd_230.bb +32 -3
@@ -291,6 +291,7 @@ PACKAGES =+ "\ ${PN}-pam \ ${PN}-zsh-completion \ ${PN}-xorg-xinitrc \ + ${PN}-container \ ${PN}-extra-utils \ "
@@ -348,6 +349,37 @@ RRECOMMENDS_${PN}-binfmt = "kernel-module-binfmt-misc" RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps" +FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf \ + ${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf \ + ${base_bindir}/machinectl \ + ${bindir}/systemd-nspawn \ + ${exec_prefix}/lib/systemd/import-pubring.gpg \ + ${systemd_unitdir}/system/busnames.target.wants/org.freedesktop.import1.busname \ + ${systemd_unitdir}/system/busnames.target.wants/org.freedesktop.machine1.busname \ + ${systemd_unitdir}/system/local-fs.target.wants/var-lib-machines.mount \ + ${systemd_unitdir}/system/machine.slice \ + ${systemd_unitdir}/system/machines.target \ + ${systemd_unitdir}/system/org.freedesktop.import1.busname \ + ${systemd_unitdir}/system/org.freedesktop.machine1.busname \ + ${systemd_unitdir}/system/systemd-importd.service \ + ${systemd_unitdir}/system/systemd-machined.service \ + ${systemd_unitdir}/system/var-lib-machines.mount \ + ${rootlibexecdir}/systemd/systemd-import \ + ${rootlibexecdir}/systemd/systemd-importd \ + ${rootlibexecdir}/systemd/systemd-journal-gatewayd \ + ${rootlibexecdir}/systemd/systemd-journal-remote \ + ${rootlibexecdir}/systemd/systemd-journal-upload \ + ${rootlibexecdir}/systemd/systemd-machined \ + ${rootlibexecdir}/systemd/systemd-pull \ + ${exec_prefix}/lib/tmpfiles.d/systemd-nspawn.conf \ + ${systemd_unitdir}/system/[email protected] \ + ${libdir}/libnss_mymachines.so.2 \ + ${datadir}/dbus-1/system-services/org.freedesktop.import1.service \ + ${datadir}/dbus-1/system-services/org.freedesktop.machine1.service \ + ${datadir}/polkit-1/actions/org.freedesktop.import1.policy \ + ${datadir}/polkit-1/actions/org.freedesktop.machine1.policy \ + " + FILES_${PN}-extra-utils = "\ ${base_bindir}/systemd-escape \ ${base_bindir}/systemd-inhibit \
@@ -371,9 +403,6 @@ FILES_${PN}-extra-utils = "\ ${rootlibexecdir}/systemd/systemd-resolve-host \ ${rootlibexecdir}/systemd/systemd-ac-power \ ${rootlibexecdir}/systemd/systemd-activate \ - ${bindir}/systemd-nspawn \ - ${exec_prefix}/lib/tmpfiles.d/systemd-nspawn.conf \ - ${systemd_unitdir}/system/[email protected] \ ${rootlibexecdir}/systemd/systemd-bus-proxyd \ ${systemd_unitdir}/system/systemd-bus-proxyd.service \ ${systemd_unitdir}/system/systemd-bus-proxyd.socket \
Signature · 1 line
1.9.1
Quoted 29 lines · Chen Qi
Split container/vm related units into a new package, systemd- container.
The split mainly references Fedora 24, with a few differences. Apart from the bash and zsh completion files, the differences include adding [email protected] into the systemd-container package.
[YOCTO #9835]
Signed-off-by Chen Qi <[email protected]>---
meta/recipes-core/systemd/systemd_230.bb | 35
+++++++++++++++++++++++++++++---1 file changed, 32 insertions(+), 3 deletions(-)meta/recipes- renamed from meta/recipes-core/systemd/systemd_230.bb +0
-0core/systemd/systemd_230.bb
index 374a197..cf8aec1 100644meta/recipes-core/systemd/systemd_230.bb +1
-0@@ -291,6 +291,7 @@ PACKAGES =+ "\ ${PN}-pam \ ${PN}-zsh-completion \ ${PN}-xorg-xinitrc \ + ${PN}-container \ ${PN}-extra-utils \"
meta/recipes-core/systemd/systemd_230.bb +0
-0@@ -348,6 +349,37 @@ RRECOMMENDS_${PN}-binfmt = "kernel-module-
Quoted 4 lines
binfmt-misc"
RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd- keymaps"
It would be nice to provide more information about systemd-container to package managers with a SUMMARY_${PN}-container and DESCRIPTION_${PN}- container
Quoted 9 lines
+FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf\
+ ${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf\
+ ${base_bindir}/machinectl \
+ ${bindir}/systemd-nspawn \
+ ${exec_prefix}/lib/systemd/import- pubring.gpg \
any reason you didn't use ${libdir}/systemd/import-pubring.gpg or ${nonarch_libdir} if the files is always installed in /usr/lib regardless of whether libdir is i.e. /usr/lib64
Quoted 10 lines
+ ${systemd_unitdir}/system/busnames.target.w ants/org.freedesktop.import1.busname \
+ ${systemd_unitdir}/system/busnames.target.w ants/org.freedesktop.machine1.busname \
+ ${systemd_unitdir}/system/local- fs.target.wants/var-lib-machines.mount \
+ ${systemd_unitdir}/system/machine.slice \
+ ${systemd_unitdir}/system/machines.target \
+ ${systemd_unitdir}/system/org.freedesktop.i mport1.busname \
Quoted 8 lines
+ ${systemd_unitdir}/system/org.freedesktop.m achine1.busname \
+ ${systemd_unitdir}/system/systemd- importd.service \
+ ${systemd_unitdir}/system/systemd- machined.service \
+ ${systemd_unitdir}/system/var-lib- machines.mount \
I realise these are probably copy/pasted, but you could replace all of the ${systemd_unitdir}/system with ${systemd_system_unitdir}
Otherwise this change looks good, thanks!
Joshua
Quoted 51 lines
+ ${rootlibexecdir}/systemd/systemd-import \
+ ${rootlibexecdir}/systemd/systemd-importd \
+ ${rootlibexecdir}/systemd/systemd-journal- gatewayd \
+ ${rootlibexecdir}/systemd/systemd-journal- remote \
+ ${rootlibexecdir}/systemd/systemd-journal- upload \
+ ${rootlibexecdir}/systemd/systemd-machined \
+ ${rootlibexecdir}/systemd/systemd-pull \+ ${exec_prefix}/lib/tmpfiles.d/systemd- nspawn.conf \
+ ${systemd_unitdir}/system/systemd- [email protected] \
+ ${libdir}/libnss_mymachines.so.2 \
+ ${datadir}/dbus-1/system- services/org.freedesktop.import1.service \
+ ${datadir}/dbus-1/system- services/org.freedesktop.machine1.service \
+ ${datadir}/polkit- 1/actions/org.freedesktop.import1.policy \
+ ${datadir}/polkit- 1/actions/org.freedesktop.machine1.policy \
+ "
+FILES_${PN}-extra-utils = "\
${base_bindir}/systemd-escape \
${base_bindir}/systemd-inhibit \meta/recipes-core/systemd/systemd_230.bb +0
-0@@ -371,9 +403,6 @@ FILES_${PN}-extra-utils = "\${rootlibexecdir}/systemd/systemd-resolve- host \
${rootlibexecdir}/systemd/systemd-ac-power \
${rootlibexecdir}/systemd/systemd-activate \
- ${bindir}/systemd-nspawn \
- ${exec_prefix}/lib/tmpfiles.d/systemd- nspawn.conf \
- ${systemd_unitdir}/system/systemd- [email protected] \
${rootlibexecdir}/systemd/systemd-bus-proxyd \
${systemd_unitdir}/system/systemd-bus- proxyd.service \
${systemd_unitdir}/system/systemd-bus- proxyd.socket \
--
1.9.1
Quoted 69 lines · Joshua G Lock
Quoted 31 lines · Chen Qi
Split container/vm related units into a new package, systemd- container.
The split mainly references Fedora 24, with a few differences. Apart from the bash and zsh completion files, the differences include adding [email protected] into the systemd-container package.
[YOCTO #9835]
Signed-off-by Chen Qi <[email protected]>--- meta/recipes-core/systemd/systemd_230.bb | 35 +++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-)meta/recipes- renamed from meta/recipes-core/systemd/systemd_230.bb +0
-0core/systemd/systemd_230.bb
index 374a197..cf8aec1 100644meta/recipes-core/systemd/systemd_230.bb +1
-0@@ -291,6 +291,7 @@ PACKAGES =+ "\ ${PN}-pam \ ${PN}-zsh-completion \ ${PN}-xorg-xinitrc \ + ${PN}-container \ ${PN}-extra-utils \ "@@ -348,6 +349,37 @@ RRECOMMENDS_${PN}-binfmt = "kernel-module-binfmt-misc"
Quoted 2 lines
RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-
keymaps"It would be nice to provide more information about systemd-container to package managers with a SUMMARY_${PN}-container and DESCRIPTION_${PN}- container
Quoted 9 lines
+FILES_${PN}-container = "${sysconfdir}/dbus-
1/system.d/org.freedesktop.import1.conf\
+ ${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf\meta/recipes-core/systemd/systemd_230.bb +3
-0+ ${base_bindir}/machinectl \ + ${bindir}/systemd-nspawn \ + ${exec_prefix}/lib/systemd/import-pubring.gpg \
any reason you didn't use ${libdir}/systemd/import-pubring.gpg or ${nonarch_libdir} if the files is always installed in
/usr/libregardless of whether libdir is i.e./usr/lib64Quoted 10 lines
+ ${systemd_unitdir}/system/busnames.target.w
ants/org.freedesktop.import1.busname \
+ ${systemd_unitdir}/system/busnames.target.w
ants/org.freedesktop.machine1.busname \
+ ${systemd_unitdir}/system/local-
fs.target.wants/var-lib-machines.mount \meta/recipes-core/systemd/systemd_230.bb +3
-0+ ${systemd_unitdir}/system/machine.slice \ + ${systemd_unitdir}/system/machines.target \ + ${systemd_unitdir}/system/org.freedesktop.import1.busname \
Quoted 8 lines
+ ${systemd_unitdir}/system/org.freedesktop.m
achine1.busname \
+ ${systemd_unitdir}/system/systemd-
importd.service \
+ ${systemd_unitdir}/system/systemd-
machined.service \
+ ${systemd_unitdir}/system/var-lib-
machines.mount \
Quoted 7 lines
I realise these are probably copy/pasted, but you could replace all of the ${systemd_unitdir}/system with ${systemd_system_unitdir}
Otherwise this change looks good, thanks!
Joshua
Thanks a lot for you suggestion.
I'll send out V2.
Best Regards,
Chen Qi
Quoted 50 lines
Quoted 50 lines
meta/recipes-core/systemd/systemd_230.bb +3
-0+ ${rootlibexecdir}/systemd/systemd-import \ + ${rootlibexecdir}/systemd/systemd-importd \ + ${rootlibexecdir}/systemd/systemd-journal-gatewayd \
+ ${rootlibexecdir}/systemd/systemd-journal-
remote \
+ ${rootlibexecdir}/systemd/systemd-journal-
upload \
+ ${rootlibexecdir}/systemd/systemd-machined
\
+ ${rootlibexecdir}/systemd/systemd-pull
\+ ${exec_prefix}/lib/tmpfiles.d/systemd-
nspawn.conf \
+ ${systemd_unitdir}/system/systemd-
[email protected] \meta/recipes-core/systemd/systemd_230.bb +2
-0+ ${libdir}/libnss_mymachines.so.2 \ + ${datadir}/dbus-1/system-services/org.freedesktop.import1.service \
+ ${datadir}/dbus-1/system-
services/org.freedesktop.machine1.service \
+ ${datadir}/polkit-
1/actions/org.freedesktop.import1.policy \
+ ${datadir}/polkit-
1/actions/org.freedesktop.machine1.policy \meta/recipes-core/systemd/systemd_230.bb +2
-3+ " + FILES_${PN}-extra-utils = "\ ${base_bindir}/systemd-escape \ ${base_bindir}/systemd-inhibit \@@ -371,9 +403,6 @@ FILES_${PN}-extra-utils = "\ ${rootlibexecdir}/systemd/systemd-resolve- host \ ${rootlibexecdir}/systemd/systemd-ac-power \ ${rootlibexecdir}/systemd/systemd-activate \ - ${bindir}/systemd-nspawn \ - ${exec_prefix}/lib/tmpfiles.d/systemd- nspawn.conf \ - ${systemd_unitdir}/system/systemd- [email protected] \${rootlibexecdir}/systemd/systemd-bus-proxyd \ ${systemd_unitdir}/system/systemd-bus- proxyd.service \ ${systemd_unitdir}/system/systemd-bus-proxyd.socket \
Signature · 1 line
1.9.1
ping
Quoted 15 lines · Chen Qi
The following changes since commit
da7a2c7b00b40a8759dbe9f4ab6df3e337e3d6b6:useradd-staticids: use map() instead of imap() (2016-07-12 23:11:57 +0100)are available in the git repository at:
git://git.openembedded.org/openembedded-core-contribChenQi/systemd-container
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/systemd-containerChen Qi (1):
systemd: split systemd-containermeta/recipes-core/systemd/systemd_230.bb | 35 +++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-)