* [PATCH 0/1] Overwritable variables @ 2017-07-24 6:40 claudius.heine.ext 2017-07-24 6:40 ` [PATCH 1/1] meta-isar: allow all config variables to be overwritten by local.conf claudius.heine.ext 0 siblings, 1 reply; 3+ messages in thread From: claudius.heine.ext @ 2017-07-24 6:40 UTC (permalink / raw) To: isar-users; +Cc: Claudius Heine From: Claudius Heine <ch@denx.de> Hi, here is the new patch that is based on master. I combined the last two patches into one and expanded on them. Now all variables from distro, machine and multiconfig are overwritable. Cheers, Claudius Claudius Heine (1): meta-isar: allow all config variables to be overwritten by local.conf meta-isar/conf/distro/debian-jessie.conf | 8 ++++---- meta-isar/conf/distro/debian-stretch.conf | 8 ++++---- meta-isar/conf/distro/debian-wheezy.conf | 8 ++++---- meta-isar/conf/distro/raspbian-jessie.conf | 8 ++++---- meta-isar/conf/machine/qemuamd64.conf | 6 +++--- meta-isar/conf/machine/qemuarm.conf | 6 +++--- meta-isar/conf/machine/qemui386.conf | 6 +++--- meta-isar/conf/machine/rpi.conf | 6 +++--- meta-isar/conf/multiconfig/qemuamd64-jessie.conf | 22 +++++++++++----------- meta-isar/conf/multiconfig/qemuamd64-stretch.conf | 22 +++++++++++----------- meta-isar/conf/multiconfig/qemuarm-jessie.conf | 22 +++++++++++----------- meta-isar/conf/multiconfig/qemuarm-stretch.conf | 22 +++++++++++----------- meta-isar/conf/multiconfig/qemuarm-wheezy.conf | 22 +++++++++++----------- meta-isar/conf/multiconfig/qemui386-jessie.conf | 22 +++++++++++----------- meta-isar/conf/multiconfig/qemui386-stretch.conf | 22 +++++++++++----------- meta-isar/conf/multiconfig/rpi-jessie.conf | 14 +++++++------- 16 files changed, 112 insertions(+), 112 deletions(-) -- 2.13.2 ^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1] meta-isar: allow all config variables to be overwritten by local.conf 2017-07-24 6:40 [PATCH 0/1] Overwritable variables claudius.heine.ext @ 2017-07-24 6:40 ` claudius.heine.ext 2017-07-24 6:44 ` Jan Kiszka 0 siblings, 1 reply; 3+ messages in thread From: claudius.heine.ext @ 2017-07-24 6:40 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/distro/debian-jessie.conf | 8 ++++---- meta-isar/conf/distro/debian-stretch.conf | 8 ++++---- meta-isar/conf/distro/debian-wheezy.conf | 8 ++++---- meta-isar/conf/distro/raspbian-jessie.conf | 8 ++++---- meta-isar/conf/machine/qemuamd64.conf | 6 +++--- meta-isar/conf/machine/qemuarm.conf | 6 +++--- meta-isar/conf/machine/qemui386.conf | 6 +++--- meta-isar/conf/machine/rpi.conf | 6 +++--- meta-isar/conf/multiconfig/qemuamd64-jessie.conf | 22 +++++++++++----------- meta-isar/conf/multiconfig/qemuamd64-stretch.conf | 22 +++++++++++----------- meta-isar/conf/multiconfig/qemuarm-jessie.conf | 22 +++++++++++----------- meta-isar/conf/multiconfig/qemuarm-stretch.conf | 22 +++++++++++----------- meta-isar/conf/multiconfig/qemuarm-wheezy.conf | 22 +++++++++++----------- meta-isar/conf/multiconfig/qemui386-jessie.conf | 22 +++++++++++----------- meta-isar/conf/multiconfig/qemui386-stretch.conf | 22 +++++++++++----------- meta-isar/conf/multiconfig/rpi-jessie.conf | 14 +++++++------- 16 files changed, 112 insertions(+), 112 deletions(-) diff --git a/meta-isar/conf/distro/debian-jessie.conf b/meta-isar/conf/distro/debian-jessie.conf index 08543f3..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://deb.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 6d7ed91..3555c14 100644 --- a/meta-isar/conf/distro/debian-stretch.conf +++ b/meta-isar/conf/distro/debian-stretch.conf @@ -1,7 +1,7 @@ # This software is a part of ISAR. # Copyright (C) 2017 ilbers GmbH -DISTRO_SUITE = "stretch" -DISTRO_COMPONENTS = "main contrib non-free" -DISTRO_APT_SOURCE = "http://deb.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/debian-wheezy.conf b/meta-isar/conf/distro/debian-wheezy.conf index 3ddfd8b..8e5ceac 100644 --- a/meta-isar/conf/distro/debian-wheezy.conf +++ b/meta-isar/conf/distro/debian-wheezy.conf @@ -3,7 +3,7 @@ # This software is a part of ISAR. # Copyright (C) 2015-2016 ilbers GmbH -DISTRO_SUITE = "wheezy" -DISTRO_COMPONENTS = "main contrib non-free" -DISTRO_APT_SOURCE = "http://deb.debian.org/debian" -DISTRO_CONFIG_SCRIPT = "debian-configscript.sh" +DISTRO_SUITE ?= "wheezy" +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-jessie.conf b/meta-isar/conf/distro/raspbian-jessie.conf index 6310a96..70066d5 100644 --- a/meta-isar/conf/distro/raspbian-jessie.conf +++ b/meta-isar/conf/distro/raspbian-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 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" diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf index 79483c1..1eb85e6 100644 --- a/meta-isar/conf/machine/qemuamd64.conf +++ b/meta-isar/conf/machine/qemuamd64.conf @@ -1,7 +1,7 @@ # This software is a part of ISAR. # Copyright (C) 2017 ilbers GmbH -MACHINE_SERIAL = "ttyS0" -BAUDRATE_TTY = "115200" +MACHINE_SERIAL ?= "ttyS0" +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 36c50b2..70dd941 100644 --- a/meta-isar/conf/machine/qemuarm.conf +++ b/meta-isar/conf/machine/qemuarm.conf @@ -1,7 +1,7 @@ # This software is a part of ISAR. # Copyright (C) 2015-2017 ilbers GmbH -MACHINE_SERIAL = "ttyAMA0" -BAUDRATE_TTY = "115200" +MACHINE_SERIAL ?= "ttyAMA0" +BAUDRATE_TTY ?= "115200" -IMAGE_TYPE = "ext4-img" +IMAGE_TYPE ?= "ext4-img" diff --git a/meta-isar/conf/machine/qemui386.conf b/meta-isar/conf/machine/qemui386.conf index 79483c1..1eb85e6 100644 --- a/meta-isar/conf/machine/qemui386.conf +++ b/meta-isar/conf/machine/qemui386.conf @@ -1,7 +1,7 @@ # This software is a part of ISAR. # Copyright (C) 2017 ilbers GmbH -MACHINE_SERIAL = "ttyS0" -BAUDRATE_TTY = "115200" +MACHINE_SERIAL ?= "ttyS0" +BAUDRATE_TTY ?= "115200" -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 77af6a9..31f2219 100644 --- a/meta-isar/conf/machine/rpi.conf +++ b/meta-isar/conf/machine/rpi.conf @@ -1,7 +1,7 @@ # This software is a part of ISAR. # Copyright (C) 2015-2017 ilbers GmbH -MACHINE_SERIAL = "ttyAMA0" -BAUDRATE_TTY = "9600" +MACHINE_SERIAL ?= "ttyAMA0" +BAUDRATE_TTY ?= "9600" -IMAGE_TYPE = "rpi-sdimg" +IMAGE_TYPE ?= "rpi-sdimg" diff --git a/meta-isar/conf/multiconfig/qemuamd64-jessie.conf b/meta-isar/conf/multiconfig/qemuamd64-jessie.conf index 7089b5d..5926ddc 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-jessie.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-jessie.conf @@ -1,19 +1,19 @@ # This software is a part of ISAR. # Copyright (C) 2017 ilbers GmbH -MACHINE = "qemuamd64" +MACHINE ?= "qemuamd64" -DISTRO = "debian-jessie" -DISTRO_ARCH = "amd64" +DISTRO ?= "debian-jessie" +DISTRO_ARCH ?= "amd64" -IMAGE_PREINSTALL = "linux-image-3.16.0-4-amd64" +IMAGE_PREINSTALL += "linux-image-3.16.0-4-amd64" -KERNEL_IMAGE = "vmlinuz-3.16.0-4-amd64" -INITRD_IMAGE = "initrd.img-3.16.0-4-amd64" +KERNEL_IMAGE ?= "vmlinuz-3.16.0-4-amd64" +INITRD_IMAGE ?= "initrd.img-3.16.0-4-amd64" -ROOTFS_DEV = "sda" +ROOTFS_DEV ?= "sda" -QEMU_ARCH = "x86_64" -QEMU_MACHINE = "pc" -QEMU_CPU = "" -QEMU_ROOTFS_DEV = "-hda ##ROOTFS_IMAGE##" +QEMU_ARCH ?= "x86_64" +QEMU_MACHINE ?= "pc" +QEMU_CPU ?= "" +QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE##" diff --git a/meta-isar/conf/multiconfig/qemuamd64-stretch.conf b/meta-isar/conf/multiconfig/qemuamd64-stretch.conf index a1a0f9a..9ae0f75 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-stretch.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-stretch.conf @@ -1,22 +1,22 @@ # This software is a part of ISAR. # Copyright (C) 2017 ilbers GmbH -MACHINE = "qemuamd64" +MACHINE ?= "qemuamd64" -DISTRO = "debian-stretch" -DISTRO_ARCH = "amd64" +DISTRO ?= "debian-stretch" +DISTRO_ARCH ?= "amd64" -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" -ROOTFS_DEV = "sda" +ROOTFS_DEV ?= "sda" -QEMU_ARCH = "x86_64" -QEMU_MACHINE = "pc" -QEMU_CPU = "" -QEMU_ROOTFS_DEV = "-hda ##ROOTFS_IMAGE##" +QEMU_ARCH ?= "x86_64" +QEMU_MACHINE ?= "pc" +QEMU_CPU ?= "" +QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE##" diff --git a/meta-isar/conf/multiconfig/qemuarm-jessie.conf b/meta-isar/conf/multiconfig/qemuarm-jessie.conf index 0872720..f2bacd8 100644 --- a/meta-isar/conf/multiconfig/qemuarm-jessie.conf +++ b/meta-isar/conf/multiconfig/qemuarm-jessie.conf @@ -7,21 +7,21 @@ # environment. # This sets the default machine to be qemuarm in this configuration: -MACHINE = "qemuarm" +MACHINE ?= "qemuarm" # This sets the default multistrap configuration: -DISTRO = "debian-jessie" -DISTRO_ARCH = "armhf" +DISTRO ?= "debian-jessie" +DISTRO_ARCH ?= "armhf" -IMAGE_PREINSTALL = "linux-image-3.16.0-4-armmp" +IMAGE_PREINSTALL += "linux-image-3.16.0-4-armmp" -KERNEL_IMAGE = "vmlinuz-3.16.0-4-armmp" -INITRD_IMAGE = "initrd.img-3.16.0-4-armmp" +KERNEL_IMAGE ?= "vmlinuz-3.16.0-4-armmp" +INITRD_IMAGE ?= "initrd.img-3.16.0-4-armmp" -ROOTFS_DEV = "vda" +ROOTFS_DEV ?= "vda" -QEMU_ARCH = "arm" -QEMU_MACHINE = "virt" -QEMU_CPU = "cortex-a15" +QEMU_ARCH ?= "arm" +QEMU_MACHINE ?= "virt" +QEMU_CPU ?= "cortex-a15" # TODO: start_vm doesn't support multiline vars -QEMU_ROOTFS_DEV = "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" +QEMU_ROOTFS_DEV ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" diff --git a/meta-isar/conf/multiconfig/qemuarm-stretch.conf b/meta-isar/conf/multiconfig/qemuarm-stretch.conf index 8025f40..e793f8f 100644 --- a/meta-isar/conf/multiconfig/qemuarm-stretch.conf +++ b/meta-isar/conf/multiconfig/qemuarm-stretch.conf @@ -1,23 +1,23 @@ # This software is a part of ISAR. # Copyright (C) 2017 ilbers GmbH -MACHINE = "qemuarm" +MACHINE ?= "qemuarm" -DISTRO = "debian-stretch" -DISTRO_ARCH = "armhf" +DISTRO ?= "debian-stretch" +DISTRO_ARCH ?= "armhf" -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" -ROOTFS_DEV = "vda" +ROOTFS_DEV ?= "vda" -QEMU_ARCH = "arm" -QEMU_MACHINE = "virt" -QEMU_CPU = "cortex-a15" +QEMU_ARCH ?= "arm" +QEMU_MACHINE ?= "virt" +QEMU_CPU ?= "cortex-a15" # TODO: start_vm doesn't support multiline vars -QEMU_ROOTFS_DEV = "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" +QEMU_ROOTFS_DEV ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" diff --git a/meta-isar/conf/multiconfig/qemuarm-wheezy.conf b/meta-isar/conf/multiconfig/qemuarm-wheezy.conf index 8b79c67..92cffbd 100644 --- a/meta-isar/conf/multiconfig/qemuarm-wheezy.conf +++ b/meta-isar/conf/multiconfig/qemuarm-wheezy.conf @@ -7,20 +7,20 @@ # environment. # This sets the default machine to be qemuarm in this configuration: -MACHINE = "qemuarm" +MACHINE ?= "qemuarm" # This sets the default multistrap configuration: -DISTRO = "debian-wheezy" -DISTRO_ARCH = "armhf" +DISTRO ?= "debian-wheezy" +DISTRO_ARCH ?= "armhf" -IMAGE_PREINSTALL = "linux-image-3.2.0-4-vexpress" +IMAGE_PREINSTALL += "linux-image-3.2.0-4-vexpress" -KERNEL_IMAGE = "vmlinuz-3.2.0-4-vexpress" -INITRD_IMAGE = "initrd.img-3.2.0-4-vexpress" +KERNEL_IMAGE ?= "vmlinuz-3.2.0-4-vexpress" +INITRD_IMAGE ?= "initrd.img-3.2.0-4-vexpress" -ROOTFS_DEV = "mmcblk0" +ROOTFS_DEV ?= "mmcblk0" -QEMU_ARCH = "arm" -QEMU_MACHINE = "vexpress-a9" -QEMU_CPU = "" -QEMU_ROOTFS_DEV = "-sd ##ROOTFS_IMAGE##" +QEMU_ARCH ?= "arm" +QEMU_MACHINE ?= "vexpress-a9" +QEMU_CPU ?= "" +QEMU_ROOTFS_DEV ?= "-sd ##ROOTFS_IMAGE##" diff --git a/meta-isar/conf/multiconfig/qemui386-jessie.conf b/meta-isar/conf/multiconfig/qemui386-jessie.conf index 028de10..3ccce91 100644 --- a/meta-isar/conf/multiconfig/qemui386-jessie.conf +++ b/meta-isar/conf/multiconfig/qemui386-jessie.conf @@ -1,19 +1,19 @@ # This software is a part of ISAR. # Copyright (C) 2017 ilbers GmbH -MACHINE = "qemui386" +MACHINE ?= "qemui386" -DISTRO = "debian-jessie" -DISTRO_ARCH = "i386" +DISTRO ?= "debian-jessie" +DISTRO_ARCH ?= "i386" -IMAGE_PREINSTALL = "linux-image-3.16.0-4-686-pae" +IMAGE_PREINSTALL += "linux-image-3.16.0-4-686-pae" -KERNEL_IMAGE = "vmlinuz-3.16.0-4-686-pae" -INITRD_IMAGE = "initrd.img-3.16.0-4-686-pae" +KERNEL_IMAGE ?= "vmlinuz-3.16.0-4-686-pae" +INITRD_IMAGE ?= "initrd.img-3.16.0-4-686-pae" -ROOTFS_DEV = "sda" +ROOTFS_DEV ?= "sda" -QEMU_ARCH = "i386" -QEMU_MACHINE = "pc" -QEMU_CPU = "" -QEMU_ROOTFS_DEV = "-hda ##ROOTFS_IMAGE##" +QEMU_ARCH ?= "i386" +QEMU_MACHINE ?= "pc" +QEMU_CPU ?= "" +QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE##" diff --git a/meta-isar/conf/multiconfig/qemui386-stretch.conf b/meta-isar/conf/multiconfig/qemui386-stretch.conf index 50d14a0..fa38120 100644 --- a/meta-isar/conf/multiconfig/qemui386-stretch.conf +++ b/meta-isar/conf/multiconfig/qemui386-stretch.conf @@ -1,22 +1,22 @@ # This software is a part of ISAR. # Copyright (C) 2017 ilbers GmbH -MACHINE = "qemui386" +MACHINE ?= "qemui386" -DISTRO = "debian-stretch" -DISTRO_ARCH = "i386" +DISTRO ?= "debian-stretch" +DISTRO_ARCH ?= "i386" -IMAGE_PREINSTALL = " \ +IMAGE_PREINSTALL += " \ init \ linux-image-4.9.0-3-686-pae \ " -KERNEL_IMAGE = "vmlinuz-4.9.0-3-686-pae" -INITRD_IMAGE = "initrd.img-4.9.0-3-686-pae" +KERNEL_IMAGE ?= "vmlinuz-4.9.0-3-686-pae" +INITRD_IMAGE ?= "initrd.img-4.9.0-3-686-pae" -ROOTFS_DEV = "sda" +ROOTFS_DEV ?= "sda" -QEMU_ARCH = "i386" -QEMU_MACHINE = "pc" -QEMU_CPU = "" -QEMU_ROOTFS_DEV = "-hda ##ROOTFS_IMAGE##" +QEMU_ARCH ?= "i386" +QEMU_MACHINE ?= "pc" +QEMU_CPU ?= "" +QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE##" diff --git a/meta-isar/conf/multiconfig/rpi-jessie.conf b/meta-isar/conf/multiconfig/rpi-jessie.conf index 8a97085..29c361c 100644 --- a/meta-isar/conf/multiconfig/rpi-jessie.conf +++ b/meta-isar/conf/multiconfig/rpi-jessie.conf @@ -7,13 +7,13 @@ # environment. # This sets the default machine to be rpi in this configuration: -MACHINE = "rpi" +MACHINE ?= "rpi" # This sets the default multistrap configuration: -DISTRO = "raspbian-jessie" -DISTRO_ARCH = "armhf" +DISTRO ?= "raspbian-jessie" +DISTRO_ARCH ?= "armhf" -IMAGE_PREINSTALL = " \ +IMAGE_PREINSTALL += " \ bind9-host \ dnsutils \ iproute2 \ @@ -31,7 +31,7 @@ IMAGE_PREINSTALL = " \ vim \ " -KERNEL_IMAGE = "vmlinuz-4.9.0-2-rpi" -INITRD_IMAGE = "initrd.img-4.9.0-2-rpi" +KERNEL_IMAGE ?= "vmlinuz-4.9.0-2-rpi" +INITRD_IMAGE ?= "initrd.img-4.9.0-2-rpi" -ROOTFS_DEV = "mmcblk0p2" +ROOTFS_DEV ?= "mmcblk0p2" -- 2.13.2 ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] meta-isar: allow all config variables to be overwritten by local.conf 2017-07-24 6:40 ` [PATCH 1/1] meta-isar: allow all config variables to be overwritten by local.conf claudius.heine.ext @ 2017-07-24 6:44 ` Jan Kiszka 0 siblings, 0 replies; 3+ messages in thread From: Jan Kiszka @ 2017-07-24 6:44 UTC (permalink / raw) To: [ext] claudius.heine.ext@siemens.com, isar-users; +Cc: Claudius Heine On 2017-07-24 08:40, [ext] claudius.heine.ext@siemens.com wrote: > From: Claudius Heine <ch@denx.de> > -ENOCOMMITMSG 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/debian-wheezy.conf | 8 ++++---- > meta-isar/conf/distro/raspbian-jessie.conf | 8 ++++---- > meta-isar/conf/machine/qemuamd64.conf | 6 +++--- > meta-isar/conf/machine/qemuarm.conf | 6 +++--- > meta-isar/conf/machine/qemui386.conf | 6 +++--- > meta-isar/conf/machine/rpi.conf | 6 +++--- > meta-isar/conf/multiconfig/qemuamd64-jessie.conf | 22 +++++++++++----------- > meta-isar/conf/multiconfig/qemuamd64-stretch.conf | 22 +++++++++++----------- > meta-isar/conf/multiconfig/qemuarm-jessie.conf | 22 +++++++++++----------- > meta-isar/conf/multiconfig/qemuarm-stretch.conf | 22 +++++++++++----------- > meta-isar/conf/multiconfig/qemuarm-wheezy.conf | 22 +++++++++++----------- > meta-isar/conf/multiconfig/qemui386-jessie.conf | 22 +++++++++++----------- > meta-isar/conf/multiconfig/qemui386-stretch.conf | 22 +++++++++++----------- > meta-isar/conf/multiconfig/rpi-jessie.conf | 14 +++++++------- > 16 files changed, 112 insertions(+), 112 deletions(-) > > diff --git a/meta-isar/conf/distro/debian-jessie.conf b/meta-isar/conf/distro/debian-jessie.conf > index 08543f3..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://deb.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 6d7ed91..3555c14 100644 > --- a/meta-isar/conf/distro/debian-stretch.conf > +++ b/meta-isar/conf/distro/debian-stretch.conf > @@ -1,7 +1,7 @@ > # This software is a part of ISAR. > # Copyright (C) 2017 ilbers GmbH > > -DISTRO_SUITE = "stretch" > -DISTRO_COMPONENTS = "main contrib non-free" > -DISTRO_APT_SOURCE = "http://deb.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/debian-wheezy.conf b/meta-isar/conf/distro/debian-wheezy.conf > index 3ddfd8b..8e5ceac 100644 > --- a/meta-isar/conf/distro/debian-wheezy.conf > +++ b/meta-isar/conf/distro/debian-wheezy.conf > @@ -3,7 +3,7 @@ > # This software is a part of ISAR. > # Copyright (C) 2015-2016 ilbers GmbH > > -DISTRO_SUITE = "wheezy" > -DISTRO_COMPONENTS = "main contrib non-free" > -DISTRO_APT_SOURCE = "http://deb.debian.org/debian" > -DISTRO_CONFIG_SCRIPT = "debian-configscript.sh" > +DISTRO_SUITE ?= "wheezy" > +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-jessie.conf b/meta-isar/conf/distro/raspbian-jessie.conf > index 6310a96..70066d5 100644 > --- a/meta-isar/conf/distro/raspbian-jessie.conf > +++ b/meta-isar/conf/distro/raspbian-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 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" > diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf > index 79483c1..1eb85e6 100644 > --- a/meta-isar/conf/machine/qemuamd64.conf > +++ b/meta-isar/conf/machine/qemuamd64.conf > @@ -1,7 +1,7 @@ > # This software is a part of ISAR. > # Copyright (C) 2017 ilbers GmbH > > -MACHINE_SERIAL = "ttyS0" > -BAUDRATE_TTY = "115200" > +MACHINE_SERIAL ?= "ttyS0" > +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 36c50b2..70dd941 100644 > --- a/meta-isar/conf/machine/qemuarm.conf > +++ b/meta-isar/conf/machine/qemuarm.conf > @@ -1,7 +1,7 @@ > # This software is a part of ISAR. > # Copyright (C) 2015-2017 ilbers GmbH > > -MACHINE_SERIAL = "ttyAMA0" > -BAUDRATE_TTY = "115200" > +MACHINE_SERIAL ?= "ttyAMA0" > +BAUDRATE_TTY ?= "115200" > > -IMAGE_TYPE = "ext4-img" > +IMAGE_TYPE ?= "ext4-img" > diff --git a/meta-isar/conf/machine/qemui386.conf b/meta-isar/conf/machine/qemui386.conf > index 79483c1..1eb85e6 100644 > --- a/meta-isar/conf/machine/qemui386.conf > +++ b/meta-isar/conf/machine/qemui386.conf > @@ -1,7 +1,7 @@ > # This software is a part of ISAR. > # Copyright (C) 2017 ilbers GmbH > > -MACHINE_SERIAL = "ttyS0" > -BAUDRATE_TTY = "115200" > +MACHINE_SERIAL ?= "ttyS0" > +BAUDRATE_TTY ?= "115200" > > -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 77af6a9..31f2219 100644 > --- a/meta-isar/conf/machine/rpi.conf > +++ b/meta-isar/conf/machine/rpi.conf > @@ -1,7 +1,7 @@ > # This software is a part of ISAR. > # Copyright (C) 2015-2017 ilbers GmbH > > -MACHINE_SERIAL = "ttyAMA0" > -BAUDRATE_TTY = "9600" > +MACHINE_SERIAL ?= "ttyAMA0" > +BAUDRATE_TTY ?= "9600" > > -IMAGE_TYPE = "rpi-sdimg" > +IMAGE_TYPE ?= "rpi-sdimg" > diff --git a/meta-isar/conf/multiconfig/qemuamd64-jessie.conf b/meta-isar/conf/multiconfig/qemuamd64-jessie.conf > index 7089b5d..5926ddc 100644 > --- a/meta-isar/conf/multiconfig/qemuamd64-jessie.conf > +++ b/meta-isar/conf/multiconfig/qemuamd64-jessie.conf > @@ -1,19 +1,19 @@ > # This software is a part of ISAR. > # Copyright (C) 2017 ilbers GmbH > > -MACHINE = "qemuamd64" > +MACHINE ?= "qemuamd64" > > -DISTRO = "debian-jessie" > -DISTRO_ARCH = "amd64" > +DISTRO ?= "debian-jessie" > +DISTRO_ARCH ?= "amd64" > > -IMAGE_PREINSTALL = "linux-image-3.16.0-4-amd64" > +IMAGE_PREINSTALL += "linux-image-3.16.0-4-amd64" > > -KERNEL_IMAGE = "vmlinuz-3.16.0-4-amd64" > -INITRD_IMAGE = "initrd.img-3.16.0-4-amd64" > +KERNEL_IMAGE ?= "vmlinuz-3.16.0-4-amd64" > +INITRD_IMAGE ?= "initrd.img-3.16.0-4-amd64" > > -ROOTFS_DEV = "sda" > +ROOTFS_DEV ?= "sda" > > -QEMU_ARCH = "x86_64" > -QEMU_MACHINE = "pc" > -QEMU_CPU = "" > -QEMU_ROOTFS_DEV = "-hda ##ROOTFS_IMAGE##" > +QEMU_ARCH ?= "x86_64" > +QEMU_MACHINE ?= "pc" > +QEMU_CPU ?= "" > +QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE##" > diff --git a/meta-isar/conf/multiconfig/qemuamd64-stretch.conf b/meta-isar/conf/multiconfig/qemuamd64-stretch.conf > index a1a0f9a..9ae0f75 100644 > --- a/meta-isar/conf/multiconfig/qemuamd64-stretch.conf > +++ b/meta-isar/conf/multiconfig/qemuamd64-stretch.conf > @@ -1,22 +1,22 @@ > # This software is a part of ISAR. > # Copyright (C) 2017 ilbers GmbH > > -MACHINE = "qemuamd64" > +MACHINE ?= "qemuamd64" > > -DISTRO = "debian-stretch" > -DISTRO_ARCH = "amd64" > +DISTRO ?= "debian-stretch" > +DISTRO_ARCH ?= "amd64" > > -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" > > -ROOTFS_DEV = "sda" > +ROOTFS_DEV ?= "sda" > > -QEMU_ARCH = "x86_64" > -QEMU_MACHINE = "pc" > -QEMU_CPU = "" > -QEMU_ROOTFS_DEV = "-hda ##ROOTFS_IMAGE##" > +QEMU_ARCH ?= "x86_64" > +QEMU_MACHINE ?= "pc" > +QEMU_CPU ?= "" > +QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE##" > diff --git a/meta-isar/conf/multiconfig/qemuarm-jessie.conf b/meta-isar/conf/multiconfig/qemuarm-jessie.conf > index 0872720..f2bacd8 100644 > --- a/meta-isar/conf/multiconfig/qemuarm-jessie.conf > +++ b/meta-isar/conf/multiconfig/qemuarm-jessie.conf > @@ -7,21 +7,21 @@ > # environment. > > # This sets the default machine to be qemuarm in this configuration: > -MACHINE = "qemuarm" > +MACHINE ?= "qemuarm" > > # This sets the default multistrap configuration: > -DISTRO = "debian-jessie" > -DISTRO_ARCH = "armhf" > +DISTRO ?= "debian-jessie" > +DISTRO_ARCH ?= "armhf" > > -IMAGE_PREINSTALL = "linux-image-3.16.0-4-armmp" > +IMAGE_PREINSTALL += "linux-image-3.16.0-4-armmp" > > -KERNEL_IMAGE = "vmlinuz-3.16.0-4-armmp" > -INITRD_IMAGE = "initrd.img-3.16.0-4-armmp" > +KERNEL_IMAGE ?= "vmlinuz-3.16.0-4-armmp" > +INITRD_IMAGE ?= "initrd.img-3.16.0-4-armmp" > > -ROOTFS_DEV = "vda" > +ROOTFS_DEV ?= "vda" > > -QEMU_ARCH = "arm" > -QEMU_MACHINE = "virt" > -QEMU_CPU = "cortex-a15" > +QEMU_ARCH ?= "arm" > +QEMU_MACHINE ?= "virt" > +QEMU_CPU ?= "cortex-a15" > # TODO: start_vm doesn't support multiline vars > -QEMU_ROOTFS_DEV = "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" > +QEMU_ROOTFS_DEV ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" > diff --git a/meta-isar/conf/multiconfig/qemuarm-stretch.conf b/meta-isar/conf/multiconfig/qemuarm-stretch.conf > index 8025f40..e793f8f 100644 > --- a/meta-isar/conf/multiconfig/qemuarm-stretch.conf > +++ b/meta-isar/conf/multiconfig/qemuarm-stretch.conf > @@ -1,23 +1,23 @@ > # This software is a part of ISAR. > # Copyright (C) 2017 ilbers GmbH > > -MACHINE = "qemuarm" > +MACHINE ?= "qemuarm" > > -DISTRO = "debian-stretch" > -DISTRO_ARCH = "armhf" > +DISTRO ?= "debian-stretch" > +DISTRO_ARCH ?= "armhf" > > -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" > > -ROOTFS_DEV = "vda" > +ROOTFS_DEV ?= "vda" > > -QEMU_ARCH = "arm" > -QEMU_MACHINE = "virt" > -QEMU_CPU = "cortex-a15" > +QEMU_ARCH ?= "arm" > +QEMU_MACHINE ?= "virt" > +QEMU_CPU ?= "cortex-a15" > # TODO: start_vm doesn't support multiline vars > -QEMU_ROOTFS_DEV = "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" > +QEMU_ROOTFS_DEV ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" > diff --git a/meta-isar/conf/multiconfig/qemuarm-wheezy.conf b/meta-isar/conf/multiconfig/qemuarm-wheezy.conf > index 8b79c67..92cffbd 100644 > --- a/meta-isar/conf/multiconfig/qemuarm-wheezy.conf > +++ b/meta-isar/conf/multiconfig/qemuarm-wheezy.conf > @@ -7,20 +7,20 @@ > # environment. > > # This sets the default machine to be qemuarm in this configuration: > -MACHINE = "qemuarm" > +MACHINE ?= "qemuarm" > > # This sets the default multistrap configuration: > -DISTRO = "debian-wheezy" > -DISTRO_ARCH = "armhf" > +DISTRO ?= "debian-wheezy" > +DISTRO_ARCH ?= "armhf" > > -IMAGE_PREINSTALL = "linux-image-3.2.0-4-vexpress" > +IMAGE_PREINSTALL += "linux-image-3.2.0-4-vexpress" > > -KERNEL_IMAGE = "vmlinuz-3.2.0-4-vexpress" > -INITRD_IMAGE = "initrd.img-3.2.0-4-vexpress" > +KERNEL_IMAGE ?= "vmlinuz-3.2.0-4-vexpress" > +INITRD_IMAGE ?= "initrd.img-3.2.0-4-vexpress" > > -ROOTFS_DEV = "mmcblk0" > +ROOTFS_DEV ?= "mmcblk0" > > -QEMU_ARCH = "arm" > -QEMU_MACHINE = "vexpress-a9" > -QEMU_CPU = "" > -QEMU_ROOTFS_DEV = "-sd ##ROOTFS_IMAGE##" > +QEMU_ARCH ?= "arm" > +QEMU_MACHINE ?= "vexpress-a9" > +QEMU_CPU ?= "" > +QEMU_ROOTFS_DEV ?= "-sd ##ROOTFS_IMAGE##" > diff --git a/meta-isar/conf/multiconfig/qemui386-jessie.conf b/meta-isar/conf/multiconfig/qemui386-jessie.conf > index 028de10..3ccce91 100644 > --- a/meta-isar/conf/multiconfig/qemui386-jessie.conf > +++ b/meta-isar/conf/multiconfig/qemui386-jessie.conf > @@ -1,19 +1,19 @@ > # This software is a part of ISAR. > # Copyright (C) 2017 ilbers GmbH > > -MACHINE = "qemui386" > +MACHINE ?= "qemui386" > > -DISTRO = "debian-jessie" > -DISTRO_ARCH = "i386" > +DISTRO ?= "debian-jessie" > +DISTRO_ARCH ?= "i386" > > -IMAGE_PREINSTALL = "linux-image-3.16.0-4-686-pae" > +IMAGE_PREINSTALL += "linux-image-3.16.0-4-686-pae" > > -KERNEL_IMAGE = "vmlinuz-3.16.0-4-686-pae" > -INITRD_IMAGE = "initrd.img-3.16.0-4-686-pae" > +KERNEL_IMAGE ?= "vmlinuz-3.16.0-4-686-pae" > +INITRD_IMAGE ?= "initrd.img-3.16.0-4-686-pae" > > -ROOTFS_DEV = "sda" > +ROOTFS_DEV ?= "sda" > > -QEMU_ARCH = "i386" > -QEMU_MACHINE = "pc" > -QEMU_CPU = "" > -QEMU_ROOTFS_DEV = "-hda ##ROOTFS_IMAGE##" > +QEMU_ARCH ?= "i386" > +QEMU_MACHINE ?= "pc" > +QEMU_CPU ?= "" > +QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE##" > diff --git a/meta-isar/conf/multiconfig/qemui386-stretch.conf b/meta-isar/conf/multiconfig/qemui386-stretch.conf > index 50d14a0..fa38120 100644 > --- a/meta-isar/conf/multiconfig/qemui386-stretch.conf > +++ b/meta-isar/conf/multiconfig/qemui386-stretch.conf > @@ -1,22 +1,22 @@ > # This software is a part of ISAR. > # Copyright (C) 2017 ilbers GmbH > > -MACHINE = "qemui386" > +MACHINE ?= "qemui386" > > -DISTRO = "debian-stretch" > -DISTRO_ARCH = "i386" > +DISTRO ?= "debian-stretch" > +DISTRO_ARCH ?= "i386" > > -IMAGE_PREINSTALL = " \ > +IMAGE_PREINSTALL += " \ > init \ > linux-image-4.9.0-3-686-pae \ > " > > -KERNEL_IMAGE = "vmlinuz-4.9.0-3-686-pae" > -INITRD_IMAGE = "initrd.img-4.9.0-3-686-pae" > +KERNEL_IMAGE ?= "vmlinuz-4.9.0-3-686-pae" > +INITRD_IMAGE ?= "initrd.img-4.9.0-3-686-pae" > > -ROOTFS_DEV = "sda" > +ROOTFS_DEV ?= "sda" > > -QEMU_ARCH = "i386" > -QEMU_MACHINE = "pc" > -QEMU_CPU = "" > -QEMU_ROOTFS_DEV = "-hda ##ROOTFS_IMAGE##" > +QEMU_ARCH ?= "i386" > +QEMU_MACHINE ?= "pc" > +QEMU_CPU ?= "" > +QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE##" > diff --git a/meta-isar/conf/multiconfig/rpi-jessie.conf b/meta-isar/conf/multiconfig/rpi-jessie.conf > index 8a97085..29c361c 100644 > --- a/meta-isar/conf/multiconfig/rpi-jessie.conf > +++ b/meta-isar/conf/multiconfig/rpi-jessie.conf > @@ -7,13 +7,13 @@ > # environment. > > # This sets the default machine to be rpi in this configuration: > -MACHINE = "rpi" > +MACHINE ?= "rpi" > > # This sets the default multistrap configuration: > -DISTRO = "raspbian-jessie" > -DISTRO_ARCH = "armhf" > +DISTRO ?= "raspbian-jessie" > +DISTRO_ARCH ?= "armhf" > > -IMAGE_PREINSTALL = " \ > +IMAGE_PREINSTALL += " \ > bind9-host \ > dnsutils \ > iproute2 \ > @@ -31,7 +31,7 @@ IMAGE_PREINSTALL = " \ > vim \ > " > > -KERNEL_IMAGE = "vmlinuz-4.9.0-2-rpi" > -INITRD_IMAGE = "initrd.img-4.9.0-2-rpi" > +KERNEL_IMAGE ?= "vmlinuz-4.9.0-2-rpi" > +INITRD_IMAGE ?= "initrd.img-4.9.0-2-rpi" > > -ROOTFS_DEV = "mmcblk0p2" > +ROOTFS_DEV ?= "mmcblk0p2" > ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-07-24 6:44 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-07-24 6:40 [PATCH 0/1] Overwritable variables claudius.heine.ext 2017-07-24 6:40 ` [PATCH 1/1] meta-isar: allow all config variables to be overwritten by local.conf claudius.heine.ext 2017-07-24 6:44 ` Jan Kiszka
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox