From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6520199916203016192 X-Received: by 10.28.63.65 with SMTP id m62mr296991wma.18.1518194797981; Fri, 09 Feb 2018 08:46:37 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.223.187.9 with SMTP id r9ls2320836wrg.4.gmail; Fri, 09 Feb 2018 08:46:37 -0800 (PST) X-Google-Smtp-Source: AH8x224tv2nwFslk35DjOX9XhxIhB+DH+X2ZzfaKvvj7RJTPwmc8qr2N2Eu9C4ocaBaybPt3Xw30 X-Received: by 10.223.130.184 with SMTP id 53mr397818wrc.6.1518194797440; Fri, 09 Feb 2018 08:46:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518194797; cv=none; d=google.com; s=arc-20160816; b=VmgNYT7QNWerxGusD9FB9XnsD35JvT97NWeenI2UM8JFbwQIrDiWMU2gUX220s1ibR DvOXSfE6RIMKa7FGjUXf4eZK6q9nTzxdxwvlJA/F6vUD2qC7vuuirA3ez5yetE++4LdV G9mKb/6HjSV46lOsMSdC3INDBVRIEAfi50NbM248zqpiTigQK/BStFHSsE79U4AQKtOn 8t5hX+IxQRGw2JGXx9/G5+wiSKstqiRqFNbBGzXwp/KeJf8jMrKivszaIVt+DzxSdTJF rBQQ/dXq2j1t6zrbOBfL1YS4pTW5+vJE49ZhKkXlvjllcJiajmSvg0ACn38oXc5JEtO/ HEYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:arc-authentication-results; bh=PUlb/zeJTy/cDz7INk4Vt2wc1WeRDwjhu7AEP/DPIv4=; b=ujevVgDGISSt3EqrWANY28AuDHa1UJwDx/kho9IUF1hyOTaztuZbfI/Q/QhaPrxSEO 402hyfaWvPVuxxPied4PoosaKC3dDArPdUFG4S9paqF/2nROjCF/HaLGMMHX0j6cnjxw 642gKUWzd+Md2/JinfH3y/H9xR+E+HamofS/MHXjW3cQL1/pEo3ZxVBOn0B4QdRQj43e fNr1BgwMyRjwJaKrRB1OdnQY3UI2mwi0v5oov3dqINqeGB166XRWql3TKG1S0rQNv/HT ux2gD/AfwDMQxgGxXOoySsrpfcBN+OWtm0Ovt/jAQLxyuYpagl+EprfTd/+SOjq5biGi VQzQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id y42si124648wry.5.2018.02.09.08.46.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Feb 2018 08:46:37 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@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 henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@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 w19GkbDj002829 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 9 Feb 2018 17:46:37 +0100 Received: from mmd1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w19Gkb9Z008719; Fri, 9 Feb 2018 17:46:37 +0100 Date: Fri, 9 Feb 2018 17:46:36 +0100 From: Henning Schild To: "[ext] Jan Kiszka" Cc: isar-users Subject: Re: [PATCH v2 2/8] Prioritize isar-apt repo over all others Message-ID: <20180209174636.1072b5c3@mmd1pvb1c.ad001.siemens.net> In-Reply-To: <4bf281bca0d2afbf2bc661b70ed9a6932c72fcde.1518110579.git.jan.kiszka@siemens.com> References: <4bf281bca0d2afbf2bc661b70ed9a6932c72fcde.1518110579.git.jan.kiszka@siemens.com> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: hX2dY5mPVFIx Am Thu, 8 Feb 2018 18:22:53 +0100 schrieb "[ext] Jan Kiszka" : > From: Jan Kiszka > > This ensures that we can override packages from upstream Debian or > other external sources with our self-built versions. We achieve this > for now by asking multistrap to drop a preferences file for the > buildchroot so that dependency installations use the right priority. > For the image build, this does not work because all packages are pull > during the bootstrap. Therefore, we set aptdefaultrelease to isar to > ensure that our repo gets the higher priority. > > Signed-off-by: Jan Kiszka > --- > meta-isar/recipes-core/images/files/multistrap.conf.in | 1 + > meta-isar/recipes-core/images/isar-image-base.bb | 1 + > meta/recipes-devtools/buildchroot/buildchroot.bb | 4 +++- > meta/recipes-devtools/buildchroot/files/isar-apt-prefs | 3 +++ > meta/recipes-devtools/buildchroot/files/multistrap.conf.in | 1 + > 5 files changed, 9 insertions(+), 1 deletion(-) > create mode 100644 > meta/recipes-devtools/buildchroot/files/isar-apt-prefs > > diff --git a/meta-isar/recipes-core/images/files/multistrap.conf.in > b/meta-isar/recipes-core/images/files/multistrap.conf.in index > 432b6af..2ab7eab 100644 --- > a/meta-isar/recipes-core/images/files/multistrap.conf.in +++ > b/meta-isar/recipes-core/images/files/multistrap.conf.in @@ -10,6 > +10,7 @@ aptsources=##DISTRO_MULTICONF_APTSOURCES## > configscript=##CONFIG_SCRIPT## setupscript=##SETUP_SCRIPT## > hookdir=##DIR_HOOKS## > +aptdefaultrelease=isar This is a hack for the bootstrap environment, we probably need the prevs here as well. I guess an apt-get update/upgrade in the image would get me the debian kernel again. Henning > [base] > source=##DISTRO_APT_SOURCE## > diff --git a/meta-isar/recipes-core/images/isar-image-base.bb > b/meta-isar/recipes-core/images/isar-image-base.bb index > 8ddbabb..e54b9a6 100644 --- > a/meta-isar/recipes-core/images/isar-image-base.bb +++ > b/meta-isar/recipes-core/images/isar-image-base.bb @@ -53,6 +53,7 @@ > do_rootfs() { -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' \ > + -e 's|##APT_PREFS##|./'"$WORKDIR_REL"'/isar-apt-prefs|g' \ > "${WORKDIR}/multistrap.conf.in" > > "${WORKDIR}/multistrap.conf" > # Do not use bitbake flag [dirs] here because this folder should > have diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb > b/meta/recipes-devtools/buildchroot/buildchroot.bb index > df9df19..bf80114 100644 --- > a/meta/recipes-devtools/buildchroot/buildchroot.bb +++ > b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -12,7 +12,8 @@ > FILESPATH =. "${LAYERDIR_core}/recipes-devtools/buildchroot/files:" > SRC_URI = "file://multistrap.conf.in \ file://configscript.sh \ > file://setup.sh \ > - file://build.sh" > + file://build.sh \ > + file://isar-apt-prefs" > PV = "1.0" > > BUILDCHROOT_PREINSTALL ?= "gcc \ > @@ -58,6 +59,7 @@ do_build() { > -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' \ > + -e 's|##APT_PREFS##|./'"$WORKDIR_REL"'/isar-apt-prefs|g' \ > "${WORKDIR}/multistrap.conf.in" > > "${WORKDIR}/multistrap.conf" > do_setup_mounts > diff --git a/meta/recipes-devtools/buildchroot/files/isar-apt-prefs > b/meta/recipes-devtools/buildchroot/files/isar-apt-prefs new file > mode 100644 index 0000000..2db40e5 > --- /dev/null > +++ b/meta/recipes-devtools/buildchroot/files/isar-apt-prefs > @@ -0,0 +1,3 @@ > +Package: * > +Pin: release n=isar,c=main > +Pin-Priority: 1001 > diff --git > a/meta/recipes-devtools/buildchroot/files/multistrap.conf.in > b/meta/recipes-devtools/buildchroot/files/multistrap.conf.in index > 480a4b8..89c4968 100644 --- > a/meta/recipes-devtools/buildchroot/files/multistrap.conf.in +++ > b/meta/recipes-devtools/buildchroot/files/multistrap.conf.in @@ -10,6 > +10,7 @@ aptsources=isar-apt ##DISTRO_MULTICONF_APTSOURCES## > configscript=##CONFIG_SCRIPT## setupscript=##SETUP_SCRIPT## > hookdir=##DIR_HOOKS## +aptpreferences=##APT_PREFS## > > [base] > source=##DISTRO_APT_SOURCE##