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-lxde-image.bb | 15 ++++++++++--- recipes/images/angstrom-qt-x11-image.bb | 15 ++++++++++--- recipes/images/console-trdx-image.bb | 13 ++++++++--- recipes/images/qt4e-demo-image.bb | 13 ++++++++--- recipes/images/trdx-extra.inc | 4 ---- recipes/images/trdx-image-fstype.inc | 38 +++++++++++++++++++-------------- 6 files changed, 66 insertions(+), 32 deletions(-) diff --git a/recipes/images/angstrom-lxde-image.bb b/recipes/images/angstrom-lxde-image.bb index 4625280..68c0d39 100644 --- a/recipes/images/angstrom-lxde-image.bb +++ b/recipes/images/angstrom-lxde-image.bb @@ -2,9 +2,8 @@ DESCRIPTION = "Image based on the LXDE desktop" 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 @@ -16,11 +15,21 @@ IMAGE_NAME_colibri-vf = "Colibri_VF_LinuxImage" IMAGE_NAME_apalis-imx6 = "Apalis_iMX6_LinuxImage" IMAGE_NAME = "${MACHINE}_LinuxImage" +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" 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" diff --git a/recipes/images/console-trdx-image.bb b/recipes/images/console-trdx-image.bb index 196d787..8771e2b 100644 --- a/recipes/images/console-trdx-image.bb +++ b/recipes/images/console-trdx-image.bb @@ -2,9 +2,8 @@ DESCRIPTION = "Image booting to a console" 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 @@ -20,7 +19,15 @@ IMAGE_NAME = "${MACHINE}_LinuxConsoleImage" 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" diff --git a/recipes/images/qt4e-demo-image.bb b/recipes/images/qt4e-demo-image.bb index e3f0fb4..f8d4a19 100644 --- a/recipes/images/qt4e-demo-image.bb +++ b/recipes/images/qt4e-demo-image.bb @@ -2,9 +2,8 @@ DESCRIPTION = "Image based on qt4e-demo-image.bb" 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 @@ -16,7 +15,15 @@ IMAGE_NAME = "${MACHINE}_LinuxImage-qte" 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" diff --git a/recipes/images/trdx-extra.inc b/recipes/images/trdx-extra.inc index b933359..42f5771 100644 --- a/recipes/images/trdx-extra.inc +++ b/recipes/images/trdx-extra.inc @@ -144,7 +144,3 @@ IMAGE_INSTALL += " \ " # openssl-conf # ntpclient - -do_rootfs_prepend () { - export NATIVE_ROOT=${STAGING_DIR_NATIVE} -} diff --git a/recipes/images/trdx-image-fstype.inc b/recipes/images/trdx-image-fstype.inc index 3cd094e..bea9e59 100644 --- a/recipes/images/trdx-image-fstype.inc +++ b/recipes/images/trdx-image-fstype.inc @@ -1,25 +1,21 @@ #create the deployment directory-tree BURNFLASH := "${THISDIR}/files/${MACHINE}/burnflash.tar.bz2" - -S = "${WORKDIR}/burnflash" - IMAGE_ROOTFS = "${WORKDIR}/${IMAGE_NAME}${PV}/rootfs" + U_BOOT_EXT = "bin" U_BOOT_EXT_colibri-vf = "imx" U_BOOT_EXT_apalis-imx6 = "imx" -do_rootfs_prepend() { - tar -C ${WORKDIR} -xf ${BURNFLASH} - mkdir -p ${IMAGE_ROOTFS} - cp -pPr ${S}/* ${IMAGE_ROOTFS}/../ -} - #we need some native tools for deployment DEPENDS_colibri-vf = "mtd-utils-native imx-loader-native" DEPENDS_mx6 = "imx-loader-native" -do_rootfs_append_colibri-vf() { +imagedeploytools() { + # default to nothing to deploy + : +} +imagedeploytools_colibri-vf() { IMAGE_ROOT="${IMAGE_ROOTFS}/../vf_flash/" rm -f ${IMAGE_ROOT}/mkfs.ubifs ${IMAGE_ROOT}/imx_uart mkdir -p ${IMAGE_ROOT} @@ -34,7 +30,7 @@ do_rootfs_append_colibri-vf() { cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/* ${IMAGE_ROOT}/ } -do_rootfs_append_mx6() { +imagedeploytools_append_mx6() { IMAGE_ROOT="${IMAGE_ROOTFS}/../imx_flash/" rm -f ${IMAGE_ROOT}/imx_flash/imx_usb ${IMAGE_ROOT}/imx_flash/*.conf mkdir -p ${IMAGE_ROOT} @@ -45,10 +41,15 @@ do_rootfs_append_mx6() { cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/* ${IMAGE_ROOT}/ } -do_rootfs_append() { - # put u-boot, kernel into the bin directories, remove the kernel from the rootfs/boot - rm -f ${IMAGE_ROOTFS}/boot/uImage* +fakeroot do_imagedeploy() { + cd ${WORKDIR} + tar -xf ${BURNFLASH} + cp -pPr burnflash/* ${IMAGE_NAME}${PV}/ + + # put u-boot, kernel into the bin directories, remove the kernel/dtb from the rootfs/boot + rm -f ${IMAGE_ROOTFS}/boot/uImage* ${IMAGE_ROOTFS}/boot/*.dtb cp -pP ${DEPLOY_DIR_IMAGE}/uImage* ${IMAGE_ROOTFS}/../${MACHINE}_bin/ + ls ${DEPLOY_DIR_IMAGE}/*.dtb 2> /dev/null && cp -pP ${DEPLOY_DIR_IMAGE}/*.dtb ${IMAGE_ROOTFS}/../${MACHINE}_bin/ mv ${IMAGE_ROOTFS}/../${MACHINE}_bin/uImage-${MACHINE}.bin ${IMAGE_ROOTFS}/../${MACHINE}_bin/uImage cp -pP ${DEPLOY_DIR_IMAGE}/u-boot* ${IMAGE_ROOTFS}/../${MACHINE}_bin/ @@ -59,10 +60,15 @@ do_rootfs_append() { echo "${IMAGE_NAME}${PV}_${DATE}" >> ${IMAGE_ROOTFS}/etc/issue echo "" >> ${IMAGE_ROOTFS}/etc/issue + # add additional tools if required + imagedeploytools + # remove intermediate file rootfs.lock - rm ${WORKDIR}/${IMAGE_NAME}${PV}/rootfs.lock + rm -f ${IMAGE_NAME}${PV}/rootfs.lock #create tarball DATE=`date +%Y%m%d` - cd ${WORKDIR}; tar -cjvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${PV}_${DATE}.tar.bz2 ${IMAGE_NAME}${PV} + tar -cjf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${PV}_${DATE}.tar.bz2 ${IMAGE_NAME}${PV} } + +addtask imagedeploy after do_rootfs before do_rm_work -- cgit v1.2.3