From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Cc: Henning Schild <henning.schild@siemens.com>
Subject: [PATCH 3/7] meta-isar: Factor out bananapi machine config
Date: Mon, 26 Nov 2018 10:38:58 +0100 [thread overview]
Message-ID: <e48ab92f46db788d6002bc0c1acad7f4fbe46f8e.1543225142.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1543225142.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1543225142.git.jan.kiszka@siemens.com>
From: Jan Kiszka <jan.kiszka@siemens.com>
The multiconfig file should only select the machine, not define it.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
.../bananapi-stretch.conf => machine/bananapi.conf} | 3 ---
meta-isar/conf/multiconfig/bananapi-stretch.conf | 17 ++---------------
2 files changed, 2 insertions(+), 18 deletions(-)
copy meta-isar/conf/{multiconfig/bananapi-stretch.conf => machine/bananapi.conf} (89%)
diff --git a/meta-isar/conf/multiconfig/bananapi-stretch.conf b/meta-isar/conf/machine/bananapi.conf
similarity index 89%
copy from meta-isar/conf/multiconfig/bananapi-stretch.conf
copy to meta-isar/conf/machine/bananapi.conf
index bf89652..95876f1 100644
--- a/meta-isar/conf/multiconfig/bananapi-stretch.conf
+++ b/meta-isar/conf/machine/bananapi.conf
@@ -3,9 +3,6 @@
#
# SPDX-License-Identifier: MIT
-MACHINE ?= "bananapi"
-
-DISTRO ?= "debian-stretch"
DISTRO_ARCH ?= "armhf"
KERNEL_NAME ?= "armmp"
diff --git a/meta-isar/conf/multiconfig/bananapi-stretch.conf b/meta-isar/conf/multiconfig/bananapi-stretch.conf
index bf89652..6c80020 100644
--- a/meta-isar/conf/multiconfig/bananapi-stretch.conf
+++ b/meta-isar/conf/multiconfig/bananapi-stretch.conf
@@ -3,18 +3,5 @@
#
# SPDX-License-Identifier: MIT
-MACHINE ?= "bananapi"
-
-DISTRO ?= "debian-stretch"
-DISTRO_ARCH ?= "armhf"
-
-KERNEL_NAME ?= "armmp"
-
-DISTRO_APT_SOURCES_append = " conf/distro/debian-stretch-backports.list"
-DISTRO_APT_PREFERENCES += "conf/multiconfig/preferences.bananapi.conf"
-
-IMAGE_INSTALL += "u-boot-script-${KERNEL_NAME}"
-
-IMAGE_TYPE ?= "wic-img"
-WKS_FILE ?= "bananapi"
-IMAGER_INSTALL += "u-boot-sunxi"
+MACHINE = "bananapi"
+DISTRO = "debian-stretch"
--
2.16.4
next prev parent reply other threads:[~2018-11-26 9:39 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-26 9:38 [PATCH 0/7] u-boot-script rework, the Final One (tm) Jan Kiszka
2018-11-26 9:38 ` [PATCH 1/7] wic: Move isar plugins out of example layer to core Jan Kiszka
2018-11-26 9:38 ` [PATCH 2/7] wic: Remove obsolete reference to msger logger Jan Kiszka
2018-11-26 9:45 ` Henning Schild
2018-11-26 9:50 ` Jan Kiszka
2018-11-26 10:07 ` Henning Schild
2018-11-26 11:02 ` Jan Kiszka
2018-11-26 9:38 ` Jan Kiszka [this message]
2018-11-26 9:38 ` [PATCH 4/7] wic: Add rootfs-u-boot Jan Kiszka
2018-11-26 9:39 ` [PATCH 5/7] meta-isar: Switch bananapi and de0-nano-soc to rootfs-u-boot Jan Kiszka
2018-11-26 9:39 ` [PATCH 6/7] u-boot-script: Make truly generic Jan Kiszka
2018-11-26 9:39 ` [PATCH 7/7] meta: Fold wks-file class into wic-img Jan Kiszka
2018-11-29 12:15 ` [PATCH 0/7] u-boot-script rework, the Final One (tm) Maxim Yu. Osipov
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=e48ab92f46db788d6002bc0c1acad7f4fbe46f8e.1543225142.git.jan.kiszka@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=henning.schild@siemens.com \
--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