From patchwork Thu Jun 25 13:12:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 11625351 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8D066138C for ; Thu, 25 Jun 2020 13:24:13 +0000 (UTC) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 65B7320781 for ; Thu, 25 Jun 2020 13:24:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=lists.cip-project.org header.i=@lists.cip-project.org header.b="CwJ4KJOx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 65B7320781 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=bounce+64572+4813+4520428+8129116@lists.cip-project.org X-Received: by 127.0.0.2 with SMTP id 1w4mYY4521763xbIaB8XhGnU; Thu, 25 Jun 2020 06:24:13 -0700 X-Received: from goliath.siemens.de (goliath.siemens.de [192.35.17.28]) by mx.groups.io with SMTP id smtpd.web12.10139.1593090772026501680 for ; Thu, 25 Jun 2020 06:12:52 -0700 X-Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 05PDCnTP020583 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 25 Jun 2020 15:12:49 +0200 X-Received: from md2dvrtc.ad001.siemens.net ([167.87.6.122]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 05PDCmRI024761; Thu, 25 Jun 2020 15:12:49 +0200 From: "Quirin Gylstorff" To: Jan.Kiszka@siemens.com, cip-dev@lists.cip-project.org Cc: Quirin Gylstorff Subject: [cip-dev] [isar-cip-core PATCH 2/2] kas: Restructure kas files. Date: Thu, 25 Jun 2020 15:12:48 +0200 Message-Id: <20200625131248.15742-3-Quirin.Gylstorff@siemens.com> In-Reply-To: <20200625131248.15742-1-Quirin.Gylstorff@siemens.com> References: <20200625131248.15742-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: cip-dev@lists.cip-project.org List-Id: Mailing-List: list cip-dev@lists.cip-project.org; contact cip-dev+owner@lists.cip-project.org Delivered-To: mailing list cip-dev@lists.cip-project.org Reply-To: cip-dev@lists.cip-project.org X-Gm-Message-State: Vs3x14bJhtzkJRJN8ziCPVqrx4520428AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.cip-project.org; q=dns/txt; s=20140610; t=1593091453; bh=7ybPjnA7l8Ghxr33U8ZTr5Ahy1j+cCXm7XifxWUg4K8=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=CwJ4KJOxNKOyeR5s0TMSb23B7RZDE3m2OJryyyS/ENQg5YE7DLy46QqQqtfj2KfHh+Q qqSfkMebtWqdFoCxiG5ZVcCX9LB2DuSg3DTXA7DJyiYSoP3sD/XDtjdYkjeYc5gH2iAZM LsSzRCdQEgq4L3pP5rIKv1V8fToeZKseQtI= From: Quirin Gylstorff Create folder structure kas -> general configuration kas/board -> all supported boards kas/opt -> all kas option files Signed-off-by: Quirin Gylstorff --- .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