From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6444761527603953664 X-Received: by 10.28.12.134 with SMTP id 128mr207934wmm.29.1500538564811; Thu, 20 Jul 2017 01:16:04 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.87.65 with SMTP id r1ls359791ljd.27.gmail; Thu, 20 Jul 2017 01:16:04 -0700 (PDT) X-Received: by 10.46.20.3 with SMTP id u3mr470954ljd.43.1500538564537; Thu, 20 Jul 2017 01:16:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500538564; cv=none; d=google.com; s=arc-20160816; b=0taE9mVOzty9/Hhykn670vOgA0w9Wh5U2tkgqzciwqi8nMrcYuB5qo6/9xQjv+huse 0mFUUnese3hWaXxxevqaYvDEP+rlsPAj1HwabuX/VKUpVOGCnHOJMx6L9K1Cr0W+tzsR pW/fJjLRTp9i16mB3lg/s+6T0UIncDCdFKTXax4cL2LjyPr+D6fFE+1OoA6YLNlR+BSz q0ekjCoW5p8/+jiRaeJz7qLk/dEQZ24uS3RmqMBpDdwiVw6mbwRJJMlSe1Dnq7BxSwv2 T/xFlNzh2BLwttv3CsJoRn0Pd+shntHYnazvRwRMsJl31nhYZugBjjpafDk4igwfyAe7 itrA== 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=l4qNfdQ1Hh1E0UDUIh9r0MtSQ7aqCu1d5QC/JKpOgQM=; b=wWXa2xz9qKapybOXnhnvk5uHBlQ6TFPjkPO9IGmdNB5wfbM5/2c2Q9JvkO0NwYMnts J+JJfkONNi/SoG4t7UNQkH+3DPIodInB/rG9K/wGyCwf9SkGwImoITKionOLhTLEkyi9 sa03n6R6kVtJHLiTZGaIxWWuTacCsCgiaEJJHQeuxDGy+vzZlteV6W1H9643PFf4hm0s niwSgTvifChfwScPrJzHoUrCyJolBDv11gWYhT4+zDghRiQbO2PuT5RPyKkGc6c467JW ib+IB8XnsMXupi+VPIKlxTqvONM6pmiSwEg40uAvQ3WnSGjESi/zl4UGwNZFTk3fncfI 8XJQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id m85si583042wmi.7.2017.07.20.01.16.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jul 2017 01:16:04 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.28 is neither permitted nor denied by best guess record for domain of claudius.heine.ext@siemens.com) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.28 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 goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id v6K8G3ju013641 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 20 Jul 2017 10:16:03 +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 v6K8G21c028923; Thu, 20 Jul 2017 10:16:03 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v2 1/2] meta-isar: allow all distro variables to be overwritten by local.conf Date: Thu, 20 Jul 2017 10:15:41 +0200 Message-Id: <20170720081542.32733-2-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170720081542.32733-1-claudius.heine.ext@siemens.com> References: <20170720081542.32733-1-claudius.heine.ext@siemens.com> X-TUID: FNyZgbQ4VMWR From: Claudius Heine Also removed '??=' because that not really necessary since the distro configuration is loaded after the local.conf anyway. Signed-off-by: Claudius Heine --- 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