From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6641861376070385664 X-Received: by 2002:a1c:2d07:: with SMTP id t7mr3208968wmt.17.1546428860041; Wed, 02 Jan 2019 03:34:20 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:280a:: with SMTP id o10ls4135930wmo.11.gmail; Wed, 02 Jan 2019 03:34:19 -0800 (PST) X-Google-Smtp-Source: AFSGD/UoWadLSW0uW/rsKRBWyIN3VK020lpQ9GiJgrPU2SEFB9wodwVDhkMIHJhRC/S/VdrhzLG7 X-Received: by 2002:a1c:6584:: with SMTP id z126mr3505959wmb.18.1546428859516; Wed, 02 Jan 2019 03:34:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546428859; cv=none; d=google.com; s=arc-20160816; b=KMZZ9rSMPwzAscslgpnx8ApTduwIArdbn4vAUyVGpDr4p8kmL8KW46xMlS9bzK0TuZ 2pzZFinTnLl4w/JVHsHgKBAmy5YuPi5Rtv9KjeJ0zZxp34zVVZE9DhcljvMz4Zdp8EVB m1lGrv35U+NtQrhO3j363coEQLhtKNMb9IMNea8fllHvtsywab+gtqDSHwkqVPo6TPia hAJ1y5TVcTa7Y9Xl/dUwfkc31AA34HtiMQemUIg/KvcERnI+6vr9jStCRDk9EXOaguc0 aWqNJoORJdd4ZaHbNqa6haAYuPq+lGscrfj17TAtL/wbDqsFTfgPaOqfAVqtwlD48QYk +xug== 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=Yep+HhEzw6e1tn+CxmNNY+RSA1dqbDI5bbK5TO66ZwU=; b=DlISdvYZnlDnITa4Ylk3HA/7xUCQZri0AfPRpza1/NCI8LVYXkew7uccQY7KJc6Lkf ABpWDRgXxFeWmKk6sqRVdIgLifkug/QiyAyaJBmrreMN56S8Nabyvn4VRbP89IXpCc2t Yp2jNuLVkD8pCGO8qQNLn9bNdx79/XMXsVu0ZgPZbvhY59Z9Y/NQIDM91/q3QtQepLR8 eg7uRKKA0WxCsKCxUTaBjV0QJPRTcsLnCU8LZLobjFGgpNQgrMIk1GgdMgDozGv34d7i El034vlJLMAu0KjZ6r6fGKsIyxPtuNXo0KJw3faU4IEj8Jc6DBiB+Q1JPZD4CWK77dNp gB/g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id 20si534034wmy.2.2019.01.02.03.34.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Jan 2019 03:34:19 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x02BYIDJ002851 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 2 Jan 2019 12:34:19 +0100 Received: from md1f2u6c.ad001.siemens.net (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x02BYIYR009562 for ; Wed, 2 Jan 2019 12:34:18 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH 7/7] Move debian distro conf files to meta Date: Wed, 2 Jan 2019 12:34:17 +0100 Message-Id: <5a90a51cc845054e3a135fbcb83858ee0e22879c.1546428857.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: cSatCeoz8ms8 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 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