[isar-cip-core][PATCH 0/2] Isar update

[isar-cip-core][PATCH 0/2] Isar update

[Jan Kiszka]

Late Isar update to bring in its fixes and allow us to model the
dosfstools build more cleanly.

Jan

Jan Kiszka (2):
  Update Isar revision
  dosfstools: Use -native suffix to select the right architecture

 conf/distro/cip-core-common.inc                   | 4 ++--
 kas-cip.yml                                       | 2 +-
 recipes-bsp/edk2/edk2-standalonemm-rpmb_202305.bb | 3 +++
 recipes-devtools/dosfstools/dosfstools_latest.bb  | 3 ---
 4 files changed, 6 insertions(+), 6 deletions(-)

-- 
2.35.3

[isar-cip-core][PATCH 1/2] Update Isar revision

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

This brings a couple of fixes some downstream users are interesting it.
Therefore, make sure isar-cip-core itself is ready for it.

One adaption is needed because of the factored-out and modified
dpkg-source job. It now filters out binaries from the source package by
default, but we have some in edk2-standalonemm-rpmb. So, drop that
default filter in that package.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 kas-cip.yml                                       | 2 +-
 recipes-bsp/edk2/edk2-standalonemm-rpmb_202305.bb | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/kas-cip.yml b/kas-cip.yml
index 84b74414..b255c977 100644
--- a/kas-cip.yml
+++ b/kas-cip.yml
@@ -22,7 +22,7 @@ repos:
 
   isar:
     url: https://github.com/ilbers/isar.git
-    commit: dff8ad504b54a4e292a1b986cdc74ebc9e6e177a
+    commit: 30471bb3f787fb0aa822d15e141ecce2f3b99860
     layers:
       meta:
 
diff --git a/recipes-bsp/edk2/edk2-standalonemm-rpmb_202305.bb b/recipes-bsp/edk2/edk2-standalonemm-rpmb_202305.bb
index 1a589184..01dcbf99 100644
--- a/recipes-bsp/edk2/edk2-standalonemm-rpmb_202305.bb
+++ b/recipes-bsp/edk2/edk2-standalonemm-rpmb_202305.bb
@@ -40,6 +40,9 @@ PV-openssl = "OpenSSL_1_1_1t"
 
 DEBIAN_BUILD_DEPENDS = "bash, python3:native, dh-python, uuid-dev:native"
 
+# edk2-edk2-stable comes with two pre-built .a files that need to be preserved
+DPKG_SOURCE_EXTRA_ARGS = ""
+
 do_prepare_build() {
     deb_debianize
 
-- 
2.35.3

[isar-cip-core][PATCH 2/2] dosfstools: Use -native suffix to select the right architecture

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

HOST_ARCH is static, not taking cross-compilation mode into account.
Rather than hard-coding the PACKAGE_ARCH, we need to request the -native
version of the tool for the imager. If the latter should switch cross-
building off, the right thing will happen (building of dosfstools for
the target arch).

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 conf/distro/cip-core-common.inc                  | 4 ++--
 recipes-devtools/dosfstools/dosfstools_latest.bb | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/conf/distro/cip-core-common.inc b/conf/distro/cip-core-common.inc
index 3ae2a3ed..fb5b98d7 100644
--- a/conf/distro/cip-core-common.inc
+++ b/conf/distro/cip-core-common.inc
@@ -15,5 +15,5 @@ WKS_FILE ?= "${MACHINE}.wks"
 
 CIP_IMAGE_OPTIONS ?= ""
 
-IMAGER_BUILD_DEPS ?= "dosfstools"
-IMAGER_BUILD_DEPS:remove:buster = "dosfstools"
+IMAGER_BUILD_DEPS ?= "dosfstools-native"
+IMAGER_BUILD_DEPS:remove:buster = "dosfstools-native"
diff --git a/recipes-devtools/dosfstools/dosfstools_latest.bb b/recipes-devtools/dosfstools/dosfstools_latest.bb
index ebdf983c..f42ff18a 100644
--- a/recipes-devtools/dosfstools/dosfstools_latest.bb
+++ b/recipes-devtools/dosfstools/dosfstools_latest.bb
@@ -16,9 +16,6 @@ CHANGELOG_V="<orig-version>+cip"
 SRC_URI = "apt://${PN}"
 SRC_URI += "file://0001-Honor-the-SOURCE_DATE_EPOCH-variable.patch;apply=no"
 
-# this is a host tool
-PACKAGE_ARCH = "${HOST_ARCH}"
-
 do_prepare_build() {
 	deb_add_changelog
 
-- 
2.35.3