* [PATCH 0/1] image.bbclass: add ability to set systemd default target
@ 2013-12-17 9:05 Qi.Chen
2013-12-17 9:05 ` [PATCH 1/1] " Qi.Chen
0 siblings, 1 reply; 3+ messages in thread
From: Qi.Chen @ 2013-12-17 9:05 UTC (permalink / raw)
To: openembedded-core
From: Chen Qi <Qi.Chen@windriver.com>
The following changes since commit 9daa1de753e58b7f678e68cf307f6028c0c79a6a:
qemu/local.conf.sample: Add sdl PACKAGECONFIG (2013-12-16 12:13:59 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib ChenQi/systemd-default-target
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/systemd-default-target
Chen Qi (1):
image.bbclass: add ability to set systemd default target
meta/classes/image.bbclass | 8 ++++++++
1 file changed, 8 insertions(+)
--
1.7.9.5
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1] image.bbclass: add ability to set systemd default target
2013-12-17 9:05 [PATCH 0/1] image.bbclass: add ability to set systemd default target Qi.Chen
@ 2013-12-17 9:05 ` Qi.Chen
2013-12-18 7:33 ` ChenQi
0 siblings, 1 reply; 3+ messages in thread
From: Qi.Chen @ 2013-12-17 9:05 UTC (permalink / raw)
To: openembedded-core
From: Chen Qi <Qi.Chen@windriver.com>
Add ability to set the default target for systemd images.
The default value for the target is derived from checking whether
IMAGE_FEATRUES contains 'x11-base' or not. Each image could override
this value in its own recipe. For now, we don't need to do any change,
because all images that support graphical environment has 'x11-base'
in its IMAGE_FEATRUES.
[YOCTO #3816]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
meta/classes/image.bbclass | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index c595721..c8366d6 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -186,6 +186,9 @@ IMAGE_MANIFEST = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.manifest"
ROOTFS_POSTPROCESS_COMMAND =+ "write_image_manifest ; "
# Set default postinst log file
POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log"
+# Set default target for systemd images
+SYSTEMD_DEFAULT_TARGET ?= '${@base_contains("IMAGE_FEATURES", "x11-base", "graphical.target", "multi-user.target", d)}'
+ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("DISTRO_FEATURES", "systemd", "set_systemd_default_target; ", "", d)}'
# some default locales
IMAGE_LINGUAS ?= "de-de fr-fr en-gb"
@@ -596,6 +599,11 @@ postinst_enable_logging () {
echo "LOGFILE=${POSTINST_LOGFILE}" >> ${IMAGE_ROOTFS}${sysconfdir}/default/postinst
}
+# Modify systemd default target
+set_systemd_default_target () {
+ ln -sf ${systemd_unitdir}/system/${SYSTEMD_DEFAULT_TARGET} ${IMAGE_ROOTFS}${sysconfdir}/systemd/system/default.target
+}
+
# Turn any symbolic /sbin/init link into a file
remove_init_link () {
if [ -h ${IMAGE_ROOTFS}/sbin/init ]; then
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] image.bbclass: add ability to set systemd default target
2013-12-17 9:05 ` [PATCH 1/1] " Qi.Chen
@ 2013-12-18 7:33 ` ChenQi
0 siblings, 0 replies; 3+ messages in thread
From: ChenQi @ 2013-12-18 7:33 UTC (permalink / raw)
To: openembedded-core
Please drop this one. It has some problem with live images.
I'll send out a V2.
//Chen Qi
On 12/17/2013 05:05 PM, Qi.Chen@windriver.com wrote:
> From: Chen Qi <Qi.Chen@windriver.com>
>
> Add ability to set the default target for systemd images.
>
> The default value for the target is derived from checking whether
> IMAGE_FEATRUES contains 'x11-base' or not. Each image could override
> this value in its own recipe. For now, we don't need to do any change,
> because all images that support graphical environment has 'x11-base'
> in its IMAGE_FEATRUES.
>
> [YOCTO #3816]
>
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
> meta/classes/image.bbclass | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index c595721..c8366d6 100644
> --- a/meta/classes/image.bbclass
> +++ b/meta/classes/image.bbclass
> @@ -186,6 +186,9 @@ IMAGE_MANIFEST = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.manifest"
> ROOTFS_POSTPROCESS_COMMAND =+ "write_image_manifest ; "
> # Set default postinst log file
> POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log"
> +# Set default target for systemd images
> +SYSTEMD_DEFAULT_TARGET ?= '${@base_contains("IMAGE_FEATURES", "x11-base", "graphical.target", "multi-user.target", d)}'
> +ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("DISTRO_FEATURES", "systemd", "set_systemd_default_target; ", "", d)}'
>
> # some default locales
> IMAGE_LINGUAS ?= "de-de fr-fr en-gb"
> @@ -596,6 +599,11 @@ postinst_enable_logging () {
> echo "LOGFILE=${POSTINST_LOGFILE}" >> ${IMAGE_ROOTFS}${sysconfdir}/default/postinst
> }
>
> +# Modify systemd default target
> +set_systemd_default_target () {
> + ln -sf ${systemd_unitdir}/system/${SYSTEMD_DEFAULT_TARGET} ${IMAGE_ROOTFS}${sysconfdir}/systemd/system/default.target
> +}
> +
> # Turn any symbolic /sbin/init link into a file
> remove_init_link () {
> if [ -h ${IMAGE_ROOTFS}/sbin/init ]; then
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-12-18 7:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-17 9:05 [PATCH 0/1] image.bbclass: add ability to set systemd default target Qi.Chen
2013-12-17 9:05 ` [PATCH 1/1] " Qi.Chen
2013-12-18 7:33 ` ChenQi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox