From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6771003121820762112 X-Received: by 2002:a7b:c342:: with SMTP id l2mr31478432wmj.20.1576497016424; Mon, 16 Dec 2019 03:50:16 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:6385:: with SMTP id x127ls7965559wmb.2.gmail; Mon, 16 Dec 2019 03:50:15 -0800 (PST) X-Google-Smtp-Source: APXvYqy/dfqIgAbAT154X54FAjerXLw7iYEuZwRipaAP0qfDNIL8aB7bg2H70vePlnzDfyE8CeyX X-Received: by 2002:a05:600c:210e:: with SMTP id u14mr7407805wml.28.1576497015879; Mon, 16 Dec 2019 03:50:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576497015; cv=none; d=google.com; s=arc-20160816; b=x6IRpcyV/B7oA/N9vFCcxb+TNwoVa6r6eH26GAGabX709Z134o3EeSvbBsjjIijSL/ hssp1qxjmGcP7Dka6X5OZZURX6sEsDn76AYXKdRrH+eNKe8p1+AWJHLorw5t3kRo/6Oc tnQo8LPV6e5AlWlLqyaF4r/s4ND6LMGvVuOxNdT5Ru3z2x7Z33liNQy8/PGN/QZo1Shi cznotz+b7KmaKAZneN6CznAgCvq+75SjqCD3YqR7lZMuXfUj2vp87Oc1GUzBDSNZgjS/ qW7FAMWLJkU+PO0F/F9Cu9BtObsPOcsECNvvTBAAe2KqMC4QCp26rN2eq5/vjjritWSU fI4Q== 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:date:subject:cc:to:from; bh=rD84CyrK5fR7s69Uip7lmoCFlXb3I5+dvEuy8BCk0Ag=; b=u5seLU/QWBYes1FtVzDAVB6XW1AlsMuDO6wHW5dbQDx6OdzSo2ddN+Wqq3dw8EHoxF YgIJwms6xyYbCjXggoiVlBNMhMFub9tbBNUco3SGftGT4QZ/ZAz6Swphwmwo4c3iMTeJ 7ZBGHfn1RmrI/dKRnE7FV6jFcXbD0b48Uz0DgRBSrvpKN4k/eimAW+5fjBNK9CAwvVTQ TCKBAD5kWshYLXWc/E8N3y8Imfe4bamPFPbA3jNquwqjmoSrt+AaUyhumYY9fJMSaQOi R44tiFLfwvUpIDRb28wwQizre0GA5Q8melqp00Y2/gS+D+OR3N+o+nJNgpCSj46WyPNx mA9g== 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id y185si437357wmg.0.2019.12.16.03.50.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Dec 2019 03:50:15 -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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id xBGBoFRh003911 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 16 Dec 2019 12:50:15 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.101]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id xBGBoDWc009084; Mon, 16 Dec 2019 12:50:15 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Jan Kiszka , Baurzhan Ismagulov , chombourger@gmail.com, Henning Schild Subject: [PATCHv2 17/25] CI: include "isar-disable-apt-cache" into all CI images Date: Mon, 16 Dec 2019 12:50:03 +0100 Message-Id: <20191216115011.17664-18-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216115011.17664-1-henning.schild@siemens.com> References: <20191216115011.17664-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: XmS5gM2WyRZq From: Henning Schild The base-apt does not rely on the rootfs-cache anymore, so we can test our cleanup package in all images. Signed-off-by: Henning Schild --- meta-isar/conf/local.conf.sample | 4 +--- scripts/ci_build.sh | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 0e55da1..dee1250 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -166,9 +166,7 @@ CONF_VERSION = "1" # # The default list of extra packages to be installed. -IMAGE_INSTALL = "hello-isar example-raw example-module-${KERNEL_NAME} enable-fsck isar-exclude-docs samefile hello" -## "cache_base_repo" relies on the cache ... -#IMAGE_INSTALL += "isar-disable-apt-cache" +IMAGE_INSTALL = "hello-isar example-raw example-module-${KERNEL_NAME} enable-fsck isar-exclude-docs samefile hello isar-disable-apt-cache" # # Enable cross-compilation support diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index f50c9e4..bfaf1f6 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -168,8 +168,6 @@ if [ -n "$REPRO_BUILD" ]; then sed -i -e 's/ISAR_USE_CACHED_BASE_REPO ?= "1"/#ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf fi -sed -i -e 's/#IMAGE_INSTALL += "isar-disable-apt-cache"/IMAGE_INSTALL += "isar-disable-apt-cache"/g' conf/local.conf - echo 'IMAGE_INSTALL += "cowsay"' >> conf/local.conf # Start cross build for the defined set of configurations -- 2.24.1