summaryrefslogtreecommitdiff
path: root/openembedded/packages/modutils/files
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-07-21 10:10:31 +0000
committerRichard Purdie <richard@openedhand.com>2006-07-21 10:10:31 +0000
commitb2f192faabe412adce79534e22efe9fb69ee40e2 (patch)
tree7076c49d4286f8a1733650bd8fbc7161af200d57 /openembedded/packages/modutils/files
parent2cf0eadf9f730027833af802d7e6c90b44248f80 (diff)
downloadopenembedded-core-b2f192faabe412adce79534e22efe9fb69ee40e2.tar.gz
openembedded-core-b2f192faabe412adce79534e22efe9fb69ee40e2.tar.bz2
openembedded-core-b2f192faabe412adce79534e22efe9fb69ee40e2.tar.xz
openembedded-core-b2f192faabe412adce79534e22efe9fb69ee40e2.zip
Rename /openembedded/ -> /meta/
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/modutils/files')
-rw-r--r--openembedded/packages/modutils/files/armeb.patch14
-rw-r--r--openembedded/packages/modutils/files/configure.patch33
-rw-r--r--openembedded/packages/modutils/files/gcc4.patch66
-rw-r--r--openembedded/packages/modutils/files/ipaq-pxa-2.6/modules18
-rw-r--r--openembedded/packages/modutils/files/ipaq-pxa-2.6/modules.conf1
-rw-r--r--openembedded/packages/modutils/files/lex.l.diff33
-rw-r--r--openembedded/packages/modutils/files/mnci/modules1
-rw-r--r--openembedded/packages/modutils/files/mnci/modules-ramses1
-rw-r--r--openembedded/packages/modutils/files/mnci/modules.conf20
-rwxr-xr-xopenembedded/packages/modutils/files/mnci/modutils.sh10
-rw-r--r--openembedded/packages/modutils/files/modules0
-rw-r--r--openembedded/packages/modutils/files/modules.conf0
-rw-r--r--openembedded/packages/modutils/files/modutils-notest.patch14
-rwxr-xr-xopenembedded/packages/modutils/files/modutils.sh27
-rw-r--r--openembedded/packages/modutils/files/mtx-1/modules3
-rw-r--r--openembedded/packages/modutils/files/omap1610h2/modules0
-rw-r--r--openembedded/packages/modutils/files/omap1610h2/modules.conf0
-rw-r--r--openembedded/packages/modutils/files/poodle/modules3
-rw-r--r--openembedded/packages/modutils/files/poodle/modules.conf4
-rw-r--r--openembedded/packages/modutils/files/program_prefix.patch69
-rw-r--r--openembedded/packages/modutils/files/tosa/modules4
-rw-r--r--openembedded/packages/modutils/files/tosa/modules.conf4
-rw-r--r--openembedded/packages/modutils/files/wrt54/modules4
23 files changed, 0 insertions, 329 deletions
diff --git a/openembedded/packages/modutils/files/armeb.patch b/openembedded/packages/modutils/files/armeb.patch
deleted file mode 100644
index a26a3a24e..000000000
--- a/openembedded/packages/modutils/files/armeb.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- modutils-2.4.27/include/elf_arm.h.orig 2004-09-21 18:37:00.000000000 -0400
-+++ modutils-2.4.27/include/elf_arm.h 2004-09-21 18:38:18.000000000 -0400
-@@ -1,7 +1,11 @@
- /* Machine-specific elf macros for ARM. */
-
- #define ELFCLASSM ELFCLASS32
-+#ifdef __ARMEB__
-+#define ELFDATAM ELFDATA2MSB
-+#else
- #define ELFDATAM ELFDATA2LSB
-+#endif
-
- #define MATCH_MACHINE(x) (x == EM_ARM)
-
diff --git a/openembedded/packages/modutils/files/configure.patch b/openembedded/packages/modutils/files/configure.patch
deleted file mode 100644
index cdf501593..000000000
--- a/openembedded/packages/modutils/files/configure.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- modutils-2.4.25/./configure.in~configure
-+++ modutils-2.4.25/./configure.in
-@@ -1,4 +1,5 @@
--AC_INIT(insmod/insmod.c)
-+AC_INIT
-+AC_CONFIG_SRCDIR([insmod/insmod.c])
- AC_PREFIX_DEFAULT(/usr)
-
- # Canonical system uses CC_FOR_BUILD while Linux may use BUILDCC
-@@ -15,7 +16,7 @@
- BUILDCC="$CC_FOR_BUILD"
- export CC_FOR_BUILD
-
--AC_CANONICAL_SYSTEM
-+AC_CANONICAL_TARGET([])
-
- # Handle target_cpu for compatibility.
- if test "$host_cpu" != "$target_cpu"; then
-@@ -350,6 +351,7 @@
- fi
- fi
-
--AC_OUTPUT(Makefile Makefile.common depmod/Makefile genksyms/Makefile
-+AC_CONFIG_FILES([Makefile Makefile.common depmod/Makefile genksyms/Makefile
- insmod/Makefile $kerneld_Makefiles obj/Makefile util/Makefile
-- man/Makefile)
-+ man/Makefile])
-+AC_OUTPUT
diff --git a/openembedded/packages/modutils/files/gcc4.patch b/openembedded/packages/modutils/files/gcc4.patch
deleted file mode 100644
index e204898f0..000000000
--- a/openembedded/packages/modutils/files/gcc4.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- modutils-2.4.27/depmod/depmod.c.old 2005-06-05 23:25:28.000000000 +0100
-+++ modutils-2.4.27/depmod/depmod.c 2005-06-05 23:25:38.000000000 +0100
-@@ -1133,7 +1133,7 @@
-
- for (ksym = ksyms; so_far < nksyms; ++so_far, ksym++) {
- if (strncmp((char *)ksym->name, "GPLONLY_", 8) == 0)
-- ((char *)ksym->name) += 8;
-+ ksym->name += 8;
- assert(n_syms < MAX_MAP_SYM);
- symtab[n_syms++] = addsym((char *)ksym->name, mod, SYM_DEFINED, 0);
- }
---- modutils-2.4.27/genksyms/genksyms.c.old 2005-06-05 23:24:16.000000000 +0100
-+++ modutils-2.4.27/genksyms/genksyms.c 2005-06-05 23:24:35.000000000 +0100
-@@ -45,7 +45,7 @@
- int flag_debug, flag_dump_defs, flag_warnings;
- int checksum_version = 1, kernel_version = version(2,0,0);
-
--static int errors;
-+int errors;
- static int nsyms;
-
- static struct symbol *expansion_trail;
---- modutils-2.4.27/insmod/insmod.c.old 2005-06-05 23:21:47.000000000 +0100
-+++ modutils-2.4.27/insmod/insmod.c 2005-06-05 23:22:34.000000000 +0100
-@@ -275,7 +275,7 @@
- if (strncmp((char *)s->name, "GPLONLY_", 8) == 0) {
- gplonly_seen = 1;
- if (gpl)
-- ((char *)s->name) += 8;
-+ s->name += 8;
- else
- continue;
- }
---- modutils-2.4.27/obj/obj_kallsyms.c.old 2005-06-05 23:20:08.000000000 +0100
-+++ modutils-2.4.27/obj/obj_kallsyms.c 2005-06-05 23:20:24.000000000 +0100
-@@ -200,7 +200,7 @@
-
- /* Initial contents, header + one entry per input section. No strings. */
- osec->header.sh_size = sizeof(*a_hdr) + loaded*sizeof(*a_sec);
-- a_hdr = (struct kallsyms_header *) osec->contents =
-+ a_hdr = osec->contents =
- xmalloc(osec->header.sh_size);
- memset(osec->contents, 0, osec->header.sh_size);
- a_hdr->size = sizeof(*a_hdr);
-@@ -275,7 +275,7 @@
- a_hdr->symbol_off +
- a_hdr->symbols*a_hdr->symbol_size +
- strings_size - strings_left;
-- a_hdr = (struct kallsyms_header *) osec->contents =
-+ a_hdr = osec->contents =
- xrealloc(a_hdr, a_hdr->total_size);
- p = (char *)a_hdr + a_hdr->symbol_off;
- memcpy(p, symbols, a_hdr->symbols*a_hdr->symbol_size);
---- modutils-2.4.27/obj/obj_mips.c.orig 2003-04-05 00:47:17.000000000 +0200
-+++ modutils-2.4.27/obj/obj_mips.c 2005-07-21 12:51:48.000000000 +0200
-@@ -244,7 +244,9 @@
- archdata_sec->header.sh_size = 0;
- sec = obj_find_section(f, "__dbe_table");
- if (sec) {
-- ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad));
-+/* ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad));*/
-+ archdata_sec->contents = xmalloc(sizeof(*ad));
-+ ad = (struct archdata *) (archdata_sec->contents);
- memset(ad, 0, sizeof(*ad));
- archdata_sec->header.sh_size = sizeof(*ad);
- ad->__start___dbe_table = sec->header.sh_addr;
diff --git a/openembedded/packages/modutils/files/ipaq-pxa-2.6/modules b/openembedded/packages/modutils/files/ipaq-pxa-2.6/modules
deleted file mode 100644
index ca99e71df..000000000
--- a/openembedded/packages/modutils/files/ipaq-pxa-2.6/modules
+++ /dev/null
@@ -1,18 +0,0 @@
-mq11xx_base
-soc-device
-h2200_lcd
-h4000_lcd
-cfbcopyarea
-cfbfillrect
-cfbimgblt
-mq1100fb
-pxafb
-lcd
-backlight
-font
-fbcon
-pxa2xx_udc
-g_ether
-sunrpc
-lockd
-nfs
diff --git a/openembedded/packages/modutils/files/ipaq-pxa-2.6/modules.conf b/openembedded/packages/modutils/files/ipaq-pxa-2.6/modules.conf
deleted file mode 100644
index ef2e561e8..000000000
--- a/openembedded/packages/modutils/files/ipaq-pxa-2.6/modules.conf
+++ /dev/null
@@ -1 +0,0 @@
-# Add ipaq-pxa-2.6 modules parameters and aliases here
diff --git a/openembedded/packages/modutils/files/lex.l.diff b/openembedded/packages/modutils/files/lex.l.diff
deleted file mode 100644
index 65904b6b0..000000000
--- a/openembedded/packages/modutils/files/lex.l.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- modutils-2.4.26.orig/genksyms/lex.l
-+++ modutils-2.4.26/genksyms/lex.l
-@@ -130,6 +130,7 @@
-
- static int suppress_type_lookup, dont_want_brace_phrase;
- static struct string_list *next_node;
-+ static int next_token = 0;
-
- int token, count = 0;
- struct string_list *cur_node;
-@@ -144,7 +145,12 @@
- }
-
- repeat:
-- token = yylex1();
-+ if (next_token != 0) {
-+ token = next_token;
-+ next_token = 0;
-+ }
-+ else
-+ token = yylex1();
-
- if (token == 0)
- return 0;
-@@ -425,7 +431,7 @@
- {
- /* Put back the token we just read so's we can find it again
- after registering the expression. */
-- unput(token);
-+ next_token = token;
-
- lexstate = ST_NORMAL;
- token = EXPRESSION_PHRASE;
diff --git a/openembedded/packages/modutils/files/mnci/modules b/openembedded/packages/modutils/files/mnci/modules
deleted file mode 100644
index e228d2e8a..000000000
--- a/openembedded/packages/modutils/files/mnci/modules
+++ /dev/null
@@ -1 +0,0 @@
-sysctl
diff --git a/openembedded/packages/modutils/files/mnci/modules-ramses b/openembedded/packages/modutils/files/mnci/modules-ramses
deleted file mode 100644
index e228d2e8a..000000000
--- a/openembedded/packages/modutils/files/mnci/modules-ramses
+++ /dev/null
@@ -1 +0,0 @@
-sysctl
diff --git a/openembedded/packages/modutils/files/mnci/modules.conf b/openembedded/packages/modutils/files/mnci/modules.conf
deleted file mode 100644
index 310e5bb6c..000000000
--- a/openembedded/packages/modutils/files/mnci/modules.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-alias irda0 pxa_ir
-alias usbd0 usbdmonitor
-alias usbf usb-eth
-alias sound-slot-0 pxa-ac97
-alias sound-slot-1 pxa-ac97
-
-# Affix modules
-alias net-pf-27 affix
-alias char-major-60 affix_rfcomm
-
-# BlueZ modules
-alias net-pf-31 bluez
-alias bt-proto-0 l2cap
-alias bt-proto-2 sco
-alias bt-proto-3 rfcomm
-alias bt-proto-4 bnep
-alias bt-proto-5 cmtp
-alias bt-proto-6 hidp
-alias tty-ldisc-15 hci_uart
-alias char-major-10-250 hci_vhci
diff --git a/openembedded/packages/modutils/files/mnci/modutils.sh b/openembedded/packages/modutils/files/mnci/modutils.sh
deleted file mode 100755
index 378915c27..000000000
--- a/openembedded/packages/modutils/files/mnci/modutils.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-depmod -Ae
-
-(cat /etc/modules; echo; ) |
-while read module args
-do
- case "$module" in
- \#*|"") continue ;;
- esac
- modprobe $module $args
-done
diff --git a/openembedded/packages/modutils/files/modules b/openembedded/packages/modutils/files/modules
deleted file mode 100644
index e69de29bb..000000000
--- a/openembedded/packages/modutils/files/modules
+++ /dev/null
diff --git a/openembedded/packages/modutils/files/modules.conf b/openembedded/packages/modutils/files/modules.conf
deleted file mode 100644
index e69de29bb..000000000
--- a/openembedded/packages/modutils/files/modules.conf
+++ /dev/null
diff --git a/openembedded/packages/modutils/files/modutils-notest.patch b/openembedded/packages/modutils/files/modutils-notest.patch
deleted file mode 100644
index 0e15a1014..000000000
--- a/openembedded/packages/modutils/files/modutils-notest.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This test disables the annoying
- Note: /etc/modules.conf is more recent than /lib/modules/2.4.19-rmk6-pxa1/modules.dep
-message.
-
---- modutils-2.4.6/insmod/modprobe.c~notest Mon Feb 26 02:07:17 2001
-+++ modutils-2.4.6/insmod/modprobe.c Wed Feb 19 14:31:52 2003
-@@ -785,7 +785,6 @@
- return -1;
- }
-
--#define EXTREMELY_CAUTIOUS
- #ifdef EXTREMELY_CAUTIOUS
- if (fstat(fileno(fin), &statbuf) != 0)
- error("Could not stat %s", depfile);
diff --git a/openembedded/packages/modutils/files/modutils.sh b/openembedded/packages/modutils/files/modutils.sh
deleted file mode 100755
index 89281276f..000000000
--- a/openembedded/packages/modutils/files/modutils.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-LOAD_MODULE=modprobe
-[ -f /proc/modules ] || exit 0
-[ -f /etc/modules ] || exit 0
-[ -e /sbin/modprobe ] || LOAD_MODULE=insmod
-
-if [ ! -e /sbin/depmod ]; then
- [ -f /lib/modules/`uname -r`/modules.dep ] || LOAD_MODULE=insmod
-else
- [ "$VERBOSE" != no ] && echo "Calculating module dependencies ..."
- depmod -Ae
-fi
-
-[ "$VERBOSE" != no ] && echo -n "Loading modules: "
-(cat /etc/modules; echo; ) |
-while read module args
-do
- case "$module" in
- \#*|"") continue ;;
- esac
- [ "$VERBOSE" != no ] && echo -n "$module "
- eval "$LOAD_MODULE $module $args >/dev/null 2>&1"
-done
-[ "$VERBOSE" != no ] && echo
-
-exit 0
diff --git a/openembedded/packages/modutils/files/mtx-1/modules b/openembedded/packages/modutils/files/mtx-1/modules
deleted file mode 100644
index 3eb719acf..000000000
--- a/openembedded/packages/modutils/files/mtx-1/modules
+++ /dev/null
@@ -1,3 +0,0 @@
-tun
-ppp_async
-hostap_pci \ No newline at end of file
diff --git a/openembedded/packages/modutils/files/omap1610h2/modules b/openembedded/packages/modutils/files/omap1610h2/modules
deleted file mode 100644
index e69de29bb..000000000
--- a/openembedded/packages/modutils/files/omap1610h2/modules
+++ /dev/null
diff --git a/openembedded/packages/modutils/files/omap1610h2/modules.conf b/openembedded/packages/modutils/files/omap1610h2/modules.conf
deleted file mode 100644
index e69de29bb..000000000
--- a/openembedded/packages/modutils/files/omap1610h2/modules.conf
+++ /dev/null
diff --git a/openembedded/packages/modutils/files/poodle/modules b/openembedded/packages/modutils/files/poodle/modules
deleted file mode 100644
index 28d14f658..000000000
--- a/openembedded/packages/modutils/files/poodle/modules
+++ /dev/null
@@ -1,3 +0,0 @@
-usbdcore
-net_fd
-pxa_bi
diff --git a/openembedded/packages/modutils/files/poodle/modules.conf b/openembedded/packages/modutils/files/poodle/modules.conf
deleted file mode 100644
index 8ff87872f..000000000
--- a/openembedded/packages/modutils/files/poodle/modules.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-alias irda0 pxa_ir
-alias usbd0 usbdmonitor
-alias usbf usb-eth
-
diff --git a/openembedded/packages/modutils/files/program_prefix.patch b/openembedded/packages/modutils/files/program_prefix.patch
deleted file mode 100644
index 2927a23a2..000000000
--- a/openembedded/packages/modutils/files/program_prefix.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- modutils-2.4.25/Makefile.common.in Sun Nov 24 21:23:35 2002
-+++ modutils-2.4.25/Makefile.common.in Thu Jan 29 17:16:30 2004
-@@ -7,6 +7,7 @@
- mandir = @mandir@
- prefix = @prefix@
- sbindir = @sbindir@
-+transform = @program_transform_name@
-
- AR = @AR@
- ARCH = @ARCH@
---- modutils-2.4.25/configure.in Thu Jan 29 17:24:10 2004
-+++ modutils-2.4.25/configure.in Thu Jan 29 17:13:59 2004
-@@ -17,6 +17,7 @@
- export CC_FOR_BUILD
-
- AC_CANONICAL_TARGET([])
-+AC_ARG_PROGRAM
-
- # Handle target_cpu for compatibility.
- if test "$host_cpu" != "$target_cpu"; then
---- modutils-2.4.25/depmod/Makefile.in Fri Mar 28 17:54:20 2003
-+++ modutils-2.4.25/depmod/Makefile.in Thu Jan 29 17:16:41 2004
-@@ -60,7 +60,7 @@
-
- install install-bin: all
- $(MKDIR) $(DESTDIR)$(sbindir)
-- $(INSTALL) $(STRIP) depmod $(DESTDIR)$(sbindir)
-+ $(INSTALL) $(STRIP) depmod $(DESTDIR)$(sbindir)/`echo depmod | sed -e'$(transform)'`
-
- dep depend .depend: depmod.c
- $(CC) -M $(CFLAGS) $(DEFSNOARCH) $(DEFS) $^ > .depend
---- modutils-2.4.25/genksyms/Makefile.in Sun Nov 24 21:23:35 2002
-+++ modutils-2.4.25/genksyms/Makefile.in Thu Jan 29 17:17:07 2004
-@@ -62,7 +62,7 @@
-
- install install-bin: all
- $(MKDIR) $(DESTDIR)$(sbindir)
-- $(INSTALL) $(STRIP) genksyms $(DESTDIR)$(sbindir)
-+ $(INSTALL) $(STRIP) genksyms $(DESTDIR)$(sbindir)/`echo genksyms | sed -e'$(transform)'`
-
- # auto-generated dependancies are almost redundant once we add all the
- # rules to get the generated files built first.
---- modutils-2.4.25/insmod/Makefile.in Fri Mar 28 17:54:20 2003
-+++ modutils-2.4.25/insmod/Makefile.in Thu Jan 29 17:21:10 2004
-@@ -120,16 +120,19 @@
- @set -ex;\
- for i in $(TARGETS_REAL); do \
- $(MKDIR) $(DESTDIR)$(sbindir); \
-- $(INSTALL) $(STRIP) $$i $(DESTDIR)$(sbindir); done;
-+ f=`echo $$i|sed -e'$(transform)'`; \
-+ $(INSTALL) $(STRIP) $$i $(DESTDIR)$(sbindir)/$$f; done;
- set -e; \
-- for i in $(srcdir)/insmod_ksymoops_clean $(srcdir)/kernelversion; do \
-+ for i in insmod_ksymoops_clean kernelversion; do \
- $(MKDIR) $(DESTDIR)$(sbindir); \
-- $(INSTALL) $$i $(DESTDIR)$(sbindir); done;
-+ f=`echo $$i|sed -e'$(transform)'`; \
-+ $(INSTALL) $$i $(DESTDIR)$(sbindir)/$$f; done;
- set -e; \
- for i in $(COMB); do \
-- ln -sf insmod $(DESTDIR)$(sbindir)/$$i; \
-+ f=`echo $$i|sed -e'$(transform)'`; \
-+ ln -sf `echo insmod|sed -e'$(transform)'` $(DESTDIR)$(sbindir)/$$f; \
- (test "$(insmod_static)" = yes && \
-- ln -sf insmod.static $(DESTDIR)$(sbindir)/$$i.static) || true; \
-+ ln -sf `echo insmod.static|sed -e'$(transform)'` $(DESTDIR)$(sbindir)/$$f.static) || true; \
- done
-
- clean:
diff --git a/openembedded/packages/modutils/files/tosa/modules b/openembedded/packages/modutils/files/tosa/modules
deleted file mode 100644
index 754cc7f60..000000000
--- a/openembedded/packages/modutils/files/tosa/modules
+++ /dev/null
@@ -1,4 +0,0 @@
-usbdcore
-net_fd
-pxa_bi
-usb_ohci_tc6393 \ No newline at end of file
diff --git a/openembedded/packages/modutils/files/tosa/modules.conf b/openembedded/packages/modutils/files/tosa/modules.conf
deleted file mode 100644
index 8ff87872f..000000000
--- a/openembedded/packages/modutils/files/tosa/modules.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-alias irda0 pxa_ir
-alias usbd0 usbdmonitor
-alias usbf usb-eth
-
diff --git a/openembedded/packages/modutils/files/wrt54/modules b/openembedded/packages/modutils/files/wrt54/modules
deleted file mode 100644
index 78f651a83..000000000
--- a/openembedded/packages/modutils/files/wrt54/modules
+++ /dev/null
@@ -1,4 +0,0 @@
-et
-wl
-wlcompat
-diag