From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6444761527603953664 X-Received: by 10.28.147.136 with SMTP id v130mr192854wmd.15.1500538564284; Thu, 20 Jul 2017 01:16:04 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.210.74 with SMTP id j71ls130592wmg.12.gmail; Thu, 20 Jul 2017 01:16:03 -0700 (PDT) X-Received: by 10.223.182.169 with SMTP id j41mr816651wre.5.1500538563938; Thu, 20 Jul 2017 01:16:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500538563; cv=none; d=google.com; s=arc-20160816; b=pv7L+P84dfnJusk3k6yVm4Aj70n1WIV3cLi2ailoPj6bOTDd9uQvfh/enjUSNOJXfy 8cQnpiUqW8hQQkiXr2gIYcrehjIyoqHpWPowIV9bXP1MdsonCU6aXrxM4NHHJCXsvDJ1 UW5+pSlRYTrO01VwNRNRFNBrrJHv2IvqxHsIkkUqGQinFix/cfsgAVJKQxeTtGw4L0l7 Uw54DzTVJoJlUpoGpgkP82mljqhEQhTHBJB7vWYEavvirec97BG7BpZHh5aa736HxmQz ajW6Gt0tUzrT78Aev0fME65IP2EG2rfIe0bxc/H6GOH5E+RVA5kFaMYEYvxFshL2PJTc sVEw== 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=Q3lKnIivH/AgoJ+7IkQ8AyPseZK0OD0x8JpGmxgOAhUgeIG/oSPBQMtczQg2fRiC0q pWkUYCMMXkmyXPZGP7o/63z4v9EFmLltRS0mzN6K84LYgHbcAAJhOMejDA4tTa6aUOeI 2LGTtGDCKpWFX2bgk6MhzepewYo6xuW6EGmnqcoBVnqhWiH+HDYlxhfb9OAz13teHaCx qnyYG35nhoPWYV0GZRpaaltk6abKu0QYISJcj0eSCjKPgce+E4pDshnZCp0An6l9gMNv 9IDN3m4MkIyXk5G0JZgyELl01xm2HxRW23ummVFswce19a+WGm3VBdY8Bjuoshs/Eugw N+mA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id 132si571347wmn.6.2017.07.20.01.16.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jul 2017 01:16:03 -0700 (PDT) Received-SPF: neutral (google.com: 194.138.37.39 is neither permitted nor denied by best guess record for domain of claudius.heine.ext@siemens.com) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 194.138.37.39 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 lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id v6K8G3A8015897 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 20 Jul 2017 10:16:03 +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 v6K8G21d028923; Thu, 20 Jul 2017 10:16:03 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v2 2/2] meta-isar/machine: replaced '=' with '+=' or '?=' to allow overwrite Date: Thu, 20 Jul 2017 10:15:42 +0200 Message-Id: <20170720081542.32733-3-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170720081542.32733-1-claudius.heine.ext@siemens.com> References: <20170720081542.32733-1-claudius.heine.ext@siemens.com> X-TUID: 6/q4CFZFZ1aA 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