From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6752900179667451904 X-Received: by 2002:a2e:5d1:: with SMTP id 200mr9386792ljf.50.1572282097116; Mon, 28 Oct 2019 10:01:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9d44:: with SMTP id y4ls2630223ljj.4.gmail; Mon, 28 Oct 2019 10:01:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqyPwkX6WKazO4L080WHKDrEm9iubS3PCqdmFF35yFGdQxz4QZEZt0MU9382U2fM+3kBmzkx X-Received: by 2002:a2e:98c7:: with SMTP id s7mr11831853ljj.9.1572282096270; Mon, 28 Oct 2019 10:01:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572282096; cv=none; d=google.com; s=arc-20160816; b=VPG0/fHupVcGDQhNMJK+SmINIosnmg977flzWg9+U6sL/ZZ/cKK6U7ljr3qLSuDIMt K4yDh4VNuY+6PFJm79HH8EvMERjI7oOfTMqrX3BF6G7hvW6GqxGyUC6kb1AV/hB3iO/O l9xTEH+dAuDUMUntTKOeTa9y6kzOrJm/NymWBOmCAcpu+NQ8nDNBmGpBKfDfW0i36Y0y tW3cCtqM06/58jmss4hH092T9qv6VVTDB+6eqmaoyXtOuYkWlq11g/L/X6dZ7JGST5lc 8PXdO1RceCAqVjom3TyxER6J6FJBQoypWazCpJboaRxyXxjxW2lWnv7W96DVZgPlWx6w aEYg== 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=IolRN/LsBNnJbdTB0VMAa3h0bOAx/KThvfr3gW60NrQ=; b=YLAMEYNaMiJkuJhn2CF75ghJmCcgkLOLXdJSWrUFGxOp4PmVCb8eF9+bhnwzRyKfgu /iwTZuOVgrTr3Fe4xJdGJD4PyrBqKzsSIoV83xHSssOwvlgwPXOBuzIOVC1in3Z+JN8J EXnXnz/BdQEDLcB0NEEs8kb8XnYjlBb1LSBpJK+/2wW4SwW5CcmW1G3fLX/Qhf3rCQI+ OF4bCIvSjhJbpwKd1dZqge6Gy/HqaY7i1ryysbadxX6r+iewgMjm6DX1pL/Gp+uIy3bM BIYy0fBnzU9BBQNQZGqxCLNjV8iyl4oK86F2WAOrCR4UBie0g7GaRVvoddtIqZbFqpVx h5Ng== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id b22si74839ljo.3.2019.10.28.10.01.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Oct 2019 10:01:36 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x9SH1Zn4030492 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 28 Oct 2019 18:01:35 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.244]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x9SH1YPL025390; Mon, 28 Oct 2019 18:01:35 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 15/17] CI: include "isar-disable-apt-cache" into all CI images Date: Mon, 28 Oct 2019 18:01:30 +0100 Message-Id: <20191028170132.28072-16-henning.schild@siemens.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191028170132.28072-1-henning.schild@siemens.com> References: <20191028170132.28072-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: lXhvrbIxDtjs 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 eee8da3..abed01e 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 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 isar-disable-apt-cache hello" # # Enable cross-compilation support diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 713d1c2..285f4d8 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -153,8 +153,6 @@ if [ -n "$REPRO_BUILD" ]; then sed -i -e 's/^BASE_REPO_KEY/#BASE_REPO_KEY/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.23.0