* [PATCH 0/1] systemd: split systemd-container @ 2016-07-14 3:25 Chen Qi 2016-07-14 3:25 ` [PATCH 1/1] " Chen Qi 2016-08-02 3:10 ` [PATCH 0/1] " ChenQi 0 siblings, 2 replies; 5+ messages in thread From: Chen Qi @ 2016-07-14 3:25 UTC (permalink / raw) To: openembedded-core 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(-) -- 1.9.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/1] systemd: split systemd-container 2016-07-14 3:25 [PATCH 0/1] systemd: split systemd-container Chen Qi @ 2016-07-14 3:25 ` Chen Qi 2016-08-02 14:55 ` Joshua G Lock 2016-08-02 3:10 ` [PATCH 0/1] " ChenQi 1 sibling, 1 reply; 5+ messages in thread From: Chen Qi @ 2016-07-14 3:25 UTC (permalink / raw) To: openembedded-core 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 systemd-spawn@.service into the systemd-container package. [YOCTO #9835] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> --- meta/recipes-core/systemd/systemd_230.bb | 35 +++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_230.bb b/meta/recipes-core/systemd/systemd_230.bb index 374a197..cf8aec1 100644 --- a/meta/recipes-core/systemd/systemd_230.bb +++ b/meta/recipes-core/systemd/systemd_230.bb @@ -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/systemd-nspawn@.service \ + ${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/systemd-nspawn@.service \ ${rootlibexecdir}/systemd/systemd-bus-proxyd \ ${systemd_unitdir}/system/systemd-bus-proxyd.service \ ${systemd_unitdir}/system/systemd-bus-proxyd.socket \ -- 1.9.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] systemd: split systemd-container 2016-07-14 3:25 ` [PATCH 1/1] " Chen Qi @ 2016-08-02 14:55 ` Joshua G Lock 2016-08-19 2:01 ` ChenQi 0 siblings, 1 reply; 5+ messages in thread From: Joshua G Lock @ 2016-08-02 14:55 UTC (permalink / raw) To: Chen Qi, openembedded-core On Thu, 2016-07-14 at 11:25 +0800, Chen Qi wrote: > 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 systemd-spawn@.service into the systemd-container package. > > [YOCTO #9835] > > Signed-off-by: Chen Qi <Qi.Chen@windriver.com> > --- > meta/recipes-core/systemd/systemd_230.bb | 35 > +++++++++++++++++++++++++++++--- > 1 file changed, 32 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-core/systemd/systemd_230.bb b/meta/recipes- > core/systemd/systemd_230.bb > index 374a197..cf8aec1 100644 > --- a/meta/recipes-core/systemd/systemd_230.bb > +++ b/meta/recipes-core/systemd/systemd_230.bb > @@ -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" It would be nice to provide more information about systemd-container to package managers with a SUMMARY_${PN}-container and DESCRIPTION_${PN}- container > > +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 > + ${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 \ > + ${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 > + ${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- > nspawn@.service \ > + ${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/systemd- > nspawn@.service \ > ${rootlibexecdir}/systemd/systemd-bus-proxyd > \ > ${systemd_unitdir}/system/systemd-bus- > proxyd.service \ > ${systemd_unitdir}/system/systemd-bus- > proxyd.socket \ > -- > 1.9.1 > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] systemd: split systemd-container 2016-08-02 14:55 ` Joshua G Lock @ 2016-08-19 2:01 ` ChenQi 0 siblings, 0 replies; 5+ messages in thread From: ChenQi @ 2016-08-19 2:01 UTC (permalink / raw) To: Joshua G Lock, openembedded-core On 08/02/2016 10:55 PM, Joshua G Lock wrote: > On Thu, 2016-07-14 at 11:25 +0800, Chen Qi wrote: >> 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 systemd-spawn@.service into the systemd-container package. >> >> [YOCTO #9835] >> >> Signed-off-by: Chen Qi <Qi.Chen@windriver.com> >> --- >> meta/recipes-core/systemd/systemd_230.bb | 35 >> +++++++++++++++++++++++++++++--- >> 1 file changed, 32 insertions(+), 3 deletions(-) >> >> diff --git a/meta/recipes-core/systemd/systemd_230.bb b/meta/recipes- >> core/systemd/systemd_230.bb >> index 374a197..cf8aec1 100644 >> --- a/meta/recipes-core/systemd/systemd_230.bb >> +++ b/meta/recipes-core/systemd/systemd_230.bb >> @@ -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" > It would be nice to provide more information about systemd-container to > package managers with a SUMMARY_${PN}-container and DESCRIPTION_${PN}- > container > >> >> +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 > >> + ${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 \ >> + ${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 > Thanks a lot for you suggestion. I'll send out V2. Best Regards, Chen Qi >> + ${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- >> nspawn@.service \ >> + ${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/systemd- >> nspawn@.service \ >> ${rootlibexecdir}/systemd/systemd-bus-proxyd >> \ >> ${systemd_unitdir}/system/systemd-bus- >> proxyd.service \ >> ${systemd_unitdir}/system/systemd-bus- >> proxyd.socket \ >> -- >> 1.9.1 >> ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 0/1] systemd: split systemd-container 2016-07-14 3:25 [PATCH 0/1] systemd: split systemd-container Chen Qi 2016-07-14 3:25 ` [PATCH 1/1] " Chen Qi @ 2016-08-02 3:10 ` ChenQi 1 sibling, 0 replies; 5+ messages in thread From: ChenQi @ 2016-08-02 3:10 UTC (permalink / raw) To: openembedded-core ping On 07/14/2016 11:25 AM, Chen Qi wrote: > 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(-) > ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-08-19 2:01 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-07-14 3:25 [PATCH 0/1] systemd: split systemd-container Chen Qi 2016-07-14 3:25 ` [PATCH 1/1] " Chen Qi 2016-08-02 14:55 ` Joshua G Lock 2016-08-19 2:01 ` ChenQi 2016-08-02 3:10 ` [PATCH 0/1] " ChenQi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox