summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/modutils/files
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-kernel/modutils/files')
-rw-r--r--meta/recipes-kernel/modutils/files/armeb.patch16
-rw-r--r--meta/recipes-kernel/modutils/files/configure.patch34
-rw-r--r--meta/recipes-kernel/modutils/files/gcc4.patch93
-rw-r--r--meta/recipes-kernel/modutils/files/lex.l.diff35
-rw-r--r--meta/recipes-kernel/modutils/files/modules0
-rw-r--r--meta/recipes-kernel/modutils/files/modules.conf0
-rw-r--r--meta/recipes-kernel/modutils/files/modutils-notest.patch16
-rw-r--r--meta/recipes-kernel/modutils/files/program_prefix.patch71
8 files changed, 0 insertions, 265 deletions
diff --git a/meta/recipes-kernel/modutils/files/armeb.patch b/meta/recipes-kernel/modutils/files/armeb.patch
deleted file mode 100644
index 3198553421..0000000000
--- a/meta/recipes-kernel/modutils/files/armeb.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Upstream-Status: Pending
2
3--- modutils-2.4.27/include/elf_arm.h.orig 2004-09-21 18:37:00.000000000 -0400
4+++ modutils-2.4.27/include/elf_arm.h 2004-09-21 18:38:18.000000000 -0400
5@@ -1,7 +1,11 @@
6 /* Machine-specific elf macros for ARM. */
7
8 #define ELFCLASSM ELFCLASS32
9+#ifdef __ARMEB__
10+#define ELFDATAM ELFDATA2MSB
11+#else
12 #define ELFDATAM ELFDATA2LSB
13+#endif
14
15 #define MATCH_MACHINE(x) (x == EM_ARM)
16
diff --git a/meta/recipes-kernel/modutils/files/configure.patch b/meta/recipes-kernel/modutils/files/configure.patch
deleted file mode 100644
index 63e80d7191..0000000000
--- a/meta/recipes-kernel/modutils/files/configure.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1Upstream-Status: Pending
2
3#
4# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
5#
6
7--- modutils-2.4.25/./configure.in~configure
8+++ modutils-2.4.25/./configure.in
9@@ -1,4 +1,5 @@
10-AC_INIT(insmod/insmod.c)
11+AC_INIT
12+AC_CONFIG_SRCDIR([insmod/insmod.c])
13 AC_PREFIX_DEFAULT(/usr)
14
15 # Canonical system uses CC_FOR_BUILD while Linux may use BUILDCC
16@@ -15,7 +16,7 @@
17 BUILDCC="$CC_FOR_BUILD"
18 export CC_FOR_BUILD
19
20-AC_CANONICAL_SYSTEM
21+AC_CANONICAL_TARGET([])
22
23 # Handle target_cpu for compatibility.
24 if test "$host_cpu" != "$target_cpu"; then
25@@ -350,6 +351,7 @@
26 fi
27 fi
28
29-AC_OUTPUT(Makefile Makefile.common depmod/Makefile genksyms/Makefile
30+AC_CONFIG_FILES([Makefile Makefile.common depmod/Makefile genksyms/Makefile
31 insmod/Makefile $kerneld_Makefiles obj/Makefile util/Makefile
32- man/Makefile)
33+ man/Makefile])
34+AC_OUTPUT
diff --git a/meta/recipes-kernel/modutils/files/gcc4.patch b/meta/recipes-kernel/modutils/files/gcc4.patch
deleted file mode 100644
index 4507b0338b..0000000000
--- a/meta/recipes-kernel/modutils/files/gcc4.patch
+++ /dev/null
@@ -1,93 +0,0 @@
1Upstream-Status: Pending
2
3Index: modutils-2.4.27/depmod/depmod.c
4===================================================================
5--- modutils-2.4.27.orig/depmod/depmod.c
6+++ modutils-2.4.27/depmod/depmod.c
7@@ -1133,7 +1133,7 @@ static int addksyms(char *file_syms)
8
9 for (ksym = ksyms; so_far < nksyms; ++so_far, ksym++) {
10 if (strncmp((char *)ksym->name, "GPLONLY_", 8) == 0)
11- ((char *)ksym->name) += 8;
12+ ksym->name += 8;
13 assert(n_syms < MAX_MAP_SYM);
14 symtab[n_syms++] = addsym((char *)ksym->name, mod, SYM_DEFINED, 0);
15 }
16Index: modutils-2.4.27/genksyms/genksyms.c
17===================================================================
18--- modutils-2.4.27.orig/genksyms/genksyms.c
19+++ modutils-2.4.27/genksyms/genksyms.c
20@@ -45,7 +45,7 @@ char *cur_filename, *output_directory;
21 int flag_debug, flag_dump_defs, flag_warnings;
22 int checksum_version = 1, kernel_version = version(2,0,0);
23
24-static int errors;
25+int errors;
26 static int nsyms;
27
28 static struct symbol *expansion_trail;
29Index: modutils-2.4.27/insmod/insmod.c
30===================================================================
31--- modutils-2.4.27.orig/insmod/insmod.c
32+++ modutils-2.4.27/insmod/insmod.c
33@@ -275,7 +275,7 @@ static int add_symbols_from(struct obj_f
34 if (strncmp((char *)s->name, "GPLONLY_", 8) == 0) {
35 gplonly_seen = 1;
36 if (gpl)
37- ((char *)s->name) += 8;
38+ s->name += 8;
39 else
40 continue;
41 }
42Index: modutils-2.4.27/obj/obj_kallsyms.c
43===================================================================
44--- modutils-2.4.27.orig/obj/obj_kallsyms.c
45+++ modutils-2.4.27/obj/obj_kallsyms.c
46@@ -200,7 +200,7 @@ obj_kallsyms (struct obj_file *fin, stru
47
48 /* Initial contents, header + one entry per input section. No strings. */
49 osec->header.sh_size = sizeof(*a_hdr) + loaded*sizeof(*a_sec);
50- a_hdr = (struct kallsyms_header *) osec->contents =
51+ a_hdr = osec->contents =
52 xmalloc(osec->header.sh_size);
53 memset(osec->contents, 0, osec->header.sh_size);
54 a_hdr->size = sizeof(*a_hdr);
55@@ -275,7 +275,7 @@ obj_kallsyms (struct obj_file *fin, stru
56 a_hdr->symbol_off +
57 a_hdr->symbols*a_hdr->symbol_size +
58 strings_size - strings_left;
59- a_hdr = (struct kallsyms_header *) osec->contents =
60+ a_hdr = osec->contents =
61 xrealloc(a_hdr, a_hdr->total_size);
62 p = (char *)a_hdr + a_hdr->symbol_off;
63 memcpy(p, symbols, a_hdr->symbols*a_hdr->symbol_size);
64Index: modutils-2.4.27/obj/obj_mips.c
65===================================================================
66--- modutils-2.4.27.orig/obj/obj_mips.c
67+++ modutils-2.4.27/obj/obj_mips.c
68@@ -244,7 +244,9 @@ arch_archdata (struct obj_file *f, struc
69 archdata_sec->header.sh_size = 0;
70 sec = obj_find_section(f, "__dbe_table");
71 if (sec) {
72- ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad));
73+/* ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad));*/
74+ archdata_sec->contents = xmalloc(sizeof(*ad));
75+ ad = (struct archdata *) (archdata_sec->contents);
76 memset(ad, 0, sizeof(*ad));
77 archdata_sec->header.sh_size = sizeof(*ad);
78 ad->__start___dbe_table = sec->header.sh_addr;
79Index: modutils-2.4.27/obj/obj_ppc.c
80===================================================================
81--- modutils-2.4.27.orig/obj/obj_ppc.c
82+++ modutils-2.4.27/obj/obj_ppc.c
83@@ -255,7 +255,9 @@ arch_archdata (struct obj_file *f, struc
84 archdata_sec->header.sh_size = 0;
85 sec = obj_find_section(f, "__ftr_fixup");
86 if (sec) {
87- ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad));
88+ /* ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad)); */
89+ archdata_sec->contents = xmalloc(sizeof(*ad));
90+ ad = (struct archdata *) (archdata_sec->contents);
91 memset(ad, 0, sizeof(*ad));
92 archdata_sec->header.sh_size = sizeof(*ad);
93 ad->__start___ftr_fixup = sec->header.sh_addr;
diff --git a/meta/recipes-kernel/modutils/files/lex.l.diff b/meta/recipes-kernel/modutils/files/lex.l.diff
deleted file mode 100644
index b2419a4814..0000000000
--- a/meta/recipes-kernel/modutils/files/lex.l.diff
+++ /dev/null
@@ -1,35 +0,0 @@
1Upstream-Status: Pending
2
3--- modutils-2.4.26.orig/genksyms/lex.l
4+++ modutils-2.4.26/genksyms/lex.l
5@@ -130,6 +130,7 @@
6
7 static int suppress_type_lookup, dont_want_brace_phrase;
8 static struct string_list *next_node;
9+ static int next_token = 0;
10
11 int token, count = 0;
12 struct string_list *cur_node;
13@@ -144,7 +145,12 @@
14 }
15
16 repeat:
17- token = yylex1();
18+ if (next_token != 0) {
19+ token = next_token;
20+ next_token = 0;
21+ }
22+ else
23+ token = yylex1();
24
25 if (token == 0)
26 return 0;
27@@ -425,7 +431,7 @@
28 {
29 /* Put back the token we just read so's we can find it again
30 after registering the expression. */
31- unput(token);
32+ next_token = token;
33
34 lexstate = ST_NORMAL;
35 token = EXPRESSION_PHRASE;
diff --git a/meta/recipes-kernel/modutils/files/modules b/meta/recipes-kernel/modutils/files/modules
deleted file mode 100644
index e69de29bb2..0000000000
--- a/meta/recipes-kernel/modutils/files/modules
+++ /dev/null
diff --git a/meta/recipes-kernel/modutils/files/modules.conf b/meta/recipes-kernel/modutils/files/modules.conf
deleted file mode 100644
index e69de29bb2..0000000000
--- a/meta/recipes-kernel/modutils/files/modules.conf
+++ /dev/null
diff --git a/meta/recipes-kernel/modutils/files/modutils-notest.patch b/meta/recipes-kernel/modutils/files/modutils-notest.patch
deleted file mode 100644
index ab100f2dcc..0000000000
--- a/meta/recipes-kernel/modutils/files/modutils-notest.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1This test disables the annoying
2 Note: /etc/modules.conf is more recent than /lib/modules/2.4.19-rmk6-pxa1/modules.dep
3message.
4
5Upstream-Status: Inappropriate [disable feature]
6
7--- modutils-2.4.6/insmod/modprobe.c~notest Mon Feb 26 02:07:17 2001
8+++ modutils-2.4.6/insmod/modprobe.c Wed Feb 19 14:31:52 2003
9@@ -785,7 +785,6 @@
10 return -1;
11 }
12
13-#define EXTREMELY_CAUTIOUS
14 #ifdef EXTREMELY_CAUTIOUS
15 if (fstat(fileno(fin), &statbuf) != 0)
16 error("Could not stat %s", depfile);
diff --git a/meta/recipes-kernel/modutils/files/program_prefix.patch b/meta/recipes-kernel/modutils/files/program_prefix.patch
deleted file mode 100644
index 973705ee27..0000000000
--- a/meta/recipes-kernel/modutils/files/program_prefix.patch
+++ /dev/null
@@ -1,71 +0,0 @@
1Upstream-Status: Pending
2
3--- modutils-2.4.25/Makefile.common.in Sun Nov 24 21:23:35 2002
4+++ modutils-2.4.25/Makefile.common.in Thu Jan 29 17:16:30 2004
5@@ -7,6 +7,7 @@
6 mandir = @mandir@
7 prefix = @prefix@
8 sbindir = @sbindir@
9+transform = @program_transform_name@
10
11 AR = @AR@
12 ARCH = @ARCH@
13--- modutils-2.4.25/configure.in Thu Jan 29 17:24:10 2004
14+++ modutils-2.4.25/configure.in Thu Jan 29 17:13:59 2004
15@@ -17,6 +17,7 @@
16 export CC_FOR_BUILD
17
18 AC_CANONICAL_TARGET([])
19+AC_ARG_PROGRAM
20
21 # Handle target_cpu for compatibility.
22 if test "$host_cpu" != "$target_cpu"; then
23--- modutils-2.4.25/depmod/Makefile.in Fri Mar 28 17:54:20 2003
24+++ modutils-2.4.25/depmod/Makefile.in Thu Jan 29 17:16:41 2004
25@@ -60,7 +60,7 @@
26
27 install install-bin: all
28 $(MKDIR) $(DESTDIR)$(sbindir)
29- $(INSTALL) $(STRIP) depmod $(DESTDIR)$(sbindir)
30+ $(INSTALL) $(STRIP) depmod $(DESTDIR)$(sbindir)/`echo depmod | sed -e'$(transform)'`
31
32 dep depend .depend: depmod.c
33 $(CC) -M $(CFLAGS) $(DEFSNOARCH) $(DEFS) $^ > .depend
34--- modutils-2.4.25/genksyms/Makefile.in Sun Nov 24 21:23:35 2002
35+++ modutils-2.4.25/genksyms/Makefile.in Thu Jan 29 17:17:07 2004
36@@ -62,7 +62,7 @@
37
38 install install-bin: all
39 $(MKDIR) $(DESTDIR)$(sbindir)
40- $(INSTALL) $(STRIP) genksyms $(DESTDIR)$(sbindir)
41+ $(INSTALL) $(STRIP) genksyms $(DESTDIR)$(sbindir)/`echo genksyms | sed -e'$(transform)'`
42
43 # auto-generated dependancies are almost redundant once we add all the
44 # rules to get the generated files built first.
45--- modutils-2.4.25/insmod/Makefile.in Fri Mar 28 17:54:20 2003
46+++ modutils-2.4.25/insmod/Makefile.in Thu Jan 29 17:21:10 2004
47@@ -120,16 +120,19 @@
48 @set -ex;\
49 for i in $(TARGETS_REAL); do \
50 $(MKDIR) $(DESTDIR)$(sbindir); \
51- $(INSTALL) $(STRIP) $$i $(DESTDIR)$(sbindir); done;
52+ f=`echo $$i|sed -e'$(transform)'`; \
53+ $(INSTALL) $(STRIP) $$i $(DESTDIR)$(sbindir)/$$f; done;
54 set -e; \
55- for i in $(srcdir)/insmod_ksymoops_clean $(srcdir)/kernelversion; do \
56+ for i in insmod_ksymoops_clean kernelversion; do \
57 $(MKDIR) $(DESTDIR)$(sbindir); \
58- $(INSTALL) $$i $(DESTDIR)$(sbindir); done;
59+ f=`echo $$i|sed -e'$(transform)'`; \
60+ $(INSTALL) $$i $(DESTDIR)$(sbindir)/$$f; done;
61 set -e; \
62 for i in $(COMB); do \
63- ln -sf insmod $(DESTDIR)$(sbindir)/$$i; \
64+ f=`echo $$i|sed -e'$(transform)'`; \
65+ ln -sf `echo insmod|sed -e'$(transform)'` $(DESTDIR)$(sbindir)/$$f; \
66 (test "$(insmod_static)" = yes && \
67- ln -sf insmod.static $(DESTDIR)$(sbindir)/$$i.static) || true; \
68+ ln -sf `echo insmod.static|sed -e'$(transform)'` $(DESTDIR)$(sbindir)/$$f.static) || true; \
69 done
70
71 clean:
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-18 04:26:48 +0000