From: Quirin Gylstorff <Quirin.Gylstorff@siemens.com>
To: jan.kiszka@siemens.com, cip-dev@lists.cip-project.org
Subject: [cip-dev][isar-cip-core][PATCH 2/4] scripts/deploy-cip-core.sh: Use dtb from deploy dir
Date: Fri, 29 Jul 2022 10:39:29 +0200 [thread overview]
Message-ID: <20220729083931.419731-3-Quirin.Gylstorff@siemens.com> (raw)
In-Reply-To: <20220729083931.419731-1-Quirin.Gylstorff@siemens.com>
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
This fixes the build errors after sbuild migration as the build
artifacts are no longer available after the build.
This adds the DTB file for the beagle bone black to the deploy
dir to fix the CI pipeline after using sbuild.
Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
.gitlab-ci.yml | 6 +++---
conf/machine/bbb.conf | 1 +
scripts/deploy-cip-core.sh | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d39d1f..41af3e9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,7 +68,7 @@ build:hihope-rzg2m-base:
- .build_base
variables:
target: hihope-rzg2m
- dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb
+ dtb: r8a774a1-hihope-rzg2m-ex.dtb
build:qemu-amd64-base:
extends:
@@ -166,7 +166,7 @@ build:hihope-rzg2m-test:
variables:
target: hihope-rzg2m
extension: test
- dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb
+ dtb: r8a774a1-hihope-rzg2m-ex.dtb
build:qemu-amd64-test:
extends:
@@ -271,7 +271,7 @@ build:hihope-rzg2m-buster:
- .build_base
variables:
target: hihope-rzg2m
- dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb
+ dtb: r8a774a1-hihope-rzg2m-ex.dtb
release: buster
build:qemu-amd64-secure-boot-buster:
diff --git a/conf/machine/bbb.conf b/conf/machine/bbb.conf
index b592f4d..ea87ed8 100644
--- a/conf/machine/bbb.conf
+++ b/conf/machine/bbb.conf
@@ -7,6 +7,7 @@
#
DISTRO_ARCH = "armhf"
+DTB_FILES = "am335x-boneblack.dtb"
IMAGE_FSTYPES ?= "wic"
IMAGER_INSTALL += "u-boot-omap"
diff --git a/scripts/deploy-cip-core.sh b/scripts/deploy-cip-core.sh
index 203ab1d..01aa494 100755
--- a/scripts/deploy-cip-core.sh
+++ b/scripts/deploy-cip-core.sh
@@ -50,5 +50,5 @@ aws s3 cp --no-progress --acl public-read $KERNEL_IMAGE ${S3_TARGET}
aws s3 cp --no-progress --acl public-read $BASE_PATH-initrd.img ${S3_TARGET}
if [ "$DTB" != "none" ]; then
- aws s3 cp --no-progress --acl public-read build/tmp/work/cip-core-*/linux-cip*/*/linux-cip-*/debian/linux-image-cip*/usr/lib/linux-image-*/$DTB ${S3_TARGET}
+ aws s3 cp --no-progress --acl public-read build/tmp/deploy/images/*/$DTB ${S3_TARGET}
fi
--
2.35.1
next prev parent reply other threads:[~2022-07-29 8:39 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-29 8:39 [cip-dev][isar-cip-core][PATCH 0/4] Add support for ISAR with sbuild Quirin Gylstorff
2022-07-29 8:39 ` [cip-dev][isar-cip-core][PATCH 1/4] Update ISAR for sbuild integration Quirin Gylstorff
2022-07-29 8:39 ` Quirin Gylstorff [this message]
2022-07-29 8:58 ` [cip-dev][isar-cip-core][PATCH 2/4] scripts/deploy-cip-core.sh: Use dtb from deploy dir Jan Kiszka
2022-07-29 9:06 ` Gylstorff Quirin
2022-07-29 8:39 ` [cip-dev][isar-cip-core][PATCH 3/4] recipes-devtools/ovmf-binaries: Adapt to sbuild environment Quirin Gylstorff
2022-07-29 8:59 ` Jan Kiszka
2022-07-29 8:39 ` [cip-dev][isar-cip-core][PATCH 4/4] kas-cip: Add patch for linux-cip with CONFIG_MODULES=n Quirin Gylstorff
2022-07-29 9:00 ` Jan Kiszka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220729083931.419731-3-Quirin.Gylstorff@siemens.com \
--to=quirin.gylstorff@siemens.com \
--cc=cip-dev@lists.cip-project.org \
--cc=jan.kiszka@siemens.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.