* [PATCH v2 0/2] Allow for overwriting settings in local.conf
@ 2017-07-20 8:15 claudius.heine.ext
2017-07-20 8:15 ` [PATCH v2 1/2] meta-isar: allow all distro variables to be overwritten by local.conf claudius.heine.ext
2017-07-20 8:15 ` [PATCH v2 2/2] meta-isar/machine: replaced '=' with '+=' or '?=' to allow overwrite claudius.heine.ext
0 siblings, 2 replies; 5+ messages in thread
From: claudius.heine.ext @ 2017-07-20 8:15 UTC (permalink / raw)
To: isar-users; +Cc: Claudius Heine
From: Claudius Heine <ch@denx.de>
Hi,
sorry for sending this again. I forgot to sign patch 1.
Claudius
Claudius Heine (2):
meta-isar: allow all distro variables to be overwritten by local.conf
meta-isar/machine: replaced '=' with '+=' or '?=' to allow overwrite
meta-isar/conf/distro/debian-jessie.conf | 8 ++++----
meta-isar/conf/distro/debian-stretch.conf | 8 ++++----
meta-isar/conf/distro/raspbian-stable.conf | 8 ++++----
meta-isar/conf/machine/qemu-amd64.conf | 14 +++++++-------
meta-isar/conf/machine/qemu-i386.conf | 16 ++++++++--------
meta-isar/conf/machine/qemuarm.conf | 14 +++++++-------
meta-isar/conf/machine/rpi.conf | 16 ++++++++--------
7 files changed, 42 insertions(+), 42 deletions(-)
--
2.13.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 1/2] meta-isar: allow all distro variables to be overwritten by local.conf
2017-07-20 8:15 [PATCH v2 0/2] Allow for overwriting settings in local.conf claudius.heine.ext
@ 2017-07-20 8:15 ` claudius.heine.ext
2017-07-21 8:39 ` Jan Kiszka
2017-07-20 8:15 ` [PATCH v2 2/2] meta-isar/machine: replaced '=' with '+=' or '?=' to allow overwrite claudius.heine.ext
1 sibling, 1 reply; 5+ messages in thread
From: claudius.heine.ext @ 2017-07-20 8:15 UTC (permalink / raw)
To: isar-users; +Cc: Claudius Heine
From: Claudius Heine <ch@denx.de>
Also removed '??=' because that not really necessary since the distro
configuration is loaded after the local.conf anyway.
Signed-off-by: Claudius Heine <ch@denx.de>
---
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 2/2] meta-isar/machine: replaced '=' with '+=' or '?=' to allow overwrite
2017-07-20 8:15 [PATCH v2 0/2] Allow for overwriting settings in local.conf claudius.heine.ext
2017-07-20 8:15 ` [PATCH v2 1/2] meta-isar: allow all distro variables to be overwritten by local.conf claudius.heine.ext
@ 2017-07-20 8:15 ` claudius.heine.ext
1 sibling, 0 replies; 5+ messages in thread
From: claudius.heine.ext @ 2017-07-20 8:15 UTC (permalink / raw)
To: isar-users; +Cc: Claudius Heine
From: Claudius Heine <ch@denx.de>
Signed-off-by: Claudius Heine <ch@denx.de>
---
meta-isar/conf/machine/qemu-amd64.conf | 14 +++++++-------
meta-isar/conf/machine/qemu-i386.conf | 16 ++++++++--------
meta-isar/conf/machine/qemuarm.conf | 14 +++++++-------
meta-isar/conf/machine/rpi.conf | 16 ++++++++--------
4 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/meta-isar/conf/machine/qemu-amd64.conf b/meta-isar/conf/machine/qemu-amd64.conf
index 161ee12..886e365 100644
--- a/meta-isar/conf/machine/qemu-amd64.conf
+++ b/meta-isar/conf/machine/qemu-amd64.conf
@@ -1,16 +1,16 @@
# This software is a part of ISAR.
# Copyright (C) 2015-2016 ilbers GmbH
-IMAGE_PREINSTALL = " \
+IMAGE_PREINSTALL += " \
init \
linux-image-4.9.0-3-amd64 \
"
-KERNEL_IMAGE = "vmlinuz-4.9.0-3-amd64"
-INITRD_IMAGE = "initrd.img-4.9.0-3-amd64"
+KERNEL_IMAGE ?= "vmlinuz-4.9.0-3-amd64"
+INITRD_IMAGE ?= "initrd.img-4.9.0-3-amd64"
-MACHINE_SERIAL = "ttyS0"
-ROOTFS_DEV = "sda"
-BAUDRATE_TTY = "115200"
+MACHINE_SERIAL ?= "ttyS0"
+ROOTFS_DEV ?= "sda"
+BAUDRATE_TTY ?= "115200"
-IMAGE_TYPE = "ext4-img"
+IMAGE_TYPE ?= "ext4-img"
diff --git a/meta-isar/conf/machine/qemu-i386.conf b/meta-isar/conf/machine/qemu-i386.conf
index 2188494..13d3990 100644
--- a/meta-isar/conf/machine/qemu-i386.conf
+++ b/meta-isar/conf/machine/qemu-i386.conf
@@ -1,18 +1,18 @@
# This software is a part of ISAR.
# Copyright (C) 2015-2016 ilbers GmbH
-IMAGE_PREINSTALL = " \
+IMAGE_PREINSTALL += " \
init \
linux-image-4.9.0-2-686-pae \
"
-KERNEL_IMAGE = "vmlinuz-4.9.0-2-686-pae"
-INITRD_IMAGE = "initrd.img-4.9.0-2-686-pae"
+KERNEL_IMAGE ?= "vmlinuz-4.9.0-2-686-pae"
+INITRD_IMAGE ?= "initrd.img-4.9.0-2-686-pae"
-IMAGE_BOOT_FILES = "${KERNEL_IMAGE}"
+IMAGE_BOOT_FILES ?= "${KERNEL_IMAGE}"
-MACHINE_SERIAL = "ttyS0"
-ROOTFS_DEV = "sda"
-BAUDRATE_TTY = "115200"
+MACHINE_SERIAL ?= "ttyS0"
+ROOTFS_DEV ?= "sda"
+BAUDRATE_TTY ?= "115200"
-IMAGE_TYPE = "ext4-img"
+IMAGE_TYPE ?= "ext4-img"
diff --git a/meta-isar/conf/machine/qemuarm.conf b/meta-isar/conf/machine/qemuarm.conf
index 9ace4ec..5616649 100644
--- a/meta-isar/conf/machine/qemuarm.conf
+++ b/meta-isar/conf/machine/qemuarm.conf
@@ -1,16 +1,16 @@
# This software is a part of ISAR.
# Copyright (C) 2015-2016 ilbers GmbH
-IMAGE_PREINSTALL = " \
+IMAGE_PREINSTALL += " \
init \
linux-image-4.9.0-3-armmp \
"
-KERNEL_IMAGE = "vmlinuz-4.9.0-3-armmp"
-INITRD_IMAGE = "initrd.img-4.9.0-3-armmp"
+KERNEL_IMAGE ?= "vmlinuz-4.9.0-3-armmp"
+INITRD_IMAGE ?= "initrd.img-4.9.0-3-armmp"
-MACHINE_SERIAL = "ttyAMA0"
-ROOTFS_DEV = "mmcblk0"
-BAUDRATE_TTY = "9600"
+MACHINE_SERIAL ?= "ttyAMA0"
+ROOTFS_DEV ?= "mmcblk0"
+BAUDRATE_TTY ?= "9600"
-IMAGE_TYPE = "ext4-img"
+IMAGE_TYPE ?= "ext4-img"
diff --git a/meta-isar/conf/machine/rpi.conf b/meta-isar/conf/machine/rpi.conf
index 3ad3f59..dec02d2 100644
--- a/meta-isar/conf/machine/rpi.conf
+++ b/meta-isar/conf/machine/rpi.conf
@@ -1,15 +1,15 @@
# This software is a part of ISAR.
# Copyright (C) 2015-2016 ilbers GmbH
-IMAGE_PREINSTALL = "linux-image-rpi-rpfv \
+IMAGE_PREINSTALL += "linux-image-rpi-rpfv \
raspberrypi-bootloader-nokernel"
-KERNEL_IMAGE = "vmlinuz-4.4.0-1-rpi"
-INITRD_IMAGE = "initrd.img-4.4.0-1-rpi"
-IMAGE_BOOT_FILES = "boot_rpi/overlays/*;overlays/* boot_rpi/*.*"
+KERNEL_IMAGE ?= "vmlinuz-4.4.0-1-rpi"
+INITRD_IMAGE ?= "initrd.img-4.4.0-1-rpi"
+IMAGE_BOOT_FILES ?= "boot_rpi/overlays/*;overlays/* boot_rpi/*.*"
-MACHINE_SERIAL = "ttyAMA0"
-ROOTFS_DEV = "mmcblk0p2"
-BAUDRATE_TTY = "9600"
+MACHINE_SERIAL ?= "ttyAMA0"
+ROOTFS_DEV ?= "mmcblk0p2"
+BAUDRATE_TTY ?= "9600"
-IMAGE_TYPE = "rpi-sdimg"
+IMAGE_TYPE ?= "rpi-sdimg"
--
2.13.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] meta-isar: allow all distro variables to be overwritten by local.conf
2017-07-20 8:15 ` [PATCH v2 1/2] meta-isar: allow all distro variables to be overwritten by local.conf claudius.heine.ext
@ 2017-07-21 8:39 ` Jan Kiszka
2017-07-21 9:07 ` Claudius Heine
0 siblings, 1 reply; 5+ messages in thread
From: Jan Kiszka @ 2017-07-21 8:39 UTC (permalink / raw)
To: [ext] claudius.heine.ext@siemens.com, isar-users; +Cc: Claudius Heine
On 2017-07-20 10:15, [ext] claudius.heine.ext@siemens.com wrote:
> From: Claudius Heine <ch@denx.de>
>
> Also removed '??=' because that not really necessary since the distro
> configuration is loaded after the local.conf anyway.
I suppose you based this on my "Allow overwriting of DISTRO_APT_SOURCE
via local.conf" patch, which I didn't send yet. Better base it on
master, then I can skip the submission.
Jan
>
> Signed-off-by: Claudius Heine <ch@denx.de>
> ---
> 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"
>
--
Siemens AG, Corporate Technology, CT RDA ITP SES-DE
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] meta-isar: allow all distro variables to be overwritten by local.conf
2017-07-21 8:39 ` Jan Kiszka
@ 2017-07-21 9:07 ` Claudius Heine
0 siblings, 0 replies; 5+ messages in thread
From: Claudius Heine @ 2017-07-21 9:07 UTC (permalink / raw)
To: Jan Kiszka, [ext] claudius.heine.ext@siemens.com, isar-users
[-- Attachment #1: Type: text/plain, Size: 962 bytes --]
On Fri, 2017-07-21 at 10:39 +0200, Jan Kiszka wrote:
> On 2017-07-20 10:15, [ext] claudius.heine.ext@siemens.com wrote:
> > From: Claudius Heine <ch@denx.de>
> >
> > Also removed '??=' because that not really necessary since the
> > distro
> > configuration is loaded after the local.conf anyway.
>
> I suppose you based this on my "Allow overwriting of
> DISTRO_APT_SOURCE
> via local.conf" patch, which I didn't send yet.
Since I joined the isar mailinglist relatively recently, I didn't knew
that.
I will rebase that to master and resubmit it on Monday.
Cheers,
Claudius
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de
PGP key: 6FF2 E59F 00C6 BC28 31D8 64C1 1173 CB19 9808 B153
Keyserver: hkp://pool.sks-keyservers.net
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-07-21 9:07 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-20 8:15 [PATCH v2 0/2] Allow for overwriting settings in local.conf claudius.heine.ext
2017-07-20 8:15 ` [PATCH v2 1/2] meta-isar: allow all distro variables to be overwritten by local.conf claudius.heine.ext
2017-07-21 8:39 ` Jan Kiszka
2017-07-21 9:07 ` Claudius Heine
2017-07-20 8:15 ` [PATCH v2 2/2] meta-isar/machine: replaced '=' with '+=' or '?=' to allow overwrite claudius.heine.ext
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox