Re: [isar-cip-core][PATCH 2/4] scripts/deploy-cip-core.sh: Use dtb from deploy dir


Quirin Gylstorff
 

On 7/29/22 10:58, Jan Kiszka wrote:
On 29.07.22 10:39, Quirin Gylstorff wrote:
From: Quirin Gylstorff <quirin.gylstorff@...>

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@...>
---
.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
Can't we do that before patch 1?
There is nothing sbuild specific in it - it only had an impact when switching to sbuild. I can reorder the patchset.

Quirin
Jan

Join cip-dev@lists.cip-project.org to automatically receive all group messages.