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

28 files changed, 0 insertions, 377 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
diff --git a/modutils/modutils-collateral.bb b/modutils/modutils-collateral.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/modutils/modutils-collateral.bb
+++ /dev/null
diff --git a/modutils/modutils-cross/module.h.diff b/modutils/modutils-cross/module.h.diff
deleted file mode 100644
index 077baaf3eb..0000000000
--- a/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/modutils/modutils-cross_2.4.27.bb b/modutils/modutils-cross_2.4.27.bb
deleted file mode 100644
index 3ff2295117..0000000000
--- a/modutils/modutils-cross_2.4.27.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SECTION = "base"
-include modutils_${PV}.bb
-PR = "r5"
-inherit cross
-S = "${WORKDIR}/modutils-${PV}"
-DEPENDS = "patcher-native"
-PACKAGES = ""
-PROVIDES += "virtual/${TARGET_PREFIX}depmod"
-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
-}
-
-do_install () {
-        :
-}
diff --git a/modutils/modutils-initscripts.bb b/modutils/modutils-initscripts.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/modutils/modutils-initscripts.bb
+++ /dev/null
diff --git a/modutils/modutils_2.4.27.bb b/modutils/modutils_2.4.27.bb
deleted file mode 100644
index 17fbb2f44d..0000000000
--- a/modutils/modutils_2.4.27.bb
+++ /dev/null
@@ -1,87 +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 = "r6"
-
-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"
-
-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}/sbin/lsmod
-	install -d ${D}/bin/
-	ln -s ../sbin/insmod ${D}/bin/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`"; then
-		for kerneldir in `ls -p ${IMAGE_ROOTFS}/lib/modules|grep /`; do
-			kernelver=`basename $kerneldir`
-			${TARGET_PREFIX}depmod -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"