From 2dd8f84040668f9e07250f46393deae034694a87 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Fri, 11 Jul 2014 23:00:29 +0200 Subject: images: update to comply with V2.3 / daisy Set image version to V2.3 do_rootfs is now written in python, so no appends with shell scripts. Replace appends with new tasks. Set the default systemd target on images that launch X as this is no longer the default. Remove the unneeded LIC_FILES_CHKSUM --- recipes/images/angstrom-qt-x11-image.bb | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'recipes/images/angstrom-qt-x11-image.bb') diff --git a/recipes/images/angstrom-qt-x11-image.bb b/recipes/images/angstrom-qt-x11-image.bb index 6782011..e6eff70 100644 --- a/recipes/images/angstrom-qt-x11-image.bb +++ b/recipes/images/angstrom-qt-x11-image.bb @@ -2,9 +2,8 @@ DESCRIPTION = "Image based on qt4-x11-free" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" -PV = "V2.2" +PV = "V2.3" PR = "r0" #start of the resulting deployable tarball name @@ -15,11 +14,21 @@ IMAGE_NAME_colibri-pxa = "Colibri_PXA_LinuxImage-qt" IMAGE_NAME_apalis-imx6 = "Apalis_iMX6_LinuxImage-qt" IMAGE_NAME = "${MACHINE}_LinuxImage-qt" +SYSTEMD_DEFAULT_TARGET = "graphical.target" + #create the deployment directory-tree require recipes/images/trdx-image-fstype.inc #remove interfering sysv scripts, connman systemd service -ROOTFS_POSTINSTALL_COMMAND = "for i in ${IMAGE_ROOTFS}/etc/rc0.d ${IMAGE_ROOTFS}/etc/rc1.d ${IMAGE_ROOTFS}/etc/rc2.d ${IMAGE_ROOTFS}/etc/rc3.d ${IMAGE_ROOTFS}/etc/rc4.d ${IMAGE_ROOTFS}/etc/rc5.d ${IMAGE_ROOTFS}/etc/rc6.d ${IMAGE_ROOTFS}/etc/rcS.d ; do rm -f $i/*dropbear $i/*avahi-daemon $i/*dbus-1 $i/*lxdm $i/*ntpd $i/*syslog $i/*ofono $i/*alsa-state $i/*networking $i/*udev-late-mount $i/*sendsigs $i/*save-rtc.sh $i/*umountnfs.sh $i/*portmap $i/*umountfs $i/*halt $i/*rmnologin.sh $i/*reboot; rm -f $i/*banner.sh $i/*sysfs.sh $i/*checkroot.sh $i/*alignment.sh $i/*mountall.sh $i/*populate-volatile.sh $i/*devpts.sh $i/*hostname.sh $i/*portmap $i/*mountnfs.sh $i/*bootmisc.sh ; done" +do_mkrmscript () { + echo "for i in ${IMAGE_ROOTFS}/etc/rc0.d ${IMAGE_ROOTFS}/etc/rc1.d ${IMAGE_ROOTFS}/etc/rc2.d ${IMAGE_ROOTFS}/etc/rc3.d ${IMAGE_ROOTFS}/etc/rc4.d ${IMAGE_ROOTFS}/etc/rc5.d ${IMAGE_ROOTFS}/etc/rc6.d ${IMAGE_ROOTFS}/etc/rcS.d ; do" > ${WORKDIR}/rmscript + echo " rm -f \$i/*dropbear \$i/*avahi-daemon \$i/*dbus-1 \$i/*lxdm \$i/*ntpd \$i/*syslog \$i/*ofono \$i/*alsa-state \$i/*networking \$i/*udev-late-mount \$i/*sendsigs \$i/*save-rtc.sh \$i/*umountnfs.sh \$i/*portmap \$i/*umountfs \$i/*halt \$i/*rmnologin.sh \$i/*reboot; rm -f \$i/*banner.sh \$i/*sysfs.sh \$i/*checkroot.sh \$i/*alignment.sh \$i/*mountall.sh \$i/*populate-volatile.sh \$i/*devpts.sh \$i/*hostname.sh \$i/*portmap \$i/*mountnfs.sh \$i/*bootmisc.sh" >> ${WORKDIR}/rmscript + echo "done" >> ${WORKDIR}/rmscript + chmod +x ${WORKDIR}/rmscript + readlink -e ${WORKDIR}/rmscript + cat ${WORKDIR}/rmscript +} +addtask mkrmscript before do_rootfs IMAGE_LINGUAS = "en-us" #IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in" -- cgit v1.2.3