From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6506467811408216064 X-Received: by 10.28.209.72 with SMTP id i69mr4417417wmg.10.1514905091361; Tue, 02 Jan 2018 06:58:11 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.128.150 with SMTP id b144ls1513044wmd.2.canary-gmail; Tue, 02 Jan 2018 06:58:10 -0800 (PST) X-Google-Smtp-Source: ACJfBotn+47ENX/WSdEaKS4iS0Js9ekxj811Hvgy/m7qripML6D/e4+ZXlIn3ABzFChMlOXWN12U X-Received: by 10.28.26.19 with SMTP id a19mr3959588wma.14.1514905090939; 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=GfmmMggxEGjdjJgKgNjqwW/7EOUF+at0aEvD5Ex7NvpS+nx0HAt8Zga/XVW0dQcqUq OisFqqWiMU9CSs64MRhGfUM04bcHjQPHZxxzhmEUj/huonjRiA6cD2LIoyy/n2tyf0Re nPR3vupdYiIvumMR4hseZ+ISRHCyGam2CRawF9yT3BGzD/PPVHzInCZJBm7Ewe6jLKwD NnH/ZZDaMjcc2l3Wjr2G52Be6r/jErkcYZZ6Y71spaK3bnF4MJVFtlAQPcFzAvYMX5cw iTJHe0JaEo4/Km+/ny/G+LtpQbn3jBwiNUbDBOXH4NJjUDxar9KvH2AwBlBNHO7/shmQ B5CA== 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=dGUVl+MCBGEIl1azcQaXSAF/TR9BdWMDjDZEoQRBmHk=; b=JC2OR/LqyW794uqXFUVaOv8uPgQH11nMY2rprs1iNe4nkGU6+pXk+n82NbAo7l54Xw IKVF23M7i3wt441csj82Yn24vbYAc1a333l84wZXvVu8wZGSHbES6DTYp5OXSPDpYh38 pDoodwNpb/34OvFb+EOEsAE5ZYoHNG4FNmcTsG0xY9ACfnYPjPPP6V8l9RqCTrNtU9H5 Boi6jM0z+wI3XzcH4IRSX8ytq7BOvr4TIauaMfrgtrEgLg9JXpEB5p6YoPBXi+OZxogN gwZx8gouzodUOeLhCMB33XOJFcjOURgK8v+T7l9S9FGahnXGiRu2nBSSqWLVZboy6UVB 1nrg== 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 q76si965765wme.3.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 w02Evpwk016822 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 2 Jan 2018 15:58:02 +0100 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [RFC][PATCH 5/6] image: Switch to base-apt Date: Tue, 2 Jan 2018 17:57:43 +0300 Message-Id: <20180102145744.21814-6-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: sLDglDxfxTVB Switch image generation from upstream repos to 'base-apt'. Signed-off-by: Alexander Smirnov --- meta-isar/recipes-core/images/files/multistrap.conf.in | 18 +++--------------- meta-isar/recipes-core/images/isar-image-base.bb | 5 +---- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/meta-isar/recipes-core/images/files/multistrap.conf.in b/meta-isar/recipes-core/images/files/multistrap.conf.in index 432b6af..6ba535f 100644 --- a/meta-isar/recipes-core/images/files/multistrap.conf.in +++ b/meta-isar/recipes-core/images/files/multistrap.conf.in @@ -5,31 +5,19 @@ noauth=true unpack=true ignorenativearch=true -bootstrap=##DISTRO_MULTICONF_BOOTSTRAP## Isar -aptsources=##DISTRO_MULTICONF_APTSOURCES## +bootstrap=base-apt Isar +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=##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## diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb index e359ac3..ec14a98 100644 --- a/meta-isar/recipes-core/images/isar-image-base.bb +++ b/meta-isar/recipes-core/images/isar-image-base.bb @@ -41,10 +41,7 @@ do_rootfs() { # 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_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"'/${DISTRO_CONFIG_SCRIPT}|g' \ -- 2.1.4