From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6646963333394071552 X-Received: by 2002:a2e:505a:: with SMTP id v26-v6mr463148ljd.5.1547616753902; Tue, 15 Jan 2019 21:32:33 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8910:: with SMTP id d16-v6ls605644lji.14.gmail; Tue, 15 Jan 2019 21:32:33 -0800 (PST) X-Google-Smtp-Source: ALg8bN50vDNIvpD/I59XIgTYcvPVsFI/C7BBNxFmJL6M1HpHBOfDwgxvl7CPgZ7ni9e3SnGXc1kh X-Received: by 2002:a2e:8514:: with SMTP id j20-v6mr463508lji.6.1547616753234; Tue, 15 Jan 2019 21:32:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547616753; cv=none; d=google.com; s=arc-20160816; b=Lfu/9s/ytxIaEKuOJA5P6LNHB90Yh+CCFuduPs/77pTdmhNTqFSV4yWdXr7hCNS4cy cHD5qBkenbEtMcgpn4T6GIrNprRE9D9ZJ0CLQwGdNkYPSXwGJUhmlk+aIZMySVL6Hq2w ZugKRSDhE12o0Fz6iWWLx8no9PsJb5ipYiq/ApmVzE+NJs7MdtWg1e3SRwpfRqiDfWjc VyYDfiSDl5pYPzq558z9EJCN9FxLFuIgENRN+/MVeyyYpNKrWwkxiPLC06D0V9okYcC/ +7Il/YGdzldcObHIoJqQDXozmkVIDeB2VZvN+2+So8MJeMh+8po8r2cNrDL33rF+9CbU 7nPA== 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:to:from; bh=SwCDOnFtMy0YbzaUBLljDM+2m6nyuo8FAOCjotTZYkg=; b=tdt5cwHv3FHRGv5JLq48sUj151tTq9FuvXixLRKdCdCYuS98Em5aCBewST7E7b9fkm y2Evtsqn5PLhOTSVlbN1+8BwMuUgF4DQUQvG9xasCB0iCYnKe/M/hUJGuAF7TjJr2w84 Cps8MDyCChsh5qvDEKNvm0y0vuY72aO0OM0S6MwBtydVG+5mh4ucyu7p8z7Rk0Hkvf+F 72dBiAPe92VegzdIBQNTY6HNybEhro/f/e1/ScOBQ8dUaAF++rJ9TDX/mgvdq30J2kNy FA1Px+ykM89VRT6zgIvFmyemvGfhU9lpE2TmbA6mAhTuXR7h3ygc/RDKdfN+sQxihEbG TWyA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id n189si203348lfa.4.2019.01.15.21.32.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Jan 2019 21:32:33 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@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 x0G5WW12023608 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 16 Jan 2019 06:32:32 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.33.125]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x0G5WRoP011496 for ; Wed, 16 Jan 2019 06:32:32 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH v3 07/14] Move debian distro conf files to meta Date: Wed, 16 Jan 2019 06:32:20 +0100 Message-Id: <72d9be224d28d1113ae4d1130c888cd372a09304.1547616747.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: Lndibf9zLT/k From: Jan Kiszka This only keeps specialties and examples in meta-isar, allowing to base normal Debian layers solely on meta. Signed-off-by: Jan Kiszka --- meta-isar/conf/distro/raspbian-jessie.conf | 2 +- meta/classes/isar-image.bbclass | 4 ++-- {meta-isar => meta}/conf/distro/debian-buster.conf | 0 {meta-isar => meta}/conf/distro/debian-buster.list | 0 {meta-isar => meta}/conf/distro/debian-common.conf | 0 {meta-isar => meta}/conf/distro/debian-configscript.sh | 0 {meta-isar => meta}/conf/distro/debian-jessie.conf | 0 {meta-isar => meta}/conf/distro/debian-jessie.list | 0 {meta-isar => meta}/conf/distro/debian-stretch.conf | 0 {meta-isar => meta}/conf/distro/debian-stretch.list | 0 10 files changed, 3 insertions(+), 3 deletions(-) rename {meta-isar => meta}/conf/distro/debian-buster.conf (100%) rename {meta-isar => meta}/conf/distro/debian-buster.list (100%) rename {meta-isar => meta}/conf/distro/debian-common.conf (100%) rename {meta-isar => meta}/conf/distro/debian-configscript.sh (100%) rename {meta-isar => meta}/conf/distro/debian-jessie.conf (100%) rename {meta-isar => meta}/conf/distro/debian-jessie.list (100%) rename {meta-isar => meta}/conf/distro/debian-stretch.conf (100%) rename {meta-isar => meta}/conf/distro/debian-stretch.list (100%) diff --git a/meta-isar/conf/distro/raspbian-jessie.conf b/meta-isar/conf/distro/raspbian-jessie.conf index de8b5a1..5e907e5 100644 --- a/meta-isar/conf/distro/raspbian-jessie.conf +++ b/meta-isar/conf/distro/raspbian-jessie.conf @@ -8,5 +8,5 @@ BASE_DISTRO_CODENAME = "jessie" DISTRO_APT_SOURCES += "conf/distro/raspbian-jessie.list" DISTRO_APT_KEYS += "https://archive.raspbian.org/raspbian.public.key;sha256sum=ca59cd4f2bcbc3a1d41ba6815a02a8dc5c175467a59bd87edeac458f4a5345de" -DISTRO_CONFIG_SCRIPT?= "raspbian-configscript.sh" +DISTRO_CONFIG_SCRIPT ?= "${LAYERDIR_isar}/conf/distro/raspbian-configscript.sh" DISTRO_KERNELS ?= "rpi rpi2 rpi-rpfv rpi2-rpfv" diff --git a/meta/classes/isar-image.bbclass b/meta/classes/isar-image.bbclass index 754e896..cf68947 100644 --- a/meta/classes/isar-image.bbclass +++ b/meta/classes/isar-image.bbclass @@ -6,7 +6,7 @@ inherit image inherit isar-bootstrap-helper -FILESPATH =. "${LAYERDIR_isar}/conf/distro:" +FILESPATH =. "${LAYERDIR_core}/conf/distro:" SRC_URI += "${@ 'file://${DISTRO_CONFIG_SCRIPT}' if '${DISTRO_CONFIG_SCRIPT}' else '' }" DEPENDS += "${IMAGE_INSTALL} ${IMAGE_TRANSIENT_PACKAGES}" @@ -15,7 +15,7 @@ IMAGE_TRANSIENT_PACKAGES += "isar-cfg-localepurge" WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}" -ISAR_RELEASE_CMD_DEFAULT = "git -C ${LAYERDIR_isar} describe --tags --dirty --match 'v[0-9].[0-9]*'" +ISAR_RELEASE_CMD_DEFAULT = "git -C ${LAYERDIR_core} describe --tags --dirty --match 'v[0-9].[0-9]*'" ISAR_RELEASE_CMD ?= "${ISAR_RELEASE_CMD_DEFAULT}" do_rootfs[root_cleandirs] = "${IMAGE_ROOTFS} \ diff --git a/meta-isar/conf/distro/debian-buster.conf b/meta/conf/distro/debian-buster.conf similarity index 100% rename from meta-isar/conf/distro/debian-buster.conf rename to meta/conf/distro/debian-buster.conf diff --git a/meta-isar/conf/distro/debian-buster.list b/meta/conf/distro/debian-buster.list similarity index 100% rename from meta-isar/conf/distro/debian-buster.list rename to meta/conf/distro/debian-buster.list diff --git a/meta-isar/conf/distro/debian-common.conf b/meta/conf/distro/debian-common.conf similarity index 100% rename from meta-isar/conf/distro/debian-common.conf rename to meta/conf/distro/debian-common.conf diff --git a/meta-isar/conf/distro/debian-configscript.sh b/meta/conf/distro/debian-configscript.sh similarity index 100% rename from meta-isar/conf/distro/debian-configscript.sh rename to meta/conf/distro/debian-configscript.sh diff --git a/meta-isar/conf/distro/debian-jessie.conf b/meta/conf/distro/debian-jessie.conf similarity index 100% rename from meta-isar/conf/distro/debian-jessie.conf rename to meta/conf/distro/debian-jessie.conf diff --git a/meta-isar/conf/distro/debian-jessie.list b/meta/conf/distro/debian-jessie.list similarity index 100% rename from meta-isar/conf/distro/debian-jessie.list rename to meta/conf/distro/debian-jessie.list diff --git a/meta-isar/conf/distro/debian-stretch.conf b/meta/conf/distro/debian-stretch.conf similarity index 100% rename from meta-isar/conf/distro/debian-stretch.conf rename to meta/conf/distro/debian-stretch.conf diff --git a/meta-isar/conf/distro/debian-stretch.list b/meta/conf/distro/debian-stretch.list similarity index 100% rename from meta-isar/conf/distro/debian-stretch.list rename to meta/conf/distro/debian-stretch.list -- 2.16.4