Re: [PATCHv2 1/2] isar-apt: Mark repo as trusted in sources.list

["Maxim Yu. Osipov" <mosipov@ilbers.de>]

On 05/24/2018 05:31 PM, Henning Schild wrote:
> This first patch was missing in v1. Note this might collide with stuff
> that Claudius has in the queue. Please merge if needed.

Merged and applied to next,

Thanks,
Maxim.

> The second patch was just rebased and the buster images in v2 use wic.
> 
> Henning
> 
> Am Thu, 24 May 2018 17:26:51 +0200
> schrieb Henning Schild <henning.schild@siemens.com>:
> 
>> Mark our own repository 'isar-apt' trusted in sources.list, and then
>> drop the '--allow-unauthenticated' switch we used for apt-get so far.
>>
>> Signed-off-by: Henning Schild <henning.schild@siemens.com>
>> ---
>>   meta/classes/isar-bootstrap-helper.bbclass       | 5 ++---
>>   meta/recipes-devtools/buildchroot/files/build.sh | 3 ---
>>   2 files changed, 2 insertions(+), 6 deletions(-)
>>
>> diff --git a/meta/classes/isar-bootstrap-helper.bbclass
>> b/meta/classes/isar-bootstrap-helper.bbclass index 4284d02..30f768c
>> 100644 --- a/meta/classes/isar-bootstrap-helper.bbclass
>> +++ b/meta/classes/isar-bootstrap-helper.bbclass
>> @@ -11,15 +11,14 @@ setup_root_file_system() {
>>       shift
>>       shift
>>       PACKAGES="$@"
>> -    APT_ARGS="install --yes --allow-unauthenticated \
>> -              -o Debug::pkgProblemResolver=yes"
>> +    APT_ARGS="install --yes -o Debug::pkgProblemResolver=yes"
>>       CLEANHOSTLEAK_FILES="${ROOTFSDIR}/etc/hostname
>> ${ROOTFSDIR}/etc/resolv.conf"
>>       sudo cp -Trpfx \
>>           "${DEPLOY_DIR_IMAGE}/isar-bootstrap-${DISTRO}-${DISTRO_ARCH}/"
>> \ "$ROOTFSDIR"
>>   
>> -    echo "deb file:///isar-apt ${DEBDISTRONAME} main" | \
>> +    echo "deb [trusted=yes] file:///isar-apt ${DEBDISTRONAME} main"
>> | \ sudo tee "$ROOTFSDIR/etc/apt/sources.list.d/isar-apt.list"
>>> /dev/null
>>       echo "Package: *\nPin: release n=${DEBDISTRONAME}\nPin-Priority:
>> 1000" | \ diff --git
>> a/meta/recipes-devtools/buildchroot/files/build.sh
>> b/meta/recipes-devtools/buildchroot/files/build.sh index
>> aa769e4..73c0889 100644 ---
>> a/meta/recipes-devtools/buildchroot/files/build.sh +++
>> b/meta/recipes-devtools/buildchroot/files/build.sh @@ -20,9 +20,6 @@
>> export LANGUAGE=C #   2) we add -y to go non-interactive
>> install_cmd="apt-get -o Debug::pkgProblemResolver=yes
>> --no-install-recommends -y" -# Allow unauthenticated feeds
>> -install_cmd="${install_cmd} --allow-unauthenticated"
>> -
>>   (
>>       # Lock-protected because apt and dpkg do not wait in case of
>> contention flock 42 || exit 1
> 


-- 
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov