From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6646963333394071552 X-Received: by 2002:a17:906:2352:: with SMTP id m18-v6mr1903846eja.9.1547743008005; Thu, 17 Jan 2019 08:36:48 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:c2cf:: with SMTP id ch15-v6ls1833646ejb.9.gmail; Thu, 17 Jan 2019 08:36:47 -0800 (PST) X-Google-Smtp-Source: ALg8bN7jc1jrnuDBGXyiFXvt1dJxP+MCp+VhWdTz5m8cRJx5tD12Zg/M1HtZPF/0nykam/VlB30x X-Received: by 2002:a17:906:443:: with SMTP id e3-v6mr1900431eja.1.1547743007558; Thu, 17 Jan 2019 08:36:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547743007; cv=none; d=google.com; s=arc-20160816; b=CpkV3e3deLmkKLBIvYoKzpVM6SI1Y92rZ1WuA7YUiDo1ipZpxcr0dPd7PF4RjKRA3q LT4j58OvvzoVTJYeJnuZ7KCxlAu3RUDonyUIv7aQ22OvM1Cbbw/dSU7+vX0UCIESePyj fbKScJ5YATV2IXHhOMWkJqlxEXigm9ixmBPzlaisTGOB6WmaCECN4HWHFhq01IptzMAX 1eJw1K0oqfCM7CIXQOTm5NNKjhh47boYHYwJkHEt0ckX/+ZGSF7V4OpDNpxUw/++XPBC jqkl10VlhNujMx/x/Z8wuo9b9N3uUGJ8s/3aLcxdM4riLdREZuhiK3AGKrldmNqNPAjX j/yQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:to:from; bh=xULc4cdR7J0P7I661NclD9Ai7HfiAQ8kHjJwJ4mbQFA=; b=xEvj7XvllkHNv3K+MzuD2RJW3QQyQBlGSdXjK8flmdnbXQ8k0avmE9ke9XTS7CFRlE 8dN5ZjZgob59LSEnd3cNY6/KpvdE7qdrrdDAwVnG3DixXXTRsvlaL9lTM7ih1RfpJ9bh 956pB9swGnukFDoDnp92FOKIyXkCEjyMo0EqYY1ti5e9HhJ/22GbqDqtd+lCzFoIamHX eB+m+1Lg6TJDnZPU27r/49/bS7am+7MlToVBJXD7QsAqS1BSiwFmXU+5JhYBvl21PP0J h6qVl/+qkFcxwuyAGBWjNmJ6Mw/NYHrEanBfmqmBV2U7VCok9ad1XTSD/+VVqmV5h+pg SMzg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id l31si1376327edb.5.2019.01.17.08.36.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Jan 2019 08:36:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id x0HGacU3008509 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Thu, 17 Jan 2019 17:36:46 +0100 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH v4 07/14] Move debian distro conf files to meta Date: Thu, 17 Jan 2019 17:36:38 +0100 Message-Id: <20190117163638.29167-1-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 X-TUID: 8fonTobifBgR 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 Signed-off-by: Maxim Yu. Osipov --- meta-isar/conf/distro/raspbian-jessie.conf | 2 +- meta/classes/isar-image.bbclass | 3 ++- {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(+), 2 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..4ebf523 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 ?= "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..3f65b7a 100644 --- a/meta/classes/isar-image.bbclass +++ b/meta/classes/isar-image.bbclass @@ -7,6 +7,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 +16,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.11.0