Skip to contentSkip to conversation

image.bbclass: add ability to set systemd default target

PATCH Superseded [email protected] 1 participant 3 messages Dec 17, 2013 – Dec 18, 2013

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover image.bbclass: add ability to set systemd default target

From: Chen Qi <[email protected]>

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(+)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 image.bbclass: add ability to set systemd default target

From: Chen Qi <[email protected]>

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]

---
 meta/classes/image.bbclass |    8 ++++++++
 1 file changed, 8 insertions(+)
meta/classes/image.bbclass +8 -0
index c595721..c8366d6 100644
@@ -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
Signature · 1 line
1.7.9.5
author
#2 lore raw

Please drop this one. It has some problem with live images. I'll send out a V2.

//Chen Qi

Quoted 43 lines · On 12/17/2013 05:05 PM, [email protected] wrote:

From: Chen Qi <[email protected]>

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]

---
  meta/classes/image.bbclass |    8 ++++++++
  1 file changed, 8 insertions(+)
meta/classes/image.bbclass +8 -0
index c595721..c8366d6 100644
@@ -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