Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/20 10:35:16-05:00 handhelds.org!kergoth
Add patcher-native to ixp425-eth's depends.  Really, it shouldnt be calling out patcher explicitly in its tasks at all, since the .bb shouldn't have any knowledge of how patches are applied.  That said, this should at least get it building again in the meantime.

2005/01/20 10:29:55-05:00 handhelds.org!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into handhelds.org:/home/kergoth/code/openembedded

2005/01/20 10:29:38-05:00 handhelds.org!kergoth
Kill off module-init-tools 3.1-pre5.  It didn't have the correct set of patches applied, and there's no reason to keep around the old version.

BKrev: 41efd0darfDOqFGMjJ_Ozpgb-p9H9g

diff --git a/packages/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb
index e69de29..6e852be 100644 (file)
--- a/packages/ixp425-eth/ixp425-eth_1.1.bb
+++ b/packages/ixp425-eth/ixp425-eth_1.1.bb
@@ -0,0 +1,47 @@
+DEPENDS = "ixp4xx-csr patcher-native"
+LICENSE = "GPL"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+SRC_URI = "http://www.intel.com/design/network/swsup/ixp400LinuxEthernetDriverPatch-1_1.zip \
+          file://makefile.patch;patch=1 \
+          file://ethhdr.patch;patch=1"
+S = "${WORKDIR}"
+
+COMPATIBLE_HOST = "^armeb-linux.*"
+
+inherit module
+
+do_ixp425_c_patch_fetch () {
+       if test ! -e ${DL_DIR}/ixp425_eth.c.patch.md5; then
+               cd ${DL_DIR}
+               wget -Oixp425_eth.c.patch http://sourceforge.net/tracker/download.php?group_id=74209\&atid=544386\&file_id=90129\&aid=970193
+               md5sum > ixp425_eth.c.patch.md5
+       fi
+}
+
+addtask ixp425_c_patch_fetch after do_fetch before do_unpack
+
+do_ixp425_c_patch_unpack () {
+       install -m 0644 ${DL_DIR}/ixp425_eth.c.patch ${WORKDIR}/
+}
+
+addtask ixp425_c_patch_unpack after do_unpack before do_pre_patch
+
+do_pre_patch () {
+       patcher -p 0 -i ixp425_eth_1_1_update_nf_bridge.patch
+       patcher -f -p 0 -i ixp425_eth.c.patch
+}
+
+addtask pre_patch before do_patch
+
+do_compile () {
+        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+       oe_runmake 'KDIR=${STAGING_KERNEL_DIR}' \
+                  'CC=${KERNEL_CC}' \
+                  'LD=${KERNEL_LD}' \
+                  'EXTRA_CFLAGS=-I${STAGING_INCDIR}/linux/ixp4xx-csr -I${STAGING_KERNEL_DIR}/include'
+}
+
+do_install () {
+       install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net
+       install -m 0644 ixp425_eth.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/
+}

diff --git a/packages/module-init-tools/module-init-tools-cross_3.1-pre5.bb b/packages/module-init-tools/module-init-tools-cross_3.1-pre5.bb
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/module-init-tools/module-init-tools_3.1-pre5.bb b/packages/module-init-tools/module-init-tools_3.1-pre5.bb
deleted file mode 100644 (file)
index ff8b4d5..0000000
--- a/packages/module-init-tools/module-init-tools_3.1-pre5.bb
+++ /dev/null
@@ -1,56 +0,0 @@
-LICENSE = GPL
-SECTION = "base"
-DESCRIPTION = "This package contains a set of programs for loading, inserting, and \
-removing kernel modules for Linux (versions 2.5.48 and above). It serves \
-the same function that the modutils package serves for Linux 2.4."
-PR = "r6"
-
-PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
-RDEPENDS_${PN} += "module-init-tools-depmod"
-
-FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
-FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
-
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
-       file://backwards.patch;patch=1"
-S = "${WORKDIR}/module-init-tools-${PV}"
-
-bindir = "/bin"
-sbindir = "/sbin"
-
-inherit autotools
-
-do_install() {
-       autotools_do_install
-       for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do
-               mv ${D}/$f ${D}/$f.26
-       done
-       install -d ${D}${mandir}
-       mv ${D}${prefix}/man/* ${D}${mandir}/
-}
-
-pkg_postinst_module-init-tools() {
-#!/bin/sh
-for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do
-bn=`basename $f`
-   update-alternatives --install /$f $bn /$f.26 20
-done
-}
-
-pkg_prerm_module-init-tools() {
-#!/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.26
-done
-}
-
-pkg_postinst_module-init-tools-depmod() {
-#!/bin/sh
-update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 20
-}
-
-pkg_prerm_module-init-tools() {
-#!/bin/sh
-update-alternatives --remove depmod /sbin/depmod.26
-}