diff mbox series

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

Message ID 04ea9de0181e72961491f28c294172178efe474a.1697522355.git.jan.kiszka@siemens.com (mailing list archive)
State Accepted
Headers show
Series Isar update | expand

Commit Message

Jan Kiszka Oct. 17, 2023, 5:59 a.m. UTC 
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 mbox series

Patch

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