Skip to content

Commit

Permalink
Update Isar and isar-cip-core revisions
Browse files Browse the repository at this point in the history
With our last dependency on buildchroot gone, we can bump Isar as well.
One patch is needed for it to cure a regression there.

This also implies to update isar-cip-core which had buildchroot traces
in the past. No other impact on us.

Signed-off-by: Jan Kiszka <[email protected]>
  • Loading branch information
jan-kiszka committed Oct 12, 2023
1 parent 5687902 commit b0b296b
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 2 deletions.
30 changes: 30 additions & 0 deletions isar-patches/0001-dpkg-source-Drop-I-filter.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
From f8f39f9722ebc24cd41e6c41bb22f8ebe9295414 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <[email protected]>
Date: Thu, 12 Oct 2023 13:17:32 +0200
Subject: [PATCH] dpkg-source: Drop -I filter

This is a regression of 38b832ad8248 which added this while factoring
out this step. However, some packages may break over this, e.g. the
edk2-standalonemm-rpmb recipe in isar-cip-core.

Signed-off-by: Jan Kiszka <[email protected]>
---
meta/classes/dpkg-source.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/dpkg-source.bbclass b/meta/classes/dpkg-source.bbclass
index 1f4f8164..a86b4635 100644
--- a/meta/classes/dpkg-source.bbclass
+++ b/meta/classes/dpkg-source.bbclass
@@ -12,7 +12,7 @@ do_dpkg_source() {
if [ ! -z "${SOURCE_DATE_EPOCH}" ]; then
export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}"
fi
- sh -c "cd ${WORKDIR}; dpkg-source -I -b ${PPS}"
+ sh -c "cd ${WORKDIR}; dpkg-source -b ${PPS}"
}
addtask dpkg_source after do_prepare_build before do_dpkg_build

--
2.35.3

6 changes: 4 additions & 2 deletions kas/iot2050.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,20 @@ repos:

isar:
url: https://github.com/ilbers/isar
commit: ecc7cae423a828d294575301c1584fbe303cba3e
commit: 6b6c74411074e3d3a08f044e681c3f1216727b6e
layers:
meta:
patches:
01:
path: isar-patches/0001-optee-client-Fix-native-arm64-build.patch
02:
path: isar-patches/0001-meta-optee-client-Generalize-and-update-shutdown-rul.patch
03:
path: isar-patches/0001-dpkg-source-Drop-I-filter.patch

cip-core:
url: https://gitlab.com/cip-project/cip-core/isar-cip-core.git
commit: 7d3a05b3351726c5c76912f5c73d4720f4a46b18
commit: 3d8e24c0cc6cb811b57648bd356bce2ae5e94795

local_conf_header:
standard: |
Expand Down

0 comments on commit b0b296b

Please sign in to comment.