[PATCH 0/3] Follow-up fixes to meta/meta-isar reorganisation

[PATCH 0/3] Follow-up fixes to meta/meta-isar reorganisation

[Jan Kiszka]

This restores the original version of "Move debian distro conf files to
meta" after fixing the issue that prevented it and performs a missing
update on the manual as well.

Only lightly tested due to time constraints.

Jan

Jan Kiszka (3):
  isar-image: Allow paths in DISTRO_CONFIG_SCRIPT
  Remove last reference from meta to meta-isar
  doc: Fix licenses path in user manual

 doc/user_manual.md                         | 6 +++---
 meta-isar/conf/distro/raspbian-jessie.conf | 2 +-
 meta/classes/isar-image.bbclass            | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

-- 
2.16.4

[PATCH 1/3] isar-image: Allow paths in DISTRO_CONFIG_SCRIPT

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

This allows to specify DISTRO_CONFIG_SCRIPT by relative or absolute
paths, required in order to pull it from layers != meta.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/classes/isar-image.bbclass | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/classes/isar-image.bbclass b/meta/classes/isar-image.bbclass
index 7efde7d..237e2cb 100644
--- a/meta/classes/isar-image.bbclass
+++ b/meta/classes/isar-image.bbclass
@@ -52,9 +52,10 @@ isar_image_conf_rootfs() {
     # Configure root filesystem
     if [ -n "${DISTRO_CONFIG_SCRIPT}" ]; then
         sudo install -m 755 "${WORKDIR}/${DISTRO_CONFIG_SCRIPT}" "${IMAGE_ROOTFS}"
-        sudo chroot ${IMAGE_ROOTFS} /${DISTRO_CONFIG_SCRIPT} "${MACHINE_SERIAL}" \
-                                                             "${BAUDRATE_TTY}"
-        sudo rm "${IMAGE_ROOTFS}/${DISTRO_CONFIG_SCRIPT}"
+        TARGET_DISTRO_CONFIG_SCRIPT="$(basename ${DISTRO_CONFIG_SCRIPT})"
+        sudo chroot ${IMAGE_ROOTFS} "/$TARGET_DISTRO_CONFIG_SCRIPT" \
+                                    "${MACHINE_SERIAL}" "${BAUDRATE_TTY}"
+        sudo rm "${IMAGE_ROOTFS}/$TARGET_DISTRO_CONFIG_SCRIPT"
    fi
 }
 
-- 
2.16.4

[PATCH 2/3] Remove last reference from meta to meta-isar

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

No that we can specify the DISTRO_CONFIG_SCRIPT also by absolute path,
we can drop the hack of adding meta-isar to isar-image's FILESPATH.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta-isar/conf/distro/raspbian-jessie.conf | 2 +-
 meta/classes/isar-image.bbclass            | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta-isar/conf/distro/raspbian-jessie.conf b/meta-isar/conf/distro/raspbian-jessie.conf
index 4ebf523..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 237e2cb..e2bae58 100644
--- a/meta/classes/isar-image.bbclass
+++ b/meta/classes/isar-image.bbclass
@@ -12,7 +12,6 @@ def cfg_script(d):
         return 'file://' + cf
     return ''
 
-FILESPATH =. "${LAYERDIR_isar}/conf/distro:"
 FILESPATH =. "${LAYERDIR_core}/conf/distro:"
 SRC_URI += "${@ cfg_script(d) }"
 
-- 
2.16.4

[PATCH 3/3] doc: Fix licenses path in user manual

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Moved into core layer by now.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 doc/user_manual.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/user_manual.md b/doc/user_manual.md
index 2aa291d..42e940c 100644
--- a/doc/user_manual.md
+++ b/doc/user_manual.md
@@ -507,7 +507,7 @@ installation by appending them to the `IMAGE_PREINSTALL` variable while packages
 DESCRIPTION = "Sample image recipe for ISAR"
 
 LICENSE = "gpl-2.0"
-LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
+LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
 
 PV = "1.0"
 
@@ -546,7 +546,7 @@ The `deb` packages are built using `dpkg-buildpackage`, so the sources should co
 DESCRIPTION = "Sample application for ISAR"
 
 LICENSE = "gpl-2.0"
-LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
+LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
 
 PV = "1.0"
 
@@ -565,7 +565,7 @@ The following variables are used in this recipe:
  - `LIC_FILES_CHKSUM` - Reference to the license file with its checksum. Isar recommends to store license files for your applications into layer your layer folder `meta-user/licenses/`. Then you may reference it in recipe using the following path:
 
     ```
-    LIC_FILES_CHKSUM = file://${LAYERDIR_isar}/licenses/...
+    LIC_FILES_CHKSUM = file://${LAYERDIR_core}/licenses/...
     ```
 This approach prevents duplication of the license files in different packages.
 
-- 
2.16.4

Re: [PATCH 0/3] Follow-up fixes to meta/meta-isar reorganisation

[Maxim Yu. Osipov]

On 1/18/19 5:24 PM, Jan Kiszka wrote:
> This restores the original version of "Move debian distro conf files to
> meta" after fixing the issue that prevented it and performs a missing
> update on the manual as well.
> 
> Only lightly tested due to time constraints.

Applied to the 'next'.

Thanks,
Maxim.

> Jan
> 
> Jan Kiszka (3):
>    isar-image: Allow paths in DISTRO_CONFIG_SCRIPT
>    Remove last reference from meta to meta-isar
>    doc: Fix licenses path in user manual
> 
>   doc/user_manual.md                         | 6 +++---
>   meta-isar/conf/distro/raspbian-jessie.conf | 2 +-
>   meta/classes/isar-image.bbclass            | 8 ++++----
>   3 files changed, 8 insertions(+), 8 deletions(-)
> 


-- 
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov