r82 - tarballs unstable/rt2400/debian unstable/rt2400/debian/patches
benh at alioth.debian.org
benh at alioth.debian.org
Sun Nov 11 23:48:10 UTC 2007
Author: benh
Date: 2007-11-11 23:48:09 +0000 (Sun, 11 Nov 2007)
New Revision: 82
Added:
tarballs/rt2400_1.2.2+cvs20070911.orig.tar.gz
unstable/rt2400/debian/patches/004_fix_mlme_queue_locking.diff
Removed:
unstable/rt2400/debian/RaConfig2400.1
unstable/rt2400/debian/RaConfig2400.xpm
unstable/rt2400/debian/patches/002_linux-headers.diff
unstable/rt2400/debian/patches/2.6.22.diff
unstable/rt2400/debian/rt2400.dirs
unstable/rt2400/debian/rt2400.docs
unstable/rt2400/debian/rt2400.manpages
unstable/rt2400/debian/rt2400.menu
Modified:
unstable/rt2400/debian/changelog
unstable/rt2400/debian/control
unstable/rt2400/debian/control.modules.in
unstable/rt2400/debian/patches/000_if_name.diff
unstable/rt2400/debian/patches/series
unstable/rt2400/debian/rules
Log:
New CVS snapshot.
This removes RaConfig2400 utility; therefore removed rt2400 binary package.
Added suggestion of rutilt package as a replacement for rt2400.
Added fix for race conditions in processing of queued work, as in rt2500.
Added: tarballs/rt2400_1.2.2+cvs20070911.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: tarballs/rt2400_1.2.2+cvs20070911.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: unstable/rt2400/debian/RaConfig2400.1
===================================================================
--- unstable/rt2400/debian/RaConfig2400.1 2007-11-11 23:01:04 UTC (rev 81)
+++ unstable/rt2400/debian/RaConfig2400.1 2007-11-11 23:48:09 UTC (rev 82)
@@ -1,35 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH RACONFIG2400 1 "May 17, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-RaConfig2400 \- A configuration tool for wireless RT2400 network cards
-.SH SYNOPSIS
-.B RaConfig2400
-.SH DESCRIPTION
-.B RaConfig2400
-is a simple X11 utility to configure your RT2400 wireless
-network card. It must be used with the corresponding RT2400 driver.
-.SH OPTIONS
-This software does not have any options.
-.SH SEE ALSO
-iwconfig(8).
-.SH AUTHOR
-.B RaConfig2400
-was written by Ralink Tech Inc.
-.br
-This manual page was written by Aurelien Jarno <aurel32 at debian.org>,
-for the Debian GNU/Linux system (but may be used by others).
Deleted: unstable/rt2400/debian/RaConfig2400.xpm
===================================================================
--- unstable/rt2400/debian/RaConfig2400.xpm 2007-11-11 23:01:04 UTC (rev 81)
+++ unstable/rt2400/debian/RaConfig2400.xpm 2007-11-11 23:48:09 UTC (rev 82)
@@ -1,43 +0,0 @@
-/* XPM */
-static char *pixmap[] = {
-/* width height ncols cpp */
-"32 32 5 2",
- /* Colors */
- "00 c #000000",
- "01 c #000080",
- "02 c #FF0000",
- "03 c #00FFFF",
- ".. s None c None",
- "................................................................",
- "............................030303030303030303..................",
- "........................03030303030303030303030303..............",
- "........................0303030303030303030303030303............",
- "..............................................03030303..........",
- "................................................030303..........",
- "................................................030303..........",
- "................................0303030303030303030303..........",
- "............................03030303030303030303030303..........",
- "........................030303030303030303030303030303..........",
- "..01010101010101010101010303030301..............030303..........",
- "......010101010101....0303030301010101..........030303..........",
- "........0101010101....030303..0101010101......03030303..........",
- "........0101010101....03030303..0101010101030303030303..........",
- "........0101010101......03030303010101010103030303030303........",
- "........0101010101........03030301010101010303..03030303030303..",
- "........0101010101............030101010101......................",
- "........0101010101..............01010101........................",
- "........0101010101............0101010101........................",
- "........0101010101..........01010101..............02............",
- "........010101010101010101010101..................0202..........",
- "........0101010101..010101010101..................0202..........",
- "........0101010101....010101010101................0202..........",
- "........0101010101......010101010101..............0202..........",
- "........0101010101........010101010101....0202020202020202020202",
- "........0101010101..........0101010101010202020202020202020202..",
- "........0101010101............010101010101........0202..........",
- "........0101010101..............010101010101......0202..........",
- "........0101010101................010101010101....0202..........",
- "......01010101010101................010101010101..0202..........",
- "..0101010101010101010101............010101010101010102..........",
- "................................................................",
-};
Modified: unstable/rt2400/debian/changelog
===================================================================
--- unstable/rt2400/debian/changelog 2007-11-11 23:01:04 UTC (rev 81)
+++ unstable/rt2400/debian/changelog 2007-11-11 23:48:09 UTC (rev 82)
@@ -1,3 +1,13 @@
+rt2400 (1.2.2+cvs20070911-1) unstable; urgency=low
+
+ * New CVS snapshot
+ - Removes RaConfig2400 utility and rt2400 binary package
+ * Added suggestion of rutilt package as a replacement for rt2400
+ * Fixed some race conditions in processing of queued work, with help
+ from Bryan Batten (004_fix_mlme_queue_locking.diff)
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 30 Sep 2007 19:56:47 +0100
+
rt2400 (1.2.2+cvs20070219-3) unstable; urgency=low
* Workaround linux-libc-dev bug by including linux/if.h before
@@ -192,7 +202,3 @@
* Initial Release (closes: bug#285757).
-- Aurelien Jarno <aurel32 at debian.org> Tue, 31 May 2005 07:23:11 +0200
-
-Local variables:
-mode: debian-changelog
-End:
Modified: unstable/rt2400/debian/control
===================================================================
--- unstable/rt2400/debian/control 2007-11-11 23:01:04 UTC (rev 81)
+++ unstable/rt2400/debian/control 2007-11-11 23:48:09 UTC (rev 82)
@@ -1,7 +1,7 @@
Source: rt2400
Section: net
Priority: extra
-Build-Depends: debhelper (>= 4.0), libqt3-mt-dev (>= 3.3.4-4), bzip2, quilt
+Build-Depends: debhelper (>= 4.0), bzip2, quilt
Maintainer: Debian Ralink packages maintainers <pkg-ralink-maintainers at lists.alioth.debian.org>
Uploaders: Aurelien Jarno <aurel32 at debian.org>, Ben Hutchings <ben at decadent.org.uk>, Romain Beauxis <toots at rastageeks.org>
Standards-Version: 3.7.2
@@ -24,16 +24,3 @@
the linux-headers for the linux-image packages from Debian). For
compile instructions look into /usr/share/doc/rt2400-source/README.Debian
or simply use the module-assistant utility.
-
-Package: rt2400
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: rt2400-base
-Recommends: wireless-tools
-Description: configuration tool for rt2400 wireless network driver
- This package provides an X11 application to configure wireless
- network cards controlled by the rt2400 driver.
- .
- This package is useless without the appropriate rt2400-modules-x.yy.zz package
- for the kernel you are running, except if you have built it by hand. You can
- create such a package from rt2400-source.
Modified: unstable/rt2400/debian/control.modules.in
===================================================================
--- unstable/rt2400/debian/control.modules.in 2007-11-11 23:01:04 UTC (rev 81)
+++ unstable/rt2400/debian/control.modules.in 2007-11-11 23:48:09 UTC (rev 82)
@@ -10,7 +10,7 @@
Architecture: any
Recommends: linux-image-_KVERS_, wireless-tools
Conflicts: rt2400-_KVERS_
-Suggests: rt2400
+Suggests: rutilt
Description: rt2400 wireless network driver
This package contains the rt2400 driver for Linux _KVERS_.
.
Modified: unstable/rt2400/debian/patches/000_if_name.diff
===================================================================
--- unstable/rt2400/debian/patches/000_if_name.diff 2007-11-11 23:01:04 UTC (rev 81)
+++ unstable/rt2400/debian/patches/000_if_name.diff 2007-11-11 23:48:09 UTC (rev 82)
@@ -1,15 +1,4 @@
---- Utility/raconfig.cpp
-+++ Utility/raconfig.cpp
-@@ -135,7 +135,7 @@
-
- for (i=0; i<8; i++)
- {
-- sprintf(name, "ra%d", i);
-+ sprintf(name, "eth%d", i);
- if(Check_DeviceName(socket_id, name, "RT2400PCI"))
- {
- count++;
---- Module/rtmp_main.c
+--- Module/rtmp_main.c.orig
+++ Module/rtmp_main.c
@@ -64,7 +64,7 @@
#endif
@@ -29,12 +18,14 @@
#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) */
// The driver version information
-@@ -265,7 +265,7 @@
+@@ -284,9 +284,8 @@
+ net_dev->set_mac_address = rt2400_set_mac_address;
+
// register_netdev() will call dev_alloc_name() for us
- // TODO: remove the following line to keep the default "eth%d" (see above)
+- // TODO: remove the following line to keep the default "eth%d" (see above)
if (ifname == NULL)
- strcpy(net_dev->name, "ra%d");
+ strcpy(net_dev->name, "eth%d");
- else
+ else
strncpy(net_dev->name, ifname, IFNAMSIZ);
Deleted: unstable/rt2400/debian/patches/002_linux-headers.diff
===================================================================
--- unstable/rt2400/debian/patches/002_linux-headers.diff 2007-11-11 23:01:04 UTC (rev 81)
+++ unstable/rt2400/debian/patches/002_linux-headers.diff 2007-11-11 23:48:09 UTC (rev 82)
@@ -1,40 +0,0 @@
---- Utility/rt_tool.cpp
-+++ Utility/rt_tool.cpp
-@@ -38,6 +38,7 @@
- #include <string.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
-+#include <linux/if.h>
- #include <linux/wireless.h>
-
- #include "rt_tool.h"
---- Utility/raconfigform.cpp
-+++ Utility/raconfigform.cpp
-@@ -71,6 +71,7 @@
- #include <string.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
-+#include <linux/if.h>
- #include <linux/wireless.h>
- #include <unistd.h>
- #include <sys/types.h>
---- Utility/addform.cpp
-+++ Utility/addform.cpp
-@@ -66,6 +66,7 @@
- #include <string.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
-+#include <linux/if.h>
- #include <linux/wireless.h>
- #include <ctype.h>
-
---- Utility/raconfig.cpp
-+++ Utility/raconfig.cpp
-@@ -46,6 +46,7 @@
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <unistd.h>
-+#include <linux/if.h>
- #include <linux/wireless.h>
- #include <errno.h>
- #include <fcntl.h>
Added: unstable/rt2400/debian/patches/004_fix_mlme_queue_locking.diff
===================================================================
--- unstable/rt2400/debian/patches/004_fix_mlme_queue_locking.diff (rev 0)
+++ unstable/rt2400/debian/patches/004_fix_mlme_queue_locking.diff 2007-11-11 23:48:09 UTC (rev 82)
@@ -0,0 +1,217 @@
+--- rt2400.orig/Module/mlme.c
++++ rt2400/Module/mlme.c
+@@ -39,6 +39,8 @@
+ #include "rt_config.h"
+ #include <stdarg.h>
+
++#include <asm/system.h>
++
+ /*
+ ==========================================================================
+ Description:
+@@ -58,7 +60,6 @@
+ do
+ {
+ pAd->Mlme.Running = FALSE;
+- spin_lock_init(&pAd->Mlme.TaskLock);
+
+ // initialize the two tables
+ // MacTableInit(pAd);
+@@ -131,32 +132,28 @@
+ {
+ MLME_QUEUE_ELEM *Elem = NULL;
+
+- // Only accept MLME and Frame from peer side, no other (control/data) frame should
+- // get into this state machine
++ // Only accept MLME and Frame from peer side, no other (control/data)
++ // frame should get into this state machine
+
+- spin_lock(&pAd->Mlme.TaskLock);
++ // We fix the multiple context service drop problem identified by
++ // Ben Hutchings in an SMP- safe way by combining TaskLock and Queue.Lock
++ // per his suggestion.
++ spin_lock(&pAd->Mlme.Queue.Lock);
+ if(pAd->Mlme.Running)
+ {
+- spin_unlock(&pAd->Mlme.TaskLock);
++ spin_unlock(&pAd->Mlme.Queue.Lock);
+ return;
+ }
+- else
+- {
+- pAd->Mlme.Running = TRUE;
+- }
+- spin_unlock(&pAd->Mlme.TaskLock);
++ pAd->Mlme.Running = TRUE;
++
++ while (MlmeGetHead(&pAd->Mlme.Queue, &Elem)) {
++ smp_read_barrier_depends();
++ if (!Elem->Occupied) break;
+
+- while (TRUE) {
+- spin_lock(&pAd->Mlme.Queue.Lock);
+- if (!MlmeDequeue(&pAd->Mlme.Queue, &Elem)) {
+- spin_unlock(&pAd->Mlme.Queue.Lock);
+- break;
+- }
+ spin_unlock(&pAd->Mlme.Queue.Lock);
+- if (pAd->PortCfg.BssType == BSS_MONITOR)
+- continue;
++
+ // From message type, determine which state machine I should drive
+- switch (Elem->Machine) {
++ if (pAd->PortCfg.BssType != BSS_MONITOR) switch (Elem->Machine) {
+ case ASSOC_STATE_MACHINE:
+ StateMachinePerformAction(pAd, &pAd->Mlme.AssocMachine, Elem);
+ break;
+@@ -173,18 +170,19 @@
+ MlmeCntlMachinePerformAction(pAd, &pAd->Mlme.CntlMachine, Elem);
+ break;
+ default:
+- DBGPRINT(RT_DEBUG_TRACE, "ERROR: Illegal machine in MlmeHandler()\n");
++ DBGPRINT(RT_DEBUG_ERROR,
++ "ERROR: Illegal machine in MlmeHandler()\n");
+ break;
+ } // end of switch
+
+ // free MLME element
+- Elem->Occupied = FALSE;
+- Elem->MsgLen = 0;
++ smp_mb();
++ Elem->Occupied = FALSE; // sic - bb
++ spin_lock(&pAd->Mlme.Queue.Lock);
++ MlmeDequeue(&pAd->Mlme.Queue);
+ }
+-
+- spin_lock(&pAd->Mlme.TaskLock);
+ pAd->Mlme.Running = FALSE;
+- spin_unlock(&pAd->Mlme.TaskLock);
++ spin_unlock(&pAd->Mlme.Queue.Lock);
+ }
+
+ /*
+@@ -229,7 +227,6 @@
+ StateMachineDestroy(&pAd->Mlme.AuthRspMachine);
+ StateMachineDestroy(&pAd->Mlme.SyncMachine);
+ // StateMachineDestroy(&pAd->Mlme.CntlMachine);
+-// spin_unlock(&pAd->Mlme.TaskLock);
+ // NdisFreeSpinLock(&pAd->PortCfg.MacTab.Lock);
+
+ // Cancel pending timers
+@@ -1392,17 +1389,31 @@
+ printk(KERN_ERR DRV_NAME ": MlmeEnqueue full, msg dropped and may corrupt MLME\n");
+ return FALSE;
+ }
++ // If another context preempts us, it uses the next element - sic. bb
+ Tail = Queue->Tail++;
+ Queue->Tail %= MAX_LEN_OF_MLME_QUEUE;
+ Queue->Num++;
++
++ // We guard against Ben Hutchings' incomplete queue element problem by not
++ // setting the Occupied flag until the memcpy is done. The ocurrence of a
++ // refresh cycle during a copy can stretch the time by up to 100 usec
++ // (well, quite a few usec, anyway); not good when interrupts are disabled.
++ // Note that this can leave a bubble in the queue, but it will have
++ // disappeared by the time this thread gets around to calling MlmeHandler.
++ // All items will be handled in their proper order, but possibly not in the
++ // context in which they were added. - bb
+ spin_unlock(&Queue->Lock);
+ DBGPRINT(RT_DEBUG_INFO, "MlmeEnqueue, num=%d\n", Queue->Num);
+
+- Queue->Entry[Tail].Occupied = TRUE;
+ Queue->Entry[Tail].Machine = Machine;
+ Queue->Entry[Tail].MsgType = MsgType;
+ Queue->Entry[Tail].MsgLen = MsgLen;
+ memcpy(Queue->Entry[Tail].Msg, Msg, MsgLen);
++
++ //MlmeHandler will stop when it finds this false.
++ smp_wmb();
++ Queue->Entry[Tail].Occupied = TRUE;
++
+ return TRUE;
+ }
+
+@@ -1449,7 +1460,7 @@
+ DBGPRINT(RT_DEBUG_INFO, "MlmeEnqueueForRecv, num=%d\n",Queue->Num);
+
+ // OK, we got all the informations, it is time to put things into queue
+- Queue->Entry[Tail].Occupied = TRUE;
++ // See MlmeEnqueue note for use of Occupied flag.
+ Queue->Entry[Tail].Machine = Machine;
+ Queue->Entry[Tail].MsgType = MsgType;
+ Queue->Entry[Tail].MsgLen = MsgLen;
+@@ -1458,13 +1469,15 @@
+ Queue->Entry[Tail].TimeStamp = jiffies;
+ Queue->Entry[Tail].Rssi = Rssi;
+ memcpy(Queue->Entry[Tail].Msg, Msg, MsgLen);
++ smp_wmb();
++ Queue->Entry[Tail].Occupied = TRUE;
+
+ MlmeHandler(pAd);
+
+ return TRUE;
+ }
+
+-/*! \brief Dequeue a message from the MLME Queue
++/*! \brief Get the first message from the MLME Queue
+ * WARNING: Must be call with Mlme.Queue.Lock held
+ * \param *Queue The MLME Queue
+ * \param *Elem The message dequeued from MLME Queue
+@@ -1472,14 +1485,29 @@
+ * \pre
+ * \post
+ */
+-BOOLEAN MlmeDequeue(
++BOOLEAN MlmeGetHead(
+ IN MLME_QUEUE *Queue,
+ OUT MLME_QUEUE_ELEM **Elem)
+ {
+ if (Queue->Num == 0)
+ return FALSE;
+- *Elem = &Queue->Entry[Queue->Head++];
+- Queue->Head %= MAX_LEN_OF_MLME_QUEUE;
++ *Elem = &Queue->Entry[Queue->Head];
++ return TRUE;
++}
++
++/*! \brief Remove the first message from the MLME Queue
++ * WARNING: Must be call with Mlme.Queue.Lock held
++ * \param *Queue The MLME Queue
++ * \return TRUE if a message was removed, FALSE if the queue was empty
++ * \pre
++ * \post
++ */
++BOOLEAN MlmeDequeue(
++ IN MLME_QUEUE *Queue)
++{
++ if (Queue->Num == 0)
++ return FALSE;
++ Queue->Head = (Queue->Head + 1) % MAX_LEN_OF_MLME_QUEUE;
+ Queue->Num--;
+ DBGPRINT(RT_DEBUG_INFO, "MlmeDequeue, num=%d\n",Queue->Num);
+
+--- rt2400.orig/Module/rtmp.h
++++ rt2400/Module/rtmp.h
+@@ -596,7 +596,6 @@
+ ULONG RxPER; // 0..100 %
+
+ BOOLEAN Running;
+- spinlock_t TaskLock;
+ MLME_QUEUE Queue;
+
+ UINT ShiftReg;
+@@ -1287,10 +1286,13 @@
+ IN ULONG MsgLen,
+ IN VOID *Msg);
+
+-BOOLEAN MlmeDequeue(
++BOOLEAN MlmeGetHead(
+ IN MLME_QUEUE *Queue,
+ OUT MLME_QUEUE_ELEM **Elem);
+
++BOOLEAN MlmeDequeue(
++ IN MLME_QUEUE *Queue);
++
+ BOOLEAN MsgTypeSubst(
+ IN MACFRAME *Fr,
+ OUT INT *Machine,
Deleted: unstable/rt2400/debian/patches/2.6.22.diff
===================================================================
--- unstable/rt2400/debian/patches/2.6.22.diff 2007-11-11 23:01:04 UTC (rev 81)
+++ unstable/rt2400/debian/patches/2.6.22.diff 2007-11-11 23:48:09 UTC (rev 82)
@@ -1,53 +0,0 @@
---- Module.orig/rt_config.h 2007/05/10 08:45:32 1.8
-+++ Module/rt_config.h 2007/06/18 19:39:09 1.9
-@@ -88,6 +88,22 @@
- #include <asm/irq.h>
- #include <asm/uaccess.h>
-
-+#ifndef pci_name
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
-+#define pci_name(__pPci_Dev) (__pPci_Dev)->dev.bus_id
-+#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) */
-+#define pci_name(__pPci_Dev) (__pPci_Dev)->slot_name
-+#endif /*(LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) */
-+#endif /* pci_name */
-+
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22))
-+#define pci_module_init pci_register_driver
-+#endif
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22))
-+#define skb_reset_mac_header(skb) (skb->mac.raw = skb->data)
-+#endif
-+
- #if WIRELESS_EXT > 12
- #include <net/iw_handler.h> /* New driver API */
- #endif /* WIRELESS_EXT > 12 */
---- Module.orig/rtmp.h 2007/04/25 05:28:43 1.10
-+++ Module/rtmp.h 2007/06/18 19:39:10 1.11
-@@ -55,14 +55,6 @@
- #define netdev_priv(_dev) ( _dev->priv )
- #endif
-
--#ifndef pci_name
--#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
--#define pci_name(__pPci_Dev) (__pPci_Dev)->dev.bus_id
--#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) */
--#define pci_name(__pPci_Dev) (__pPci_Dev)->slot_name
--#endif /*(LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) */
--#endif /* pci_name */
--
- //
- // MACRO for debugging information
- //
---- Module.orig/rtmp_data.c 2007/03/21 04:12:20 1.6
-+++ Module/rtmp_data.c 2007/06/18 19:39:10 1.7
-@@ -110,7 +110,7 @@
- {
- skb->dev = pAd->net_dev;
- memcpy(skb_put(skb, pRxD->DataByteCnt), pData, pRxD->DataByteCnt);
-- skb->mac.raw = skb->data;
-+ skb_reset_mac_header(skb);
- skb->pkt_type = PACKET_OTHERHOST;
- skb->protocol = htons(ETH_P_802_2);
- skb->ip_summed = CHECKSUM_NONE;
Modified: unstable/rt2400/debian/patches/series
===================================================================
--- unstable/rt2400/debian/patches/series 2007-11-11 23:01:04 UTC (rev 81)
+++ unstable/rt2400/debian/patches/series 2007-11-11 23:48:09 UTC (rev 82)
@@ -1,3 +1,2 @@
000_if_name.diff -p0
-002_linux-headers.diff -p0
-2.6.22.diff -p0
+004_fix_mlme_queue_locking.diff
Deleted: unstable/rt2400/debian/rt2400.dirs
===================================================================
--- unstable/rt2400/debian/rt2400.dirs 2007-11-11 23:01:04 UTC (rev 81)
+++ unstable/rt2400/debian/rt2400.dirs 2007-11-11 23:48:09 UTC (rev 82)
@@ -1,3 +0,0 @@
-/etc/Ralink/RT2400
-usr/bin
-usr/share/pixmaps
Deleted: unstable/rt2400/debian/rt2400.docs
===================================================================
--- unstable/rt2400/debian/rt2400.docs 2007-11-11 23:01:04 UTC (rev 81)
+++ unstable/rt2400/debian/rt2400.docs 2007-11-11 23:48:09 UTC (rev 82)
@@ -1,2 +0,0 @@
-FAQ
-THANKS
Deleted: unstable/rt2400/debian/rt2400.manpages
===================================================================
--- unstable/rt2400/debian/rt2400.manpages 2007-11-11 23:01:04 UTC (rev 81)
+++ unstable/rt2400/debian/rt2400.manpages 2007-11-11 23:48:09 UTC (rev 82)
@@ -1 +0,0 @@
-debian/RaConfig2400.1
Deleted: unstable/rt2400/debian/rt2400.menu
===================================================================
--- unstable/rt2400/debian/rt2400.menu 2007-11-11 23:01:04 UTC (rev 81)
+++ unstable/rt2400/debian/rt2400.menu 2007-11-11 23:48:09 UTC (rev 82)
@@ -1,7 +0,0 @@
-?package(rt2400):\
- needs="X11" \
- section="Apps/System" \
- title="RT2400 configuration utility" \
- command="su-to-root -X -c /usr/bin/RaConfig2400" \
- icon="/usr/share/pixmaps/RaConfig2400.xpm"
-
Modified: unstable/rt2400/debian/rules
===================================================================
--- unstable/rt2400/debian/rules 2007-11-11 23:01:04 UTC (rev 81)
+++ unstable/rt2400/debian/rules 2007-11-11 23:48:09 UTC (rev 82)
@@ -29,9 +29,6 @@
dh_testdir
dh_testroot
-$(MAKE) -C Module clean
- -$(MAKE) -C Utility clean
- -rm Utility/Makefile
- -rm Utility/RaConfig2400
QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
dh_clean
rm -rf debian/build
@@ -44,22 +41,11 @@
build-arch: build-arch-stamp
build-arch-stamp: patch-stamp
dh_testdir
- cd Utility/ \
- && qmake -o Makefile raconfig2400.pro \
- && $(MAKE)
-
touch build-arch-stamp
install-arch: build-arch install-arch-stamp
install-arch-stamp:
dh_testdir
- dh_testroot
- dh_clean -k -a
- dh_installdirs -a
-
- install -m 755 -o root -g root $(CURDIR)/Utility/RaConfig2400 $(CURDIR)/debian/rt2400/usr/bin
- install -m 644 -o root -g root $(CURDIR)/debian/RaConfig2400.xpm $(CURDIR)/debian/rt2400/usr/share/pixmaps
-
touch install-arch-stamp
build-indep: build-indep-stamp
More information about the Pkg-ralink-commits
mailing list