From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6524973730788016128 X-Received: by 10.80.200.202 with SMTP id k10mr827840edh.10.1519418729324; Fri, 23 Feb 2018 12:45:29 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.170.50 with SMTP id o47ls3812151edc.3.gmail; Fri, 23 Feb 2018 12:45:28 -0800 (PST) X-Google-Smtp-Source: AH8x227L30fzpMjO/Cgb45XVNq84zNJbH7RytDWp29SbJbdZN6fiIW4gyK8eqmM3G86R0v1lAmkq X-Received: by 10.80.206.8 with SMTP id y8mr1014994edi.1.1519418728689; Fri, 23 Feb 2018 12:45:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519418728; cv=none; d=google.com; s=arc-20160816; b=gIgbFc4eUq3Vbez11IK9t+S9mANmdhYAAiSS38VhJzUS0JrWmBTOFk/L6IkzCRmwb2 XUBPNDjaP9vmeS9erY7wy1INS6+VPEN0nLgvbcu5N7CP0lApxcITtXga7KmrC4e8S7k6 khMvQCRzSYCKlAGvQFA55a1c8euzJlJHsmvla31zYmqWVkDo3//xS0YwNXJluby4jlK7 Neb3ux6L3hu9N0fTzMb9yDGr5CKrtE069A0XncsZ8dh8zPByqzNBvEyK0q+YuVhO58pe yYQwDeJnlzZyBXvfQsBvcF3WK25uB9yo7hbH4b5JmTt0czJ2+FL2fKaEJ7lzU/PtO9uk ZtbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject :arc-authentication-results; bh=Wchm/Ot6NSUrpWv1kypTnnYmomJNej8WluhyvDd+lU4=; b=wsyGCDTnV65hs5b6KCZ163ePkPa/oY1wuggnezZu5UPNuY3q12gl/gfxfXq3X6tHky 5hqR8HanCN205aYeVs3mOlP0Nnhm46UfWfkyDfhnKivYGvzSgMtpFiroF3Nk2I6CxNnx 6kG1Gx1HC7BYlU+hUqGIGEFiOP2N2StZI52edhaTcz2/Lv8t5lKXhIuurOx81IaekcRY pgnUGvMB7qSF1FmdYZ1VqdzM+TkL7Iy0Nv8uVHdwDr7JGg8EZ4pZ7WGJPoSiy8S1S5eh isB7xGBWDrBOjdF862qFgtIZy4xZK+4sbpDznuiArsJAjxieib0Pf7preEsjwx6MhUvu dgCg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id h9si154774edi.4.2018.02.23.12.45.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Feb 2018 12:45:28 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id w1NKjRXQ007417 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 23 Feb 2018 21:45:27 +0100 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w1NKjR0i017779; Fri, 23 Feb 2018 21:45:27 +0100 Subject: Re: [PATCH v2 4/5] meta-isar/isar-image-base: switch to using isar-bootstrap To: "[ext] claudius.heine.ext@siemens.com" , isar-users@googlegroups.com Cc: Claudius Heine References: <20180222131901.20915-1-claudius.heine.ext@siemens.com> <20180222131901.20915-5-claudius.heine.ext@siemens.com> From: Jan Kiszka Message-ID: Date: Fri, 23 Feb 2018 21:45:26 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: <20180222131901.20915-5-claudius.heine.ext@siemens.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: pnAKJqjdw2iJ On 2018-02-22 14:19, [ext] claudius.heine.ext@siemens.com wrote: > From: Claudius Heine > > This patch removes the multistrap dependency of the isar-image-base > recipe and changes it to use the 'isar-bootstrap' and > 'isar-bootstrap-helper' instead. > > Signed-off-by: Claudius Heine > --- > .../recipes-core/images/files/download_dev-random | 24 ------- > .../recipes-core/images/files/multistrap.conf.in | 38 ----------- > meta-isar/recipes-core/images/files/setup.sh | 77 ---------------------- > meta-isar/recipes-core/images/isar-image-base.bb | 61 +++++------------ > meta/classes/image.bbclass | 2 +- > 5 files changed, 17 insertions(+), 185 deletions(-) > delete mode 100644 meta-isar/recipes-core/images/files/download_dev-random > delete mode 100644 meta-isar/recipes-core/images/files/multistrap.conf.in > delete mode 100755 meta-isar/recipes-core/images/files/setup.sh > > diff --git a/meta-isar/recipes-core/images/files/download_dev-random b/meta-isar/recipes-core/images/files/download_dev-random > deleted file mode 100644 > index f7f5fe5..0000000 > --- a/meta-isar/recipes-core/images/files/download_dev-random > +++ /dev/null > @@ -1,24 +0,0 @@ > -#!/bin/sh > -# > -# This software is a part of ISAR. > -# Copyright (C) 2017 ilbers GmbH > - > -set -e > - > -readonly ROOTFS="$1" > - > -if [ ! -c ${ROOTFS}/dev/random ]; then > - rm -f ${ROOTFS}/dev/random > - mknod "${ROOTFS}/dev/random" c 1 8 > - chmod 666 "${ROOTFS}/dev/random" > - chown 0:0 "${ROOTFS}/dev/random" > -fi > - > -if [ ! -c ${ROOTFS}/dev/urandom ]; then > - rm -f ${ROOTFS}/dev/urandom > - mknod "${ROOTFS}/dev/urandom" c 1 9 > - chmod 666 "${ROOTFS}/dev/urandom" > - chown 0:0 "${ROOTFS}/dev/urandom" > -fi > - > -exit 0 > diff --git a/meta-isar/recipes-core/images/files/multistrap.conf.in b/meta-isar/recipes-core/images/files/multistrap.conf.in > deleted file mode 100644 > index 432b6af..0000000 > --- a/meta-isar/recipes-core/images/files/multistrap.conf.in > +++ /dev/null > @@ -1,38 +0,0 @@ > -# This software is a part of ISAR. > -# Copyright (C) 2015-2017 ilbers GmbH > - > -[General] > -noauth=true > -unpack=true > -ignorenativearch=true > -bootstrap=##DISTRO_MULTICONF_BOOTSTRAP## Isar > -aptsources=##DISTRO_MULTICONF_APTSOURCES## > -configscript=##CONFIG_SCRIPT## > -setupscript=##SETUP_SCRIPT## > -hookdir=##DIR_HOOKS## > - > -[base] > -source=##DISTRO_APT_SOURCE## > -suite=##DISTRO_SUITE## > -components=##DISTRO_COMPONENTS## > -packages=##IMAGE_PREINSTALL## > -omitdebsrc=true > - > -[updates] > -source=##DISTRO_APT_SOURCE## > -suite=##DISTRO_SUITE##-updates > -components=##DISTRO_COMPONENTS## > -omitdebsrc=true > - > -[security] > -source=##DISTRO_APT_SOURCE_SEC## > -suite=##DISTRO_SUITE##/updates > -components=##DISTRO_COMPONENTS## > -omitdebsrc=true > - > -[Isar] > -packages=##IMAGE_INSTALL## > -source=##DEPLOY_DIR_APT## > -suite=##ISAR_DISTRO_SUITE## > -components=main > -omitdebsrc=true > diff --git a/meta-isar/recipes-core/images/files/setup.sh b/meta-isar/recipes-core/images/files/setup.sh > deleted file mode 100755 > index 86c065c..0000000 > --- a/meta-isar/recipes-core/images/files/setup.sh > +++ /dev/null > @@ -1,77 +0,0 @@ > -#!/bin/sh > -# > -# This software is a part of ISAR. > -# Copyright (C) 2015-2016 ilbers GmbH > -# > -# Based on multistrap/examples/chroot.sh > - > -set -e > - > -# The script is called with the following arguments: > -# $1 = $DIR - the top directory of the bootstrapped system > -# $2 = $ARCH - the specified architecture, already checked with > -# dpkg-architecture. > -# setup.sh needs to be executable. > - > -TARGET=$1 > -ARCH=$2 > - > -# Prevent daemons from starting in postinstall during the initial "dpkg > -# --configure -a" under QEMU on the build host > -if [ -x "$TARGET/sbin/start-stop-daemon" ]; then > - echo "initctl: Trying to prevent daemons from starting in $TARGET" > - > - # Disable start-stop-daemon > - mv $TARGET/sbin/start-stop-daemon $TARGET/sbin/start-stop-daemon.REAL > - cat > $TARGET/sbin/start-stop-daemon << EOF > -#!/bin/sh > -echo > -echo Warning: Fake start-stop-daemon called, doing nothing > -EOF > - chmod 755 $TARGET/sbin/start-stop-daemon > -fi > - > -if [ -x "$TARGET/sbin/initctl" ]; then > - echo "start-stop-daemon: Trying to prevent daemons from starting in $TARGET" > - > - # Disable initctl > - mv "$TARGET/sbin/initctl" "$TARGET/sbin/initctl.REAL" > - cat > $TARGET/sbin/initctl << EOF > -#!/bin/sh > -echo > -echo "Warning: Fake initctl called, doing nothing" > -EOF > - chmod 755 $TARGET/sbin/initctl > -fi > - > -# Define sysvinit policy 101 to prevent daemons from starting in postinstall > -# during the initial "dpkg --configure -a" under QEMU on the build host > -if [ -x "$TARGET/sbin/init" -a ! -f "$TARGET/usr/sbin/policy-rc.d" ]; then > - echo "sysvinit: Using policy-rc.d to prevent daemons from starting in $TARGET" > - > - cat > $TARGET/usr/sbin/policy-rc.d << EOF > -#!/bin/sh > -echo "sysvinit: All runlevel operations denied by policy" >&2 > -exit 101 > -EOF > - chmod a+x $TARGET/usr/sbin/policy-rc.d > -fi > - > -case $ARCH in > - armel|armhf) > - qemu_arch=arm > - ;; > - arm64) > - qemu_arch=aarch64 > - ;; > -esac > - > -# Install QEMU emulator to execute foreign binaries > -if [ ! -x /usr/bin/qemu-${qemu_arch}-static ]; then > - echo "qemu-${qemu_arch}-static binary not present, unable to execute target binaries" > -else > - sudo cp /usr/bin/qemu-${qemu_arch}-static ${TARGET}/usr/bin > -fi > - > -# Set hostname > -echo "isar" > $TARGET/etc/hostname > diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb > index b444258..6047dd0 100644 > --- a/meta-isar/recipes-core/images/isar-image-base.bb > +++ b/meta-isar/recipes-core/images/isar-image-base.bb > @@ -9,14 +9,12 @@ LICENSE = "gpl-2.0" > LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" > > FILESPATH =. "${LAYERDIR_isar}/recipes-core/images/files:" > -SRC_URI = "file://multistrap.conf.in \ > - file://${DISTRO_CONFIG_SCRIPT} \ > - file://setup.sh \ > - file://download_dev-random" > +SRC_URI = "file://${DISTRO_CONFIG_SCRIPT}" > > PV = "1.0" > > inherit image > +inherit isar-bootstrap-helper > > IMAGE_INSTALL += "linux-image-${KERNEL_NAME}" > > @@ -28,50 +26,23 @@ IMAGE_PREINSTALL += "apt \ > > WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}" > > -do_rootfs[dirs] = "${WORKDIR}/hooks_multistrap" > +do_rootfs[cleandirs] = "${IMAGE_ROOTFS} \ > + ${IMAGE_ROOTFS}/isar-apt" Same issue as with the buildchroot: cleaning does not work. Jan > > do_rootfs() { > - E="${@ bb.utils.export_proxies(d)}" > - > - sudo rm -rf ${IMAGE_ROOTFS} > - > - chmod +x "${WORKDIR}/${DISTRO_CONFIG_SCRIPT}" > - chmod +x "${WORKDIR}/setup.sh" > - install -m 755 "${WORKDIR}/download_dev-random" "${WORKDIR}/hooks_multistrap/" > - > - # Multistrap accepts only relative path in configuration files, so get it: > - cd ${TOPDIR} > - WORKDIR_REL=${@ os.path.relpath(d.getVar("WORKDIR", True))} > - > - # Adjust multistrap config > - sed -e 's|##IMAGE_PREINSTALL##|${IMAGE_PREINSTALL}|g' \ > - -e 's|##DISTRO_MULTICONF_BOOTSTRAP##|${DISTRO_MULTICONF_BOOTSTRAP}|g' \ > - -e 's|##DISTRO_MULTICONF_APTSOURCES##|${DISTRO_MULTICONF_APTSOURCES}|g' \ > - -e 's|##DISTRO_APT_SOURCE##|${DISTRO_APT_SOURCE}|g' \ > - -e 's|##DISTRO_APT_SOURCE_SEC##|${DISTRO_APT_SOURCE_SEC}|g' \ > - -e 's|##DISTRO_SUITE##|${DISTRO_SUITE}|g' \ > - -e 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|g' \ > - -e 's|##CONFIG_SCRIPT##|./'"$WORKDIR_REL"'/${DISTRO_CONFIG_SCRIPT}|g' \ > - -e 's|##SETUP_SCRIPT##|./'"$WORKDIR_REL"'/setup.sh|g' \ > - -e 's|##DIR_HOOKS##|./'"$WORKDIR_REL"'/hooks_multistrap|g' \ > - -e 's|##IMAGE_INSTALL##|${IMAGE_INSTALL}|g' \ > - -e 's|##DEPLOY_DIR_APT##|copy:///${DEPLOY_DIR_APT}/${DISTRO}|g' \ > - -e 's|##ISAR_DISTRO_SUITE##|${DEBDISTRONAME}|g' \ > - "${WORKDIR}/multistrap.conf.in" > "${WORKDIR}/multistrap.conf" > - > - # Do not use bitbake flag [dirs] here because this folder should have > - # specific ownership. > - [ ! -d ${IMAGE_ROOTFS}/proc ] && sudo install -d -o 0 -g 0 -m 555 ${IMAGE_ROOTFS}/proc > - sudo mount -t proc none ${IMAGE_ROOTFS}/proc > - > - # Create root filesystem. We must use sudo -E here to preserve the environment > - # because of proxy settings > - sudo -E multistrap -a ${DISTRO_ARCH} -d "${IMAGE_ROOTFS}" -f "${WORKDIR}/multistrap.conf" > + setup_root_file_system "${IMAGE_ROOTFS}" ${IMAGE_PREINSTALL} ${IMAGE_INSTALL} > > # Configure root filesystem > - sudo chroot ${IMAGE_ROOTFS} /${DISTRO_CONFIG_SCRIPT} ${MACHINE_SERIAL} ${BAUDRATE_TTY} \ > - ${ROOTFS_DEV} > - sudo rm "${IMAGE_ROOTFS}/${DISTRO_CONFIG_SCRIPT}" > + sudo install -m 755 "${WORKDIR}/${DISTRO_CONFIG_SCRIPT}" "${IMAGE_ROOTFS}" > + sudo chroot ${IMAGE_ROOTFS} /${DISTRO_CONFIG_SCRIPT} ${MACHINE_SERIAL} \ > + ${BAUDRATE_TTY} \ > + ${ROOTFS_DEV} > > - sudo umount ${IMAGE_ROOTFS}/proc 2>/dev/null || true > + # Cleanup > + sudo rm "${IMAGE_ROOTFS}/${DISTRO_CONFIG_SCRIPT}" > + sudo rm "${IMAGE_ROOTFS}/etc/apt/sources.list.d/isar-apt.list" > + sudo umount -l ${IMAGE_ROOTFS}/isar-apt > + sudo rmdir ${IMAGE_ROOTFS}/isar-apt > + sudo umount -l ${IMAGE_ROOTFS}/dev > + sudo umount -l ${IMAGE_ROOTFS}/proc > } > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > index 2c255f4..56038b3 100644 > --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -19,7 +19,7 @@ INITRD_IMAGE ?= "${@get_image_name(d, 'initrd.img')}" > inherit ${IMAGE_TYPE} > > do_rootfs[stamp-extra-info] = "${MACHINE}-${DISTRO}" > -do_rootfs[depends] = "isar-apt:do_cache_config" > +do_rootfs[depends] = "isar-apt:do_cache_config isar-bootstrap:do_deploy" > > do_rootfs() { > die "No root filesystem function defined, please implement in your recipe" > -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux