From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a17:906:298f:: with SMTP id x15mr11797085eje.380.1584779521618; Sat, 21 Mar 2020 01:32:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:11c2:: with SMTP id va2ls4532906ejb.6.gmail; Sat, 21 Mar 2020 01:32:01 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvIKSQtsmxe6+trafS0YFCd6taUpQ8DWMlNu84ojCrDYki6RqA7ETrFM5V6ehXNUA5u7N0l X-Received: by 2002:a17:906:d145:: with SMTP id br5mr12171648ejb.92.1584779521064; Sat, 21 Mar 2020 01:32:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584779521; cv=none; d=google.com; s=arc-20160816; b=HZpLla4kcGAfVx/ToDP6beSymOU2gNxEzYv5IhrxEo0bisAQ0apFZlV5DO4XjaeKIQ jQ5Xz9P1eDe1oZsXoufllXDdWtfUCSprypWKYWrVATDfXWgR9oBZ303w+wjduqAvkpal Fcb43Ea/x4AkeifgzpD/Dp+6BGX4y4hS1oFc0Fs2cJE3Bf4dieFTUI78pw0K+j/pAOiw 1kYSutz6Uw2bzFT/3nwDxlDLxODtVAAiyA/x9KgKUdr1+mD7NAbpUwukHpFBqtG+MMam SeaeVycZmk7qw35tH9ZsSnL9Y5lfqFqtmWDF3+Sv8jCUYVCbl/74iksmKZ9xUOPbwerL mleg== 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=zoJ8r+n6vvtK5RCjVqqy7/Aq8glqaSY31cqTIev4Dkqo0YezVIDoHZA+9FuS7GWoBV b4tKYhAxXpegm/6F2Xmc7gMbtGKBqf6HlufBSoOeVsHVZfBkRGze+U2aMd7j8cRn6KXC 3vV9S8YScrOiavU5qMCJzGwiON32qEA/VwtN7GWovaAvDcNEP9mo5JcsJ0ENsmmT5Yft 4V6VfSbB65OUDwNMZwd2w8xWVy4Crz2fstf+J08bbCbpo97vK2kVfwr3FMh3zFZmSTP4 9Igug53MGvU4ZtZdNfF3wDsXnWGSKJ79dznXsUwwnhkCiYzVROipkQI0YFQCngjyiP2d WfLg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id cw13si457023edb.2.2020.03.21.01.32.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Mar 2020 01:32:01 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 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 thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 02L8W0Sd009501 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 21 Mar 2020 09:32:00 +0100 Received: from localhost.localdomain ([139.22.32.253]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02L8VuGL021533; Sat, 21 Mar 2020 09:31:59 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv7 07/29] ci: conf: add "hello" to the sample config and every build Date: Sat, 21 Mar 2020 09:31:26 +0100 Message-Id: <20200321083148.26160-8-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200321083148.26160-1-henning.schild@siemens.com> References: <20200321083148.26160-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: Jy++W/BUoON+ 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