From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6646963333394071552 X-Received: by 2002:a19:a245:: with SMTP id l66mr1392447lfe.0.1547825280634; Fri, 18 Jan 2019 07:28:00 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9d8e:: with SMTP id c14-v6ls289882ljj.10.gmail; Fri, 18 Jan 2019 07:28:00 -0800 (PST) X-Google-Smtp-Source: ALg8bN4Thq7hqTsGgU9bSzEOFnB5WKeC+H5Yc/zX21ImTN4QF/i/857Qal34YKd73dmxEqcwTNGy X-Received: by 2002:a2e:90c8:: with SMTP id o8-v6mr1380960ljg.24.1547825280113; Fri, 18 Jan 2019 07:28:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547825280; cv=none; d=google.com; s=arc-20160816; b=KmRtJFPACWlExyhdfbtgKgPghFkSL4vA3NOxz2WXi4u01L5e9pIZo4UbID6zxnrZPQ HkpjDLlpChNJP1TM6lAz5chkJC520NvYqp6HlZfr3Btc2Gi6d/rRqE5nmycwKo7WcPqs aCwEZoLY9IOdAF1Ybtf35/1VwhZWTX+eiGVA8YQ2yTcR5y73Chh26CF2EiKMg2Hk3uIj 9sZ+mu2zJlKmNoa0tXt4w1yaGz5gVgXyiKJzUrWdFcT3pL97PtwQDU9GDqjWRocPbeMc PeWdvEq/kVC/4ySJ10AwHsaRpJE/OkdSu2ZrEfuypupnlGkzsA/gFG8nlkW9txBdHTc+ L1Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject :dkim-signature; bh=+gQb54jJUzEs+sRdZmNCc7mTo8i2s3bHtsIRpnraTY0=; b=yPUMqXzNkyVU2pzW69iOVKWHbZoi6EZ52XRZ3+0DSplaSrLCUBkMNR2DlS0gdQfFH8 icTqy3axfGKHN/MYPpWbFJays8oH4riG6EThJzP2UjebZpxYHicYDCanEptkN94C0yu3 YPYUlv1aoAakpTE8Ioo8QsRFgIAmtGNUhxj0U6kRIsPclCprDn3WjQFZH+0+2arVBl/C NGj3wA6cg7G2CvOxiNoRngCPtndMm7ovE2Fc8jwvyGe1cOWu9ReC+awnd21nY0LNVF1A yzkPbfvCMkW24/YPfJqOPI1EokKtEx0MMvo80w0fSjhmKi7se4BqqX6wAzJCSuyl0f0U QTUA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@web.de header.s=dbaedf251592 header.b=PL6LNCEG; spf=pass (google.com: domain of jan.kiszka@web.de designates 212.227.15.4 as permitted sender) smtp.mailfrom=jan.kiszka@web.de Return-Path: Received: from mout.web.de (mout.web.de. [212.227.15.4]) by gmr-mx.google.com with ESMTPS id 81-v6si167482ljc.2.2019.01.18.07.27.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 07:28:00 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@web.de designates 212.227.15.4 as permitted sender) client-ip=212.227.15.4; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@web.de header.s=dbaedf251592 header.b=PL6LNCEG; spf=pass (google.com: domain of jan.kiszka@web.de designates 212.227.15.4 as permitted sender) smtp.mailfrom=jan.kiszka@web.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1547825279; bh=Fn1gdxYN+MyrOMzwLj1dQyY3Hl/tSs0ae4uJPUWcFxo=; h=X-UI-Sender-Class:Subject:To:References:From:Date:In-Reply-To; b=PL6LNCEG/I5X9J1CLNf2FnCyPGDH0h6LdOyFXZAbZo7+SLLZBv5nAGyRbsSeqaHPl 2fpk0ux8e+7kg4svNfXD5FbO1pmkDspW5wVHzqyRQz0jPOWjGq9rjF0zlcpG61adqa Fz2WqBjd/mE9paAVIpuYOgI4PWLnFp7FgYhiWlVY= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.0.24] ([83.215.108.61]) by smtp.web.de (mrweb004 [213.165.67.108]) with ESMTPSA (Nemesis) id 0M7Eb0-1h7wpF0vOY-00x60T; Fri, 18 Jan 2019 16:27:59 +0100 Subject: Re: [PATCH v4 07/14] Move debian distro conf files to meta To: "Maxim Yu. Osipov" , isar-users@googlegroups.com References: <20190117163638.29167-1-mosipov@ilbers.de> From: Jan Kiszka Message-ID: <9cfc77af-2c1a-40f3-a751-a7086cc8947d@web.de> Date: Fri, 18 Jan 2019 16:27:57 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: <20190117163638.29167-1-mosipov@ilbers.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:YYMA9+0S3VRmDRDdeltW0ZXqwRQfy4uEQpJYGdPcO0oskNpLt0V riG0QjatI36IgweLtIq9vfoSYeW/Dj/iF+miizcIsKwnIzLhbZscBUvo//CC1DzbE83sFBw IKCxNcFu2NruOuxckUcPpDk7r2jdPxOiHy+X66v3eVOvpIqxdahsJ+af7pcTDj8bMT9N+ZB TCOjDUxNLo0VafPENRY5w== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:CpdDGT5TqNY=:zNcHLSAuHPaXZlCIdbdEO6 2im4rbN9oc9glv3p63qxsIvY/d2P2Z1a/2IBr0mIVN1yc3b5McyTUoL4EQORGQlZ1a3bYHctv nV6Vf9xQn+hU134rk1/REWz3iUej3jt+9cM7JPjpRDpyGwF98pwlJA43sz6CDTJrxyTfsY0aa y7dGDgYHW2HH/+EJ92QX2DRSU6yXV60I7qaIuVZKOZYWLGvepf6j+Rw4ZgJOlWCivc32ChYOP qmaAgg6hf/68/Qs3f5yInTlr3f/nRcZknlijIklYNp00QzoztQR4dU22myL2esDQpPgGIfbpb iHZ0LtWZV2VmQrFJfGKql9yL+1r78CcEIcwdDxABeCUG6frXLqTK96XLoXsBWGVKSCeRy3XgM VBnufPXOq9KKeYU71bBrwzqUE3FeKzTJoaFjHKPh4gc1TreOu+2mC8VLpT0FbvovqlFWRjZ7V Mh3XHrAb9T1h9A2b8fzOzftr6gkMHb10RaT7u8ZlZR4r/ODgZdnSzuW0MBo7CXShuPk4tbxZV z9VnDoXVbFRioumnVj1UY+CVemwlM11Ag5zkr/5DOMA09ozNKe+5Fo5/T1KYQnDxTO5ZZe8YF HGhM/M4sI6Wdnl7jdxyDY1m8a92wZL7mGxFnendJaD/+i3RRH08sQinzt5q7iKvlnJP0kWev1 o9fLi5YzlxPaQuLQdtMRo0dKZPccQmFY3t/04msnRf0BCIjG7XzlfZh+5EeEuK+W4FIENCDMT d7LUAQf7MT3kkRqo596rvY2QISmaYcEHrckzugkdQdCLyxVG5afOaNSV3lS/ZV2VG0JPXNquz hwl9CI+n381y2lnTP5+/JPJvh/WzFJ1W+BthgGFUabGtyvjRXq9i+e2mN7StmtQ6IX+vDbuxX JBejBvwM/IBnkpcEbBW8CN1j0c+NsJu1ERUaerVUjoZoqQW/mzWFXRvQubzUqjdtNPA4rTpBk NRjSmWnJwcg== X-TUID: 1MTBKEnjseXf On 17.01.19 17:36, Maxim Yu. Osipov wrote: > 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 =3D> meta}/conf/distro/debian-buster.conf | 0 > {meta-isar =3D> meta}/conf/distro/debian-buster.list | 0 > {meta-isar =3D> meta}/conf/distro/debian-common.conf | 0 > {meta-isar =3D> meta}/conf/distro/debian-configscript.sh | 0 > {meta-isar =3D> meta}/conf/distro/debian-jessie.conf | 0 > {meta-isar =3D> meta}/conf/distro/debian-jessie.list | 0 > {meta-isar =3D> meta}/conf/distro/debian-stretch.conf | 0 > {meta-isar =3D> meta}/conf/distro/debian-stretch.list | 0 > 10 files changed, 3 insertions(+), 2 deletions(-) > rename {meta-isar =3D> meta}/conf/distro/debian-buster.conf (100%) > rename {meta-isar =3D> meta}/conf/distro/debian-buster.list (100%) > rename {meta-isar =3D> meta}/conf/distro/debian-common.conf (100%) > rename {meta-isar =3D> meta}/conf/distro/debian-configscript.sh (100%) > rename {meta-isar =3D> meta}/conf/distro/debian-jessie.conf (100%) > rename {meta-isar =3D> meta}/conf/distro/debian-jessie.list (100%) > rename {meta-isar =3D> meta}/conf/distro/debian-stretch.conf (100%) > rename {meta-isar =3D> 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 =3D "jessie" > > DISTRO_APT_SOURCES +=3D "conf/distro/raspbian-jessie.list" > DISTRO_APT_KEYS +=3D "https://archive.raspbian.org/raspbian.public.key= ;sha256sum=3Dca59cd4f2bcbc3a1d41ba6815a02a8dc5c175467a59bd87edeac458f4a534= 5de" > -DISTRO_CONFIG_SCRIPT?=3D "raspbian-configscript.sh" > +DISTRO_CONFIG_SCRIPT ?=3D "raspbian-configscript.sh" > DISTRO_KERNELS ?=3D "rpi rpi2 rpi-rpfv rpi2-rpfv" > diff --git a/meta/classes/isar-image.bbclass b/meta/classes/isar-image.b= bclass > 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 =3D. "${LAYERDIR_isar}/conf/distro:" This line must go, or we have layer violation bug: no references from the = core to meta-isar. Keep in mind that other layers than meta-isar may want to pr= ovide a difference distro as well and should be able to do so without this hack. I thought I tested the raspi case - isn't it part of the fast CI test? Jan > +FILESPATH =3D. "${LAYERDIR_core}/conf/distro:" > SRC_URI +=3D "${@ 'f= ile://${DISTRO_CONFIG_SCRIPT}' if '${DISTRO_CONFIG_SCRIPT}' else '' }" > > DEPENDS +=3D "${IMAGE_INSTALL} ${IMAGE_TRANSIENT_PACKAGES}" > @@ -15,7 +16,7 @@ IMAGE_TRANSIENT_PACKAGES +=3D "isar-cfg-localepurge" > > WORKDIR =3D "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}" > > -ISAR_RELEASE_CMD_DEFAULT =3D "git -C ${LAYERDIR_isar} describe --tags -= -dirty --match 'v[0-9].[0-9]*'" > +ISAR_RELEASE_CMD_DEFAULT =3D "git -C ${LAYERDIR_core} describe --tags -= -dirty --match 'v[0-9].[0-9]*'" > ISAR_RELEASE_CMD ?=3D "${ISAR_RELEASE_CMD_DEFAULT}" > > do_rootfs[root_cleandirs] =3D "${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/di= stro/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/distr= o/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/distr= o/debian-stretch.list > similarity index 100% > rename from meta-isar/conf/distro/debian-stretch.list > rename to meta/conf/distro/debian-stretch.list >