From b2f192faabe412adce79534e22efe9fb69ee40e2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 21 Jul 2006 10:10:31 +0000 Subject: Rename /openembedded/ -> /meta/ git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- openembedded/packages/modutils/files/armeb.patch | 14 ---- .../packages/modutils/files/configure.patch | 33 -------- openembedded/packages/modutils/files/gcc4.patch | 66 ---------------- .../packages/modutils/files/ipaq-pxa-2.6/modules | 18 ----- .../modutils/files/ipaq-pxa-2.6/modules.conf | 1 - openembedded/packages/modutils/files/lex.l.diff | 33 -------- openembedded/packages/modutils/files/mnci/modules | 1 - .../packages/modutils/files/mnci/modules-ramses | 1 - .../packages/modutils/files/mnci/modules.conf | 20 ----- .../packages/modutils/files/mnci/modutils.sh | 10 --- openembedded/packages/modutils/files/modules | 0 openembedded/packages/modutils/files/modules.conf | 0 .../packages/modutils/files/modutils-notest.patch | 14 ---- openembedded/packages/modutils/files/modutils.sh | 27 ------- openembedded/packages/modutils/files/mtx-1/modules | 3 - .../packages/modutils/files/omap1610h2/modules | 0 .../modutils/files/omap1610h2/modules.conf | 0 .../packages/modutils/files/poodle/modules | 3 - .../packages/modutils/files/poodle/modules.conf | 4 - .../packages/modutils/files/program_prefix.patch | 69 ----------------- openembedded/packages/modutils/files/tosa/modules | 4 - .../packages/modutils/files/tosa/modules.conf | 4 - openembedded/packages/modutils/files/wrt54/modules | 4 - .../packages/modutils/modutils-collateral.bb | 16 ---- .../packages/modutils/modutils-cross/module.h.diff | 33 -------- .../packages/modutils/modutils-cross_2.4.27.bb | 27 ------- .../packages/modutils/modutils-initscripts.bb | 18 ----- openembedded/packages/modutils/modutils_2.4.27.bb | 88 ---------------------- 28 files changed, 511 deletions(-) delete mode 100644 openembedded/packages/modutils/files/armeb.patch delete mode 100644 openembedded/packages/modutils/files/configure.patch delete mode 100644 openembedded/packages/modutils/files/gcc4.patch delete mode 100644 openembedded/packages/modutils/files/ipaq-pxa-2.6/modules delete mode 100644 openembedded/packages/modutils/files/ipaq-pxa-2.6/modules.conf delete mode 100644 openembedded/packages/modutils/files/lex.l.diff delete mode 100644 openembedded/packages/modutils/files/mnci/modules delete mode 100644 openembedded/packages/modutils/files/mnci/modules-ramses delete mode 100644 openembedded/packages/modutils/files/mnci/modules.conf delete mode 100755 openembedded/packages/modutils/files/mnci/modutils.sh delete mode 100644 openembedded/packages/modutils/files/modules delete mode 100644 openembedded/packages/modutils/files/modules.conf delete mode 100644 openembedded/packages/modutils/files/modutils-notest.patch delete mode 100755 openembedded/packages/modutils/files/modutils.sh delete mode 100644 openembedded/packages/modutils/files/mtx-1/modules delete mode 100644 openembedded/packages/modutils/files/omap1610h2/modules delete mode 100644 openembedded/packages/modutils/files/omap1610h2/modules.conf delete mode 100644 openembedded/packages/modutils/files/poodle/modules delete mode 100644 openembedded/packages/modutils/files/poodle/modules.conf delete mode 100644 openembedded/packages/modutils/files/program_prefix.patch delete mode 100644 openembedded/packages/modutils/files/tosa/modules delete mode 100644 openembedded/packages/modutils/files/tosa/modules.conf delete mode 100644 openembedded/packages/modutils/files/wrt54/modules delete mode 100644 openembedded/packages/modutils/modutils-collateral.bb delete mode 100644 openembedded/packages/modutils/modutils-cross/module.h.diff delete mode 100644 openembedded/packages/modutils/modutils-cross_2.4.27.bb delete mode 100644 openembedded/packages/modutils/modutils-initscripts.bb delete mode 100644 openembedded/packages/modutils/modutils_2.4.27.bb (limited to 'openembedded/packages/modutils') 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 diff --git a/openembedded/packages/modutils/files/modules.conf b/openembedded/packages/modutils/files/modules.conf deleted file mode 100644 index e69de29bb..000000000 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 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 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 diff --git a/openembedded/packages/modutils/modutils-collateral.bb b/openembedded/packages/modutils/modutils-collateral.bb deleted file mode 100644 index 5c502021f..000000000 --- a/openembedded/packages/modutils/modutils-collateral.bb +++ /dev/null @@ -1,16 +0,0 @@ -SECTION = "base" -DESCRIPTION = "modutils configuration files" -PR = "r2" -LICENSE = "MIT" - -SRC_URI = "file://modules \ - file://modules.conf" - -do_compile () { -} - -do_install () { - install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/modules ${D}${sysconfdir}/modules - install -m 0644 ${WORKDIR}/modules.conf ${D}${sysconfdir}/modules.conf -} diff --git a/openembedded/packages/modutils/modutils-cross/module.h.diff b/openembedded/packages/modutils/modutils-cross/module.h.diff deleted file mode 100644 index 077baaf3e..000000000 --- a/openembedded/packages/modutils/modutils-cross/module.h.diff +++ /dev/null @@ -1,33 +0,0 @@ -diff -urN modutils-2.4.27.orig/include/module.h modutils-2.4.27/include/module.h ---- modutils-2.4.27.orig/include/module.h 2003-01-27 11:22:02.000000000 -0500 -+++ modutils-2.4.27/include/module.h 2004-08-23 19:52:34.756772712 -0400 -@@ -88,6 +88,20 @@ - /* For sizeof() which are related to the module platform and not to the - environment isnmod is running in, use sizeof_xx instead of sizeof(xx). */ - -+/* Additional test for OE, set tgt_blah correct for the target arch, *not* the -+ native arch. If int isn't 32bit on the native machine we're in trouble. */ -+ -+#ifdef ARCH_arm -+#define tgt_sizeof_char sizeof(char) -+#define tgt_sizeof_short sizeof(short) -+#define tgt_sizeof_int sizeof(int) -+#define tgt_sizeof_long 4 -+#define tgt_sizeof_char_p 4 -+#define tgt_sizeof_void_p 4 -+#define tgt_long int -+#define tgt_long_fmt "l" -+#define tgt_strtoul strtoul -+#else - #define tgt_sizeof_char sizeof(char) - #define tgt_sizeof_short sizeof(short) - #define tgt_sizeof_int sizeof(int) -@@ -97,7 +111,7 @@ - #define tgt_long long - #define tgt_long_fmt "l" - #define tgt_strtoul strtoul -- -+#endif - /* This assumes that long long on a 32 bit system is equivalent to long on the - * equivalent 64 bit system. Also that void and char pointers are 8 bytes on - * all 64 bit systems. Add per system tweaks if it ever becomes necessary. diff --git a/openembedded/packages/modutils/modutils-cross_2.4.27.bb b/openembedded/packages/modutils/modutils-cross_2.4.27.bb deleted file mode 100644 index 834f13adb..000000000 --- a/openembedded/packages/modutils/modutils-cross_2.4.27.bb +++ /dev/null @@ -1,27 +0,0 @@ -SECTION = "base" -include modutils_${PV}.bb -PR = "r8" -inherit cross -S = "${WORKDIR}/modutils-${PV}" -DEPENDS = "" -PACKAGES = "" -PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.4" -DEFAULT_PREFERENCE = "1" - -SRC_URI += "file://modutils-cross/module.h.diff;patch=1" - -sbindir = "${prefix}/bin" - -EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}" - -CFLAGS_prepend_mipsel = "-D__MIPSEL__" -CFLAGS_prepend_mipseb = "-D__MIPSEB__" - -do_stage () { - oe_runmake install - mv ${bindir}/${TARGET_PREFIX}depmod ${bindir}/${TARGET_PREFIX}depmod-2.4 -} - -do_install () { - : -} diff --git a/openembedded/packages/modutils/modutils-initscripts.bb b/openembedded/packages/modutils/modutils-initscripts.bb deleted file mode 100644 index bf51ca87f..000000000 --- a/openembedded/packages/modutils/modutils-initscripts.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "base" -DESCRIPTION = "modutils configuration files" -LICENSE = "PD" -SRC_URI = "file://modutils.sh" -PR = "r2" - -INITSCRIPT_NAME = "modutils.sh" -INITSCRIPT_PARAMS = "start 20 S ." - -inherit update-rc.d - -do_compile () { -} - -do_install () { - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/modutils.sh ${D}${sysconfdir}/init.d/ -} diff --git a/openembedded/packages/modutils/modutils_2.4.27.bb b/openembedded/packages/modutils/modutils_2.4.27.bb deleted file mode 100644 index 56420f7de..000000000 --- a/openembedded/packages/modutils/modutils_2.4.27.bb +++ /dev/null @@ -1,88 +0,0 @@ -SECTION = "base" -DESCRIPTION = "These utilities are intended to make a Linux modular kernel \ -manageable for all users, administrators and distribution maintainers." -LICENSE = "GPLv2" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/files" -PR = "r7" - -SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2 \ - file://lex.l.diff;patch=1 \ - file://modutils-notest.patch;patch=1 \ - file://configure.patch;patch=1 \ - file://program_prefix.patch;patch=1 \ - file://armeb.patch;patch=1 \ - file://gcc4.patch;patch=1" - -inherit autotools - -# modutils go in /sbin -sbindir = "/sbin" -EXTRA_OECONF = "--disable-strip" -export BUILDCC = "${BUILD_CC}" -export BUILDCFLAGS = "${BUILD_CFLAGS}" - -do_install () { - oe_runmake 'DESTDIR=${D}' install - install -d ${D}${sysconfdir} - rm ${D}${base_sbindir}/lsmod - install -d ${D}${base_bindir}/ - ln -s ../sbin/insmod ${D}${base_bindir}/lsmod - for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do mv ${D}/$f ${D}/$f.24 - done -} - -pkg_postinst_modutils () { -#!/bin/sh -for f in sbin/insmod sbin/modprobe sbin/rmmod bin/lsmod; do - bn=`basename $f` - update-alternatives --install /$f $bn /$f.24 10 -done -if test -n "$D"; then - D="-r $D" - if test -n "`which ${TARGET_PREFIX}depmod-2.4`"; then - for kerneldir in `ls -p ${IMAGE_ROOTFS}/lib/modules|grep /`; do - kernelver=`basename $kerneldir` - ${TARGET_PREFIX}depmod-2.4 -a -b ${IMAGE_ROOTFS} -C ${IMAGE_ROOTFS}/${sysconfdir}/modules.conf -r $kernelver - done - fi -fi -update-rc.d $D modutils.sh start 20 S . -} - -pkg_prerm_modutils () { -#!/bin/sh -for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do -bn=`basename $f` - update-alternatives --remove $bn /$f.24 -done -if test -n "$D"; then - D="-r $D" -fi -update-rc.d $D modutils.sh remove -} - -pkg_postinst_modutils-depmod() { -#!/bin/sh -update-alternatives --install /sbin/depmod depmod /sbin/depmod.24 10 -} - -pkg_postinst_modutils-modinfo() { -#!/bin/sh -update-alternatives --install /sbin/modinfo modinfo /sbin/modinfo.24 10 -} - -pkg_prerm_modutils-depmod() { -#!/bin/sh -update-alternatives --remove depmod /sbin/depmod.24 -} - -pkg_prerm_modutils-modinfo() { -#!/bin/sh -update-alternatives --remove modinfo /sbin/modinfo.24 -} - -PACKAGES = "modutils-depmod modutils-modinfo modutils-doc modutils" - -FILES_modutils-depmod = "sbin/depmod.24" -FILES_modutils-modinfo = "sbin/modinfo.24" -RDEPENDS_modutils = "modutils-depmod" -- cgit v1.2.3