From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6524973730788016128 X-Received: by 10.25.149.20 with SMTP id x20mr1818560lfd.5.1520497102763; Thu, 08 Mar 2018 00:18:22 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:ef12:: with SMTP id n18-v6ls419203lfh.7.gmail; Thu, 08 Mar 2018 00:18:22 -0800 (PST) X-Google-Smtp-Source: AG47ELsMX4w4NJD8ICBGIJs7eQjLlvJGf2QzPFjw+TnRV2dfSzdKdWxj9RBONdyQD8u4hdCO05dg X-Received: by 10.25.196.15 with SMTP id u15mr1824499lff.0.1520497102184; Thu, 08 Mar 2018 00:18:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520497102; cv=none; d=google.com; s=arc-20160816; b=RppCLaZxwmTDhCBAHIrL+JKXWSgV307kxR2itqkjaA9NxffvexgyY9hPc5oFmedrgQ eSzUeFCsH+rDqLePGADUPrNmljKU5sigNEHFOphbcwEZIipQZQeVMLe9C3XvSR/wAsDT j9ZhmMlVVmb/ZfeDIQTq0onIAgh4AYcIfrvfpedXus7+ppAQsTIDg7ixodWCHPMm3o5p R1jxhTzbcJatIF5XvxiY/JU9kG+vMqLwKi6AeeHfF1pbiFv3sDegO4D/usGys1ukmw3G ip+gucirGoXaI4IlVDKqWXJVkQUSXLUSdEJOVxXDCsWsa9fSC64SOHpdbgVsPXjw4RTG x8zA== 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:references:cc:to:from:subject :arc-authentication-results; bh=wAtdS3CZgzrK6gyQL+R/IcSQG73U6teIk5Gbl2QH7Ik=; b=Ljw6o6XE/PYqEkMUzp+QluShFj9F1Wg3eKk4D94AY8fOH2+SqoOtAyNUSOr1+uXEzV CtQJA+SBrTS2M0Psjpt7rDVNkdsk1x19O79xWld+xAHXGTPQgkdwpBnmUDSSR+sOnI1X uqxzcmQo/hm/u4PnWqD1AsE0kHZtA3JrhXgJ+968Kv4683uqm+2ifMxtljmGl3j4ajG+ D/xAvF6MbkKFj4FCyLjVYh1XFKUznE5JWgpxIRDYiz2cVL+r2KN6dcc5gz7Yr87rPF6m 3mMZJRI6HDslSw6SLrXyFR2Ls0BtwhA9r5fJxQsKSXohcc0R+y9n56z4B0/4xANj5bV6 8rTA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id z25si748551lfg.5.2018.03.08.00.18.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Mar 2018 00:18:22 -0800 (PST) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id w288ILu9019922 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 8 Mar 2018 09:18:21 +0100 Received: from [139.25.68.223] (linux-ses-ext02.ppmd.siemens.net [139.25.68.223]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id w288IKlx031694; Thu, 8 Mar 2018 09:18:20 +0100 Subject: Re: [PATCH v4 3/5] meta/buildchroot: switch to using isar-bootstrap From: Claudius Heine To: isar-users@googlegroups.com Cc: Claudius Heine References: <20180307164457.31933-1-claudius.heine.ext@siemens.com> <20180307164457.31933-4-claudius.heine.ext@siemens.com> Message-ID: <1328c470-71fb-7539-2231-2b4c3390e0ce@siemens.com> Date: Thu, 8 Mar 2018 09:18:20 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20180307164457.31933-4-claudius.heine.ext@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: VRzaQ8lBsXaX Hi, On 03/07/2018 05:44 PM, [ext] claudius.heine.ext@siemens.com wrote: > From: Claudius Heine > > This patch removes the multistrap dependency of the buildchroot recipe > and changes it to use the 'isar-bootstrap' and 'isar-bootstrap-helper' > instead. > > Signed-off-by: Claudius Heine > --- > meta/recipes-devtools/buildchroot/buildchroot.bb | 59 +++++----------- > meta/recipes-devtools/buildchroot/files/build.sh | 2 +- > .../buildchroot/files/configscript.sh | 10 --- > .../buildchroot/files/multistrap.conf.in | 37 ---------- > meta/recipes-devtools/buildchroot/files/setup.sh | 82 ---------------------- > 5 files changed, 18 insertions(+), 172 deletions(-) > delete mode 100644 meta/recipes-devtools/buildchroot/files/multistrap.conf.in > delete mode 100755 meta/recipes-devtools/buildchroot/files/setup.sh > > diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb > index 2fc5297..b16e63a 100644 > --- a/meta/recipes-devtools/buildchroot/buildchroot.bb > +++ b/meta/recipes-devtools/buildchroot/buildchroot.bb > @@ -8,13 +8,13 @@ DESCRIPTION = "Multistrap development filesystem" > LICENSE = "gpl-2.0" > LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" > > -FILESPATH =. "${LAYERDIR_core}/recipes-devtools/buildchroot/files:" > -SRC_URI = "file://multistrap.conf.in \ > - file://configscript.sh \ > - file://setup.sh \ > +FILESPATH_prepend := "${THISDIR}/files:" > +SRC_URI = "file://configscript.sh \ > file://build.sh" > PV = "1.0" > > +inherit isar-bootstrap-helper > + > BUILDCHROOT_PREINSTALL ?= "gcc \ > make \ > build-essential \ > @@ -31,51 +31,26 @@ BUILDCHROOT_PREINSTALL ?= "gcc \ > WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}" > > do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" > -do_build[depends] = "isar-apt:do_cache_config" > +do_build[root_cleandirs] = "${BUILDCHROOT_DIR} \ > + ${BUILDCHROOT_DIR}/isar-apt \ > + ${BUILDCHROOT_DIR}/downloads \ > + ${BUILDCHROOT_DIR}/home/builder" > +do_build[depends] = "isar-apt:do_cache_config isar-bootstrap:do_deploy" > > do_build() { > - E="${@ bb.utils.export_proxies(d)}" > - > - # If buildchroot re-build is triggered, this ensure that we are always > - # re-building a clean image: > - sudo rm -rf ${BUILDCHROOT_DIR} > - mkdir -p ${BUILDCHROOT_DIR}/isar-apt > - mkdir -p ${BUILDCHROOT_DIR}/downloads > - mkdir -p ${BUILDCHROOT_DIR}/dev > - mkdir -p ${BUILDCHROOT_DIR}/proc > - mkdir -p ${BUILDCHROOT_DIR}/sys > - > - chmod +x "${WORKDIR}/setup.sh" > - chmod +x "${WORKDIR}/configscript.sh" > - > - # 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|##BUILDCHROOT_PREINSTALL##|${BUILDCHROOT_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"'/configscript.sh|g' \ > - -e 's|##SETUP_SCRIPT##|./'"$WORKDIR_REL"'/setup.sh|g' \ > - -e 's|##DIR_HOOKS##|./'"$WORKDIR_REL"'/hooks_multistrap|g' \ > - "${WORKDIR}/multistrap.conf.in" > "${WORKDIR}/multistrap.conf" > - > - sudo mount --bind ${DEPLOY_DIR_APT}/${DISTRO} ${BUILDCHROOT_DIR}/isar-apt > - sudo mount -t devtmpfs -o mode=0755,nosuid devtmpfs ${BUILDCHROOT_DIR}/dev > - sudo mount -t proc none ${BUILDCHROOT_DIR}/proc > - sudo mount --bind ${DL_DIR} ${BUILDCHROOT_DIR}/downloads > + CDIRS="${@d.expand(d.getVarFlags("do_build").get("root_cleandirs", ""))}" > + if [ -n "$CDIRS" ]; then > + sudo rm -rf $CDIRS > + mkdir -p $CDIRS > + fi I introduced the 'root_cleandirs' flag in the hopes that these five lines could eventually move into base.bbclass and be available this way for all tasks that need it. That can be done in a later patch. Cheers, Claudius > > - # Create root filesystem > - sudo -E multistrap -a ${DISTRO_ARCH} -d "${BUILDCHROOT_DIR}" -f "${WORKDIR}/multistrap.conf" > + setup_root_file_system "${BUILDCHROOT_DIR}" ${BUILDCHROOT_PREINSTALL} > > # Install package builder script > + sudo chmod -R a+rw "${BUILDCHROOT_DIR}/home/builder" > sudo install -m 755 ${WORKDIR}/build.sh ${BUILDCHROOT_DIR} > > # Configure root filesystem > + sudo install -m 755 ${WORKDIR}/configscript.sh ${BUILDCHROOT_DIR} > sudo chroot ${BUILDCHROOT_DIR} /configscript.sh > } > diff --git a/meta/recipes-devtools/buildchroot/files/build.sh b/meta/recipes-devtools/buildchroot/files/build.sh > index 048f76f..06172f7 100644 > --- a/meta/recipes-devtools/buildchroot/files/build.sh > +++ b/meta/recipes-devtools/buildchroot/files/build.sh > @@ -29,7 +29,7 @@ install_cmd="${install_cmd} --allow-unauthenticated" > # APT::Get::List-Cleanup - do not erase obsolete packages list for > # upstream in '/var/lib/apt/lists' > apt-get update \ > - -o Dir::Etc::sourcelist="sources.list.d/multistrap-isar-apt.list" \ > + -o Dir::Etc::sourcelist="sources.list.d/isar-apt.list" \ > -o Dir::Etc::sourceparts="-" \ > -o APT::Get::List-Cleanup="0" > > diff --git a/meta/recipes-devtools/buildchroot/files/configscript.sh b/meta/recipes-devtools/buildchroot/files/configscript.sh > index a5942b5..c2a599a 100644 > --- a/meta/recipes-devtools/buildchroot/files/configscript.sh > +++ b/meta/recipes-devtools/buildchroot/files/configscript.sh > @@ -31,13 +31,3 @@ debconf-set-selections < locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8 > locales locales/default_environment_locale select en_US.UTF-8 > END > - > -#set up non-interactive configuration > -export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true > -export LC_ALL=C LANGUAGE=C LANG=C > - > -#run pre installation script > -/var/lib/dpkg/info/dash.preinst install > - > -#configuring packages > -dpkg --configure -a > diff --git a/meta/recipes-devtools/buildchroot/files/multistrap.conf.in b/meta/recipes-devtools/buildchroot/files/multistrap.conf.in > deleted file mode 100644 > index 480a4b8..0000000 > --- a/meta/recipes-devtools/buildchroot/files/multistrap.conf.in > +++ /dev/null > @@ -1,37 +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## > -aptsources=isar-apt ##DISTRO_MULTICONF_APTSOURCES## > -configscript=##CONFIG_SCRIPT## > -setupscript=##SETUP_SCRIPT## > -hookdir=##DIR_HOOKS## > - > -[base] > -source=##DISTRO_APT_SOURCE## > -suite=##DISTRO_SUITE## > -components=##DISTRO_COMPONENTS## > -packages=##BUILDCHROOT_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-apt] > -source=file:///isar-apt > -suite=isar > -components=main > -omitdebsrc=true > diff --git a/meta/recipes-devtools/buildchroot/files/setup.sh b/meta/recipes-devtools/buildchroot/files/setup.sh > deleted file mode 100755 > index 1257739..0000000 > --- a/meta/recipes-devtools/buildchroot/files/setup.sh > +++ /dev/null > @@ -1,82 +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 buildchroot > -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 buildchroot > -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 > - > -# Create packages build folder > -sudo install -d $TARGET/home/builder > -sudo chmod -R a+rw $TARGET/home/builder > - > -# Install host networking settings > -sudo cp /etc/resolv.conf $TARGET/etc > -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de