Isar update
cover Isar update
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(-)
Signature · 1 line
2.35.3
PATCH 1/2 Update Isar revision
From: Jan Kiszka <[email protected]>
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.
--- kas-cip.yml | 2 +- recipes-bsp/edk2/edk2-standalonemm-rpmb_202305.bb | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)
kas-cip.yml +1 -1
@@ -22,7 +22,7 @@ repos: isar: url: https://github.com/ilbers/isar.git - commit: dff8ad504b54a4e292a1b986cdc74ebc9e6e177a + commit: 30471bb3f787fb0aa822d15e141ecce2f3b99860 layers: meta:
recipes-bsp/edk2/edk2-standalonemm-rpmb_202305.bb +3 -0
@@ -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
Signature · 1 line
2.35.3
PATCH 2/2 dosfstools: Use -native suffix to select the right architecture
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
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).
--- conf/distro/cip-core-common.inc | 4 ++-- recipes-devtools/dosfstools/dosfstools_latest.bb | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-)
conf/distro/cip-core-common.inc +2 -2
@@ -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"
recipes-devtools/dosfstools/dosfstools_latest.bb +0 -3
@@ -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
Signature · 1 line
2.35.3