summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/feed-browser/index.php26
-rw-r--r--packages/initscripts/initscripts-slugos_1.0.bb4
-rw-r--r--packages/qemu/qemu-native.inc13
-rw-r--r--packages/qemu/qemu-native_0.7.0.bb3
-rw-r--r--packages/qemu/qemu-native_0.8.0.bb3
-rw-r--r--packages/qemu/qemu-native_0.8.1.bb2
-rw-r--r--packages/qemu/qemu-native_0.8.2.bb3
-rw-r--r--packages/qemu/qemu-native_cvs.bb13
-rw-r--r--packages/samba/samba-3.0.23c/.mtn2git_empty0
-rw-r--r--packages/samba/samba-3.0.23c/configure.patch170
-rw-r--r--packages/samba/samba.inc1
-rw-r--r--packages/samba/samba_3.0.23c.bb53
-rw-r--r--packages/zd1211/files/.mtn2git_empty0
-rw-r--r--packages/zd1211/files/makefile-unslung.patch (renamed from packages/zd1211/zd1211-r83/makefile-unslung.patch)0
-rw-r--r--packages/zd1211/files/unslung-iwpriv-hack.patch (renamed from packages/zd1211/zd1211-r83/unslung-iwpriv-hack.patch)0
-rw-r--r--packages/zd1211/files/unslung-writel-logging.patch (renamed from packages/zd1211/zd1211-r83/unslung-writel-logging.patch)0
-rw-r--r--packages/zd1211/zd1211_r59.bb35
-rw-r--r--packages/zd1211/zd1211_r67.bb35
-rw-r--r--packages/zd1211/zd1211_r74.bb38
19 files changed, 265 insertions, 134 deletions
diff --git a/contrib/feed-browser/index.php b/contrib/feed-browser/index.php
index df7282db7d..1c902ac66e 100644
--- a/contrib/feed-browser/index.php
+++ b/contrib/feed-browser/index.php
@@ -35,6 +35,13 @@ require_once 'includes/functions.inc';
check_database();
+$name = '';
+
+if(isset($_GET['name']))
+{
+ $name = $_GET['name'];
+}
+
$action = '';
if(isset($_GET['action']))
@@ -48,10 +55,8 @@ switch($action)
$ipkgoutput = pkgdetails ($_GET['pnm']);
break;
- case "package":
- $edit = $_POST['edit'];
- $searchword = $edit['searchword'];
- $ipkgoutput = searchpkg ("%$searchword%");
+ case "search":
+ $ipkgoutput = searchpkg ("%{$name}%");
break;
case "section":
@@ -78,7 +83,18 @@ switch($action)
<style type="text/css" media="all">@import "css/feed.css";</style>
</head>
<body >
- <div id="right"><?php echo searchletter(); echo $ipkgoutput; ?></div>
+ <div id="right">
+ <?php echo searchletter(); ?>
+ <form action="" method="get">
+ <fieldset>
+ <label for="name">Package name</label>
+ <input type="text" name="name" value="<?php echo $name; ?>" />
+ <input type="hidden" name="action" value="search" />
+ <input type="submit" value="Search" />
+ </fieldset>
+ </form>
+ <?php echo $ipkgoutput; ?>
+ </div>
<div id="left">
<h1>Sections list</h1>
<?php echo sectionslist(); ?>
diff --git a/packages/initscripts/initscripts-slugos_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb
index f64e11dfe4..4fb6926490 100644
--- a/packages/initscripts/initscripts-slugos_1.0.bb
+++ b/packages/initscripts/initscripts-slugos_1.0.bb
@@ -11,7 +11,7 @@ RCONFLICTS = "initscripts"
# All other standard definitions inherited from initscripts
# Except the PR which is hacked here. The format used is
# a suffix
-PR := "${PR}.10"
+PR := "${PR}.11"
FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
@@ -64,7 +64,7 @@ do_install_append() {
# udev will run at S04 if installed
rm ${D}${sysconfdir}/rcS.d/S03sysfs
rm ${D}${sysconfdir}/rcS.d/S38devpts.sh
- rm ${D}${sysconfdir}/rcS.d/S06alignment
+ rm -f ${D}${sysconfdir}/rcS.d/S06alignment
rm ${D}${sysconfdir}/rcS.d/S37populate-volatile.sh
rm ${D}${sysconfdir}/rc0.d/S25save-rtc.sh
rm ${D}${sysconfdir}/rc6.d/S25save-rtc.sh
diff --git a/packages/qemu/qemu-native.inc b/packages/qemu/qemu-native.inc
new file mode 100644
index 0000000000..049aa675f8
--- /dev/null
+++ b/packages/qemu/qemu-native.inc
@@ -0,0 +1,13 @@
+FILESPATH =. "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qemu-${PV}:"
+prefix = "${STAGING_DIR}/${BUILD_SYS}"
+
+python __anonymous() {
+ from bb import which, data
+
+ path = data.getVar('PATH', d)
+ if len(which(path, 'gcc-3.4')) != 0:
+ data.setVar('EXTRA_OECONF', " --cc=gcc-3.4", d)
+ elif len(which(path, 'gcc-3.3')) != 0:
+ data.setVar('EXTRA_OECONF', " --cc=gcc-3.3", d)
+
+}
diff --git a/packages/qemu/qemu-native_0.7.0.bb b/packages/qemu/qemu-native_0.7.0.bb
index acb5543a90..bad8bd7bf4 100644
--- a/packages/qemu/qemu-native_0.7.0.bb
+++ b/packages/qemu/qemu-native_0.7.0.bb
@@ -1,5 +1,4 @@
require qemu_${PV}.bb
inherit native
S = "${WORKDIR}/qemu-${PV}"
-prefix = "${STAGING_DIR}/${BUILD_SYS}"
-
+require qemu-native.inc
diff --git a/packages/qemu/qemu-native_0.8.0.bb b/packages/qemu/qemu-native_0.8.0.bb
index 2b143bdc0f..9613f7d614 100644
--- a/packages/qemu/qemu-native_0.8.0.bb
+++ b/packages/qemu/qemu-native_0.8.0.bb
@@ -1,6 +1,5 @@
require qemu_${PV}.bb
inherit native
-FILESPATH =. "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qemu-${PV}:"
+require qemu-native.inc
S = "${WORKDIR}/qemu-${PV}"
-prefix = "${STAGING_DIR}/${BUILD_SYS}"
diff --git a/packages/qemu/qemu-native_0.8.1.bb b/packages/qemu/qemu-native_0.8.1.bb
index acb5543a90..9613f7d614 100644
--- a/packages/qemu/qemu-native_0.8.1.bb
+++ b/packages/qemu/qemu-native_0.8.1.bb
@@ -1,5 +1,5 @@
require qemu_${PV}.bb
inherit native
+require qemu-native.inc
S = "${WORKDIR}/qemu-${PV}"
-prefix = "${STAGING_DIR}/${BUILD_SYS}"
diff --git a/packages/qemu/qemu-native_0.8.2.bb b/packages/qemu/qemu-native_0.8.2.bb
index e064723e4e..c0b1cd4ee3 100644
--- a/packages/qemu/qemu-native_0.8.2.bb
+++ b/packages/qemu/qemu-native_0.8.2.bb
@@ -1,7 +1,6 @@
require qemu_${PV}.bb
EXTRA_OECONF = ""
inherit native
-FILESPATH =. "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qemu-${PV}:"
+require qemu-native.inc
S = "${WORKDIR}/qemu-${PV}"
-prefix = "${STAGING_DIR}/${BUILD_SYS}"
diff --git a/packages/qemu/qemu-native_cvs.bb b/packages/qemu/qemu-native_cvs.bb
index 49d6c17b64..639f9a6a7c 100644
--- a/packages/qemu/qemu-native_cvs.bb
+++ b/packages/qemu/qemu-native_cvs.bb
@@ -1,14 +1,3 @@
require qemu_cvs.bb
inherit native
-prefix = "${STAGING_DIR}/${BUILD_SYS}"
-
-python __anonymous() {
- from bb import which, data
-
- path = data.getVar('PATH', d)
- if len(which(path, 'gcc-3.4')) != 0:
- data.setVar('EXTRA_OECONF', " --cc=gcc-3.4", d)
- elif len(which(path, 'gcc-3.3')) != 0:
- data.setVar('EXTRA_OECONF', " --cc=gcc-3.3", d)
-
-}
+require qemu-native.inc
diff --git a/packages/samba/samba-3.0.23c/.mtn2git_empty b/packages/samba/samba-3.0.23c/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/samba/samba-3.0.23c/.mtn2git_empty
diff --git a/packages/samba/samba-3.0.23c/configure.patch b/packages/samba/samba-3.0.23c/configure.patch
new file mode 100644
index 0000000000..0366efb314
--- /dev/null
+++ b/packages/samba/samba-3.0.23c/configure.patch
@@ -0,0 +1,170 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- source/configure.in~configure 2003-12-14 22:36:25.000000000 -0500
++++ source/configure.in 2004-01-26 14:33:15.000000000 -0500
+@@ -959,7 +959,7 @@
+ #endif
+ exit(0);
+ }
+-], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no])
++], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no], [linux_getgrouplist_ok=cross])
+ if test x"$linux_getgrouplist_ok" = x"yes"; then
+ AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist])
+ fi
+--- source/aclocal.m4~configure 2004-01-26 14:33:15.000000000 -0500
++++ source/aclocal.m4 2004-01-26 17:34:28.000000000 -0500
+@@ -2,7 +2,7 @@
+ dnl if the cache file is inconsistent with the current host,
+ dnl target and build system types, execute CMD or print a default
+ dnl error message.
+-AC_DEFUN(AC_VALIDATE_CACHE_SYSTEM_TYPE, [
++AC_DEFUN([AC_VALIDATE_CACHE_SYSTEM_TYPE], [
+ AC_REQUIRE([AC_CANONICAL_SYSTEM])
+ AC_MSG_CHECKING([config.cache system type])
+ if { test x"${ac_cv_host_system_type+set}" = x"set" &&
+@@ -24,7 +24,7 @@
+
+
+ dnl test whether dirent has a d_off member
+-AC_DEFUN(AC_DIRENT_D_OFF,
++AC_DEFUN([AC_DIRENT_D_OFF],
+ [AC_CACHE_CHECK([for d_off in dirent], ac_cv_dirent_d_off,
+ [AC_TRY_COMPILE([
+ #include <unistd.h>
+@@ -38,7 +38,7 @@
+
+ dnl Mark specified module as shared
+ dnl SMB_MODULE(name,static_files,shared_files,subsystem,whatif-static,whatif-shared)
+-AC_DEFUN(SMB_MODULE,
++AC_DEFUN([SMB_MODULE],
+ [
+ AC_MSG_CHECKING([how to build $1])
+ if test "$[MODULE_][$1]"; then
+@@ -68,7 +68,7 @@
+ fi
+ ])
+
+-AC_DEFUN(SMB_SUBSYSTEM,
++AC_DEFUN([SMB_SUBSYSTEM],
+ [
+ AC_SUBST($1_STATIC)
+ AC_SUBST($1_MODULES)
+@@ -77,7 +77,7 @@
+ ])
+
+ dnl AC_PROG_CC_FLAG(flag)
+-AC_DEFUN(AC_PROG_CC_FLAG,
++AC_DEFUN([AC_PROG_CC_FLAG],
+ [AC_CACHE_CHECK(whether ${CC-cc} accepts -$1, ac_cv_prog_cc_$1,
+ [echo 'void f(){}' > conftest.c
+ if test -z "`${CC-cc} -$1 -c conftest.c 2>&1`"; then
+@@ -91,7 +91,7 @@
+ dnl see if a declaration exists for a function or variable
+ dnl defines HAVE_function_DECL if it exists
+ dnl AC_HAVE_DECL(var, includes)
+-AC_DEFUN(AC_HAVE_DECL,
++AC_DEFUN([AC_HAVE_DECL],
+ [
+ AC_CACHE_CHECK([for $1 declaration],ac_cv_have_$1_decl,[
+ AC_TRY_COMPILE([$2],[int i = (int)$1],
+@@ -223,7 +223,7 @@
+
+ dnl Define an AC_DEFINE with ifndef guard.
+ dnl AC_N_DEFINE(VARIABLE [, VALUE])
+-define(AC_N_DEFINE,
++define([AC_N_DEFINE],
+ [cat >> confdefs.h <<\EOF
+ [#ifndef] $1
+ [#define] $1 ifelse($#, 2, [$2], $#, 3, [$2], 1)
+@@ -233,14 +233,14 @@
+
+ dnl Add an #include
+ dnl AC_ADD_INCLUDE(VARIABLE)
+-define(AC_ADD_INCLUDE,
++define([AC_ADD_INCLUDE],
+ [cat >> confdefs.h <<\EOF
+ [#include] $1
+ EOF
+ ])
+
+ dnl Copied from libtool.m4
+-AC_DEFUN(AC_PROG_LD_GNU,
++AC_DEFUN([AC_PROG_LD_GNU],
+ [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
+ [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+ if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+@@ -259,7 +259,7 @@
+ dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+ dnl Test for XML, and define XML_CFLAGS and XML_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_XML2,[
++AC_DEFUN([AM_PATH_XML2],[
+ AC_ARG_WITH(xml-prefix,
+ [ --with-xml-prefix=PFX Prefix where libxml is installed (optional)],
+ xml_config_prefix="$withval", xml_config_prefix="")
+@@ -443,7 +443,7 @@
+ dnl AM_PATH_MYSQL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+ dnl Test for MYSQL, and define MYSQL_CFLAGS and MYSQL_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_MYSQL,
++AC_DEFUN([AM_PATH_MYSQL],
+ [dnl
+ dnl Get the cflags and libraries from the mysql_config script
+ dnl
+@@ -485,7 +485,7 @@
+ ])
+
+ dnl Removes -I/usr/include/? from given variable
+-AC_DEFUN(CFLAGS_REMOVE_USR_INCLUDE,[
++AC_DEFUN([CFLAGS_REMOVE_USR_INCLUDE],[
+ ac_new_flags=""
+ for i in [$]$1; do
+ case [$]i in
+@@ -497,7 +497,7 @@
+ ])
+
+ dnl Removes -L/usr/lib/? from given variable
+-AC_DEFUN(LIB_REMOVE_USR_LIB,[
++AC_DEFUN([LIB_REMOVE_USR_LIB],[
+ ac_new_flags=""
+ for i in [$]$1; do
+ case [$]i in
+@@ -510,7 +510,7 @@
+
+ dnl From Bruno Haible.
+
+-AC_DEFUN(jm_ICONV,
++AC_DEFUN([jm_ICONV],
+ [
+ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+ dnl those with the standalone portable libiconv installed).
+@@ -607,7 +607,7 @@
+ fi
+ ])
+
+-AC_DEFUN(rjs_CHARSET,[
++AC_DEFUN([rjs_CHARSET],[
+ dnl Find out if we can convert from $1 to UCS2-LE
+ AC_MSG_CHECKING([can we convert from $1 to UCS2-LE?])
+ AC_TRY_RUN([
+@@ -625,7 +625,7 @@
+
+ dnl CFLAGS_ADD_DIR(CFLAGS, $INCDIR)
+ dnl This function doesn't add -I/usr/include into CFLAGS
+-AC_DEFUN(CFLAGS_ADD_DIR,[
++AC_DEFUN([CFLAGS_ADD_DIR],[
+ if test "$2" != "/usr/include" ; then
+ $1="$$1 -I$2"
+ fi
+@@ -633,7 +633,7 @@
+
+ dnl LIB_ADD_DIR(LDFLAGS, $LIBDIR)
+ dnl This function doesn't add -L/usr/lib into LDFLAGS
+-AC_DEFUN(LIB_ADD_DIR,[
++AC_DEFUN([LIB_ADD_DIR],[
+ if test "$2" != "/usr/lib" ; then
+ $1="$$1 -L$2"
+ fi
diff --git a/packages/samba/samba.inc b/packages/samba/samba.inc
index 1f38f131e2..b5995c1b2e 100644
--- a/packages/samba/samba.inc
+++ b/packages/samba/samba.inc
@@ -1,6 +1,7 @@
SECTION = "console/network"
DEPENDS = readline
LICENSE = "GPL"
+MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc"
FILES_cifs = "${bindir}/mount.cifs"
diff --git a/packages/samba/samba_3.0.23c.bb b/packages/samba/samba_3.0.23c.bb
new file mode 100644
index 0000000000..4425449345
--- /dev/null
+++ b/packages/samba/samba_3.0.23c.bb
@@ -0,0 +1,53 @@
+PR = "r0"
+
+SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
+ file://configure.patch;patch=1 \
+ file://cifs.patch;patch=1 \
+ file://config-lfs.patch;patch=1 \
+ file://init \
+ file://quota.patch;patch=1;pnum=0 \
+ "
+S = ${WORKDIR}/${P}/source
+
+include samba.inc
+inherit update-rc.d
+
+INITSCRIPT_NAME = "samba"
+# No dependencies, goes in at level 20 (NOTE: take care with the
+# level, later levels put the shutdown later too - see the links
+# in rc6.d, the shutdown must precede network shutdown).
+INITSCRIPT_PARAMS = "defaults"
+CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf"
+
+# The file system settings --foodir=dirfoo and overridden unconditionally
+# in the samba config by --with-foodir=dirfoo - even if the --with is not
+# specified! Fix that here. Set the privatedir to /etc/samba/private.
+EXTRA_OECONF += "\
+ samba_cv_struct_timespec=yes \
+ --with-configdir=${sysconfdir}/samba \
+ --with-privatedir=${sysconfdir}/samba/private \
+ --with-lockdir=${localstatedir}/lock \
+ --with-piddir=${localstatedir}/run \
+ --with-logfilebase=${localstatedir}/log \
+ --with-libdir=${libdir} \
+ --with-mandir=${mandir} \
+ --with-swatdir=${datadir}/swat \
+ "
+
+do_install_append() {
+ install -d "${D}${localstatedir}/log"
+ rm -f ${D}/sbin/mount.smbfs
+ ln -sf smbmount ${D}${sbindir}/mount.smbfs
+ install -d "${D}${sysconfdir}/init.d"
+ install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/samba
+ install -d "${D}${sysconfdir}/samba"
+ install -c -m 644 ../examples/smb.conf.default ${D}${sysconfdir}/samba/smb.conf
+}
+
+PACKAGES =+ "swat"
+
+FILES_swat = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
+FILES_${PN} += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat ${libdir}/auth/*.so"
+#
+# bug fix for samba.inc:
+FILES_cifs-doc = "${mandir}/man8/mount.cifs.8"
diff --git a/packages/zd1211/files/.mtn2git_empty b/packages/zd1211/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/zd1211/files/.mtn2git_empty
diff --git a/packages/zd1211/zd1211-r83/makefile-unslung.patch b/packages/zd1211/files/makefile-unslung.patch
index 4edcbb7a9d..4edcbb7a9d 100644
--- a/packages/zd1211/zd1211-r83/makefile-unslung.patch
+++ b/packages/zd1211/files/makefile-unslung.patch
diff --git a/packages/zd1211/zd1211-r83/unslung-iwpriv-hack.patch b/packages/zd1211/files/unslung-iwpriv-hack.patch
index 64f3806140..64f3806140 100644
--- a/packages/zd1211/zd1211-r83/unslung-iwpriv-hack.patch
+++ b/packages/zd1211/files/unslung-iwpriv-hack.patch
diff --git a/packages/zd1211/zd1211-r83/unslung-writel-logging.patch b/packages/zd1211/files/unslung-writel-logging.patch
index 00d54d7d68..00d54d7d68 100644
--- a/packages/zd1211/zd1211-r83/unslung-writel-logging.patch
+++ b/packages/zd1211/files/unslung-writel-logging.patch
diff --git a/packages/zd1211/zd1211_r59.bb b/packages/zd1211/zd1211_r59.bb
deleted file mode 100644
index 2ab0f2c5b2..0000000000
--- a/packages/zd1211/zd1211_r59.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles"
-PRIORITY = "optional"
-SECTION = "kernel/modules"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
-LICENSE = "GPL"
-PR = "r3"
-RDEPENDS = "wireless-tools"
-
-SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
- file://makefile.patch;patch=1 \
- "
-
-SRC_URI_unslung = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
- file://makefile-unslung.patch;patch=1 \
- "
-
-S = "${WORKDIR}/zd1211-driver-${PV}"
-
-inherit module
-
-do_compile () {
- unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP
- oe_runmake 'MODPATH=${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net' \
- 'KERNEL_SOURCE=${STAGING_KERNEL_DIR}' \
- 'KDIR=${STAGING_KERNEL_DIR}' \
- 'KERNEL_VERSION=${KERNEL_VERSION}' \
- 'CC=${KERNEL_CC}' \
- 'LD=${KERNEL_LD}'
-}
-
-do_install() {
- install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net
- install -m 0644 ${S}/zd1211*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net
-}
-
diff --git a/packages/zd1211/zd1211_r67.bb b/packages/zd1211/zd1211_r67.bb
deleted file mode 100644
index 2ab0f2c5b2..0000000000
--- a/packages/zd1211/zd1211_r67.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles"
-PRIORITY = "optional"
-SECTION = "kernel/modules"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
-LICENSE = "GPL"
-PR = "r3"
-RDEPENDS = "wireless-tools"
-
-SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
- file://makefile.patch;patch=1 \
- "
-
-SRC_URI_unslung = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
- file://makefile-unslung.patch;patch=1 \
- "
-
-S = "${WORKDIR}/zd1211-driver-${PV}"
-
-inherit module
-
-do_compile () {
- unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP
- oe_runmake 'MODPATH=${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net' \
- 'KERNEL_SOURCE=${STAGING_KERNEL_DIR}' \
- 'KDIR=${STAGING_KERNEL_DIR}' \
- 'KERNEL_VERSION=${KERNEL_VERSION}' \
- 'CC=${KERNEL_CC}' \
- 'LD=${KERNEL_LD}'
-}
-
-do_install() {
- install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net
- install -m 0644 ${S}/zd1211*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net
-}
-
diff --git a/packages/zd1211/zd1211_r74.bb b/packages/zd1211/zd1211_r74.bb
deleted file mode 100644
index bb23071835..0000000000
--- a/packages/zd1211/zd1211_r74.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles"
-PRIORITY = "optional"
-SECTION = "kernel/modules"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
-LICENSE = "GPL"
-PR = "r2"
-RDEPENDS = "wireless-tools"
-
-SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
- file://makefile.patch;patch=1 \
- file://zd1211-endian-fix.patch;patch=1 \
- "
-
-SRC_URI_unslung = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
- file://makefile-unslung.patch;patch=1 \
- file://zd1211-endian-fix.patch;patch=1 \
- file://unslung-iwpriv-hack.patch;patch=1 \
- file://unslung-writel-logging.patch;patch=1 \
- "
-
-S = "${WORKDIR}/zd1211-driver-${PV}"
-
-inherit module
-
-do_compile () {
- unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP
- oe_runmake 'MODPATH=${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net' \
- 'KERNEL_SOURCE=${STAGING_KERNEL_DIR}' \
- 'KDIR=${STAGING_KERNEL_DIR}' \
- 'KERNEL_VERSION=${KERNEL_VERSION}' \
- 'CC=${KERNEL_CC}' \
- 'LD=${KERNEL_LD}'
-}
-
-do_install() {
- install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net
- install -m 0644 ${S}/zd1211*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net
-}