From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6444761527603953664 X-Received: by 10.25.32.140 with SMTP id g134mr443233lfg.10.1500537974403; Thu, 20 Jul 2017 01:06:14 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.77.203 with SMTP id c72ls640377ljd.32.gmail; Thu, 20 Jul 2017 01:06:14 -0700 (PDT) X-Received: by 10.25.208.195 with SMTP id h186mr511976lfg.22.1500537974098; Thu, 20 Jul 2017 01:06:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500537974; cv=none; d=google.com; s=arc-20160816; b=NFiciSMNqHrAcobR0jR4qMRVuWbi8LlgTxeoc+wUuUU+QFGChTdnBwVn+w/rnDbkT/ hR9+vJp1DMQJR9JN5paPkyCM027V5tkjAMU3MediKyOg1wS073HinRbQCnOFQ3mboQUc pe7qkhBgInJBAuW44BSAqPtG+PL/bakAx1kMzFTspyUOa/jFIDbt3WYxV57Qa9zp9pPm u8MqOMEJVV/vM5drgVMM2k5xXAct7yzEK/+vMxAdh1z4Q6+l5lfvKAP99AVTo167YU28 solxaWiMadl8wfWkdCkMsymhvEsduzbz0XxeMuFfeIYO35cXVgJPOcA6WMy61YUI0qWj 4cMg== 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=399AxoAuW0dW+08afV0NOwhsaLzYjHf184IWTpVoveM=; b=aHCJvAZCYJg4B8HUaRFmTnEP4azFQ8f2wWxQy/7Ws/dw3uyDbEABIPPPYR2zxWbViC hjd9CAqR6/25OTN2Rc1eG9qiK1ssDNBqMqbtl2Uy+H9ytpWhVsTbeYYoO76fPj3Q4fE5 bQV9LXMqvIhdHSbjQv3quEqi6QTEzunX0pNUfloZRdVnv74YV9KDDOEUJOa8Su72GWwA +7YsdMNc1pqnpyK6Groa2OU2O2OK5vjcQyw2YvnAJrPYrt04V1bDNzrhDqnmIfH6yF/8 hA+juFizXnQFCp1MqS0BWgTJM5J1YKKZdGHEInrAYtsUsk76EmOuAYQilQaGqcz3S+pT Sd1g== 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 2si588147wms.6.2017.07.20.01.06.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jul 2017 01:06:14 -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 v6K86CJM023414 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 20 Jul 2017 10:06:13 +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 v6K86BcE021513; Thu, 20 Jul 2017 10:06:12 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH 2/2] meta-isar/machine: replaced '=' with '+=' or '?=' to allow overwrite Date: Thu, 20 Jul 2017 10:06:03 +0200 Message-Id: <20170720080603.32206-3-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170720080603.32206-1-claudius.heine.ext@siemens.com> References: <20170720080603.32206-1-claudius.heine.ext@siemens.com> X-TUID: UYGZuN9jqo+d From: Claudius Heine Signed-off-by: Claudius Heine --- 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