From: claudius.heine.ext@siemens.com
To: isar-users@googlegroups.com
Cc: Claudius Heine <ch@denx.de>
Subject: [PATCH 2/2] meta-isar/machine: replaced '=' with '+=' or '?=' to allow overwrite
Date: Thu, 20 Jul 2017 10:06:03 +0200 [thread overview]
Message-ID: <20170720080603.32206-3-claudius.heine.ext@siemens.com> (raw)
In-Reply-To: <20170720080603.32206-1-claudius.heine.ext@siemens.com>
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
prev parent reply other threads:[~2017-07-20 8:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-20 8:06 [PATCH 0/2] Allow for overwriting settings in local.conf claudius.heine.ext
2017-07-20 8:06 ` [PATCH 1/2] meta-isar: allow all distro variables to be overwritten by local.conf claudius.heine.ext
2017-07-20 8:06 ` claudius.heine.ext [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170720080603.32206-3-claudius.heine.ext@siemens.com \
--to=claudius.heine.ext@siemens.com \
--cc=ch@denx.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox