From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6506467811408216064 X-Received: by 10.28.125.141 with SMTP id y135mr4106189wmc.13.1514905091006; Tue, 02 Jan 2018 06:58:11 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.138.198 with SMTP id m189ls1528202wmd.4.canary-gmail; Tue, 02 Jan 2018 06:58:10 -0800 (PST) X-Google-Smtp-Source: ACJfBoum7HUQxUZdhLPI+z9H/IjazPopIflSuUSytVoac8/HSVMVvwHHeNBPzdqQGb0Mege2gQms X-Received: by 10.28.54.38 with SMTP id d38mr3974695wma.3.1514905090369; Tue, 02 Jan 2018 06:58:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514905090; cv=none; d=google.com; s=arc-20160816; b=wvD/EUhK3vc4MgJ8DJqi+qz6GQlzBvWslVmHlmt2kqwNwrmlFACigOIhtAgflABOVX Chyayj/3r1KnhoDNrFLMRSugRg9Z2AQv41ASvswNl6EbJfxf2MF676f3N8bMoswWOfhv bqWfUJbNqpSP1sGeDxDBCrZ9CMTyA8JJ2QIpHSDCJWbcR5BSqe2YxCoTgSEvCxsXqC0D WB5fBEXPxlLavIVntY181cvKApQTjBnFCjBbqHUibo2UGhScsRC29s7stwTSWu7tCSnF nHpQY4h9fjBkdOEqE3sgFvT/UzOly4Oj7uQPNkttH5HK7t8t5XrjottPIy+/npoAKDND jP8Q== 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=5QleTeuxRyh3eHe6602bAdd1zGcV4Eos1b9bANIxoG8=; b=pTMSfufbLmkmncZ2RvzEAZ3t2usdKUsQjaycI62FdL8K1+Q7eBlE+dYRpBUb1b6feP Nj0P5x8AzWtPpcByOwbCX2AH0st6+SWmwbeXzCSzCQB342oa4WS9pxG5HzyRJrffGaYP KCSEabi6kBYwSccJaEVHPqgs/XR8anamsAb+ew7jlv9Sug8LEFf0R5joz1YOEKBBVGYN NgWKIS+b7HsSichpNVBfdJoYsiBKorFQtG/T+F1yhcdHFwlplmuqhdzURx5cinrNQ/KK FoFXRe4fcWQBZU32MgmTAXFK7xOIZhh630z92jMs13RfIzU3AQETRnMJnmKBo2uPgMIX eP3g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id m3si166110wrm.5.2018.01.02.06.58.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jan 2018 06:58:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Received: from localhost.localdomain ([188.227.110.165]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w02Evpwi016822 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 2 Jan 2018 15:58:00 +0100 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [RFC][PATCH 3/6] buildchroot: Switch to base-apt Date: Tue, 2 Jan 2018 17:57:41 +0300 Message-Id: <20180102145744.21814-4-asmirnov@ilbers.de> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20180102145744.21814-1-asmirnov@ilbers.de> References: <20180102145744.21814-1-asmirnov@ilbers.de> X-TUID: C4hrVqKhVdEw Switch buildchroot generation from upstream repos to 'base-apt'. Signed-off-by: Alexander Smirnov --- meta/recipes-devtools/base-apt/base-apt.bb | 9 ++++++++- meta/recipes-devtools/buildchroot/buildchroot.bb | 5 +---- .../recipes-devtools/buildchroot/files/configscript.sh | 1 - .../buildchroot/files/multistrap.conf.in | 18 +++--------------- 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/meta/recipes-devtools/base-apt/base-apt.bb b/meta/recipes-devtools/base-apt/base-apt.bb index 108d501..741ebca 100644 --- a/meta/recipes-devtools/base-apt/base-apt.bb +++ b/meta/recipes-devtools/base-apt/base-apt.bb @@ -25,8 +25,15 @@ do_get_base_apt[dirs] = "${BASE_APT_CONF_DIR}" do_get_base_apt[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" do_get_base_apt() { + for package in `ls ${WORKDIR}/deps`; do + DEPS=$(cat ${WORKDIR}/deps/$package | xargs) + PACKAGES="$PACKAGES $DEPS" + done + + PACKAGES="$PACKAGES $BASE_PREINSTALL" + # Adjust multistrap config - sed -e 's|##BASE_PREINSTALL##|${BASE_PREINSTALL}|g' \ + sed -e 's|##BASE_PREINSTALL##|'"$PACKAGES"'|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' \ diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb index 098f5c7..4d773f9 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.bb +++ b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -57,10 +57,7 @@ do_build() { # 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_APT_SOURCE##|copy:///${BASE_APT_DIR}/apt|g' \ -e 's|##DISTRO_SUITE##|${DISTRO_SUITE}|g' \ -e 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|g' \ -e 's|##CONFIG_SCRIPT##|./'"$WORKDIR_REL"'/configscript.sh|g' \ diff --git a/meta/recipes-devtools/buildchroot/files/configscript.sh b/meta/recipes-devtools/buildchroot/files/configscript.sh index 9813c9a..458c94b 100644 --- a/meta/recipes-devtools/buildchroot/files/configscript.sh +++ b/meta/recipes-devtools/buildchroot/files/configscript.sh @@ -44,5 +44,4 @@ mount -t devtmpfs -o mode=0755,nosuid devtmpfs /dev #configuring packages dpkg --configure -a -apt-get update umount /dev diff --git a/meta/recipes-devtools/buildchroot/files/multistrap.conf.in b/meta/recipes-devtools/buildchroot/files/multistrap.conf.in index a0b28e3..622209c 100644 --- a/meta/recipes-devtools/buildchroot/files/multistrap.conf.in +++ b/meta/recipes-devtools/buildchroot/files/multistrap.conf.in @@ -5,27 +5,15 @@ noauth=true unpack=true ignorenativearch=true -bootstrap=##DISTRO_MULTICONF_BOOTSTRAP## -aptsources=##DISTRO_MULTICONF_APTSOURCES## +bootstrap=base-apt +aptsources=base-apt configscript=##CONFIG_SCRIPT## setupscript=##SETUP_SCRIPT## hookdir=##DIR_HOOKS## -[base] +[base-apt] 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 -- 2.1.4