From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a2e:b0db:: with SMTP id g27mr5918661ljl.74.1580481003997; Fri, 31 Jan 2020 06:30:03 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9c85:: with SMTP id x5ls113397lji.0.gmail; Fri, 31 Jan 2020 06:30:03 -0800 (PST) X-Google-Smtp-Source: APXvYqwetDepZKBeGWXI6bqGIs6c4kLRekn+as0k+BqOmC4WffLfleHY+RswePMohTsibTyx46B3 X-Received: by 2002:a2e:8145:: with SMTP id t5mr6173349ljg.144.1580481003362; Fri, 31 Jan 2020 06:30:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580481003; cv=none; d=google.com; s=arc-20160816; b=XXS1FYwksz2sDu16ZMKykjhsoSClwB9zkJicTkyZ/hPm0p7YXFS/tImwzKvSSIiBKG RtiFzK11bQoNyMsMgTYpTklKvQ45IX2Ckej2AlkKeZrsv7KDMUyUGw58geyKSAvq7irx k0hgjDM22jGNVzjZiRtK/Q5zL0clTeA8xuuhzwhbSshSh5Aja7kO56t3r60dpV2E2Cbo R8BUjmhQV/yj5DXwiuv22ZrNuwKx0wDWC7eLIopfJYtCZETPWTm8K8XN2B8zJfkCU8SN krLtpu3WRQncuBnAO3EQ14CzIT3zX1KWSORJiFX/9oKglLq79QK2O1dxN5WEMUwBUWO5 KgRA== 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=TkejASn9HnduNmFXqwblRdxxMynSnDMRpjLO1EOyGkQ=; b=pJyjrzn57bgYTYo8pdccbrbjMAOTkeMf7cjQhRhtG99tbmyeSb+JYPdmKGIAf5gyYW xI1z+SPv58NgLm+AfZgIpIBmnXb2Q9CXjASNIGB8xabDeXaVIvnThJJtzw7hx3FN7kSW zZqQWD6uyuJTPcNEOjDvuufMl9rUynBd6X61PZAgnLqQV6H8WzAnV7sh/YYeqBp/Mqhf H+OIywWAlc9Og/stA/3Pk2BOyM/rreVDOL6WVULfwsgxXUyRikLm8FnKuzfGGyAFAJSf G+l3/FqSqq/yt8WJt/nq0rAvasRaOb4OP7AKM9Rke2JNzJ/MKPbZwdM9QPRfWAWagQxm Gsvw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id x5si415596ljh.5.2020.01.31.06.30.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jan 2020 06:30:03 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 00VEU2s4008312 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jan 2020 15:30:02 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.68.229]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 00VEU1RL030231; Fri, 31 Jan 2020 15:30:02 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Henning Schild Subject: [PATCHv4 07/26] ci: conf: add "hello" to the sample config and every build Date: Fri, 31 Jan 2020 15:29:41 +0100 Message-Id: <20200131143000.14873-8-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200131143000.14873-1-henning.schild@siemens.com> References: <20200131143000.14873-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: yFowB+5Ru69g 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 280e0072..0e55da19 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 samefile" +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" -## 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 7cd5a2fc..f50c9e42 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -169,7 +169,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.24.1