From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6771003121820762112 X-Received: by 2002:a2e:2e0e:: with SMTP id u14mr12653552lju.106.1576497015889; Mon, 16 Dec 2019 03:50:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:3f0b:: with SMTP id m11ls1420278lfa.0.gmail; Mon, 16 Dec 2019 03:50:15 -0800 (PST) X-Google-Smtp-Source: APXvYqwMPk7kur9B56HQMbnqMyOVHPsIcEfoxAe1kOihkeLn25QCIspzTB/PiZEQVm4QnJ7UjMl9 X-Received: by 2002:a19:8842:: with SMTP id k63mr16429581lfd.90.1576497015179; 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=SukdAoujTyxgBq/oziFfgR/oWZpMflHh9nex4TsCRJM84xL8uSeG+MPIXkvxI2LTbg iiVoc1gjR2dbQo5okNBMHLC8dnyjfVfXug2ji9w4yPEhOrVrKykjl7eBD/iv9yMSGJ2P MsjVh4V7X1AdW4tYVAzyhNDGsOgPFFUy7osRnqUJFONBzqNz1XPFwmcmJSxiveGisTXH RgBx/zfTIAJrStWn9VNA//s6KKQ+JgrvnddgNWa+AvCgHs4GJBkvZ5Ya5n8LOvVNkGu1 5b8vfnfQj+6tpx2X9BiMd3hYFZjKo1y0+l1HI0+H4vu2QsgoYn438Wsk55ILERiODmDE QN9A== 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=GtU/Ea1oSkm9OR1EL/6WhL0CGo2lmmvUzfktJKfO8Co=; b=n7ausGEsaBDgNr8Cum3l8PvYzL3KdfND0yv2JoWZgMjjSAo9z2jUylXSwo84zOjwNX CjSaHv91v3pZXw+zJ7HuvhHahE8XbTMeATg2qZoCbTTi8mIUu+/Z/YkkCVZWLYCtuOaO Zl3njEEoYC0Fut8QvJSG66Qv/IIboaBkAPnWJ4i8cVxZwHgQdf7YBUCIwvUbSVIs8p3V 30noNWyMj7BxRQ/mzA2a75AlUq9JwBisRDPuzxosa7J4DYY78s+X4UHGQvc43dEpoZ5B A3LPTRm9LUjqeh6XMJbFjIZyHanpubc1JFWiGkV7OrL5i8BsDSerkEGDlDVyISF9ZiWf P8Jg== 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 x5si681691ljh.5.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 xBGBoEfU003866 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 16 Dec 2019 12:50:14 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.101]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id xBGBoDWS009084; Mon, 16 Dec 2019 12:50:13 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Jan Kiszka , Baurzhan Ismagulov , chombourger@gmail.com, Henning Schild Subject: [PATCHv2 07/25] ci: conf: add "hello" to the sample config and every build Date: Mon, 16 Dec 2019 12:49:53 +0100 Message-Id: <20191216115011.17664-8-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: BeoHTTvuElrH 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 280e007..0e55da1 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 7cd5a2f..f50c9e4 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