From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:adf:de90:: with SMTP id w16mr10105371wrl.292.1585230213565; Thu, 26 Mar 2020 06:43:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4b4f:: with SMTP id w15ls2830465wrs.1.gmail; Thu, 26 Mar 2020 06:43:33 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsuZpyxFkrwb5axttQx/Aw0CxaeBU+HgLJJbidX2Llqe+pJISHNJ/xnpAO4vF63OxtlYnOR X-Received: by 2002:adf:dd01:: with SMTP id a1mr10189943wrm.153.1585230212982; Thu, 26 Mar 2020 06:43:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585230212; cv=none; d=google.com; s=arc-20160816; b=LCUU+8hCOmh4MxwibObCoVZdRFkhdAnifgQiUGAT4hJFfX03+oTwCQ3uhcAJPQAFZd dx3Nmd8x/7Y2OFtVSzChEMMBd61ZSmL51uJmb8ZSLoss3K+Uj9rG3kNIgm/1vWW4WCJI BGkhAgtaT+apUsscxvijvsptYE5l3i4s9HbJkuIMGLQ3EM7zTQGNKutSSETdWVSDrups hRXzHhSOdDiSOZfZ6EhuA8Hu/g8tKSxwPn0b5Bd2D8SRZ0oFw7yUCq8OhAvT9ua0tlGo unKm+P4CNIJnCHHkI+cbiYUYv589JA9p0F3/6xOAtgM3iGeBeXFyvDmqaJe2b1NfJOYv Yr0w== 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=MREZ7HB3akyn5A50zRz9MF5EObNrdUjy1tdEIPd6RiM=; b=rr7YylR5f99rj+CDa7YcKECPTfPNF5z0LNwc1m4kWvEbhgWUqFw38wdRIdP7kzq6vZ El+sViYzCw0qOB629gB9ahLUJPUYDCcXQBoD+7FGKdrzlamrgcTQ1KnqfUzNFRNUTCqa 7Kf8IoxaiYIguTrnvwdmwac3Ft10Ygv0KfxmsiZwbXG3RIf8PcN8nAPilldwCoMPSUKz rYo6DuTpylwJaG/ldJplDHJJEY2ImodpuH+cZMhf2aNSWmzxzPAG3j3avqaJioilbEQt e0SGG6u9Q6fw5/HakBmr65Slk9BtAtk0P2pqs2sQUGx4Pv2ku2wB1WtEvGdVnmHWw5/C nMbQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id y201si374285wmc.0.2020.03.26.06.43.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Mar 2020 06:43:32 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 02QDhWFA006012 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Mar 2020 14:43:32 +0100 Received: from localhost.localdomain ([167.87.11.29]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02QDhSBd031897; Thu, 26 Mar 2020 14:43:31 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv8 07/29] ci: conf: add "hello" to the sample config and every build Date: Thu, 26 Mar 2020 14:43:03 +0100 Message-Id: <20200326134325.8672-8-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200326134325.8672-1-henning.schild@siemens.com> References: <20200326134325.8672-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: PrJh9LjTr53x 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 81a0426..ebc277b 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 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