* [cip-dev] [isar-cip-core PATCH 0/2] Cleanup
@ 2020-06-25 13:12 Quirin Gylstorff
2020-06-25 13:12 ` [cip-dev] [isar-cip-core PATCH 1/2] update ISAR Quirin Gylstorff
2020-06-25 13:12 ` [cip-dev] [isar-cip-core PATCH 2/2] kas: Restructure kas files Quirin Gylstorff
0 siblings, 2 replies; 9+ messages in thread
From: Quirin Gylstorff @ 2020-06-25 13:12 UTC (permalink / raw)
To: Jan.Kiszka, cip-dev; +Cc: Quirin Gylstorff
[-- Attachment #1: Type: text/plain, Size: 1756 bytes --]
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
Move kas related files into folder kas for a cleaner repository root.
Update isar to remove patches folder for now
Quirin Gylstorff (2):
update ISAR
kas: Restructure kas files.
.gitlab-ci.yml | 8 ++--
README.md | 4 +-
conf/machine/hihope-rzg2m.conf | 4 +-
conf/machine/iwg20m.conf | 4 +-
...d-path-to-image-for-arm-kernels-4.12.patch | 37 -------------------
board-bbb.yml => kas/board/bbb.yml | 0
board-iwg20m.yml => kas/board/iwg20m.yml | 0
.../board/qemu-amd64.yml | 0
board-rzg2m.yml => kas/board/rzg2m.yml | 0
.../board/simatic-ipc227e.yml | 0
kas.yml => kas/cip.yml | 7 +---
opt-4.4.yml => kas/opt/4.4.yml | 0
opt-rt.yml => kas/opt/rt.yml | 0
opt-stretch.yml => kas/opt/stretch.yml | 0
opt-targz-img.yml => kas/opt/targz-img.yml | 0
15 files changed, 11 insertions(+), 53 deletions(-)
delete mode 100644 isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch
rename board-bbb.yml => kas/board/bbb.yml (100%)
rename board-iwg20m.yml => kas/board/iwg20m.yml (100%)
rename board-qemu-amd64.yml => kas/board/qemu-amd64.yml (100%)
rename board-rzg2m.yml => kas/board/rzg2m.yml (100%)
rename board-simatic-ipc227e.yml => kas/board/simatic-ipc227e.yml (100%)
rename kas.yml => kas/cip.yml (74%)
rename opt-4.4.yml => kas/opt/4.4.yml (100%)
rename opt-rt.yml => kas/opt/rt.yml (100%)
rename opt-stretch.yml => kas/opt/stretch.yml (100%)
rename opt-targz-img.yml => kas/opt/targz-img.yml (100%)
--
2.20.1
[-- Attachment #2: Type: text/plain, Size: 419 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#4814): https://lists.cip-project.org/g/cip-dev/message/4814
Mute This Topic: https://lists.cip-project.org/mt/75102307/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 9+ messages in thread
* [cip-dev] [isar-cip-core PATCH 1/2] update ISAR
2020-06-25 13:12 [cip-dev] [isar-cip-core PATCH 0/2] Cleanup Quirin Gylstorff
@ 2020-06-25 13:12 ` Quirin Gylstorff
2020-06-25 14:54 ` Jan Kiszka
2020-06-25 13:12 ` [cip-dev] [isar-cip-core PATCH 2/2] kas: Restructure kas files Quirin Gylstorff
1 sibling, 1 reply; 9+ messages in thread
From: Quirin Gylstorff @ 2020-06-25 13:12 UTC (permalink / raw)
To: Jan.Kiszka, cip-dev; +Cc: Quirin Gylstorff
[-- Attachment #1: Type: text/plain, Size: 3918 bytes --]
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
conf/machine/hihope-rzg2m.conf | 4 +-
conf/machine/iwg20m.conf | 4 +-
...d-path-to-image-for-arm-kernels-4.12.patch | 37 -------------------
kas.yml | 7 +---
4 files changed, 5 insertions(+), 47 deletions(-)
delete mode 100644 isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch
diff --git a/conf/machine/hihope-rzg2m.conf b/conf/machine/hihope-rzg2m.conf
index 8278205..a2ae03d 100644
--- a/conf/machine/hihope-rzg2m.conf
+++ b/conf/machine/hihope-rzg2m.conf
@@ -15,5 +15,5 @@ IMAGE_TYPE ?= "wic-img"
KERNEL_DEFCONFIG = "cip-kernel-config/4.19.y-cip/arm64/renesas_defconfig"
USE_CIP_KERNEL_CONFIG = "1"
-DTB_FILE = "r8a774a1-hihope-rzg2m-ex.dtb"
-IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILE}"
+DTB_FILES = "r8a774a1-hihope-rzg2m-ex.dtb"
+IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILES}"
diff --git a/conf/machine/iwg20m.conf b/conf/machine/iwg20m.conf
index 37f98fa..91bfd94 100644
--- a/conf/machine/iwg20m.conf
+++ b/conf/machine/iwg20m.conf
@@ -21,6 +21,6 @@ USE_CIP_KERNEL_CONFIG = "1"
KERNEL_DEFCONFIG = "cip-kernel-config/4.4.y-cip/arm/renesas_shmobile_defconfig"
# Boot partition files
-DTB_FILE = "r8a7743-iwg20d-q7-dbcm-ca.dtb"
+DTB_FILES = "r8a7743-iwg20d-q7-dbcm-ca.dtb"
KERNEL_IMAGE="zImage"
-IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILE}"
+IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILES}"
diff --git a/isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch b/isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch
deleted file mode 100644
index 3e4e13e..0000000
--- a/isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 4961476f3affabd2bfb8f12ccc86c0abc6a66200 Mon Sep 17 00:00:00 2001
-From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
-Date: Wed, 8 Jan 2020 14:43:01 +0100
-Subject: [PATCH] linux-custom: add path to image for arm* kernels < 4.12
-To: isar-users@googlegroups.com
-
-ARM/ARM64 Kernel with a version < 4.12 do not contain the path to
-the kernel image in image_name. This was added with commits:
-152e6744ebfc8fa6cc9fff4ba36271f5f1ba2821 for arm and
-06995804b5762f016c7a80503406da853a8f3785 for arm64.
-
-Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
----
- meta/recipes-kernel/linux/files/debian/isar/install.tmpl | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl
-index 67b7ce3..ac347aa 100644
---- a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl
-+++ b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl
-@@ -56,7 +56,12 @@ EOF
-
- install_image() {
- install -m 755 -d ${deb_img_dir}/$(dirname ${kimage_path})
-- cp ${O}/${kimage} ${deb_img_dir}/${kimage_path}
-+ # ARM/ARM64 kernels < 4.12 do not include the path to the kernel
-+ if [ -e ${O}/${kimage} ]; then
-+ cp ${O}/${kimage} ${deb_img_dir}/${kimage_path}
-+ else
-+ cp ${O}/arch/$ARCH/boot/${kimage} ${deb_img_dir}/${kimage_path}
-+ fi
-
- # Make sure arm64 kernels are decompressed
- if [ "${ARCH}" = "arm64" ]; then
---
-2.20.1
-
diff --git a/kas.yml b/kas.yml
index a157dc9..019b31e 100644
--- a/kas.yml
+++ b/kas.yml
@@ -19,14 +19,9 @@ repos:
isar:
url: https://github.com/ilbers/isar.git
- refspec: 619d6d88ac8c745282fd16773d50a466567615b6
+ refspec: 351af175bc54a201c6f44307d4e998bd6c0afdb8
layers:
meta:
- patches:
- build-arm-with-4.4:
- path: isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch
- repo: cip-core
-
bblayers_conf_header:
standard: |
--
2.20.1
[-- Attachment #2: Type: text/plain, Size: 419 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#4815): https://lists.cip-project.org/g/cip-dev/message/4815
Mute This Topic: https://lists.cip-project.org/mt/75102309/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [cip-dev] [isar-cip-core PATCH 2/2] kas: Restructure kas files.
2020-06-25 13:12 [cip-dev] [isar-cip-core PATCH 0/2] Cleanup Quirin Gylstorff
2020-06-25 13:12 ` [cip-dev] [isar-cip-core PATCH 1/2] update ISAR Quirin Gylstorff
@ 2020-06-25 13:12 ` Quirin Gylstorff
2020-06-25 14:53 ` Jan Kiszka
1 sibling, 1 reply; 9+ messages in thread
From: Quirin Gylstorff @ 2020-06-25 13:12 UTC (permalink / raw)
To: Jan.Kiszka, cip-dev; +Cc: Quirin Gylstorff
[-- Attachment #1: Type: text/plain, Size: 4925 bytes --]
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
Create folder structure
kas -> general configuration
kas/board -> all supported boards
kas/opt -> all kas option files
Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
.gitlab-ci.yml | 8 ++++----
README.md | 4 ++--
board-bbb.yml => kas/board/bbb.yml | 0
board-iwg20m.yml => kas/board/iwg20m.yml | 0
board-qemu-amd64.yml => kas/board/qemu-amd64.yml | 0
board-rzg2m.yml => kas/board/rzg2m.yml | 0
.../board/simatic-ipc227e.yml | 0
kas.yml => kas/cip.yml | 0
opt-4.4.yml => kas/opt/4.4.yml | 0
opt-rt.yml => kas/opt/rt.yml | 0
opt-stretch.yml => kas/opt/stretch.yml | 0
opt-targz-img.yml => kas/opt/targz-img.yml | 0
12 files changed, 6 insertions(+), 6 deletions(-)
rename board-bbb.yml => kas/board/bbb.yml (100%)
rename board-iwg20m.yml => kas/board/iwg20m.yml (100%)
rename board-qemu-amd64.yml => kas/board/qemu-amd64.yml (100%)
rename board-rzg2m.yml => kas/board/rzg2m.yml (100%)
rename board-simatic-ipc227e.yml => kas/board/simatic-ipc227e.yml (100%)
rename kas.yml => kas/cip.yml (100%)
rename opt-4.4.yml => kas/opt/4.4.yml (100%)
rename opt-rt.yml => kas/opt/rt.yml (100%)
rename opt-stretch.yml => kas/opt/stretch.yml (100%)
rename opt-targz-img.yml => kas/opt/targz-img.yml (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f1dc91..564398d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,17 +13,17 @@ all:
- export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
- export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY
- - kas build kas.yml:board-simatic-ipc227e.yml:opt-rt.yml:opt-targz-img.yml
+ - kas build kas/cip.yml:kas/board/simatic-ipc227e.yml:kas/opt/rt.yml:kas/opt/targz-img.yml
- scripts/deploy-cip-core.sh buster simatic-ipc227e
- sudo rm -rf build/tmp
- - kas build kas.yml:board-bbb.yml:opt-rt.yml:opt-targz-img.yml
+ - kas build kas/cip.yml:kas/board/bbb.yml:kas/opt/rt.yml:kas/opt/targz-img.yml
- scripts/deploy-cip-core.sh buster bbb am335x-boneblack.dtb
- sudo rm -rf build/tmp
- - kas build kas.yml:board-iwg20m.yml:opt-rt.yml:opt-targz-img.yml
+ - kas build kas/cip.yml:kas/board/iwg20m.yml:kas/opt/rt.yml:kas/opt/targz-img.yml
- scripts/deploy-cip-core.sh buster iwg20m r8a7743-iwg20d-q7-dbcm-ca.dtb
- sudo rm -rf build/tmp
- - kas build kas.yml:board-rzg2m.yml:opt-rt.yml:opt-targz-img.yml
+ - kas build kas/cip.yml:kas/board/rzg2m.yml:kas/opt/rt.yml:kas/opt/targz-img.yml
- scripts/deploy-cip-core.sh buster hihope-rzg2m renesas/r8a774a1-hihope-rzg2m-ex.dtb
diff --git a/README.md b/README.md
index bbad1a0..ebbdee4 100644
--- a/README.md
+++ b/README.md
@@ -21,11 +21,11 @@ start containers.
To build, e.g., the QEMU AMD64 target inside Docker, invoke kas-docker like
this:
- ./kas-docker --isar build kas.yml:board-qemu-amd64.yml
+ ./kas-docker --isar build kas/cip.yml:kas/board/qemu-amd64.yml
This image can be run using `start-qemu.sh x86`.
-The BeagleBone Black target is selected by `... kas.yml:board-bbb.yml`. In
+The BeagleBone Black target is selected by `... kas/cip.yml:kas/board/bbb.yml`. In
order to build the image with the PREEMPT-RT kernel, append `:opt-rt.yml` to
the above. Append ':opt-4.4.yml' to use the kernel version 4.4 instead of 4.19.
diff --git a/board-bbb.yml b/kas/board/bbb.yml
similarity index 100%
rename from board-bbb.yml
rename to kas/board/bbb.yml
diff --git a/board-iwg20m.yml b/kas/board/iwg20m.yml
similarity index 100%
rename from board-iwg20m.yml
rename to kas/board/iwg20m.yml
diff --git a/board-qemu-amd64.yml b/kas/board/qemu-amd64.yml
similarity index 100%
rename from board-qemu-amd64.yml
rename to kas/board/qemu-amd64.yml
diff --git a/board-rzg2m.yml b/kas/board/rzg2m.yml
similarity index 100%
rename from board-rzg2m.yml
rename to kas/board/rzg2m.yml
diff --git a/board-simatic-ipc227e.yml b/kas/board/simatic-ipc227e.yml
similarity index 100%
rename from board-simatic-ipc227e.yml
rename to kas/board/simatic-ipc227e.yml
diff --git a/kas.yml b/kas/cip.yml
similarity index 100%
rename from kas.yml
rename to kas/cip.yml
diff --git a/opt-4.4.yml b/kas/opt/4.4.yml
similarity index 100%
rename from opt-4.4.yml
rename to kas/opt/4.4.yml
diff --git a/opt-rt.yml b/kas/opt/rt.yml
similarity index 100%
rename from opt-rt.yml
rename to kas/opt/rt.yml
diff --git a/opt-stretch.yml b/kas/opt/stretch.yml
similarity index 100%
rename from opt-stretch.yml
rename to kas/opt/stretch.yml
diff --git a/opt-targz-img.yml b/kas/opt/targz-img.yml
similarity index 100%
rename from opt-targz-img.yml
rename to kas/opt/targz-img.yml
--
2.20.1
[-- Attachment #2: Type: text/plain, Size: 419 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#4813): https://lists.cip-project.org/g/cip-dev/message/4813
Mute This Topic: https://lists.cip-project.org/mt/75102306/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [cip-dev] [isar-cip-core PATCH 2/2] kas: Restructure kas files.
2020-06-25 13:12 ` [cip-dev] [isar-cip-core PATCH 2/2] kas: Restructure kas files Quirin Gylstorff
@ 2020-06-25 14:53 ` Jan Kiszka
2020-06-26 7:52 ` Quirin Gylstorff
2020-06-26 16:56 ` [cip-dev] [isar-cip-core PATCH v2 0/1] Cleanup Quirin Gylstorff
0 siblings, 2 replies; 9+ messages in thread
From: Jan Kiszka @ 2020-06-25 14:53 UTC (permalink / raw)
To: Q. Gylstorff, cip-dev
[-- Attachment #1: Type: text/plain, Size: 5754 bytes --]
On 25.06.20 15:12, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>
> Create folder structure
> kas -> general configuration
> kas/board -> all supported boards
> kas/opt -> all kas option files
>
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
> .gitlab-ci.yml | 8 ++++----
> README.md | 4 ++--
> board-bbb.yml => kas/board/bbb.yml | 0
> board-iwg20m.yml => kas/board/iwg20m.yml | 0
> board-qemu-amd64.yml => kas/board/qemu-amd64.yml | 0
> board-rzg2m.yml => kas/board/rzg2m.yml | 0
> .../board/simatic-ipc227e.yml | 0
> kas.yml => kas/cip.yml | 0
> opt-4.4.yml => kas/opt/4.4.yml | 0
> opt-rt.yml => kas/opt/rt.yml | 0
> opt-stretch.yml => kas/opt/stretch.yml | 0
> opt-targz-img.yml => kas/opt/targz-img.yml | 0
> 12 files changed, 6 insertions(+), 6 deletions(-)
> rename board-bbb.yml => kas/board/bbb.yml (100%)
> rename board-iwg20m.yml => kas/board/iwg20m.yml (100%)
> rename board-qemu-amd64.yml => kas/board/qemu-amd64.yml (100%)
> rename board-rzg2m.yml => kas/board/rzg2m.yml (100%)
> rename board-simatic-ipc227e.yml => kas/board/simatic-ipc227e.yml (100%)
> rename kas.yml => kas/cip.yml (100%)
> rename opt-4.4.yml => kas/opt/4.4.yml (100%)
> rename opt-rt.yml => kas/opt/rt.yml (100%)
> rename opt-stretch.yml => kas/opt/stretch.yml (100%)
> rename opt-targz-img.yml => kas/opt/targz-img.yml (100%)
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 6f1dc91..564398d 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -13,17 +13,17 @@ all:
> - export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
> - export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY
>
> - - kas build kas.yml:board-simatic-ipc227e.yml:opt-rt.yml:opt-targz-img.yml
> + - kas build kas/cip.yml:kas/board/simatic-ipc227e.yml:kas/opt/rt.yml:kas/opt/targz-img.yml
> - scripts/deploy-cip-core.sh buster simatic-ipc227e
>
> - sudo rm -rf build/tmp
> - - kas build kas.yml:board-bbb.yml:opt-rt.yml:opt-targz-img.yml
> + - kas build kas/cip.yml:kas/board/bbb.yml:kas/opt/rt.yml:kas/opt/targz-img.yml
> - scripts/deploy-cip-core.sh buster bbb am335x-boneblack.dtb
>
> - sudo rm -rf build/tmp
> - - kas build kas.yml:board-iwg20m.yml:opt-rt.yml:opt-targz-img.yml
> + - kas build kas/cip.yml:kas/board/iwg20m.yml:kas/opt/rt.yml:kas/opt/targz-img.yml
> - scripts/deploy-cip-core.sh buster iwg20m r8a7743-iwg20d-q7-dbcm-ca.dtb
>
> - sudo rm -rf build/tmp
> - - kas build kas.yml:board-rzg2m.yml:opt-rt.yml:opt-targz-img.yml
> + - kas build kas/cip.yml:kas/board/rzg2m.yml:kas/opt/rt.yml:kas/opt/targz-img.yml
> - scripts/deploy-cip-core.sh buster hihope-rzg2m renesas/r8a774a1-hihope-rzg2m-ex.dtb
> diff --git a/README.md b/README.md
> index bbad1a0..ebbdee4 100644
> --- a/README.md
> +++ b/README.md
> @@ -21,11 +21,11 @@ start containers.
> To build, e.g., the QEMU AMD64 target inside Docker, invoke kas-docker like
> this:
>
> - ./kas-docker --isar build kas.yml:board-qemu-amd64.yml
> + ./kas-docker --isar build kas/cip.yml:kas/board/qemu-amd64.yml
>
> This image can be run using `start-qemu.sh x86`.
>
> -The BeagleBone Black target is selected by `... kas.yml:board-bbb.yml`. In
> +The BeagleBone Black target is selected by `... kas/cip.yml:kas/board/bbb.yml`. In
> order to build the image with the PREEMPT-RT kernel, append `:opt-rt.yml` to
> the above. Append ':opt-4.4.yml' to use the kernel version 4.4 instead of 4.19.
>
> diff --git a/board-bbb.yml b/kas/board/bbb.yml
> similarity index 100%
> rename from board-bbb.yml
> rename to kas/board/bbb.yml
> diff --git a/board-iwg20m.yml b/kas/board/iwg20m.yml
> similarity index 100%
> rename from board-iwg20m.yml
> rename to kas/board/iwg20m.yml
> diff --git a/board-qemu-amd64.yml b/kas/board/qemu-amd64.yml
> similarity index 100%
> rename from board-qemu-amd64.yml
> rename to kas/board/qemu-amd64.yml
> diff --git a/board-rzg2m.yml b/kas/board/rzg2m.yml
> similarity index 100%
> rename from board-rzg2m.yml
> rename to kas/board/rzg2m.yml
> diff --git a/board-simatic-ipc227e.yml b/kas/board/simatic-ipc227e.yml
> similarity index 100%
> rename from board-simatic-ipc227e.yml
> rename to kas/board/simatic-ipc227e.yml
> diff --git a/kas.yml b/kas/cip.yml
> similarity index 100%
> rename from kas.yml
> rename to kas/cip.yml
> diff --git a/opt-4.4.yml b/kas/opt/4.4.yml
> similarity index 100%
> rename from opt-4.4.yml
> rename to kas/opt/4.4.yml
> diff --git a/opt-rt.yml b/kas/opt/rt.yml
> similarity index 100%
> rename from opt-rt.yml
> rename to kas/opt/rt.yml
> diff --git a/opt-stretch.yml b/kas/opt/stretch.yml
> similarity index 100%
> rename from opt-stretch.yml
> rename to kas/opt/stretch.yml
> diff --git a/opt-targz-img.yml b/kas/opt/targz-img.yml
> similarity index 100%
> rename from opt-targz-img.yml
> rename to kas/opt/targz-img.yml
>
There is one catch with moving everything into a subdirectory: If a user
pulls a tarball of the layer, thus tries to use it with git, kas will
not be able to identify the top-level directory, and various things can
fail.
Therefore, we are now often using the pattern of keeping the kas-*.yml
file at the top level while moving options or boards under kas/. See
e.g. https://github.com/siemens/meta-iot2050/.
Jan
--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
[-- Attachment #2: Type: text/plain, Size: 419 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#4830): https://lists.cip-project.org/g/cip-dev/message/4830
Mute This Topic: https://lists.cip-project.org/mt/75102306/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [cip-dev] [isar-cip-core PATCH 1/2] update ISAR
2020-06-25 13:12 ` [cip-dev] [isar-cip-core PATCH 1/2] update ISAR Quirin Gylstorff
@ 2020-06-25 14:54 ` Jan Kiszka
0 siblings, 0 replies; 9+ messages in thread
From: Jan Kiszka @ 2020-06-25 14:54 UTC (permalink / raw)
To: Q. Gylstorff, cip-dev
[-- Attachment #1: Type: text/plain, Size: 4295 bytes --]
On 25.06.20 15:12, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
> conf/machine/hihope-rzg2m.conf | 4 +-
> conf/machine/iwg20m.conf | 4 +-
> ...d-path-to-image-for-arm-kernels-4.12.patch | 37 -------------------
> kas.yml | 7 +---
> 4 files changed, 5 insertions(+), 47 deletions(-)
> delete mode 100644 isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch
>
> diff --git a/conf/machine/hihope-rzg2m.conf b/conf/machine/hihope-rzg2m.conf
> index 8278205..a2ae03d 100644
> --- a/conf/machine/hihope-rzg2m.conf
> +++ b/conf/machine/hihope-rzg2m.conf
> @@ -15,5 +15,5 @@ IMAGE_TYPE ?= "wic-img"
>
> KERNEL_DEFCONFIG = "cip-kernel-config/4.19.y-cip/arm64/renesas_defconfig"
> USE_CIP_KERNEL_CONFIG = "1"
> -DTB_FILE = "r8a774a1-hihope-rzg2m-ex.dtb"
> -IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILE}"
> +DTB_FILES = "r8a774a1-hihope-rzg2m-ex.dtb"
> +IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILES}"
> diff --git a/conf/machine/iwg20m.conf b/conf/machine/iwg20m.conf
> index 37f98fa..91bfd94 100644
> --- a/conf/machine/iwg20m.conf
> +++ b/conf/machine/iwg20m.conf
> @@ -21,6 +21,6 @@ USE_CIP_KERNEL_CONFIG = "1"
> KERNEL_DEFCONFIG = "cip-kernel-config/4.4.y-cip/arm/renesas_shmobile_defconfig"
>
> # Boot partition files
> -DTB_FILE = "r8a7743-iwg20d-q7-dbcm-ca.dtb"
> +DTB_FILES = "r8a7743-iwg20d-q7-dbcm-ca.dtb"
> KERNEL_IMAGE="zImage"
> -IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILE}"
> +IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILES}"
> diff --git a/isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch b/isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch
> deleted file mode 100644
> index 3e4e13e..0000000
> --- a/isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -From 4961476f3affabd2bfb8f12ccc86c0abc6a66200 Mon Sep 17 00:00:00 2001
> -From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> -Date: Wed, 8 Jan 2020 14:43:01 +0100
> -Subject: [PATCH] linux-custom: add path to image for arm* kernels < 4.12
> -To: isar-users@googlegroups.com
> -
> -ARM/ARM64 Kernel with a version < 4.12 do not contain the path to
> -the kernel image in image_name. This was added with commits:
> -152e6744ebfc8fa6cc9fff4ba36271f5f1ba2821 for arm and
> -06995804b5762f016c7a80503406da853a8f3785 for arm64.
> -
> -Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ----
> - meta/recipes-kernel/linux/files/debian/isar/install.tmpl | 7 ++++++-
> - 1 file changed, 6 insertions(+), 1 deletion(-)
> -
> -diff --git a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl
> -index 67b7ce3..ac347aa 100644
> ---- a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl
> -+++ b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl
> -@@ -56,7 +56,12 @@ EOF
> -
> - install_image() {
> - install -m 755 -d ${deb_img_dir}/$(dirname ${kimage_path})
> -- cp ${O}/${kimage} ${deb_img_dir}/${kimage_path}
> -+ # ARM/ARM64 kernels < 4.12 do not include the path to the kernel
> -+ if [ -e ${O}/${kimage} ]; then
> -+ cp ${O}/${kimage} ${deb_img_dir}/${kimage_path}
> -+ else
> -+ cp ${O}/arch/$ARCH/boot/${kimage} ${deb_img_dir}/${kimage_path}
> -+ fi
> -
> - # Make sure arm64 kernels are decompressed
> - if [ "${ARCH}" = "arm64" ]; then
> ---
> -2.20.1
> -
> diff --git a/kas.yml b/kas.yml
> index a157dc9..019b31e 100644
> --- a/kas.yml
> +++ b/kas.yml
> @@ -19,14 +19,9 @@ repos:
>
> isar:
> url: https://github.com/ilbers/isar.git
> - refspec: 619d6d88ac8c745282fd16773d50a466567615b6
> + refspec: 351af175bc54a201c6f44307d4e998bd6c0afdb8
> layers:
> meta:
> - patches:
> - build-arm-with-4.4:
> - path: isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch
> - repo: cip-core
> -
>
> bblayers_conf_header:
> standard: |
>
Applied to next.
Thanks,
Jan
--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
[-- Attachment #2: Type: text/plain, Size: 419 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#4831): https://lists.cip-project.org/g/cip-dev/message/4831
Mute This Topic: https://lists.cip-project.org/mt/75102309/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [cip-dev] [isar-cip-core PATCH 2/2] kas: Restructure kas files.
2020-06-25 14:53 ` Jan Kiszka
@ 2020-06-26 7:52 ` Quirin Gylstorff
2020-06-26 16:56 ` [cip-dev] [isar-cip-core PATCH v2 0/1] Cleanup Quirin Gylstorff
1 sibling, 0 replies; 9+ messages in thread
From: Quirin Gylstorff @ 2020-06-26 7:52 UTC (permalink / raw)
To: Jan Kiszka, cip-dev
[-- Attachment #1: Type: text/plain, Size: 6479 bytes --]
On 6/25/20 4:53 PM, Jan Kiszka wrote:
> On 25.06.20 15:12, Q. Gylstorff wrote:
>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>
>> Create folder structure
>> kas -> general configuration
>> kas/board -> all supported boards
>> kas/opt -> all kas option files
>>
>> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> ---
>> .gitlab-ci.yml | 8 ++++----
>> README.md | 4 ++--
>> board-bbb.yml => kas/board/bbb.yml | 0
>> board-iwg20m.yml => kas/board/iwg20m.yml | 0
>> board-qemu-amd64.yml => kas/board/qemu-amd64.yml | 0
>> board-rzg2m.yml => kas/board/rzg2m.yml | 0
>> .../board/simatic-ipc227e.yml | 0
>> kas.yml => kas/cip.yml | 0
>> opt-4.4.yml => kas/opt/4.4.yml | 0
>> opt-rt.yml => kas/opt/rt.yml | 0
>> opt-stretch.yml => kas/opt/stretch.yml | 0
>> opt-targz-img.yml => kas/opt/targz-img.yml | 0
>> 12 files changed, 6 insertions(+), 6 deletions(-)
>> rename board-bbb.yml => kas/board/bbb.yml (100%)
>> rename board-iwg20m.yml => kas/board/iwg20m.yml (100%)
>> rename board-qemu-amd64.yml => kas/board/qemu-amd64.yml (100%)
>> rename board-rzg2m.yml => kas/board/rzg2m.yml (100%)
>> rename board-simatic-ipc227e.yml => kas/board/simatic-ipc227e.yml
>> (100%)
>> rename kas.yml => kas/cip.yml (100%)
>> rename opt-4.4.yml => kas/opt/4.4.yml (100%)
>> rename opt-rt.yml => kas/opt/rt.yml (100%)
>> rename opt-stretch.yml => kas/opt/stretch.yml (100%)
>> rename opt-targz-img.yml => kas/opt/targz-img.yml (100%)
>>
>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>> index 6f1dc91..564398d 100644
>> --- a/.gitlab-ci.yml
>> +++ b/.gitlab-ci.yml
>> @@ -13,17 +13,17 @@ all:
>> - export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
>> - export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY
>> - - kas build
>> kas.yml:board-simatic-ipc227e.yml:opt-rt.yml:opt-targz-img.yml
>> + - kas build
>> kas/cip.yml:kas/board/simatic-ipc227e.yml:kas/opt/rt.yml:kas/opt/targz-img.yml
>>
>> - scripts/deploy-cip-core.sh buster simatic-ipc227e
>> - sudo rm -rf build/tmp
>> - - kas build kas.yml:board-bbb.yml:opt-rt.yml:opt-targz-img.yml
>> + - kas build
>> kas/cip.yml:kas/board/bbb.yml:kas/opt/rt.yml:kas/opt/targz-img.yml
>> - scripts/deploy-cip-core.sh buster bbb am335x-boneblack.dtb
>> - sudo rm -rf build/tmp
>> - - kas build kas.yml:board-iwg20m.yml:opt-rt.yml:opt-targz-img.yml
>> + - kas build
>> kas/cip.yml:kas/board/iwg20m.yml:kas/opt/rt.yml:kas/opt/targz-img.yml
>> - scripts/deploy-cip-core.sh buster iwg20m
>> r8a7743-iwg20d-q7-dbcm-ca.dtb
>> - sudo rm -rf build/tmp
>> - - kas build kas.yml:board-rzg2m.yml:opt-rt.yml:opt-targz-img.yml
>> + - kas build
>> kas/cip.yml:kas/board/rzg2m.yml:kas/opt/rt.yml:kas/opt/targz-img.yml
>> - scripts/deploy-cip-core.sh buster hihope-rzg2m
>> renesas/r8a774a1-hihope-rzg2m-ex.dtb
>> diff --git a/README.md b/README.md
>> index bbad1a0..ebbdee4 100644
>> --- a/README.md
>> +++ b/README.md
>> @@ -21,11 +21,11 @@ start containers.
>> To build, e.g., the QEMU AMD64 target inside Docker, invoke
>> kas-docker like
>> this:
>> - ./kas-docker --isar build kas.yml:board-qemu-amd64.yml
>> + ./kas-docker --isar build kas/cip.yml:kas/board/qemu-amd64.yml
>> This image can be run using `start-qemu.sh x86`.
>> -The BeagleBone Black target is selected by `...
>> kas.yml:board-bbb.yml`. In
>> +The BeagleBone Black target is selected by `...
>> kas/cip.yml:kas/board/bbb.yml`. In
>> order to build the image with the PREEMPT-RT kernel, append
>> `:opt-rt.yml` to
>> the above. Append ':opt-4.4.yml' to use the kernel version 4.4
>> instead of 4.19.
>> diff --git a/board-bbb.yml b/kas/board/bbb.yml
>> similarity index 100%
>> rename from board-bbb.yml
>> rename to kas/board/bbb.yml
>> diff --git a/board-iwg20m.yml b/kas/board/iwg20m.yml
>> similarity index 100%
>> rename from board-iwg20m.yml
>> rename to kas/board/iwg20m.yml
>> diff --git a/board-qemu-amd64.yml b/kas/board/qemu-amd64.yml
>> similarity index 100%
>> rename from board-qemu-amd64.yml
>> rename to kas/board/qemu-amd64.yml
>> diff --git a/board-rzg2m.yml b/kas/board/rzg2m.yml
>> similarity index 100%
>> rename from board-rzg2m.yml
>> rename to kas/board/rzg2m.yml
>> diff --git a/board-simatic-ipc227e.yml b/kas/board/simatic-ipc227e.yml
>> similarity index 100%
>> rename from board-simatic-ipc227e.yml
>> rename to kas/board/simatic-ipc227e.yml
>> diff --git a/kas.yml b/kas/cip.yml
>> similarity index 100%
>> rename from kas.yml
>> rename to kas/cip.yml
>> diff --git a/opt-4.4.yml b/kas/opt/4.4.yml
>> similarity index 100%
>> rename from opt-4.4.yml
>> rename to kas/opt/4.4.yml
>> diff --git a/opt-rt.yml b/kas/opt/rt.yml
>> similarity index 100%
>> rename from opt-rt.yml
>> rename to kas/opt/rt.yml
>> diff --git a/opt-stretch.yml b/kas/opt/stretch.yml
>> similarity index 100%
>> rename from opt-stretch.yml
>> rename to kas/opt/stretch.yml
>> diff --git a/opt-targz-img.yml b/kas/opt/targz-img.yml
>> similarity index 100%
>> rename from opt-targz-img.yml
>> rename to kas/opt/targz-img.yml
>>
>
> There is one catch with moving everything into a subdirectory: If a user
> pulls a tarball of the layer, thus tries to use it with git, kas will
> not be able to identify the top-level directory, and various things can
> fail.
>
> Therefore, we are now often using the pattern of keeping the kas-*.yml
> file at the top level while moving options or boards under kas/. See
> e.g. https://github.com/siemens/meta-iot2050/.
>
> Jan
>
Ok I will send a v2 to add a top level kas-cip.yml to address that.
Quirin
[-- Attachment #2: Type: text/plain, Size: 419 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#4838): https://lists.cip-project.org/g/cip-dev/message/4838
Mute This Topic: https://lists.cip-project.org/mt/75102306/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 9+ messages in thread
* [cip-dev] [isar-cip-core PATCH v2 0/1] Cleanup
2020-06-25 14:53 ` Jan Kiszka
2020-06-26 7:52 ` Quirin Gylstorff
@ 2020-06-26 16:56 ` Quirin Gylstorff
2020-06-26 16:56 ` [cip-dev] [isar-cip-core PATCH v2 1/1] kas: Restructure kas files Quirin Gylstorff
1 sibling, 1 reply; 9+ messages in thread
From: Quirin Gylstorff @ 2020-06-26 16:56 UTC (permalink / raw)
To: cip-dev, Jan.Kiszka; +Cc: Quirin Gylstorff
[-- Attachment #1: Type: text/plain, Size: 1685 bytes --]
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
Move kas related files into folder kas for a cleaner repository root.
Update isar to remove patches folder for now
Changes V2:
- move kas-cip back to repository root
- remove applied Update ISAR patch
Quirin Gylstorff (1):
kas: Restructure kas files.
.gitlab-ci.yml | 8 ++++----
README.md | 4 ++--
kas.yml => kas-cip.yml | 0
board-bbb.yml => kas/board/bbb.yml | 0
board-iwg20m.yml => kas/board/iwg20m.yml | 0
board-qemu-amd64.yml => kas/board/qemu-amd64.yml | 0
board-rzg2m.yml => kas/board/rzg2m.yml | 0
.../board/simatic-ipc227e.yml | 0
opt-4.4.yml => kas/opt/4.4.yml | 0
opt-rt.yml => kas/opt/rt.yml | 0
opt-stretch.yml => kas/opt/stretch.yml | 0
opt-targz-img.yml => kas/opt/targz-img.yml | 0
12 files changed, 6 insertions(+), 6 deletions(-)
rename kas.yml => kas-cip.yml (100%)
rename board-bbb.yml => kas/board/bbb.yml (100%)
rename board-iwg20m.yml => kas/board/iwg20m.yml (100%)
rename board-qemu-amd64.yml => kas/board/qemu-amd64.yml (100%)
rename board-rzg2m.yml => kas/board/rzg2m.yml (100%)
rename board-simatic-ipc227e.yml => kas/board/simatic-ipc227e.yml (100%)
rename opt-4.4.yml => kas/opt/4.4.yml (100%)
rename opt-rt.yml => kas/opt/rt.yml (100%)
rename opt-stretch.yml => kas/opt/stretch.yml (100%)
rename opt-targz-img.yml => kas/opt/targz-img.yml (100%)
--
2.20.1
[-- Attachment #2: Type: text/plain, Size: 419 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#4843): https://lists.cip-project.org/g/cip-dev/message/4843
Mute This Topic: https://lists.cip-project.org/mt/75128488/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 9+ messages in thread
* [cip-dev] [isar-cip-core PATCH v2 1/1] kas: Restructure kas files.
2020-06-26 16:56 ` [cip-dev] [isar-cip-core PATCH v2 0/1] Cleanup Quirin Gylstorff
@ 2020-06-26 16:56 ` Quirin Gylstorff
2020-06-26 18:51 ` Jan Kiszka
0 siblings, 1 reply; 9+ messages in thread
From: Quirin Gylstorff @ 2020-06-26 16:56 UTC (permalink / raw)
To: cip-dev, Jan.Kiszka; +Cc: Quirin Gylstorff
[-- Attachment #1: Type: text/plain, Size: 4925 bytes --]
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
Create folder structure
kas -> general configuration
kas/board -> all supported boards
kas/opt -> all kas option files
Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
.gitlab-ci.yml | 8 ++++----
README.md | 4 ++--
kas.yml => kas-cip.yml | 0
board-bbb.yml => kas/board/bbb.yml | 0
board-iwg20m.yml => kas/board/iwg20m.yml | 0
board-qemu-amd64.yml => kas/board/qemu-amd64.yml | 0
board-rzg2m.yml => kas/board/rzg2m.yml | 0
.../board/simatic-ipc227e.yml | 0
opt-4.4.yml => kas/opt/4.4.yml | 0
opt-rt.yml => kas/opt/rt.yml | 0
opt-stretch.yml => kas/opt/stretch.yml | 0
opt-targz-img.yml => kas/opt/targz-img.yml | 0
12 files changed, 6 insertions(+), 6 deletions(-)
rename kas.yml => kas-cip.yml (100%)
rename board-bbb.yml => kas/board/bbb.yml (100%)
rename board-iwg20m.yml => kas/board/iwg20m.yml (100%)
rename board-qemu-amd64.yml => kas/board/qemu-amd64.yml (100%)
rename board-rzg2m.yml => kas/board/rzg2m.yml (100%)
rename board-simatic-ipc227e.yml => kas/board/simatic-ipc227e.yml (100%)
rename opt-4.4.yml => kas/opt/4.4.yml (100%)
rename opt-rt.yml => kas/opt/rt.yml (100%)
rename opt-stretch.yml => kas/opt/stretch.yml (100%)
rename opt-targz-img.yml => kas/opt/targz-img.yml (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f1dc91..241b09e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,17 +13,17 @@ all:
- export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
- export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY
- - kas build kas.yml:board-simatic-ipc227e.yml:opt-rt.yml:opt-targz-img.yml
+ - kas build kas-cip.yml:kas/board/simatic-ipc227e.yml:kas/opt/rt.yml:kas/opt/targz-img.yml
- scripts/deploy-cip-core.sh buster simatic-ipc227e
- sudo rm -rf build/tmp
- - kas build kas.yml:board-bbb.yml:opt-rt.yml:opt-targz-img.yml
+ - kas build kas-cip.yml:kas/board/bbb.yml:kas/opt/rt.yml:kas/opt/targz-img.yml
- scripts/deploy-cip-core.sh buster bbb am335x-boneblack.dtb
- sudo rm -rf build/tmp
- - kas build kas.yml:board-iwg20m.yml:opt-rt.yml:opt-targz-img.yml
+ - kas build kas-cip.yml:kas/board/iwg20m.yml:kas/opt/rt.yml:kas/opt/targz-img.yml
- scripts/deploy-cip-core.sh buster iwg20m r8a7743-iwg20d-q7-dbcm-ca.dtb
- sudo rm -rf build/tmp
- - kas build kas.yml:board-rzg2m.yml:opt-rt.yml:opt-targz-img.yml
+ - kas build kas-cip.yml:kas/board/rzg2m.yml:kas/opt/rt.yml:kas/opt/targz-img.yml
- scripts/deploy-cip-core.sh buster hihope-rzg2m renesas/r8a774a1-hihope-rzg2m-ex.dtb
diff --git a/README.md b/README.md
index bbad1a0..1a7af21 100644
--- a/README.md
+++ b/README.md
@@ -21,11 +21,11 @@ start containers.
To build, e.g., the QEMU AMD64 target inside Docker, invoke kas-docker like
this:
- ./kas-docker --isar build kas.yml:board-qemu-amd64.yml
+ ./kas-docker --isar build kas-cip.yml:kas/board/qemu-amd64.yml
This image can be run using `start-qemu.sh x86`.
-The BeagleBone Black target is selected by `... kas.yml:board-bbb.yml`. In
+The BeagleBone Black target is selected by `... kas-cip.yml:kas/board/bbb.yml`. In
order to build the image with the PREEMPT-RT kernel, append `:opt-rt.yml` to
the above. Append ':opt-4.4.yml' to use the kernel version 4.4 instead of 4.19.
diff --git a/kas.yml b/kas-cip.yml
similarity index 100%
rename from kas.yml
rename to kas-cip.yml
diff --git a/board-bbb.yml b/kas/board/bbb.yml
similarity index 100%
rename from board-bbb.yml
rename to kas/board/bbb.yml
diff --git a/board-iwg20m.yml b/kas/board/iwg20m.yml
similarity index 100%
rename from board-iwg20m.yml
rename to kas/board/iwg20m.yml
diff --git a/board-qemu-amd64.yml b/kas/board/qemu-amd64.yml
similarity index 100%
rename from board-qemu-amd64.yml
rename to kas/board/qemu-amd64.yml
diff --git a/board-rzg2m.yml b/kas/board/rzg2m.yml
similarity index 100%
rename from board-rzg2m.yml
rename to kas/board/rzg2m.yml
diff --git a/board-simatic-ipc227e.yml b/kas/board/simatic-ipc227e.yml
similarity index 100%
rename from board-simatic-ipc227e.yml
rename to kas/board/simatic-ipc227e.yml
diff --git a/opt-4.4.yml b/kas/opt/4.4.yml
similarity index 100%
rename from opt-4.4.yml
rename to kas/opt/4.4.yml
diff --git a/opt-rt.yml b/kas/opt/rt.yml
similarity index 100%
rename from opt-rt.yml
rename to kas/opt/rt.yml
diff --git a/opt-stretch.yml b/kas/opt/stretch.yml
similarity index 100%
rename from opt-stretch.yml
rename to kas/opt/stretch.yml
diff --git a/opt-targz-img.yml b/kas/opt/targz-img.yml
similarity index 100%
rename from opt-targz-img.yml
rename to kas/opt/targz-img.yml
--
2.20.1
[-- Attachment #2: Type: text/plain, Size: 419 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#4842): https://lists.cip-project.org/g/cip-dev/message/4842
Mute This Topic: https://lists.cip-project.org/mt/75128487/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [cip-dev] [isar-cip-core PATCH v2 1/1] kas: Restructure kas files.
2020-06-26 16:56 ` [cip-dev] [isar-cip-core PATCH v2 1/1] kas: Restructure kas files Quirin Gylstorff
@ 2020-06-26 18:51 ` Jan Kiszka
0 siblings, 0 replies; 9+ messages in thread
From: Jan Kiszka @ 2020-06-26 18:51 UTC (permalink / raw)
To: Q. Gylstorff, cip-dev
[-- Attachment #1: Type: text/plain, Size: 5408 bytes --]
On 26.06.20 18:56, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>
> Create folder structure
> kas -> general configuration
> kas/board -> all supported boards
> kas/opt -> all kas option files
>
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
> .gitlab-ci.yml | 8 ++++----
> README.md | 4 ++--
> kas.yml => kas-cip.yml | 0
> board-bbb.yml => kas/board/bbb.yml | 0
> board-iwg20m.yml => kas/board/iwg20m.yml | 0
> board-qemu-amd64.yml => kas/board/qemu-amd64.yml | 0
> board-rzg2m.yml => kas/board/rzg2m.yml | 0
> .../board/simatic-ipc227e.yml | 0
> opt-4.4.yml => kas/opt/4.4.yml | 0
> opt-rt.yml => kas/opt/rt.yml | 0
> opt-stretch.yml => kas/opt/stretch.yml | 0
> opt-targz-img.yml => kas/opt/targz-img.yml | 0
> 12 files changed, 6 insertions(+), 6 deletions(-)
> rename kas.yml => kas-cip.yml (100%)
> rename board-bbb.yml => kas/board/bbb.yml (100%)
> rename board-iwg20m.yml => kas/board/iwg20m.yml (100%)
> rename board-qemu-amd64.yml => kas/board/qemu-amd64.yml (100%)
> rename board-rzg2m.yml => kas/board/rzg2m.yml (100%)
> rename board-simatic-ipc227e.yml => kas/board/simatic-ipc227e.yml (100%)
> rename opt-4.4.yml => kas/opt/4.4.yml (100%)
> rename opt-rt.yml => kas/opt/rt.yml (100%)
> rename opt-stretch.yml => kas/opt/stretch.yml (100%)
> rename opt-targz-img.yml => kas/opt/targz-img.yml (100%)
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 6f1dc91..241b09e 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -13,17 +13,17 @@ all:
> - export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
> - export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY
>
> - - kas build kas.yml:board-simatic-ipc227e.yml:opt-rt.yml:opt-targz-img.yml
> + - kas build kas-cip.yml:kas/board/simatic-ipc227e.yml:kas/opt/rt.yml:kas/opt/targz-img.yml
> - scripts/deploy-cip-core.sh buster simatic-ipc227e
>
> - sudo rm -rf build/tmp
> - - kas build kas.yml:board-bbb.yml:opt-rt.yml:opt-targz-img.yml
> + - kas build kas-cip.yml:kas/board/bbb.yml:kas/opt/rt.yml:kas/opt/targz-img.yml
> - scripts/deploy-cip-core.sh buster bbb am335x-boneblack.dtb
>
> - sudo rm -rf build/tmp
> - - kas build kas.yml:board-iwg20m.yml:opt-rt.yml:opt-targz-img.yml
> + - kas build kas-cip.yml:kas/board/iwg20m.yml:kas/opt/rt.yml:kas/opt/targz-img.yml
> - scripts/deploy-cip-core.sh buster iwg20m r8a7743-iwg20d-q7-dbcm-ca.dtb
>
> - sudo rm -rf build/tmp
> - - kas build kas.yml:board-rzg2m.yml:opt-rt.yml:opt-targz-img.yml
> + - kas build kas-cip.yml:kas/board/rzg2m.yml:kas/opt/rt.yml:kas/opt/targz-img.yml
> - scripts/deploy-cip-core.sh buster hihope-rzg2m renesas/r8a774a1-hihope-rzg2m-ex.dtb
> diff --git a/README.md b/README.md
> index bbad1a0..1a7af21 100644
> --- a/README.md
> +++ b/README.md
> @@ -21,11 +21,11 @@ start containers.
> To build, e.g., the QEMU AMD64 target inside Docker, invoke kas-docker like
> this:
>
> - ./kas-docker --isar build kas.yml:board-qemu-amd64.yml
> + ./kas-docker --isar build kas-cip.yml:kas/board/qemu-amd64.yml
>
> This image can be run using `start-qemu.sh x86`.
>
> -The BeagleBone Black target is selected by `... kas.yml:board-bbb.yml`. In
> +The BeagleBone Black target is selected by `... kas-cip.yml:kas/board/bbb.yml`. In
> order to build the image with the PREEMPT-RT kernel, append `:opt-rt.yml` to
> the above. Append ':opt-4.4.yml' to use the kernel version 4.4 instead of 4.19.
>
> diff --git a/kas.yml b/kas-cip.yml
> similarity index 100%
> rename from kas.yml
> rename to kas-cip.yml
> diff --git a/board-bbb.yml b/kas/board/bbb.yml
> similarity index 100%
> rename from board-bbb.yml
> rename to kas/board/bbb.yml
> diff --git a/board-iwg20m.yml b/kas/board/iwg20m.yml
> similarity index 100%
> rename from board-iwg20m.yml
> rename to kas/board/iwg20m.yml
> diff --git a/board-qemu-amd64.yml b/kas/board/qemu-amd64.yml
> similarity index 100%
> rename from board-qemu-amd64.yml
> rename to kas/board/qemu-amd64.yml
> diff --git a/board-rzg2m.yml b/kas/board/rzg2m.yml
> similarity index 100%
> rename from board-rzg2m.yml
> rename to kas/board/rzg2m.yml
> diff --git a/board-simatic-ipc227e.yml b/kas/board/simatic-ipc227e.yml
> similarity index 100%
> rename from board-simatic-ipc227e.yml
> rename to kas/board/simatic-ipc227e.yml
> diff --git a/opt-4.4.yml b/kas/opt/4.4.yml
> similarity index 100%
> rename from opt-4.4.yml
> rename to kas/opt/4.4.yml
> diff --git a/opt-rt.yml b/kas/opt/rt.yml
> similarity index 100%
> rename from opt-rt.yml
> rename to kas/opt/rt.yml
> diff --git a/opt-stretch.yml b/kas/opt/stretch.yml
> similarity index 100%
> rename from opt-stretch.yml
> rename to kas/opt/stretch.yml
> diff --git a/opt-targz-img.yml b/kas/opt/targz-img.yml
> similarity index 100%
> rename from opt-targz-img.yml
> rename to kas/opt/targz-img.yml
>
Applied to next, also fixing up the remaining README spots.
Thanks,
Jan
--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
[-- Attachment #2: Type: text/plain, Size: 419 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#4844): https://lists.cip-project.org/g/cip-dev/message/4844
Mute This Topic: https://lists.cip-project.org/mt/75128487/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-06-26 18:51 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-25 13:12 [cip-dev] [isar-cip-core PATCH 0/2] Cleanup Quirin Gylstorff
2020-06-25 13:12 ` [cip-dev] [isar-cip-core PATCH 1/2] update ISAR Quirin Gylstorff
2020-06-25 14:54 ` Jan Kiszka
2020-06-25 13:12 ` [cip-dev] [isar-cip-core PATCH 2/2] kas: Restructure kas files Quirin Gylstorff
2020-06-25 14:53 ` Jan Kiszka
2020-06-26 7:52 ` Quirin Gylstorff
2020-06-26 16:56 ` [cip-dev] [isar-cip-core PATCH v2 0/1] Cleanup Quirin Gylstorff
2020-06-26 16:56 ` [cip-dev] [isar-cip-core PATCH v2 1/1] kas: Restructure kas files Quirin Gylstorff
2020-06-26 18:51 ` Jan Kiszka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).