| Message ID | 20200625131248.15742-3-Quirin.Gylstorff@siemens.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Cleanup | expand |
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
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 -=-=-=-=-=-=-=-=-=-=-=- 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/4520428 Group Owner: cip-dev+owner@lists.cip-project.org Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129116/1171672734/xyzzy [patchwork-cip-dev@patchwork.kernel.org] -=-=-=-=-=-=-=-=-=-=-=-
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