Skip to content

Commit e423556

Browse files
committed
delete patch that is not needed
1 parent f86aba0 commit e423556

File tree

2 files changed

+111
-0
lines changed

2 files changed

+111
-0
lines changed
Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
diff --color -Naur a/debian/patches/bugfix/sh/sh-boot-do-not-use-hyphen-in-exported-variable-name.patch b/debian/patches/bugfix/sh/sh-boot-do-not-use-hyphen-in-exported-variable-name.patch
2+
--- a/debian/patches/bugfix/sh/sh-boot-do-not-use-hyphen-in-exported-variable-name.patch 2025-08-12 05:28:04.000000000 +0200
3+
+++ b/debian/patches/bugfix/sh/sh-boot-do-not-use-hyphen-in-exported-variable-name.patch 1970-01-01 01:00:00.000000000 +0100
4+
@@ -1,95 +0,0 @@
5+
-From: Ben Hutchings <ben@decadent.org.uk>
6+
-Date: Mon, 07 Feb 2022 00:00:26 +0100
7+
-Subject: sh: Do not use hyphen in exported variable names
8+
-
9+
-arch/sh/Makefile defines and exports ld-bfd to be used by
10+
-arch/sh/boot/Makefile and arch/sh/boot/compressed/Makefile. However
11+
-some shells, including dash, will not pass through environment
12+
-variables whose name includes a hyphen. Usually GNU make does not use
13+
-a shell to recurse, but if e.g. $(srctree) contains '~' it will use a
14+
-shell here.
15+
-
16+
-Rename the variable to ld_bfd.
17+
-
18+
-(Another instance of this problem was fixed upstream by commit
19+
-82977af93a0d "sh: rename suffix-y to suffix_y".)
20+
-
21+
-References: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=sh4&ver=4.13%7Erc5-1%7Eexp1&stamp=1502943967&raw=0
22+
-Fixes: ef9b542fce00 ("sh: bzip2/lzma uImage support.")
23+
-Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
24+
----
25+
- arch/sh/Makefile | 10 +++++-----
26+
- arch/sh/boot/compressed/Makefile | 4 ++--
27+
- arch/sh/boot/romimage/Makefile | 4 ++--
28+
- 3 files changed, 9 insertions(+), 9 deletions(-)
29+
-
30+
-Index: linux/arch/sh/Makefile
31+
-===================================================================
32+
---- linux.orig/arch/sh/Makefile
33+
-+++ linux/arch/sh/Makefile
34+
-@@ -102,16 +102,16 @@ UTS_MACHINE := sh
35+
- LDFLAGS_vmlinux += -e _stext
36+
-
37+
- ifdef CONFIG_CPU_LITTLE_ENDIAN
38+
--ld-bfd := elf32-sh-linux
39+
--LDFLAGS_vmlinux += --defsym jiffies=jiffies_64 --oformat $(ld-bfd)
40+
-+ld_bfd := elf32-sh-linux
41+
-+LDFLAGS_vmlinux += --defsym jiffies=jiffies_64 --oformat $(ld_bfd)
42+
- KBUILD_LDFLAGS += -EL
43+
- else
44+
--ld-bfd := elf32-shbig-linux
45+
--LDFLAGS_vmlinux += --defsym jiffies=jiffies_64+4 --oformat $(ld-bfd)
46+
-+ld_bfd := elf32-shbig-linux
47+
-+LDFLAGS_vmlinux += --defsym jiffies=jiffies_64+4 --oformat $(ld_bfd)
48+
- KBUILD_LDFLAGS += -EB
49+
- endif
50+
-
51+
--export ld-bfd
52+
-+export ld_bfd
53+
-
54+
- # Mach groups
55+
- machdir-$(CONFIG_SOLUTION_ENGINE) += mach-se
56+
-Index: linux/arch/sh/boot/compressed/Makefile
57+
-===================================================================
58+
---- linux.orig/arch/sh/boot/compressed/Makefile
59+
-+++ linux/arch/sh/boot/compressed/Makefile
60+
-@@ -36,7 +36,7 @@ endif
61+
-
62+
- ccflags-remove-$(CONFIG_MCOUNT) += -pg
63+
-
64+
--LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext $(IMAGE_OFFSET) -e startup \
65+
-+LDFLAGS_vmlinux := --oformat $(ld_bfd) -Ttext $(IMAGE_OFFSET) -e startup \
66+
- -T $(obj)/../../kernel/vmlinux.lds
67+
-
68+
- KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
69+
-@@ -60,7 +60,7 @@ $(obj)/vmlinux.bin.lzo: $(obj)/vmlinux.b
70+
-
71+
- OBJCOPYFLAGS += -R .empty_zero_page
72+
-
73+
--LDFLAGS_piggy.o := -r --format binary --oformat $(ld-bfd) -T
74+
-+LDFLAGS_piggy.o := -r --format binary --oformat $(ld_bfd) -T
75+
-
76+
- $(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix_y) FORCE
77+
- $(call if_changed,ld)
78+
-Index: linux/arch/sh/boot/romimage/Makefile
79+
-===================================================================
80+
---- linux.orig/arch/sh/boot/romimage/Makefile
81+
-+++ linux/arch/sh/boot/romimage/Makefile
82+
-@@ -13,7 +13,7 @@ mmcif-obj-$(CONFIG_CPU_SUBTYPE_SH7724) :
83+
- load-$(CONFIG_ROMIMAGE_MMCIF) := $(mmcif-load-y)
84+
- obj-$(CONFIG_ROMIMAGE_MMCIF) := $(mmcif-obj-y)
85+
-
86+
--LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext $(load-y) -e romstart \
87+
-+LDFLAGS_vmlinux := --oformat $(ld_bfd) -Ttext $(load-y) -e romstart \
88+
- -T $(obj)/../../kernel/vmlinux.lds
89+
-
90+
- $(obj)/vmlinux: $(obj)/head.o $(obj-y) $(obj)/piggy.o FORCE
91+
-@@ -24,7 +24,7 @@ OBJCOPYFLAGS += -j .empty_zero_page
92+
- $(obj)/zeropage.bin: vmlinux FORCE
93+
- $(call if_changed,objcopy)
94+
-
95+
--LDFLAGS_piggy.o := -r --format binary --oformat $(ld-bfd) -T
96+
-+LDFLAGS_piggy.o := -r --format binary --oformat $(ld_bfd) -T
97+
-
98+
- $(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/zeropage.bin arch/sh/boot/zImage FORCE
99+
- $(call if_changed,ld)
100+
diff --color -Naur a/debian/patches/series b/debian/patches/series
101+
--- a/debian/patches/series 2025-08-12 05:28:04.000000000 +0200
102+
+++ b/debian/patches/series 2025-08-18 14:12:54.829732249 +0200
103+
@@ -60,7 +60,6 @@
104+
# Arch bug fixes
105+
bugfix/arm/arm-dts-kirkwood-fix-sata-pinmux-ing-for-ts419.patch
106+
bugfix/x86/perf-tools-fix-unwind-build-on-i386.patch
107+
-bugfix/sh/sh-boot-do-not-use-hyphen-in-exported-variable-name.patch
108+
bugfix/arm/arm-mm-export-__sync_icache_dcache-for-xen-privcmd.patch
109+
bugfix/powerpc/powerpc-boot-fix-missing-crc32poly.h-when-building-with-kernel_xz.patch
110+
bugfix/arm64/arm64-acpi-Add-fixup-for-HPE-m400-quirks.patch

fixes_debian/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fix-sh-boot-do-not-use-hyphen-in-exported-variable-name.patch

0 commit comments

Comments
 (0)