From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 22 Feb 2024 08:30:47 +0000 (+0100)
Subject: fix up kbuild patch on older kernels
X-Git-Tag: v4.19.307~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e24413595a1ba73918d6b4048414f32917131a1;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up kbuild patch on older kernels
---

diff --git a/queue-5.10/kbuild-fix-changing-elf-file-type-for-output-of-gen_btf-for-big-endian.patch b/queue-5.10/kbuild-fix-changing-elf-file-type-for-output-of-gen_btf-for-big-endian.patch
index 9f06fc1f563..47eb6d81dc3 100644
--- a/queue-5.10/kbuild-fix-changing-elf-file-type-for-output-of-gen_btf-for-big-endian.patch
+++ b/queue-5.10/kbuild-fix-changing-elf-file-type-for-output-of-gen_btf-for-big-endian.patch
@@ -50,6 +50,8 @@ Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
 Reviewed-by: Kees Cook <keescook@chromium.org>
 Reviewed-by: Justin Stitt <justinstitt@google.com>
 Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
+[nathan: Fix silent conflict due to lack of 7d153696e5db in older trees]
+Signed-off-by: Nathan Chancellor <nathan@kernel.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  scripts/link-vmlinux.sh |    9 +++++++--
@@ -64,7 +66,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -	# Unlike GNU ld, lld does not allow an ET_EXEC input.
 -	printf '\1' | dd of=${2} conv=notrunc bs=1 seek=16 status=none
 +	# GNU ld 2.35+ and lld do not allow an ET_EXEC input.
-+	if is_enabled CONFIG_CPU_BIG_ENDIAN; then
++	if [ -n "${CONFIG_CPU_BIG_ENDIAN}" ]; then
 +		et_rel='\0\1'
 +	else
 +		et_rel='\1\0'
diff --git a/queue-5.15/kbuild-fix-changing-elf-file-type-for-output-of-gen_btf-for-big-endian.patch b/queue-5.15/kbuild-fix-changing-elf-file-type-for-output-of-gen_btf-for-big-endian.patch
index 584ba444492..e0244b8c463 100644
--- a/queue-5.15/kbuild-fix-changing-elf-file-type-for-output-of-gen_btf-for-big-endian.patch
+++ b/queue-5.15/kbuild-fix-changing-elf-file-type-for-output-of-gen_btf-for-big-endian.patch
@@ -50,6 +50,8 @@ Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
 Reviewed-by: Kees Cook <keescook@chromium.org>
 Reviewed-by: Justin Stitt <justinstitt@google.com>
 Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
+[nathan: Fix silent conflict due to lack of 7d153696e5db in older trees]
+Signed-off-by: Nathan Chancellor <nathan@kernel.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  scripts/link-vmlinux.sh |    9 +++++++--
@@ -64,7 +66,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -	# Unlike GNU ld, lld does not allow an ET_EXEC input.
 -	printf '\1' | dd of=${2} conv=notrunc bs=1 seek=16 status=none
 +	# GNU ld 2.35+ and lld do not allow an ET_EXEC input.
-+	if is_enabled CONFIG_CPU_BIG_ENDIAN; then
++	if [ -n "${CONFIG_CPU_BIG_ENDIAN}" ]; then
 +		et_rel='\0\1'
 +	else
 +		et_rel='\1\0'
diff --git a/queue-5.4/kbuild-fix-changing-elf-file-type-for-output-of-gen_btf-for-big-endian.patch b/queue-5.4/kbuild-fix-changing-elf-file-type-for-output-of-gen_btf-for-big-endian.patch
index e3863d8d762..5790a9fcd16 100644
--- a/queue-5.4/kbuild-fix-changing-elf-file-type-for-output-of-gen_btf-for-big-endian.patch
+++ b/queue-5.4/kbuild-fix-changing-elf-file-type-for-output-of-gen_btf-for-big-endian.patch
@@ -50,6 +50,8 @@ Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
 Reviewed-by: Kees Cook <keescook@chromium.org>
 Reviewed-by: Justin Stitt <justinstitt@google.com>
 Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
+[nathan: Fix silent conflict due to lack of 7d153696e5db in older trees]
+Signed-off-by: Nathan Chancellor <nathan@kernel.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  scripts/link-vmlinux.sh |    9 +++++++--
@@ -64,7 +66,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -	# Unlike GNU ld, lld does not allow an ET_EXEC input.
 -	printf '\1' | dd of=${2} conv=notrunc bs=1 seek=16 status=none
 +	# GNU ld 2.35+ and lld do not allow an ET_EXEC input.
-+	if is_enabled CONFIG_CPU_BIG_ENDIAN; then
++	if [ -n "${CONFIG_CPU_BIG_ENDIAN}" ]; then
 +		et_rel='\0\1'
 +	else
 +		et_rel='\1\0'