From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Subject: [PATCH 7/7] Move debian distro conf files to meta
Date: Wed, 2 Jan 2019 12:34:17 +0100 [thread overview]
Message-ID: <5a90a51cc845054e3a135fbcb83858ee0e22879c.1546428857.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1546428857.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1546428857.git.jan.kiszka@siemens.com>
From: Jan Kiszka <jan.kiszka@siemens.com>
This only keeps specialties and examples in meta-isar, allowing to base
normal Debian layers solely on meta.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
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 4992800..1ab01a0 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
next prev parent reply other threads:[~2019-01-02 11:34 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-02 11:34 [PATCH 0/7] Vacation hacks Jan Kiszka
2019-01-02 11:34 ` [PATCH 1/7] dpkg-raw: Respect file permissions defined by recipe Jan Kiszka
2019-01-07 13:20 ` Henning Schild
2019-01-07 13:28 ` Jan Kiszka
2019-01-07 14:19 ` Henning Schild
2019-01-07 14:20 ` Jan Kiszka
2019-01-07 14:26 ` Jan Kiszka
2019-01-07 16:28 ` Henning Schild
2019-01-07 16:54 ` Jan Kiszka
2019-01-07 17:51 ` Henning Schild
2019-01-07 18:56 ` Jan Kiszka
2019-01-09 15:37 ` Baurzhan Ismagulov
2019-01-10 1:19 ` Jan Kiszka
2019-01-15 8:19 ` Jan Kiszka
2019-01-15 10:10 ` Baurzhan Ismagulov
2019-01-15 10:13 ` Jan Kiszka
2019-01-02 11:34 ` [PATCH 2/7] bootimg-efi-isar: Run grub-mkimage without own config Jan Kiszka
2019-01-07 13:22 ` Henning Schild
2019-01-07 14:02 ` Jan Kiszka
2019-01-02 11:34 ` [PATCH 3/7] bootimg-efi-isar: Retrieve boot disk during runtime Jan Kiszka
2019-01-02 11:34 ` [PATCH 4/7] isar-cfg-localepurge: Also set /etc/default/locale Jan Kiszka
2019-01-02 11:34 ` [PATCH 5/7] Fix LIC_FILES_CHKSUM paths Jan Kiszka
2019-01-02 11:34 ` [PATCH 6/7] Move repo variables to proper conf file Jan Kiszka
2019-01-02 11:34 ` Jan Kiszka [this message]
2019-01-04 13:49 ` [PATCH 8/7] bootimg-efi-isar: Fix serial console setup for grub Jan Kiszka
2019-01-04 13:50 ` [PATCH 9/7] bootimg-efi-isar: Reformat generated grub.cfg Jan Kiszka
2019-01-07 6:06 ` [PATCH 10/7] bitbake.conf: Clean up and enhance OVERRIDES Jan Kiszka
2019-01-07 8:17 ` Claudius Heine
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=5a90a51cc845054e3a135fbcb83858ee0e22879c.1546428857.git.jan.kiszka@siemens.com \
--to=jan.kiszka@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