From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6444761527129997312 X-Received: by 10.223.145.69 with SMTP id j63mr373669wrj.12.1500537974142; Thu, 20 Jul 2017 01:06:14 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.0.136 with SMTP id e8ls666084lji.21.gmail; Thu, 20 Jul 2017 01:06:13 -0700 (PDT) X-Received: by 10.25.32.140 with SMTP id g134mr443226lfg.10.1500537973506; Thu, 20 Jul 2017 01:06:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500537973; cv=none; d=google.com; s=arc-20160816; b=i0vGDwZxhvxB61GiGEPa27EOnwiIdS0hAtJxTeIPf+3iygF1tlWJAZwmxKA2Q1Jo6/ bTaZE5JWu2FGFloJEafa7B7uV6RvEg7EIAfE5NEMyCGF3X+2VtJ9Xsl84UQ6db+rMfZ3 A4umAtXIsOU7xq7hnYYBJLL76RkA6UDKSmrxe+wT5juRpILq6UxAVwTFSIfdHJoxR5Z1 D8/2P/SNTTPOvrmqh6NlB5Q7afQq/AuMTXtIB96VkkP7Sj6cmsG2aNC7xL6sEd3IAV5g CPbLaWB+HMwUHT8vEZMomwKglTPA2EAbnuoJH7GA0RkjugHEOY4QKhU5scrpAuYKC4pG qyNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=tQFO1vh2luoVoSKR3J9ixj8oHIguvZChzEeu/HfoF0s=; b=sAm6BK7cBCIPnt/8/zbgXXgxyE3x8r1XK6cQ7Y/mUjIVVSpLVvZN0iJIxJLSRjl2iV 1YMXbSeO9Uk6DESgNvHqAKSZRgp9rXbRc04wURm3bsIAdNowlJomivuMvXmuWXyGJKOe ga4TE2pF3q47Yke3DNUF3MC2cZu+cEfrkVwTQFTXVh9Q319GUfyCf3pqwTv2HYs7Mvoa XF53QiM7bLse2ZbMPBaBQZyksI4uEEVysfkwdaRrpPUXTyIwK4IOHLxQ0SVxzW1WEmsK IFf0VMXDMI3lMzMhHx7WhoLGOn57fMrc+R3VxL/vPuJwNL3S953U1bQvKYK8qZkKd0jE ATmg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 194.138.37.39 is neither permitted nor denied by best guess record for domain of claudius.heine.ext@siemens.com) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id 68si429827wmh.4.2017.07.20.01.06.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jul 2017 01:06:13 -0700 (PDT) Received-SPF: neutral (google.com: 194.138.37.39 is neither permitted nor denied by best guess record for domain of claudius.heine.ext@siemens.com) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 194.138.37.39 is neither permitted nor denied by best guess record for domain of claudius.heine.ext@siemens.com) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id v6K86C05007319 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 20 Jul 2017 10:06:13 +0200 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.68.223]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id v6K86BcD021513; Thu, 20 Jul 2017 10:06:11 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH 1/2] meta-isar: allow all distro variables to be overwritten by local.conf Date: Thu, 20 Jul 2017 10:06:02 +0200 Message-Id: <20170720080603.32206-2-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170720080603.32206-1-claudius.heine.ext@siemens.com> References: <20170720080603.32206-1-claudius.heine.ext@siemens.com> X-TUID: nZUFtRMMPsFi From: Claudius Heine Also removed '??=' because that not really necessary since the distro configuration is loaded after the local.conf anyway. --- meta-isar/conf/distro/debian-jessie.conf | 8 ++++---- meta-isar/conf/distro/debian-stretch.conf | 8 ++++---- meta-isar/conf/distro/raspbian-stable.conf | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta-isar/conf/distro/debian-jessie.conf b/meta-isar/conf/distro/debian-jessie.conf index 3aa8ee4..6a639e1 100644 --- a/meta-isar/conf/distro/debian-jessie.conf +++ b/meta-isar/conf/distro/debian-jessie.conf @@ -3,7 +3,7 @@ # This software is a part of ISAR. # Copyright (C) 2015-2016 ilbers GmbH -DISTRO_SUITE = "jessie" -DISTRO_COMPONENTS = "main contrib non-free" -DISTRO_APT_SOURCE ??= "http://httpredir.debian.org/debian" -DISTRO_CONFIG_SCRIPT = "debian-configscript.sh" +DISTRO_SUITE ?= "jessie" +DISTRO_COMPONENTS ?= "main contrib non-free" +DISTRO_APT_SOURCE ?= "http://deb.debian.org/debian" +DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh" diff --git a/meta-isar/conf/distro/debian-stretch.conf b/meta-isar/conf/distro/debian-stretch.conf index 00fea8a..aa1c89a 100644 --- a/meta-isar/conf/distro/debian-stretch.conf +++ b/meta-isar/conf/distro/debian-stretch.conf @@ -3,7 +3,7 @@ # This software is a part of ISAR. # Copyright (C) 2015-2016 ilbers GmbH -DISTRO_SUITE = "stretch" -DISTRO_COMPONENTS = "main contrib non-free" -DISTRO_APT_SOURCE ??= "http://ftp.debian.org/debian/" -DISTRO_CONFIG_SCRIPT = "debian-configscript.sh" +DISTRO_SUITE ?= "stretch" +DISTRO_COMPONENTS ?= "main contrib non-free" +DISTRO_APT_SOURCE ?= "http://deb.debian.org/debian" +DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh" diff --git a/meta-isar/conf/distro/raspbian-stable.conf b/meta-isar/conf/distro/raspbian-stable.conf index da8b37d..70066d5 100644 --- a/meta-isar/conf/distro/raspbian-stable.conf +++ b/meta-isar/conf/distro/raspbian-stable.conf @@ -3,7 +3,7 @@ # This software is a part of ISAR. # Copyright (C) 2015-2016 ilbers GmbH -DISTRO_SUITE = "stable" -DISTRO_COMPONENTS = "main contrib non-free firmware" -DISTRO_APT_SOURCE ??= "http://archive.raspbian.org/raspbian" -DISTRO_CONFIG_SCRIPT = "raspbian-configscript.sh" +DISTRO_SUITE ?= "jessie" +DISTRO_COMPONENTS ?= "main contrib non-free firmware" +DISTRO_APT_SOURCE ?= "http://archive.raspbian.org/raspbian" +DISTRO_CONFIG_SCRIPT ?= "raspbian-configscript.sh" -- 2.13.2