* [PATCH 1/2] linux-custom: Drop redundant setting of CROSS_COMPILE
2024-10-28 11:13 [PATCH 0/2] linux-custom: Enable compat vDSO support for arm64, clean up rules 'Jan Kiszka' via isar-users
@ 2024-10-28 11:13 ` 'Jan Kiszka' via isar-users
2024-10-28 11:13 ` [PATCH 2/2] linux-custom: Add support for arm64 compat vDSO 'Jan Kiszka' via isar-users
2024-11-04 13:54 ` [PATCH 0/2] linux-custom: Enable compat vDSO support for arm64, clean up rules Uladzimir Bely
2 siblings, 0 replies; 4+ messages in thread
From: 'Jan Kiszka' via isar-users @ 2024-10-28 11:13 UTC (permalink / raw)
To: isar-users
Cc: Stefan Koch, Cedric Hombourger, Florian Bezdeka, Clara Kowalsky
From: Jan Kiszka <jan.kiszka@siemens.com>
Since ac2bbd7ca249, we set CROSS_COMPILE in isar/common[.tmpl] if
needed. As this is run before every target, we can drop initialization
in the rules file.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta/recipes-kernel/linux/files/debian/isar/common.tmpl | 2 +-
meta/recipes-kernel/linux/files/debian/rules.tmpl | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/meta/recipes-kernel/linux/files/debian/isar/common.tmpl b/meta/recipes-kernel/linux/files/debian/isar/common.tmpl
index def8480e..5ba11289 100644
--- a/meta/recipes-kernel/linux/files/debian/isar/common.tmpl
+++ b/meta/recipes-kernel/linux/files/debian/isar/common.tmpl
@@ -51,7 +51,7 @@ main() {
done
# variables to be exported
- export ARCH
+ export ARCH CROSS_COMPILE
# are we cross-compiling?
BUILD_ARCH=$(dpkg-architecture -qDEB_BUILD_ARCH)
diff --git a/meta/recipes-kernel/linux/files/debian/rules.tmpl b/meta/recipes-kernel/linux/files/debian/rules.tmpl
index e8ae3daa..598ae93f 100755
--- a/meta/recipes-kernel/linux/files/debian/rules.tmpl
+++ b/meta/recipes-kernel/linux/files/debian/rules.tmpl
@@ -1,7 +1,5 @@
#!/usr/bin/make -f
-CROSS_COMPILE:=$(DEB_HOST_GNU_TYPE)-
-
MAINTAINER := $(shell sed -ne 's,^Maintainer: .[^<]*<\([^>]*\)>,\1,p' debian/control)
DISTRIBUTOR := ${DISTRIBUTOR}
SOURCE_DATE := $(shell dpkg-parsechangelog -SDate)
@@ -13,7 +11,6 @@ deb_top_dir:=$(S)/debian
# Dynamic variables to be passed to Isar build scripts
isar_env=$(strip \
- export CROSS_COMPILE='$(CROSS_COMPILE)' && \
export DEB_BUILD_PROFILES='$(DEB_BUILD_PROFILES)' && \
export DEB_HOST_GNU_TYPE='$(DEB_HOST_GNU_TYPE)' && \
export MAKE='$(MAKE)' && \
--
2.43.0
--
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/fb54ef19d4c385a226f583866856eb021cc70bd9.1730114004.git.jan.kiszka%40siemens.com.
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 2/2] linux-custom: Add support for arm64 compat vDSO
2024-10-28 11:13 [PATCH 0/2] linux-custom: Enable compat vDSO support for arm64, clean up rules 'Jan Kiszka' via isar-users
2024-10-28 11:13 ` [PATCH 1/2] linux-custom: Drop redundant setting of CROSS_COMPILE 'Jan Kiszka' via isar-users
@ 2024-10-28 11:13 ` 'Jan Kiszka' via isar-users
2024-11-04 13:54 ` [PATCH 0/2] linux-custom: Enable compat vDSO support for arm64, clean up rules Uladzimir Bely
2 siblings, 0 replies; 4+ messages in thread
From: 'Jan Kiszka' via isar-users @ 2024-10-28 11:13 UTC (permalink / raw)
To: isar-users
Cc: Stefan Koch, Cedric Hombourger, Florian Bezdeka, Clara Kowalsky
From: Jan Kiszka <jan.kiszka@siemens.com>
To build the 32-bit vDSO for arm64 kernels, we need to set
CROSS_COMPILE_COMPAT during the build as well. Do that if
ISAR_ENABLE_COMPAT_ARCH is enabled.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta/recipes-kernel/linux/files/debian/isar/build.tmpl | 1 +
meta/recipes-kernel/linux/files/debian/isar/common.tmpl | 7 ++++++-
meta/recipes-kernel/linux/linux-custom.inc | 2 ++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/linux/files/debian/isar/build.tmpl b/meta/recipes-kernel/linux/files/debian/isar/build.tmpl
index bafc5ca4..b4c105c1 100644
--- a/meta/recipes-kernel/linux/files/debian/isar/build.tmpl
+++ b/meta/recipes-kernel/linux/files/debian/isar/build.tmpl
@@ -43,6 +43,7 @@ print_settings() {
# ---------------
# ARCH=${ARCH}
# CROSS_COMPILE=${CROSS_COMPILE}
+# CROSS_COMPILE_COMPAT=${CROSS_COMPILE_COMPAT}
# KBUILD_BUILD_TIMESTAMP=${KBUILD_BUILD_TIMESTAMP}
EOF
}
diff --git a/meta/recipes-kernel/linux/files/debian/isar/common.tmpl b/meta/recipes-kernel/linux/files/debian/isar/common.tmpl
index 5ba11289..f9cc2f02 100644
--- a/meta/recipes-kernel/linux/files/debian/isar/common.tmpl
+++ b/meta/recipes-kernel/linux/files/debian/isar/common.tmpl
@@ -21,6 +21,11 @@ then
CROSS_COMPILE=$(dpkg-architecture -f -A ${DISTRO_ARCH} -q DEB_TARGET_GNU_TYPE)-
fi
+# Required from building a compat vDSO on arm64
+if [ "${ISAR_ENABLE_COMPAT_ARCH}" = "1" ] && [ "${DISTRO_ARCH}" = "arm64" ]; then
+ CROSS_COMPILE_COMPAT=$(dpkg-architecture -f -A ${COMPAT_DISTRO_ARCH} -q DEB_TARGET_GNU_TYPE)-
+fi
+
# Constants
KCONF=.config
@@ -51,7 +56,7 @@ main() {
done
# variables to be exported
- export ARCH CROSS_COMPILE
+ export ARCH CROSS_COMPILE CROSS_COMPILE_COMPAT
# are we cross-compiling?
BUILD_ARCH=$(dpkg-architecture -qDEB_BUILD_ARCH)
diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc
index 0f23d6f0..f6486096 100644
--- a/meta/recipes-kernel/linux/linux-custom.inc
+++ b/meta/recipes-kernel/linux/linux-custom.inc
@@ -87,6 +87,8 @@ TEMPLATE_VARS += " \
DISTRIBUTOR \
KERNEL_EXTRA_BUILDARGS \
HEADERS_INSTALL_EXTRA \
+ ISAR_ENABLE_COMPAT_ARCH \
+ COMPAT_DISTRO_ARCH \
"
inherit dpkg
--
2.43.0
--
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/1152ee8621ae69c6422890214dd3fbc3866cb05f.1730114004.git.jan.kiszka%40siemens.com.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 0/2] linux-custom: Enable compat vDSO support for arm64, clean up rules
2024-10-28 11:13 [PATCH 0/2] linux-custom: Enable compat vDSO support for arm64, clean up rules 'Jan Kiszka' via isar-users
2024-10-28 11:13 ` [PATCH 1/2] linux-custom: Drop redundant setting of CROSS_COMPILE 'Jan Kiszka' via isar-users
2024-10-28 11:13 ` [PATCH 2/2] linux-custom: Add support for arm64 compat vDSO 'Jan Kiszka' via isar-users
@ 2024-11-04 13:54 ` Uladzimir Bely
2 siblings, 0 replies; 4+ messages in thread
From: Uladzimir Bely @ 2024-11-04 13:54 UTC (permalink / raw)
To: Jan Kiszka, isar-users
On Mon, 2024-10-28 at 12:13 +0100, 'Jan Kiszka' via isar-users wrote:
> See patches for details.
>
> Jan Kiszka (2):
> linux-custom: Drop redundant setting of CROSS_COMPILE
> linux-custom: Add support for arm64 compat vDSO
>
> meta/recipes-kernel/linux/files/debian/isar/build.tmpl | 1 +
> meta/recipes-kernel/linux/files/debian/isar/common.tmpl | 7 ++++++-
> meta/recipes-kernel/linux/files/debian/rules.tmpl | 3 ---
> meta/recipes-kernel/linux/linux-custom.inc | 2 ++
> 4 files changed, 9 insertions(+), 4 deletions(-)
>
> --
> 2.43.0
>
Applied to next, thanks.
--
Best regards,
Uladzimir.
--
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/d8be08209f0fb51ac566ac6283e72c965e5a4033.camel%40ilbers.de.
^ permalink raw reply [flat|nested] 4+ messages in thread