From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6540161972509343744 X-Received: by 2002:a19:2a8b:: with SMTP id q11-v6mr534241lfq.15.1522750121901; Tue, 03 Apr 2018 03:08:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.60.12 with SMTP id j12ls1748722lja.8.gmail; Tue, 03 Apr 2018 03:08:41 -0700 (PDT) X-Google-Smtp-Source: AIpwx48WUTG3XjDuehJHCreiTZiiIpJd4n76g9JOROc5pPjBB6vegkX2DzInd21FhaADbhAbnXM3 X-Received: by 10.46.58.12 with SMTP id h12mr476338lja.10.1522750121383; Tue, 03 Apr 2018 03:08:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522750121; cv=none; d=google.com; s=arc-20160816; b=hp8EmIUb/u0j2vDJrHNDv3rcAQFU3+ZHNToj2DNxfAVwfZ+NhwGGfol1VsZACwFCl+ Cls8qzdTgNCGQ8YpaSt7XB3+WYzyndyBrghPsvu1UaK+I36jS9BMJjasIDokoWeJTc/e RwswmaZ1KGWMeb0unLWYGX7Q6uR6Nrf8rdySMPFySwmvAJLUaogK0SMR6826vJO34WtA mnvKInJKkgtVKzv8DAKh0KStwDUVhP7+uTJ1+WmcyHl3EYczavCaLDKq/i6dkCIkEs2g fP63eMY8TDdicafNV8fjq266CSSkADdM8NiBe2tg1hDIqTvJuFq9PwzPyM1EPbpdoUj8 jBuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=LOIsxXe01tfq0hg/n/wTOBFVEXa8GyBpLojBwvaqakE=; b=qxd47mmRKHlkf25qV0Osqd2QAubq3lhOnyuJV2NxBFA6zWOPUPYtWXv2rb731JAeIn TgsREZ58i2N8z6T+1+YAbgYmmh4Azp0i8o0DiItpLShoHfWi5BkYer4YwaA+E/epoCtR YyO6T+WfaTlR6wTHByX56QXoUJgyN0/dQcX/bbWkjCQfL1Dg34jkDqXemtiAsvPGESti Zn+H1GV4UhEBTQx0SlVlliuuLpdtpWramI2qEBln0qMeMG+wA+qklc5E8ayBJbE6qWpa YaS/WahXyNV5nB0YnAk0ST6ABwT5JvMshh52/YiXwlLDJw+fOcA3VO6nrKf02YkS/6to t1IQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id t83-v6si4428lff.5.2018.04.03.03.08.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Apr 2018 03:08:41 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w33A8eYV022675 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 3 Apr 2018 12:08:40 +0200 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.226]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id w33A8eeS025465; Tue, 3 Apr 2018 12:08:40 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v5 4/5] meta-isar/isar-image-base: switch to using isar-bootstrap Date: Tue, 3 Apr 2018 12:08:01 +0200 Message-Id: <20180403100802.30710-5-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180403100802.30710-1-claudius.heine.ext@siemens.com> References: <20180403100802.30710-1-claudius.heine.ext@siemens.com> X-TUID: zTIcStcxo2G6 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 | 64 ++++++------------ meta/classes/image.bbclass | 2 +- 5 files changed, 22 insertions(+), 183 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 80cb666..c4799d3 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,30 @@ IMAGE_PREINSTALL += "apt \ WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}" -do_rootfs[dirs] = "${WORKDIR}/hooks_multistrap" +do_rootfs[root_cleandirs] = "${IMAGE_ROOTFS} \ + ${IMAGE_ROOTFS}/isar-apt" do_rootfs() { - E="${@ bb.utils.export_proxies(d)}" + CDIRS="${@d.expand(d.getVarFlags("do_rootfs").get("root_cleandirs", ""))}" + if [ -n "$CDIRS" ]; then + sudo rm -rf $CDIRS + mkdir -p $CDIRS + fi - 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 install -m 755 "${WORKDIR}/${DISTRO_CONFIG_SCRIPT}" "${IMAGE_ROOTFS}" sudo chroot ${IMAGE_ROOTFS} /${DISTRO_CONFIG_SCRIPT} ${MACHINE_SERIAL} \ - ${BAUDRATE_TTY} ${ROOTFS_DEV} ${ROOTFS_TYPE} - sudo rm "${IMAGE_ROOTFS}/${DISTRO_CONFIG_SCRIPT}" + ${BAUDRATE_TTY} \ + ${ROOTFS_DEV} \ + ${ROOTFS_TYPE} - 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 e1bb5f6..a6537f9 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -22,7 +22,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" -- 2.16.3