diff options
-rw-r--r-- | meta/recipes-kernel/modutils/files/armeb.patch | 16 | ||||
-rw-r--r-- | meta/recipes-kernel/modutils/files/configure.patch | 34 | ||||
-rw-r--r-- | meta/recipes-kernel/modutils/files/gcc4.patch | 93 | ||||
-rw-r--r-- | meta/recipes-kernel/modutils/files/lex.l.diff | 35 | ||||
-rw-r--r-- | meta/recipes-kernel/modutils/files/modules | 0 | ||||
-rw-r--r-- | meta/recipes-kernel/modutils/files/modules.conf | 0 | ||||
-rw-r--r-- | meta/recipes-kernel/modutils/files/modutils-notest.patch | 16 | ||||
-rw-r--r-- | meta/recipes-kernel/modutils/files/program_prefix.patch | 71 | ||||
-rw-r--r-- | meta/recipes-kernel/modutils/modutils-collateral.bb | 21 | ||||
-rw-r--r-- | meta/recipes-kernel/modutils/modutils-cross/module.h.diff | 35 | ||||
-rw-r--r-- | meta/recipes-kernel/modutils/modutils-cross_2.4.27.bb | 20 | ||||
-rw-r--r-- | meta/recipes-kernel/modutils/modutils_2.4.27.bb | 93 |
12 files changed, 0 insertions, 434 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 @@ | |||
1 | Upstream-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 @@ | |||
1 | Upstream-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 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Index: 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 | } | ||
16 | Index: 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; | ||
29 | Index: 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 | } | ||
42 | Index: 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); | ||
64 | Index: 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; | ||
79 | Index: 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 @@ | |||
1 | Upstream-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 @@ | |||
1 | This test disables the annoying | ||
2 | Note: /etc/modules.conf is more recent than /lib/modules/2.4.19-rmk6-pxa1/modules.dep | ||
3 | message. | ||
4 | |||
5 | Upstream-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 @@ | |||
1 | Upstream-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: | ||
diff --git a/meta/recipes-kernel/modutils/modutils-collateral.bb b/meta/recipes-kernel/modutils/modutils-collateral.bb deleted file mode 100644 index 919b86f95d..0000000000 --- a/meta/recipes-kernel/modutils/modutils-collateral.bb +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | SECTION = "base" | ||
2 | DESCRIPTION = "modutils configuration files" | ||
3 | PR = "r3" | ||
4 | LICENSE = "MIT" | ||
5 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | ||
6 | SRC_URI = "file://modules \ | ||
7 | file://modules.conf" | ||
8 | |||
9 | do_compile () { | ||
10 | } | ||
11 | |||
12 | do_install () { | ||
13 | install -d ${D}${sysconfdir} | ||
14 | install -m 0644 ${WORKDIR}/modules ${D}${sysconfdir}/modules | ||
15 | if [ ${MAJOR_KERNEL_VERSION}=2.6 ]; then | ||
16 | install -d ${D}${sysconfdir}/modprobe.d | ||
17 | else | ||
18 | install -m 0644 ${WORKDIR}/modules.conf ${D}${sysconfdir}/modules.conf | ||
19 | fi | ||
20 | |||
21 | } | ||
diff --git a/meta/recipes-kernel/modutils/modutils-cross/module.h.diff b/meta/recipes-kernel/modutils/modutils-cross/module.h.diff deleted file mode 100644 index e9f1224490..0000000000 --- a/meta/recipes-kernel/modutils/modutils-cross/module.h.diff +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | diff -urN modutils-2.4.27.orig/include/module.h modutils-2.4.27/include/module.h | ||
4 | --- modutils-2.4.27.orig/include/module.h 2003-01-27 11:22:02.000000000 -0500 | ||
5 | +++ modutils-2.4.27/include/module.h 2004-08-23 19:52:34.756772712 -0400 | ||
6 | @@ -88,6 +88,20 @@ | ||
7 | /* For sizeof() which are related to the module platform and not to the | ||
8 | environment isnmod is running in, use sizeof_xx instead of sizeof(xx). */ | ||
9 | |||
10 | +/* Additional test for OE, set tgt_blah correct for the target arch, *not* the | ||
11 | + native arch. If int isn't 32bit on the native machine we're in trouble. */ | ||
12 | + | ||
13 | +#ifdef ARCH_arm | ||
14 | +#define tgt_sizeof_char sizeof(char) | ||
15 | +#define tgt_sizeof_short sizeof(short) | ||
16 | +#define tgt_sizeof_int sizeof(int) | ||
17 | +#define tgt_sizeof_long 4 | ||
18 | +#define tgt_sizeof_char_p 4 | ||
19 | +#define tgt_sizeof_void_p 4 | ||
20 | +#define tgt_long int | ||
21 | +#define tgt_long_fmt "l" | ||
22 | +#define tgt_strtoul strtoul | ||
23 | +#else | ||
24 | #define tgt_sizeof_char sizeof(char) | ||
25 | #define tgt_sizeof_short sizeof(short) | ||
26 | #define tgt_sizeof_int sizeof(int) | ||
27 | @@ -97,7 +111,7 @@ | ||
28 | #define tgt_long long | ||
29 | #define tgt_long_fmt "l" | ||
30 | #define tgt_strtoul strtoul | ||
31 | - | ||
32 | +#endif | ||
33 | /* This assumes that long long on a 32 bit system is equivalent to long on the | ||
34 | * equivalent 64 bit system. Also that void and char pointers are 8 bytes on | ||
35 | * all 64 bit systems. Add per system tweaks if it ever becomes necessary. | ||
diff --git a/meta/recipes-kernel/modutils/modutils-cross_2.4.27.bb b/meta/recipes-kernel/modutils/modutils-cross_2.4.27.bb deleted file mode 100644 index f7c68bb977..0000000000 --- a/meta/recipes-kernel/modutils/modutils-cross_2.4.27.bb +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | require modutils_${PV}.bb | ||
2 | PR = "r10" | ||
3 | inherit cross | ||
4 | DEPENDS = "" | ||
5 | PACKAGES = "" | ||
6 | PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.4" | ||
7 | DEFAULT_PREFERENCE = "1" | ||
8 | |||
9 | SRC_URI += "file://modutils-cross/module.h.diff;patch=1" | ||
10 | |||
11 | sbindir = "${prefix}/bin" | ||
12 | |||
13 | EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}" | ||
14 | |||
15 | CFLAGS_prepend_mipsel = "-D__MIPSEL__" | ||
16 | CFLAGS_prepend_mipseb = "-D__MIPSEB__" | ||
17 | |||
18 | do_install_append () { | ||
19 | mv ${D}${sbindir}/${TARGET_PREFIX}depmod ${D}${sbindir}/${TARGET_PREFIX}depmod-2.4 | ||
20 | } | ||
diff --git a/meta/recipes-kernel/modutils/modutils_2.4.27.bb b/meta/recipes-kernel/modutils/modutils_2.4.27.bb deleted file mode 100644 index 9f2add30b1..0000000000 --- a/meta/recipes-kernel/modutils/modutils_2.4.27.bb +++ /dev/null | |||
@@ -1,93 +0,0 @@ | |||
1 | SECTION = "base" | ||
2 | SUMMARY = "Kernel module utilities" | ||
3 | DESCRIPTION = "These utilities are intended to make a Linux modular kernel \ | ||
4 | manageable for all users, administrators and distribution maintainers." | ||
5 | LICENSE = "GPLv2" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" | ||
7 | DEPENDS = "bison-native" | ||
8 | PR = "r10" | ||
9 | |||
10 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2 \ | ||
11 | file://lex.l.diff;patch=1 \ | ||
12 | file://modutils-notest.patch;patch=1 \ | ||
13 | file://configure.patch;patch=1 \ | ||
14 | file://program_prefix.patch;patch=1 \ | ||
15 | file://armeb.patch;patch=1 \ | ||
16 | file://gcc4.patch;patch=1" | ||
17 | |||
18 | SRC_URI[md5sum] = "bac989c74ed10f3bf86177fc5b4b89b6" | ||
19 | SRC_URI[sha256sum] = "ab4c9191645f9ffb455ae7c014d8c45339c13a1d0f6914817cfbf30a0bc56bf0" | ||
20 | |||
21 | inherit autotools | ||
22 | |||
23 | # modutils go in /sbin | ||
24 | sbindir = "/sbin" | ||
25 | EXTRA_OECONF = "--disable-strip" | ||
26 | export BUILDCC = "${BUILD_CC}" | ||
27 | export BUILDCFLAGS = "${BUILD_CFLAGS}" | ||
28 | |||
29 | do_install () { | ||
30 | oe_runmake 'DESTDIR=${D}' install | ||
31 | install -d ${D}${sysconfdir} | ||
32 | rm ${D}${base_sbindir}/lsmod | ||
33 | install -d ${D}${base_bindir}/ | ||
34 | ln -s ../sbin/insmod ${D}${base_bindir}/lsmod | ||
35 | for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do mv ${D}/$f ${D}/$f.24 | ||
36 | done | ||
37 | } | ||
38 | |||
39 | pkg_postinst_modutils () { | ||
40 | #!/bin/sh | ||
41 | for f in sbin/insmod sbin/modprobe sbin/rmmod bin/lsmod; do | ||
42 | bn=`basename $f` | ||
43 | update-alternatives --install /$f $bn /$f.24 10 | ||
44 | done | ||
45 | if test -n "$D"; then | ||
46 | D="-r $D" | ||
47 | if test -n "`which ${TARGET_PREFIX}depmod-2.4`"; then | ||
48 | for kerneldir in `ls -p $D/lib/modules|grep /`; do | ||
49 | kernelver=`basename $kerneldir` | ||
50 | ${TARGET_PREFIX}depmod-2.4 -a -b $D -C ${IMAGE_ROOTFS}/${sysconfdir}/modules.conf -r $kernelver | ||
51 | done | ||
52 | fi | ||
53 | fi | ||
54 | update-rc.d $D modutils.sh start 20 S . | ||
55 | } | ||
56 | |||
57 | pkg_prerm_modutils () { | ||
58 | #!/bin/sh | ||
59 | for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do | ||
60 | bn=`basename $f` | ||
61 | update-alternatives --remove $bn /$f.24 | ||
62 | done | ||
63 | if test -n "$D"; then | ||
64 | D="-r $D" | ||
65 | fi | ||
66 | update-rc.d $D modutils.sh remove | ||
67 | } | ||
68 | |||
69 | pkg_postinst_modutils-depmod() { | ||
70 | #!/bin/sh | ||
71 | update-alternatives --install /sbin/depmod depmod /sbin/depmod.24 10 | ||
72 | } | ||
73 | |||
74 | pkg_postinst_modutils-modinfo() { | ||
75 | #!/bin/sh | ||
76 | update-alternatives --install /sbin/modinfo modinfo /sbin/modinfo.24 10 | ||
77 | } | ||
78 | |||
79 | pkg_prerm_modutils-depmod() { | ||
80 | #!/bin/sh | ||
81 | update-alternatives --remove depmod /sbin/depmod.24 | ||
82 | } | ||
83 | |||
84 | pkg_prerm_modutils-modinfo() { | ||
85 | #!/bin/sh | ||
86 | update-alternatives --remove modinfo /sbin/modinfo.24 | ||
87 | } | ||
88 | |||
89 | PACKAGES = "${PN}-dbg modutils-depmod modutils-modinfo modutils-doc modutils" | ||
90 | |||
91 | FILES_modutils-depmod = "sbin/depmod.24" | ||
92 | FILES_modutils-modinfo = "sbin/modinfo.24" | ||
93 | RDEPENDS_modutils = "modutils-depmod" | ||