From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6628101528005640192 X-Received: by 2002:a2e:90c8:: with SMTP id o8-v6mr753963ljg.24.1543225144810; Mon, 26 Nov 2018 01:39:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:554c:: with SMTP id j73-v6ls2318662ljb.4.gmail; Mon, 26 Nov 2018 01:39:04 -0800 (PST) X-Google-Smtp-Source: AFSGD/X0ONaNk7bUVJCltSs2KA9MhxCY3W9YFU3dlrOK1WP9z24hV+rrQtexEsrGrDsFWLQh0hBc X-Received: by 2002:a2e:42ce:: with SMTP id h75-v6mr967616ljf.27.1543225144199; Mon, 26 Nov 2018 01:39:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543225144; cv=none; d=google.com; s=arc-20160816; b=ZHtW1MyzJEZcyPRwuJHGlE5wUHxORxKHT3fF8WHdTP6Uq2ROdq0Dvr7XbpPcxi4LGI v8xiJuBIsiTi3aDOz6hqMRAXfAyRivFnPG9x5vZ7Y1rMUb5lB0NkD6RKj9m6wUfBF987 YjVce0t0HNbTDTJZFseg89yatv/Gpfc/ZotwCAnPQ0LUg9tjyeomKfQ63mdBQYGKpFRn nbuOiYSLvtHroNNq0ui5A4ksCgwmn8WPR1UsWS4cdXpnQ0Py1p+WJarH8uqnaABqYH/J ltrutGPxu2Tty2QNIwHUAErvw/q9lhGyPXU5/KqbCwgD9EpWVX5rhRnLyq+ZFtcPKxF2 i8nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from; bh=zj7ENDF/83kpZBcivPwj139PuLADFUqXTdFA+G3/ujE=; b=Tsi1t9TjLQYPCjfK07Lf0qYsneqBVV9YR5pXukEi0KBFUwT0G9aNcyp5niicDUhqSL NsEA/QNBhBtTINhTJiqCCDDxwDsM7xMNtjRUmE2c1w3KzRuseQGM1jovw+u76I/POs0a 2S7HJoHzrsigV5foLIvhPSWIQPbOeIAtNr9sr7JndAyo40TUojPPv3sTxgqSelM5sugM PdiZRhaUZ1Yplwk0y8/SPRUGyuSmLFeIr3lPStDO3zeBYd/hySncIm6hCX/4KOAwUbSb tGfFgj2XxyRmxKHHLty7+WZ6ywaDcpaVSFVEiBY68dPw9DCttvTq+YarNS4irTmwKnM7 MWHQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) 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 t16-v6si759051ljc.1.2018.11.26.01.39.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Nov 2018 01:39:04 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id wAQ9d3qj030181 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 26 Nov 2018 10:39:03 +0100 Received: from md1f2u6c.ad001.siemens.net ([139.23.79.230]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id wAQ9d2uv012310; Mon, 26 Nov 2018 10:39:03 +0100 From: Jan Kiszka To: isar-users Cc: Henning Schild Subject: [PATCH 3/7] meta-isar: Factor out bananapi machine config Date: Mon, 26 Nov 2018 10:38:58 +0100 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: s7Cwi0sGrzfc From: Jan Kiszka The multiconfig file should only select the machine, not define it. Signed-off-by: Jan Kiszka --- .../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