From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a2e:9c4:: with SMTP id 187mr160401ljj.89.1583877403373; Tue, 10 Mar 2020 14:56:43 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:58c6:: with SMTP id u6ls2024118lfo.11.gmail; Tue, 10 Mar 2020 14:56:42 -0700 (PDT) X-Google-Smtp-Source: ADFU+vv/c1tSWmr8sATmjQXqSToYagi9oFUG/MgafhBNCYTGBDvu5bNxAIm23vtf/OsSf6uV3cGy X-Received: by 2002:a19:ae03:: with SMTP id f3mr138874lfc.28.1583877402564; Tue, 10 Mar 2020 14:56:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1583877402; cv=none; d=google.com; s=arc-20160816; b=tAyCmtpiHnu8+xAurAvGrcgEFaCaOXWElP7jQFdQNexVl/EwSLVUGRky92qycR2NLb j7lV7oa5jlunH5k9+y6rWpSnYg3bMz1+9dIdM22D8OgZKQhRvBsDuZE64D98VdDnUVuy RW/l178t3oYouM/7oErDlLFsbi6fH61CG/jx8E6PvEA0vQFd1zXnQiVEzsppvvDeRzyd aXArZUIIJ3IQ2a7kGfDb3rbHA5QPfT6n0nflhax66rML/6ejzR9d5F/meZN/KHlX/7d7 tZHKr36j38UD29zeztFoyhbOBGjnzpkg+MwQbTgZ+JbI0tRc1oPiIzXlaXv6hnMMAxL9 x6jQ== 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=Mf7jZvPZ07cwI47CjX6g+i3Y5qLZCNjwK80NSRnvd/0=; b=e9ALugDyBAcqMx4zpRYnfLbV8bUYIsWGOfYIQnYEDOdCRp1fwtVOp6NYOTogxVFhcx n/VYmvyqU1bwjhYdERAfmbK/XLEGmFtyHjHFxbND8eOzRdCHMGKt7dlzUumLm50APvea Q345/bBG2LzVythSVWYlUjAuPnI+ZXjxZD3Le4OGIZ/OLUBlOBW5RG0zw0DIJPAZfZ3t YFgiL9hMgQqFNPZUWzucJ3F4rJdKvK5i0a7MyLbOL9EKw9yWyMEqc3nFoiVR4nCC0TL3 6eIunKt+RZUTzYin2mcGdm5md2DSr5Zws4AiZs55tNWPxRpb9pqItP19QRNWUQULWqA5 EJxw== 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 r20si3118ljp.5.2020.03.10.14.56.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Mar 2020 14:56:42 -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 mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 02ALufEm011361 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 10 Mar 2020 22:56:41 +0100 Received: from localhost.localdomain ([139.22.36.172]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02ALub5p026985; Tue, 10 Mar 2020 22:56:41 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv5 07/29] ci: conf: add "hello" to the sample config and every build Date: Tue, 10 Mar 2020 22:56:09 +0100 Message-Id: <20200310215631.24859-8-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200310215631.24859-1-henning.schild@siemens.com> References: <20200310215631.24859-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: QMyVwl+TLCp4 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 81a04261..ebc277b1 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -169,11 +169,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