From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6752900179667451904 X-Received: by 2002:a1c:3884:: with SMTP id f126mr253657wma.162.1572282095790; Mon, 28 Oct 2019 10:01:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:dd03:: with SMTP id a3ls9715912wrm.6.gmail; Mon, 28 Oct 2019 10:01:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqx8SDqZ34rAPyOKM+APF/84erWoC20v7RfgugGCuGwWSNo3nLF6mr7tZWmEWe/bL6I1owHu X-Received: by 2002:a5d:6a84:: with SMTP id s4mr16732909wru.237.1572282095129; Mon, 28 Oct 2019 10:01:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572282095; cv=none; d=google.com; s=arc-20160816; b=decxCUxf1c0lEIFvYk4JS/FcGixVWv4qqqYdx+oJjSsq+26e+gTKlklmfQ+GETsQoi qDyFlohZEmQrMN66X4iGgEfH9liuCNaqkkdVFqg8NC44yYsXjSmItKGo4msMFv2omWQI DPPxekBzMc5T/aoGRwOhboyB07YSW2bf35iGPggk4FHVnCOOe58qGslj2xOPoaV9W9jk Qpra/kUZ61e4PH0s5L/zgp7++Zfi6BYtOwWBc09US1YScfb8m1PV5Yy65ABrOpL/NAoj a5UCrA7VL4ZvNtiJwjkzqdoJyWD4FqsSEJ7VTTgCfLd/mfSWNAg4Km5q9nyxyBRAOc2d PiXQ== 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=tmcEtItktpZqLd8EONtDZaF2XM58oo3+Jl+n1wTA/sM=; b=E3jMikhQcNe4w18BHZ7yu4xlRzeHLxRlpLpYej2mUrxbIn3Rua302loQF04FPvvX9i MESPpLqhVChOLpZ247VAchrXnWY8ccv5klCQpbghDIJpijCLqks4sOvffXw9bCOoxS6Q QNpM0WcSt/rHfGwzM2m8TtQSlL5AyaIAODWyRh/JWjKgwCE9UT4AKXNpnFZ3bJS6pso7 DuZ1kY/X0IqR1YWdutZiWR1FeMwB6H0uu0yCR4RR55TPSQrMa3Kd0s/6bCBXkEi0juve rl9++556E3r1NLTMWKvBs126aCwvAVgPdQlLO7OCKtrxMbv791QMd8HP485/NliKBTrG lOeg== 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 c12si18704wrn.2.2019.10.28.10.01.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Oct 2019 10:01:35 -0700 (PDT) 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 mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x9SH1YVT007985 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 28 Oct 2019 18:01:34 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.244]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x9SH1YPC025390; Mon, 28 Oct 2019 18:01:34 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 06/17] ci: conf: add "hello" to the sample config and every build Date: Mon, 28 Oct 2019 18:01:21 +0100 Message-Id: <20191028170132.28072-7-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: feqTAqlw4hud From: Henning Schild Now that base-apt supports deb-src we can include hello in a standard build. Signed-off-by: Henning Schild --- meta-isar/conf/local.conf.sample | 4 +--- scripts/ci_build.sh | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 7715ce8..eee8da3 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -166,11 +166,9 @@ 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" +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" -## uses apt:// SRC_URI, which does not work with the cache -#IMAGE_INSTALL += "hello" # # Enable cross-compilation support diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index d88f46b..713d1c2 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -154,7 +154,6 @@ if [ -n "$REPRO_BUILD" ]; then fi sed -i -e 's/#IMAGE_INSTALL += "isar-disable-apt-cache"/IMAGE_INSTALL += "isar-disable-apt-cache"/g' conf/local.conf -sed -i -e 's/#IMAGE_INSTALL += "hello"/IMAGE_INSTALL += "hello"/g' conf/local.conf echo 'IMAGE_INSTALL += "cowsay"' >> conf/local.conf -- 2.23.0