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 9f06fc1f563ba9c0f4de1039686d3cf83024f2e8..47eb6d81dc3dc70d913f5cf7e75e64109c3fc118 100644 (file)
--- 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 584ba4444924e7cd3042abff844dd739641c8ca4..e0244b8c46312854de666b69207fda7a2b397a82 100644 (file)
--- 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 e3863d8d7629802951905fce8aca74fe55229896..5790a9fcd16069d98396fdac0e4d37a20d35dfd7 100644 (file)
--- 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'