diff options
author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /modutils/files | |
parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'modutils/files')
23 files changed, 0 insertions, 231 deletions
diff --git a/modutils/files/armeb.patch b/modutils/files/armeb.patch deleted file mode 100644 index a26a3a24eb..0000000000 --- a/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/modutils/files/beagle/modules b/modutils/files/beagle/modules deleted file mode 100644 index 4f13b62e69..0000000000 --- a/modutils/files/beagle/modules +++ /dev/null @@ -1,2 +0,0 @@ -unix -usbdcore
\ No newline at end of file diff --git a/modutils/files/beagle/modules.conf b/modutils/files/beagle/modules.conf deleted file mode 100644 index 258189cbf3..0000000000 --- a/modutils/files/beagle/modules.conf +++ /dev/null @@ -1,4 +0,0 @@ -alias irda0 sa1100_ir -alias usbd0 usbdmonitor -alias usbf usb-eth - diff --git a/modutils/files/configure.patch b/modutils/files/configure.patch deleted file mode 100644 index cdf501593f..0000000000 --- a/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/modutils/files/ipaq-pxa-2.6/modules b/modutils/files/ipaq-pxa-2.6/modules deleted file mode 100644 index ca99e71df0..0000000000 --- a/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/modutils/files/ipaq-pxa-2.6/modules.conf b/modutils/files/ipaq-pxa-2.6/modules.conf deleted file mode 100644 index e69de29bb2..0000000000 --- a/modutils/files/ipaq-pxa-2.6/modules.conf +++ /dev/null diff --git a/modutils/files/lex.l.diff b/modutils/files/lex.l.diff deleted file mode 100644 index 65904b6b02..0000000000 --- a/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/modutils/files/modules b/modutils/files/modules deleted file mode 100644 index e69de29bb2..0000000000 --- a/modutils/files/modules +++ /dev/null diff --git a/modutils/files/modules.conf b/modutils/files/modules.conf deleted file mode 100644 index e69de29bb2..0000000000 --- a/modutils/files/modules.conf +++ /dev/null diff --git a/modutils/files/modutils-notest.patch b/modutils/files/modutils-notest.patch deleted file mode 100644 index 0e15a1014c..0000000000 --- a/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/modutils/files/modutils.sh b/modutils/files/modutils.sh deleted file mode 100644 index 827a88df41..0000000000 --- a/modutils/files/modutils.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -[ -f /proc/modules ] || exit 0 -[ -e /sbin/depmod ] || exit 0 -[ -f /etc/modules ] || exit 0 - -[ "$VERBOSE" != no ] && echo "Calculating module dependencies ..." -depmod -Ae - -[ "$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 " - modprobe $module $args -done -[ "$VERBOSE" != no ] && echo - -exit 0
\ No newline at end of file diff --git a/modutils/files/mtx-1/modules b/modutils/files/mtx-1/modules deleted file mode 100644 index 3eb719acf9..0000000000 --- a/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/modutils/files/omap1610h2/modules b/modutils/files/omap1610h2/modules deleted file mode 100644 index e69de29bb2..0000000000 --- a/modutils/files/omap1610h2/modules +++ /dev/null diff --git a/modutils/files/omap1610h2/modules.conf b/modutils/files/omap1610h2/modules.conf deleted file mode 100644 index e69de29bb2..0000000000 --- a/modutils/files/omap1610h2/modules.conf +++ /dev/null diff --git a/modutils/files/poodle/modules b/modutils/files/poodle/modules deleted file mode 100644 index 28d14f6584..0000000000 --- a/modutils/files/poodle/modules +++ /dev/null @@ -1,3 +0,0 @@ -usbdcore -net_fd -pxa_bi diff --git a/modutils/files/poodle/modules.conf b/modutils/files/poodle/modules.conf deleted file mode 100644 index e69de29bb2..0000000000 --- a/modutils/files/poodle/modules.conf +++ /dev/null diff --git a/modutils/files/program_prefix.patch b/modutils/files/program_prefix.patch deleted file mode 100644 index 2927a23a22..0000000000 --- a/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/modutils/files/ramses/modules b/modutils/files/ramses/modules deleted file mode 100644 index e228d2e8a8..0000000000 --- a/modutils/files/ramses/modules +++ /dev/null @@ -1 +0,0 @@ -sysctl diff --git a/modutils/files/ramses/modules-ramses b/modutils/files/ramses/modules-ramses deleted file mode 100644 index e228d2e8a8..0000000000 --- a/modutils/files/ramses/modules-ramses +++ /dev/null @@ -1 +0,0 @@ -sysctl diff --git a/modutils/files/ramses/modules.conf b/modutils/files/ramses/modules.conf deleted file mode 100644 index e69de29bb2..0000000000 --- a/modutils/files/ramses/modules.conf +++ /dev/null diff --git a/modutils/files/ramses/modutils.sh b/modutils/files/ramses/modutils.sh deleted file mode 100644 index 378915c270..0000000000 --- a/modutils/files/ramses/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/modutils/files/tosa/modules b/modutils/files/tosa/modules deleted file mode 100644 index 754cc7f606..0000000000 --- a/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/modutils/files/tosa/modules.conf b/modutils/files/tosa/modules.conf deleted file mode 100644 index e69de29bb2..0000000000 --- a/modutils/files/tosa/modules.conf +++ /dev/null |