summaryrefslogtreecommitdiffstats
path: root/meta/packages/modutils/files
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:14:24 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:29:45 +0100
commit29d6678fd546377459ef75cf54abeef5b969b5cf (patch)
tree8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/packages/modutils/files
parentda49de6885ee1bc424e70bc02f21f6ab920efb55 (diff)
downloadpoky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/modutils/files')
-rw-r--r--meta/packages/modutils/files/armeb.patch14
-rw-r--r--meta/packages/modutils/files/configure.patch33
-rw-r--r--meta/packages/modutils/files/gcc4.patch66
-rw-r--r--meta/packages/modutils/files/ipaq-pxa-2.6/modules18
-rw-r--r--meta/packages/modutils/files/ipaq-pxa-2.6/modules.conf1
-rw-r--r--meta/packages/modutils/files/lex.l.diff33
-rw-r--r--meta/packages/modutils/files/mnci/modules1
-rw-r--r--meta/packages/modutils/files/mnci/modules-ramses1
-rw-r--r--meta/packages/modutils/files/mnci/modules.conf20
-rwxr-xr-xmeta/packages/modutils/files/mnci/modutils.sh10
-rw-r--r--meta/packages/modutils/files/modules0
-rw-r--r--meta/packages/modutils/files/modules.conf0
-rw-r--r--meta/packages/modutils/files/modutils-notest.patch14
-rwxr-xr-xmeta/packages/modutils/files/modutils.sh36
-rw-r--r--meta/packages/modutils/files/mtx-1/modules3
-rw-r--r--meta/packages/modutils/files/omap1610h2/modules0
-rw-r--r--meta/packages/modutils/files/omap1610h2/modules.conf0
-rw-r--r--meta/packages/modutils/files/poodle/modules3
-rw-r--r--meta/packages/modutils/files/poodle/modules.conf4
-rw-r--r--meta/packages/modutils/files/program_prefix.patch69
-rw-r--r--meta/packages/modutils/files/tosa/modules4
-rw-r--r--meta/packages/modutils/files/tosa/modules.conf4
-rw-r--r--meta/packages/modutils/files/wrt54/modules4
23 files changed, 0 insertions, 338 deletions
diff --git a/meta/packages/modutils/files/armeb.patch b/meta/packages/modutils/files/armeb.patch
deleted file mode 100644
index a26a3a24eb..0000000000
--- a/meta/packages/modutils/files/armeb.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1--- modutils-2.4.27/include/elf_arm.h.orig 2004-09-21 18:37:00.000000000 -0400
2+++ modutils-2.4.27/include/elf_arm.h 2004-09-21 18:38:18.000000000 -0400
3@@ -1,7 +1,11 @@
4 /* Machine-specific elf macros for ARM. */
5
6 #define ELFCLASSM ELFCLASS32
7+#ifdef __ARMEB__
8+#define ELFDATAM ELFDATA2MSB
9+#else
10 #define ELFDATAM ELFDATA2LSB
11+#endif
12
13 #define MATCH_MACHINE(x) (x == EM_ARM)
14
diff --git a/meta/packages/modutils/files/configure.patch b/meta/packages/modutils/files/configure.patch
deleted file mode 100644
index cdf501593f..0000000000
--- a/meta/packages/modutils/files/configure.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6--- modutils-2.4.25/./configure.in~configure
7+++ modutils-2.4.25/./configure.in
8@@ -1,4 +1,5 @@
9-AC_INIT(insmod/insmod.c)
10+AC_INIT
11+AC_CONFIG_SRCDIR([insmod/insmod.c])
12 AC_PREFIX_DEFAULT(/usr)
13
14 # Canonical system uses CC_FOR_BUILD while Linux may use BUILDCC
15@@ -15,7 +16,7 @@
16 BUILDCC="$CC_FOR_BUILD"
17 export CC_FOR_BUILD
18
19-AC_CANONICAL_SYSTEM
20+AC_CANONICAL_TARGET([])
21
22 # Handle target_cpu for compatibility.
23 if test "$host_cpu" != "$target_cpu"; then
24@@ -350,6 +351,7 @@
25 fi
26 fi
27
28-AC_OUTPUT(Makefile Makefile.common depmod/Makefile genksyms/Makefile
29+AC_CONFIG_FILES([Makefile Makefile.common depmod/Makefile genksyms/Makefile
30 insmod/Makefile $kerneld_Makefiles obj/Makefile util/Makefile
31- man/Makefile)
32+ man/Makefile])
33+AC_OUTPUT
diff --git a/meta/packages/modutils/files/gcc4.patch b/meta/packages/modutils/files/gcc4.patch
deleted file mode 100644
index e204898f05..0000000000
--- a/meta/packages/modutils/files/gcc4.patch
+++ /dev/null
@@ -1,66 +0,0 @@
1--- modutils-2.4.27/depmod/depmod.c.old 2005-06-05 23:25:28.000000000 +0100
2+++ modutils-2.4.27/depmod/depmod.c 2005-06-05 23:25:38.000000000 +0100
3@@ -1133,7 +1133,7 @@
4
5 for (ksym = ksyms; so_far < nksyms; ++so_far, ksym++) {
6 if (strncmp((char *)ksym->name, "GPLONLY_", 8) == 0)
7- ((char *)ksym->name) += 8;
8+ ksym->name += 8;
9 assert(n_syms < MAX_MAP_SYM);
10 symtab[n_syms++] = addsym((char *)ksym->name, mod, SYM_DEFINED, 0);
11 }
12--- modutils-2.4.27/genksyms/genksyms.c.old 2005-06-05 23:24:16.000000000 +0100
13+++ modutils-2.4.27/genksyms/genksyms.c 2005-06-05 23:24:35.000000000 +0100
14@@ -45,7 +45,7 @@
15 int flag_debug, flag_dump_defs, flag_warnings;
16 int checksum_version = 1, kernel_version = version(2,0,0);
17
18-static int errors;
19+int errors;
20 static int nsyms;
21
22 static struct symbol *expansion_trail;
23--- modutils-2.4.27/insmod/insmod.c.old 2005-06-05 23:21:47.000000000 +0100
24+++ modutils-2.4.27/insmod/insmod.c 2005-06-05 23:22:34.000000000 +0100
25@@ -275,7 +275,7 @@
26 if (strncmp((char *)s->name, "GPLONLY_", 8) == 0) {
27 gplonly_seen = 1;
28 if (gpl)
29- ((char *)s->name) += 8;
30+ s->name += 8;
31 else
32 continue;
33 }
34--- modutils-2.4.27/obj/obj_kallsyms.c.old 2005-06-05 23:20:08.000000000 +0100
35+++ modutils-2.4.27/obj/obj_kallsyms.c 2005-06-05 23:20:24.000000000 +0100
36@@ -200,7 +200,7 @@
37
38 /* Initial contents, header + one entry per input section. No strings. */
39 osec->header.sh_size = sizeof(*a_hdr) + loaded*sizeof(*a_sec);
40- a_hdr = (struct kallsyms_header *) osec->contents =
41+ a_hdr = osec->contents =
42 xmalloc(osec->header.sh_size);
43 memset(osec->contents, 0, osec->header.sh_size);
44 a_hdr->size = sizeof(*a_hdr);
45@@ -275,7 +275,7 @@
46 a_hdr->symbol_off +
47 a_hdr->symbols*a_hdr->symbol_size +
48 strings_size - strings_left;
49- a_hdr = (struct kallsyms_header *) osec->contents =
50+ a_hdr = osec->contents =
51 xrealloc(a_hdr, a_hdr->total_size);
52 p = (char *)a_hdr + a_hdr->symbol_off;
53 memcpy(p, symbols, a_hdr->symbols*a_hdr->symbol_size);
54--- modutils-2.4.27/obj/obj_mips.c.orig 2003-04-05 00:47:17.000000000 +0200
55+++ modutils-2.4.27/obj/obj_mips.c 2005-07-21 12:51:48.000000000 +0200
56@@ -244,7 +244,9 @@
57 archdata_sec->header.sh_size = 0;
58 sec = obj_find_section(f, "__dbe_table");
59 if (sec) {
60- ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad));
61+/* ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad));*/
62+ archdata_sec->contents = xmalloc(sizeof(*ad));
63+ ad = (struct archdata *) (archdata_sec->contents);
64 memset(ad, 0, sizeof(*ad));
65 archdata_sec->header.sh_size = sizeof(*ad);
66 ad->__start___dbe_table = sec->header.sh_addr;
diff --git a/meta/packages/modutils/files/ipaq-pxa-2.6/modules b/meta/packages/modutils/files/ipaq-pxa-2.6/modules
deleted file mode 100644
index ca99e71df0..0000000000
--- a/meta/packages/modutils/files/ipaq-pxa-2.6/modules
+++ /dev/null
@@ -1,18 +0,0 @@
1mq11xx_base
2soc-device
3h2200_lcd
4h4000_lcd
5cfbcopyarea
6cfbfillrect
7cfbimgblt
8mq1100fb
9pxafb
10lcd
11backlight
12font
13fbcon
14pxa2xx_udc
15g_ether
16sunrpc
17lockd
18nfs
diff --git a/meta/packages/modutils/files/ipaq-pxa-2.6/modules.conf b/meta/packages/modutils/files/ipaq-pxa-2.6/modules.conf
deleted file mode 100644
index ef2e561e89..0000000000
--- a/meta/packages/modutils/files/ipaq-pxa-2.6/modules.conf
+++ /dev/null
@@ -1 +0,0 @@
1# Add ipaq-pxa-2.6 modules parameters and aliases here
diff --git a/meta/packages/modutils/files/lex.l.diff b/meta/packages/modutils/files/lex.l.diff
deleted file mode 100644
index 65904b6b02..0000000000
--- a/meta/packages/modutils/files/lex.l.diff
+++ /dev/null
@@ -1,33 +0,0 @@
1--- modutils-2.4.26.orig/genksyms/lex.l
2+++ modutils-2.4.26/genksyms/lex.l
3@@ -130,6 +130,7 @@
4
5 static int suppress_type_lookup, dont_want_brace_phrase;
6 static struct string_list *next_node;
7+ static int next_token = 0;
8
9 int token, count = 0;
10 struct string_list *cur_node;
11@@ -144,7 +145,12 @@
12 }
13
14 repeat:
15- token = yylex1();
16+ if (next_token != 0) {
17+ token = next_token;
18+ next_token = 0;
19+ }
20+ else
21+ token = yylex1();
22
23 if (token == 0)
24 return 0;
25@@ -425,7 +431,7 @@
26 {
27 /* Put back the token we just read so's we can find it again
28 after registering the expression. */
29- unput(token);
30+ next_token = token;
31
32 lexstate = ST_NORMAL;
33 token = EXPRESSION_PHRASE;
diff --git a/meta/packages/modutils/files/mnci/modules b/meta/packages/modutils/files/mnci/modules
deleted file mode 100644
index e228d2e8a8..0000000000
--- a/meta/packages/modutils/files/mnci/modules
+++ /dev/null
@@ -1 +0,0 @@
1sysctl
diff --git a/meta/packages/modutils/files/mnci/modules-ramses b/meta/packages/modutils/files/mnci/modules-ramses
deleted file mode 100644
index e228d2e8a8..0000000000
--- a/meta/packages/modutils/files/mnci/modules-ramses
+++ /dev/null
@@ -1 +0,0 @@
1sysctl
diff --git a/meta/packages/modutils/files/mnci/modules.conf b/meta/packages/modutils/files/mnci/modules.conf
deleted file mode 100644
index 310e5bb6c8..0000000000
--- a/meta/packages/modutils/files/mnci/modules.conf
+++ /dev/null
@@ -1,20 +0,0 @@
1alias irda0 pxa_ir
2alias usbd0 usbdmonitor
3alias usbf usb-eth
4alias sound-slot-0 pxa-ac97
5alias sound-slot-1 pxa-ac97
6
7# Affix modules
8alias net-pf-27 affix
9alias char-major-60 affix_rfcomm
10
11# BlueZ modules
12alias net-pf-31 bluez
13alias bt-proto-0 l2cap
14alias bt-proto-2 sco
15alias bt-proto-3 rfcomm
16alias bt-proto-4 bnep
17alias bt-proto-5 cmtp
18alias bt-proto-6 hidp
19alias tty-ldisc-15 hci_uart
20alias char-major-10-250 hci_vhci
diff --git a/meta/packages/modutils/files/mnci/modutils.sh b/meta/packages/modutils/files/mnci/modutils.sh
deleted file mode 100755
index 378915c270..0000000000
--- a/meta/packages/modutils/files/mnci/modutils.sh
+++ /dev/null
@@ -1,10 +0,0 @@
1depmod -Ae
2
3(cat /etc/modules; echo; ) |
4while read module args
5do
6 case "$module" in
7 \#*|"") continue ;;
8 esac
9 modprobe $module $args
10done
diff --git a/meta/packages/modutils/files/modules b/meta/packages/modutils/files/modules
deleted file mode 100644
index e69de29bb2..0000000000
--- a/meta/packages/modutils/files/modules
+++ /dev/null
diff --git a/meta/packages/modutils/files/modules.conf b/meta/packages/modutils/files/modules.conf
deleted file mode 100644
index e69de29bb2..0000000000
--- a/meta/packages/modutils/files/modules.conf
+++ /dev/null
diff --git a/meta/packages/modutils/files/modutils-notest.patch b/meta/packages/modutils/files/modutils-notest.patch
deleted file mode 100644
index 0e15a1014c..0000000000
--- a/meta/packages/modutils/files/modutils-notest.patch
+++ /dev/null
@@ -1,14 +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
5--- modutils-2.4.6/insmod/modprobe.c~notest Mon Feb 26 02:07:17 2001
6+++ modutils-2.4.6/insmod/modprobe.c Wed Feb 19 14:31:52 2003
7@@ -785,7 +785,6 @@
8 return -1;
9 }
10
11-#define EXTREMELY_CAUTIOUS
12 #ifdef EXTREMELY_CAUTIOUS
13 if (fstat(fileno(fin), &statbuf) != 0)
14 error("Could not stat %s", depfile);
diff --git a/meta/packages/modutils/files/modutils.sh b/meta/packages/modutils/files/modutils.sh
deleted file mode 100755
index 9049bbb8aa..0000000000
--- a/meta/packages/modutils/files/modutils.sh
+++ /dev/null
@@ -1,36 +0,0 @@
1#!/bin/sh
2### BEGIN INIT INFO
3# Provides: module-init-tools
4# Required-Start:
5# Required-Stop:
6# Should-Start: checkroot
7# Should-stop:
8# Default-Start: S
9# Default-Stop:
10# Short-Description: Process /etc/modules.
11# Description: Load the modules listed in /etc/modules.
12### END INIT INFO
13
14LOAD_MODULE=modprobe
15[ -f /proc/modules ] || exit 0
16[ -f /etc/modules ] || exit 0
17[ -e /sbin/modprobe ] || LOAD_MODULE=insmod
18
19if [ ! -f /lib/modules/`uname -r`/modules.dep ]; then
20 [ "$VERBOSE" != no ] && echo "Calculating module dependencies ..."
21 depmod -Ae
22fi
23
24[ "$VERBOSE" != no ] && echo -n "Loading modules: "
25(cat /etc/modules; echo; ) |
26while read module args
27do
28 case "$module" in
29 \#*|"") continue ;;
30 esac
31 [ "$VERBOSE" != no ] && echo -n "$module "
32 eval "$LOAD_MODULE $module $args >/dev/null 2>&1"
33done
34[ "$VERBOSE" != no ] && echo
35
36exit 0
diff --git a/meta/packages/modutils/files/mtx-1/modules b/meta/packages/modutils/files/mtx-1/modules
deleted file mode 100644
index 3eb719acf9..0000000000
--- a/meta/packages/modutils/files/mtx-1/modules
+++ /dev/null
@@ -1,3 +0,0 @@
1tun
2ppp_async
3hostap_pci \ No newline at end of file
diff --git a/meta/packages/modutils/files/omap1610h2/modules b/meta/packages/modutils/files/omap1610h2/modules
deleted file mode 100644
index e69de29bb2..0000000000
--- a/meta/packages/modutils/files/omap1610h2/modules
+++ /dev/null
diff --git a/meta/packages/modutils/files/omap1610h2/modules.conf b/meta/packages/modutils/files/omap1610h2/modules.conf
deleted file mode 100644
index e69de29bb2..0000000000
--- a/meta/packages/modutils/files/omap1610h2/modules.conf
+++ /dev/null
diff --git a/meta/packages/modutils/files/poodle/modules b/meta/packages/modutils/files/poodle/modules
deleted file mode 100644
index 28d14f6584..0000000000
--- a/meta/packages/modutils/files/poodle/modules
+++ /dev/null
@@ -1,3 +0,0 @@
1usbdcore
2net_fd
3pxa_bi
diff --git a/meta/packages/modutils/files/poodle/modules.conf b/meta/packages/modutils/files/poodle/modules.conf
deleted file mode 100644
index 8ff87872f3..0000000000
--- a/meta/packages/modutils/files/poodle/modules.conf
+++ /dev/null
@@ -1,4 +0,0 @@
1alias irda0 pxa_ir
2alias usbd0 usbdmonitor
3alias usbf usb-eth
4
diff --git a/meta/packages/modutils/files/program_prefix.patch b/meta/packages/modutils/files/program_prefix.patch
deleted file mode 100644
index 2927a23a22..0000000000
--- a/meta/packages/modutils/files/program_prefix.patch
+++ /dev/null
@@ -1,69 +0,0 @@
1--- modutils-2.4.25/Makefile.common.in Sun Nov 24 21:23:35 2002
2+++ modutils-2.4.25/Makefile.common.in Thu Jan 29 17:16:30 2004
3@@ -7,6 +7,7 @@
4 mandir = @mandir@
5 prefix = @prefix@
6 sbindir = @sbindir@
7+transform = @program_transform_name@
8
9 AR = @AR@
10 ARCH = @ARCH@
11--- modutils-2.4.25/configure.in Thu Jan 29 17:24:10 2004
12+++ modutils-2.4.25/configure.in Thu Jan 29 17:13:59 2004
13@@ -17,6 +17,7 @@
14 export CC_FOR_BUILD
15
16 AC_CANONICAL_TARGET([])
17+AC_ARG_PROGRAM
18
19 # Handle target_cpu for compatibility.
20 if test "$host_cpu" != "$target_cpu"; then
21--- modutils-2.4.25/depmod/Makefile.in Fri Mar 28 17:54:20 2003
22+++ modutils-2.4.25/depmod/Makefile.in Thu Jan 29 17:16:41 2004
23@@ -60,7 +60,7 @@
24
25 install install-bin: all
26 $(MKDIR) $(DESTDIR)$(sbindir)
27- $(INSTALL) $(STRIP) depmod $(DESTDIR)$(sbindir)
28+ $(INSTALL) $(STRIP) depmod $(DESTDIR)$(sbindir)/`echo depmod | sed -e'$(transform)'`
29
30 dep depend .depend: depmod.c
31 $(CC) -M $(CFLAGS) $(DEFSNOARCH) $(DEFS) $^ > .depend
32--- modutils-2.4.25/genksyms/Makefile.in Sun Nov 24 21:23:35 2002
33+++ modutils-2.4.25/genksyms/Makefile.in Thu Jan 29 17:17:07 2004
34@@ -62,7 +62,7 @@
35
36 install install-bin: all
37 $(MKDIR) $(DESTDIR)$(sbindir)
38- $(INSTALL) $(STRIP) genksyms $(DESTDIR)$(sbindir)
39+ $(INSTALL) $(STRIP) genksyms $(DESTDIR)$(sbindir)/`echo genksyms | sed -e'$(transform)'`
40
41 # auto-generated dependancies are almost redundant once we add all the
42 # rules to get the generated files built first.
43--- modutils-2.4.25/insmod/Makefile.in Fri Mar 28 17:54:20 2003
44+++ modutils-2.4.25/insmod/Makefile.in Thu Jan 29 17:21:10 2004
45@@ -120,16 +120,19 @@
46 @set -ex;\
47 for i in $(TARGETS_REAL); do \
48 $(MKDIR) $(DESTDIR)$(sbindir); \
49- $(INSTALL) $(STRIP) $$i $(DESTDIR)$(sbindir); done;
50+ f=`echo $$i|sed -e'$(transform)'`; \
51+ $(INSTALL) $(STRIP) $$i $(DESTDIR)$(sbindir)/$$f; done;
52 set -e; \
53- for i in $(srcdir)/insmod_ksymoops_clean $(srcdir)/kernelversion; do \
54+ for i in insmod_ksymoops_clean kernelversion; do \
55 $(MKDIR) $(DESTDIR)$(sbindir); \
56- $(INSTALL) $$i $(DESTDIR)$(sbindir); done;
57+ f=`echo $$i|sed -e'$(transform)'`; \
58+ $(INSTALL) $$i $(DESTDIR)$(sbindir)/$$f; done;
59 set -e; \
60 for i in $(COMB); do \
61- ln -sf insmod $(DESTDIR)$(sbindir)/$$i; \
62+ f=`echo $$i|sed -e'$(transform)'`; \
63+ ln -sf `echo insmod|sed -e'$(transform)'` $(DESTDIR)$(sbindir)/$$f; \
64 (test "$(insmod_static)" = yes && \
65- ln -sf insmod.static $(DESTDIR)$(sbindir)/$$i.static) || true; \
66+ ln -sf `echo insmod.static|sed -e'$(transform)'` $(DESTDIR)$(sbindir)/$$f.static) || true; \
67 done
68
69 clean:
diff --git a/meta/packages/modutils/files/tosa/modules b/meta/packages/modutils/files/tosa/modules
deleted file mode 100644
index 754cc7f606..0000000000
--- a/meta/packages/modutils/files/tosa/modules
+++ /dev/null
@@ -1,4 +0,0 @@
1usbdcore
2net_fd
3pxa_bi
4usb_ohci_tc6393 \ No newline at end of file
diff --git a/meta/packages/modutils/files/tosa/modules.conf b/meta/packages/modutils/files/tosa/modules.conf
deleted file mode 100644
index 8ff87872f3..0000000000
--- a/meta/packages/modutils/files/tosa/modules.conf
+++ /dev/null
@@ -1,4 +0,0 @@
1alias irda0 pxa_ir
2alias usbd0 usbdmonitor
3alias usbf usb-eth
4
diff --git a/meta/packages/modutils/files/wrt54/modules b/meta/packages/modutils/files/wrt54/modules
deleted file mode 100644
index 78f651a83d..0000000000
--- a/meta/packages/modutils/files/wrt54/modules
+++ /dev/null
@@ -1,4 +0,0 @@
1et
2wl
3wlcompat
4diag