From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6446223961600557056 X-Received: by 10.46.0.32 with SMTP id 32mr1021810lja.20.1500878648797; Sun, 23 Jul 2017 23:44:08 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.19.25 with SMTP id 25ls172281ljt.2.gmail; Sun, 23 Jul 2017 23:44:08 -0700 (PDT) X-Received: by 10.46.82.21 with SMTP id g21mr2768056ljb.18.1500878648488; Sun, 23 Jul 2017 23:44:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500878648; cv=none; d=google.com; s=arc-20160816; b=fpdFUguvn7IJi7pVq5NErJIoWQleayDeOeDSOMoS4aZQY8HztszczkPu6AEdBEDNGh Zi96SUSgUsjtYnnLQ72P4qz2HwifxRWp4HNxwBAmvAeNML7QCzztr7NxCS2x+9pRK57a a/MPse1Eu0jH00JBrYCQElYOUQwHYuWwdB8u69gp2D3KDP6Cecz+XvHRZ+A+r8z9JXxH 3MTy6VGcO6amHnvr3HBl+DydKzQxVmK/VX8MqAzpRPl+TAj0v9iD5bQSUjT4JVBILnmr bVK+5uNJuP+v/khlP4zdCICo+fMylFS2+hbxmo99ZqtYIYajkoFcL56BXoG8lHYOeqqT YFHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject :arc-authentication-results; bh=5zMhwuQ8WO0mk1J+6sAU4XhZf6CYycShNM+YxI/QSFs=; b=MGTXtL5PO8Jzl1YUELkBTD7t4oAsFYvSOhl4M62WwSXnxI5iZWieGIvv1JOIjCKOJt J8bdHzJN5/7UGV8/bEitnFAw06tlycqiUnXRggC9d5yTYLA3eLoWcsoSh5E88H2uyg7x KFCTy3MKnRHs42ZCoA3NcRcEkNqD0L46GyBTLvv0j3nPe9oBhyG0U06nJdFuXVwvmVcx +0ON1eWKs+chdrz2+3vdMI02oIaTq2Fccv/f04Hj+z0bNoU4b+qKrTvZoRzmKqf1Jbm4 Xrz9/1C9qFMAItZwRo56wFlacIGrpKRCv8y8QJPorLhUJzLKokcinjmpufMJtD3eJ3LX 5KUg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.2 is neither permitted nor denied by best guess record for domain of jan.kiszka@siemens.com) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id 132si1953587wmn.6.2017.07.23.23.44.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Jul 2017 23:44:08 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.2 is neither permitted nor denied by best guess record for domain of jan.kiszka@siemens.com) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.2 is neither permitted nor denied by best guess record for domain of jan.kiszka@siemens.com) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id v6O6i7fZ011459 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 24 Jul 2017 08:44:07 +0200 Received: from md1f2u6c.ww002.siemens.net ([139.22.114.70]) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id v6O6i7bx027615; Mon, 24 Jul 2017 08:44:07 +0200 Subject: Re: [PATCH 1/1] meta-isar: allow all config variables to be overwritten by local.conf To: "[ext] claudius.heine.ext@siemens.com" , isar-users@googlegroups.com Cc: Claudius Heine References: <20170724064058.17647-1-claudius.heine.ext@siemens.com> <20170724064058.17647-2-claudius.heine.ext@siemens.com> From: Jan Kiszka Message-ID: <0a62c0f1-fe49-7c4d-5ba3-a88230fd7f40@siemens.com> Date: Mon, 24 Jul 2017 08:44:07 +0200 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: <20170724064058.17647-2-claudius.heine.ext@siemens.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: dfoxLjuFc1Uh On 2017-07-24 08:40, [ext] claudius.heine.ext@siemens.com wrote: > From: Claudius Heine > -ENOCOMMITMSG Jan > 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/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" >