From a9c872586c1e2158ec6038da7e923d8e64405077 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Wed, 24 Aug 2005 02:12:41 +0000 Subject: unslung-kernel: enabled CONFIG_NET_WIRELESS --- conf/distro/unslung-binary-kernel-packages.conf | 1 + packages/linux/unslung-kernel/defconfig | 13 ++++++++++++- packages/linux/unslung-kernel_2.4.22.l2.3r63.bb | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/conf/distro/unslung-binary-kernel-packages.conf b/conf/distro/unslung-binary-kernel-packages.conf index 3e9059fae8..1dd405bd6e 100644 --- a/conf/distro/unslung-binary-kernel-packages.conf +++ b/conf/distro/unslung-binary-kernel-packages.conf @@ -34,5 +34,6 @@ ${PKGDIR}/packages/slugimage/*.bb \ ${PKGDIR}/packages/unzip/*.bb \ ${PKGDIR}/packages/update-modules/*.bb \ ${PKGDIR}/packages/wget/*.bb \ +${PKGDIR}/packages/zd1211/*.bb \ ${PKGDIR}/packages/zlib/*.bb \ ${UNSLUNG_EXTRA_BBFILES}" diff --git a/packages/linux/unslung-kernel/defconfig b/packages/linux/unslung-kernel/defconfig index 208041c6d6..d9a01070d5 100644 --- a/packages/linux/unslung-kernel/defconfig +++ b/packages/linux/unslung-kernel/defconfig @@ -596,7 +596,18 @@ CONFIG_PPP_BSDCOMP=m # # Wireless LAN (non-hamradio) # -# CONFIG_NET_RADIO is not set +CONFIG_NET_RADIO=y +# CONFIG_STRIP is not set +# CONFIG_WAVELAN is not set +# CONFIG_ARLAN is not set +# CONFIG_AIRONET4500 is not set +# CONFIG_AIRONET4500_NONCS is not set +# CONFIG_AIRONET4500_PROC is not set +# CONFIG_AIRO is not set +# CONFIG_HERMES is not set +# CONFIG_PLX_HERMES is not set +# CONFIG_PCI_HERMES is not set +CONFIG_NET_WIRELESS=y # # Token Ring devices diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb index 0a7a8f3dd2..4acc6d7a5f 100644 --- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb @@ -4,7 +4,7 @@ include nslu2-linksys-kernel_2.4.22.bb DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device" MAINTAINER = "NSLU2 Linux " -PR = "r2" +PR = "r3" KERNEL_SUFFIX = "unslung" -- cgit v1.2.3 From ddd959ddc62f610a8931ce3d94c8e3c8b965ab0a Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Wed, 24 Aug 2005 02:14:20 +0000 Subject: zd1211: Added zd1211-4916 (rumoured to work with Unslung). --- packages/zd1211/zd1211-4916/.mtn2git_empty | 0 packages/zd1211/zd1211-4916/copy-break.patch | 11 + .../zd1211/zd1211-4916/explicit-key-change.patch | 24 ++ packages/zd1211/zd1211-4916/get-stats.patch | 77 ++++++ packages/zd1211/zd1211-4916/makefile.patch | 28 ++ packages/zd1211/zd1211-4916/syntax.patch | 20 ++ packages/zd1211/zd1211-4916/usb-endian.patch | 298 +++++++++++++++++++++ packages/zd1211/zd1211-4916/usb-ids.patch | 21 ++ packages/zd1211/zd1211_4916.bb | 35 +++ 9 files changed, 514 insertions(+) create mode 100644 packages/zd1211/zd1211-4916/.mtn2git_empty create mode 100644 packages/zd1211/zd1211-4916/copy-break.patch create mode 100644 packages/zd1211/zd1211-4916/explicit-key-change.patch create mode 100644 packages/zd1211/zd1211-4916/get-stats.patch create mode 100644 packages/zd1211/zd1211-4916/makefile.patch create mode 100644 packages/zd1211/zd1211-4916/syntax.patch create mode 100644 packages/zd1211/zd1211-4916/usb-endian.patch create mode 100644 packages/zd1211/zd1211-4916/usb-ids.patch create mode 100644 packages/zd1211/zd1211_4916.bb diff --git a/packages/zd1211/zd1211-4916/.mtn2git_empty b/packages/zd1211/zd1211-4916/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/zd1211/zd1211-4916/copy-break.patch b/packages/zd1211/zd1211-4916/copy-break.patch new file mode 100644 index 0000000000..a08c543550 --- /dev/null +++ b/packages/zd1211/zd1211-4916/copy-break.patch @@ -0,0 +1,11 @@ +--- zd1211-4916-r0/src/zd1205.c.cborig 2005-03-08 14:20:22.846179000 -0800 ++++ zd1211-4916-r0/src/zd1205.c 2005-03-08 14:21:09.432096896 -0800 +@@ -267,7 +267,7 @@ + zd1205_SwTcbQ_t free_txq_buf, active_txq_buf; + struct net_device *g_dev; + zd_80211Obj_t dot11Obj = {0}; +-#define RX_COPY_BREAK 0//1518 //we do bridge, don't care IP header alignment ++#define RX_COPY_BREAK MAX_WLAN_SIZE //It doesn't appear that unaligned frames work with TCP/UDP beyond a certain size + #define BEFORE_BEACON 5 + /* Definition of Wireless Extension */ + diff --git a/packages/zd1211/zd1211-4916/explicit-key-change.patch b/packages/zd1211/zd1211-4916/explicit-key-change.patch new file mode 100644 index 0000000000..ef01f3cb3e --- /dev/null +++ b/packages/zd1211/zd1211-4916/explicit-key-change.patch @@ -0,0 +1,24 @@ +--- zd1211-4916-r0/src/zd1205.c.korig 2005-03-04 13:45:07.000000000 -0800 ++++ zd1211-4916-r0/src/zd1205.c 2005-03-08 10:43:26.304994072 -0800 +@@ -5528,7 +5528,8 @@ + /* Check if the key is not marked as invalid */ + + if (!(erq->flags & IW_ENCODE_NOKEY)){ +- pSetting->EncryKeyId = index; ++ // Only change the current keyid when explicitly asked ++ // pSetting->EncryKeyId = index; + + + memcpy(&pSetting->keyVector[index][0], key, pSetting->WepKeyLen); +--- zd1211-4916-r0/src/zd1211.c.orig 2005-03-08 17:15:24.085747960 -0800 ++++ zd1211-4916-r0/src/zd1211.c 2005-03-08 17:05:02.044312632 -0800 +@@ -3423,8 +3423,8 @@ + //update card setting + + if (test_bit(KEVENT_UPDATE_SETTING, &macp->kevent_flags)){ +- zd_UpdateCardSetting(&macp->cardSetting); + clear_bit(KEVENT_UPDATE_SETTING, &macp->kevent_flags); ++ zd_UpdateCardSetting(&macp->cardSetting); + } + + diff --git a/packages/zd1211/zd1211-4916/get-stats.patch b/packages/zd1211/zd1211-4916/get-stats.patch new file mode 100644 index 0000000000..0525522b43 --- /dev/null +++ b/packages/zd1211/zd1211-4916/get-stats.patch @@ -0,0 +1,77 @@ +--- zd1211-4916-r0/src/zd1205.h.orig 2005-01-28 22:55:15.000000000 -0800 ++++ zd1211-4916-r0/src/zd1205.h 2005-03-04 13:41:16.879006208 -0800 +@@ -611,6 +611,9 @@ + ***************************************************************************/ + struct driver_stats { + struct net_device_stats net_stats; ++#ifdef CONFIG_NET_WIRELESS ++ struct iw_statistics iw_stats; ++#endif + unsigned long tx_late_col; + unsigned long tx_ok_defrd; + unsigned long tx_one_retry; +--- zd1211-4916-r0/src/zd1205.c.orig 2005-03-03 18:43:48.000000000 -0800 ++++ zd1211-4916-r0/src/zd1205.c 2005-03-04 13:45:07.134002128 -0800 +@@ -4196,6 +4196,42 @@ + return &(macp->drv_stats.net_stats); + } + ++/** ++ * zd1205wext_iw_get_stats - get driver statistics ++ ++ * @dev: adapter's net_device struct ++ * ++ * This routine is called when the OS wants the adapter's wireless ++ * stats returned. It returns the address of the iw_statistics ++ * stucture for the device. If the statistics are currently being ++ * updated, then they might be incorrect for a short while. However, ++ * since this cannot actually cause damage, no locking is used. ++ */ ++#if WIRELESS_EXT > 12 ++struct iw_statistics * ++zd1205wext_iw_get_stats(struct net_device *dev) ++{ ++ struct zd1205_private *macp = dev->priv; ++ struct iw_statistics *iw_stats = &macp->drv_stats.iw_stats; ++ ++ iw_stats->qual.noise = 161; ++ iw_stats->qual.qual = 0;//macp->rxInfo.rxSignalQuality; ++ iw_stats->qual.level = 0;//macp->rxInfo.rxSignalStrength; ++ iw_stats->qual.updated = 7; ++ ++ iw_stats->discard.nwid = 0; ++ iw_stats->discard.code = 0; ++ iw_stats->discard.fragment = 0; ++ iw_stats->discard.retries = macp->retryFailCnt; ++ iw_stats->discard.misc = macp->DropFirstFragCnt + macp->ErrLongFrmCnt + ++ macp->ErrShortFrmCnt + macp->ErrZeroLenFrmCnt; ++ ++ iw_stats->miss.beacon = 0; ++ ++ return iw_stats; ++} ++#endif ++ + + /** + * zd1205_set_mac - set the MAC address +--- zd1211-4916-r0/src/zd1211.c.orig 2005-03-03 18:43:49.000000000 -0800 ++++ zd1211-4916-r0/src/zd1211.c 2005-03-04 13:44:31.122476712 -0800 +@@ -1873,6 +1873,9 @@ + #define ZD1211_TX_TIMEOUT (HZ*10) + #define ZD1211_MTU 1500 + extern struct iw_handler_def p80211wext_handler_def; ++#ifdef CONFIG_NET_WIRELESS ++extern struct iw_statistics *zd1205wext_iw_get_stats(struct net_device *); ++#endif + + u8 zd1211_InitSetup(struct net_device *dev, struct zd1205_private *macp) + +@@ -1964,6 +1967,7 @@ + + #if WIRELESS_EXT > 12 + dev->wireless_handlers = (struct iw_handler_def *)&p80211wext_handler_def; ++ dev->get_wireless_stats = &zd1205wext_iw_get_stats; + #endif + + dev->hard_start_xmit = zd1205_xmit_frame; diff --git a/packages/zd1211/zd1211-4916/makefile.patch b/packages/zd1211/zd1211-4916/makefile.patch new file mode 100644 index 0000000000..a01cb085bc --- /dev/null +++ b/packages/zd1211/zd1211-4916/makefile.patch @@ -0,0 +1,28 @@ +--- zd1211-4916-r0/Makefile.orig 2005-01-28 22:55:15.000000000 -0800 ++++ zd1211-4916-r0/Makefile 2005-02-18 17:03:09.009560224 -0800 +@@ -11,12 +11,12 @@ + + + # if the kernel is 2.6.x, trun on this +-KERN_26=y +-KERNEL_SOURCE=/usr/src/linux-2.6.7 ++#KERN_26=y ++#KERNEL_SOURCE=/usr/src/linux-2.6.7 + + # if the kernel is 2.4.x, trun on this +-#KERN_24=y +-#KERNEL_SOURCE=/usr/src/linux-2.4.24 ++KERN_24=y ++KERNEL_SOURCE=/usr/src/linux-2.4.24 + + SRC_DIR=src + DEFINES=-D__KERNEL__ -DMODULE=1 +@@ -154,7 +154,7 @@ + all: $(MODULE) + + $(MODULE): $(OBJECTS) +- ld -r $(OBJECTS) -o $(MODULE) ++ $(LD) -r $(OBJECTS) -o $(MODULE) + chmod -x $(MODULE) + + %.o: %.c diff --git a/packages/zd1211/zd1211-4916/syntax.patch b/packages/zd1211/zd1211-4916/syntax.patch new file mode 100644 index 0000000000..969839e8dd --- /dev/null +++ b/packages/zd1211/zd1211-4916/syntax.patch @@ -0,0 +1,20 @@ +--- zd1211-4916-r0/src/zd1205.c.orig 2005-01-28 22:55:14.000000000 -0800 ++++ zd1211-4916-r0/src/zd1205.c 2005-02-18 17:40:39.136488936 -0800 +@@ -5182,6 +5182,7 @@ + + + exit: ++ 1; + //read_unlock(&(macp->isolate_lock)); + + } +--- zd1211-4916-r0/src/zdhci.c.orig 2005-01-28 22:55:15.000000000 -0800 ++++ zd1211-4916-r0/src/zdhci.c 2005-02-18 21:01:45.426134088 -0800 +@@ -10,6 +10,7 @@ + #define MAX_CHANNEL_ALLOW 13 + zd_80211Obj_t *pdot11Obj = 0; + U16 CurrScanCH = 1; ++void zd_ChooseAP(void); + + BOOLEAN zd_SendPkt(U8 *pEthHdr, U8 *pBody, U32 bodyLen, void *buf, U8 bEapol, void *pHash) + { diff --git a/packages/zd1211/zd1211-4916/usb-endian.patch b/packages/zd1211/zd1211-4916/usb-endian.patch new file mode 100644 index 0000000000..f2516ff783 --- /dev/null +++ b/packages/zd1211/zd1211-4916/usb-endian.patch @@ -0,0 +1,298 @@ +diff -ur zdold/Makefile zd1211-4916-r0/Makefile +--- zdold/Makefile 2005-02-18 21:58:36.000000000 -0800 ++++ zd1211-4916-r0/Makefile 2005-02-28 17:59:05.000000000 -0800 +@@ -149,7 +149,7 @@ + CFLAGS += -DfNEW_CODE_MAP=1 + CFLAGS += -DfWRITE_WORD_REG=1 + CFLAGS += -DfREAD_MUL_REG=1 +-#CFLAGS += -DENHANCE_RX=1 ++CFLAGS += -DENHANCE_RX=1 + + all: $(MODULE) + +diff -ur zdold/src/zd1211.c zd1211-4916-r0/src/zd1211.c +--- zdold/src/zd1211.c 2005-01-28 22:55:15.000000000 -0800 ++++ zd1211-4916-r0/src/zd1211.c 2005-03-01 14:41:07.003613776 -0800 +@@ -429,16 +429,16 @@ + memset(pRegBuffer, 0x0, size); + + +- ((PUSB_WRITE_REG)pRegBuffer)->RequestID = REGID_PROG_FLSH; +- ((PUSB_SET_RF) pRegBuffer)->Value = Value[0]; +- ((PUSB_SET_RF) pRegBuffer)->Index = Value[1]; ++ ((PUSB_WRITE_REG)pRegBuffer)->RequestID = cpu_to_le16(REGID_PROG_FLSH); ++ ((PUSB_SET_RF) pRegBuffer)->Value = cpu_to_le16(Value[0]); ++ ((PUSB_SET_RF) pRegBuffer)->Index = cpu_to_le16(Value[1]); + + + + + + for (ii = 2; ii < RegCount; ii ++) +- ((PUSB_SET_RF)pRegBuffer)->Data[ii - 2] = Value[ii]; ++ ((PUSB_SET_RF)pRegBuffer)->Data[ii - 2] = cpu_to_le16(Value[ii]); + + + bufSize = sizeof(u16) * (1+RegCount); +@@ -513,7 +513,7 @@ + }else + memset(pRegBuffer, 0x0, size); + +- ((PUSB_READ_REG_REQ)pRegBuffer)->RequestID = REGID_READ; ++ ((PUSB_READ_REG_REQ)pRegBuffer)->RequestID = cpu_to_le16(REGID_READ); + + + +@@ -526,7 +526,7 @@ + else if ((Address[ii] & BASE_ADDR_MASK_HOST) == USB_BASE_ADDR_EEPROM) + Address[ii] = ((Address[ii] - USB_BASE_ADDR_EEPROM) / 2) + cFIRMWARE_EEPROM_OFFSET; + //0x9900 //0xF817 +- ((PUSB_READ_REG_REQ) pRegBuffer)->Address[ii] = Address[ii]; ++ ((PUSB_READ_REG_REQ) pRegBuffer)->Address[ii] = cpu_to_le16(Address[ii]); + + } + +@@ -608,7 +608,7 @@ + } + else { + for (ii = 0; ii < (macp->ReadRegCount-2) / 4; ii++){ +- pValue[ii] = *((u16 *) macp->IntEPBuffer2 + 1 + ii * 2 + 1); ++ pValue[ii] = le16_to_cpu(*((u16 *) macp->IntEPBuffer2 + 1 + ii * 2 + 1)); + } + ret = 0; + +@@ -686,7 +686,7 @@ + } + + down(&macp->reg_sem); +- ++ + + + if ((RegCount == 0) || (!macp->bUSBDeveiceAttached) || !test_bit(ZD1211_RUNNING, &macp->flags)) { +@@ -712,7 +712,7 @@ + + + +- ((PUSB_WRITE_REG)pRegBuffer)->RequestID = REGID_WRITE; ++ ((PUSB_WRITE_REG)pRegBuffer)->RequestID = cpu_to_le16(REGID_WRITE); + + if (RegCount > cMIN_MULTI_WRITE_REG_NUM){ + for (i=cMIN_MULTI_WRITE_REG_NUM; iWritePackage[i].Address = Address[i]; +- ((PUSB_WRITE_REG)pRegBuffer)->WritePackage[i].WriteData_low = Value[i]; ++ ((PUSB_WRITE_REG)pRegBuffer)->WritePackage[i].Address = cpu_to_le16(Address[i]); ++ ((PUSB_WRITE_REG)pRegBuffer)->WritePackage[i].WriteData_low = cpu_to_le16(Value[i]); + } + } + +@@ -1726,17 +1726,17 @@ + + + +- ((PUSB_SET_RF)pRegBuffer)->RequestID = REGID_RFOFDMSET; ++ ((PUSB_SET_RF)pRegBuffer)->RequestID = cpu_to_le16(REGID_RFOFDMSET); + + if (bIs3683A) +- ((PUSB_SET_RF)pRegBuffer)->Value = 1; ++ ((PUSB_SET_RF)pRegBuffer)->Value = cpu_to_le16(1); + else +- ((PUSB_SET_RF)pRegBuffer)->Value = 2; ++ ((PUSB_SET_RF)pRegBuffer)->Value = cpu_to_le16(2); + +- ((PUSB_SET_RF)pRegBuffer)->Index = (u16)S_bit_cnt; ++ ((PUSB_SET_RF)pRegBuffer)->Index = cpu_to_le16((u16)S_bit_cnt); + + for (i = 0; i < S_bit_cnt; i ++) +- ((PUSB_SET_RF)pRegBuffer)->Data[i] = InputValue[i]; ++ ((PUSB_SET_RF)pRegBuffer)->Data[i] = cpu_to_le16(InputValue[i]); + + + bufSize = sizeof(u16) * (3+S_bit_cnt); +@@ -2229,7 +2229,7 @@ + + + +- ZD1211DEBUG(4, "actual_length = %x\n", urb->actual_length); ++ ZD1211DEBUG(2, "actual_length = %x\n", urb->actual_length); + + + rx_struct = list_entry(macp->active_rx_list.next, +@@ -2266,7 +2266,7 @@ + if (last_pkt_len <= (macp->wMaxPacketSize - 4)){ + + +- if (((u16 *) pRxBuffer)[TotalLength / sizeof(u16) - 1] == 0x697E){ ++ if (le16_to_cpu(((u16 *) pRxBuffer)[TotalLength / sizeof(u16) - 1]) == 0x697E){ + + total_rx_struct = 3; + //ZD1211DEBUG(0, "Got merged Rx Frames!!\n"); +@@ -2288,8 +2288,8 @@ + int CurFrmLen; + + if (total_rx_struct> 1){ +- CurFrmLen = ((u16 *) pRxBuffer)[TotalLength / sizeof(u16) + i - 4]; +- //ZD1211DEBUG(2, "CurFrmLen = %x\n", CurFrmLen); ++ CurFrmLen = le16_to_cpu(((u16 *) pRxBuffer)[TotalLength / sizeof(u16) + i - 4]); ++ //ZD1211DEBUG(2, "[RX] CurFrmLen = %x\n", CurFrmLen); + } + + else +@@ -2316,22 +2316,22 @@ + + + +- rfd->CbStatus = RFD_STATUS_COMPLETE; +- rfd->ActualCount = CurFrmLen; ++ rfd->CbStatus = cpu_to_le32(RFD_STATUS_COMPLETE); ++ rfd->ActualCount = cpu_to_le32(CurFrmLen); + + + if (i > 0){ + memcpy(&rfd->RxBuffer[macp->rxOffset], + pRxBuffer + tmpLen, +- rfd->ActualCount); ++ CurFrmLen); + + } + + +- tmpLen += (rfd->ActualCount & ~0x03); ++ tmpLen += (CurFrmLen & ~0x03); + + +- if (rfd->ActualCount & 0x03) ++ if (CurFrmLen & 0x03) + tmpLen += 4; + + } +@@ -2361,8 +2361,8 @@ + + #else + +- rfd->CbStatus = RFD_STATUS_COMPLETE; +- rfd->ActualCount = TotalLength; ++ rfd->CbStatus = cpu_to_le32(RFD_STATUS_COMPLETE); ++ rfd->ActualCount = cpu_to_le32(TotalLength); + zd1205_rx_isr(macp); + #endif + +@@ -2521,8 +2521,8 @@ + // this is USB_READ_REGISTER response + macp->ReadRegCount = (u16)actual_length; + +- intNum = *(u16 *)(macp->IntEPBuffer+2); +- //intNum = macp->IntEPBuffer[2] + (((u16)macp->IntEPBuffer[3]) << 8); ++ //intNum = *(u16 *)(macp->IntEPBuffer+2); ++ intNum = macp->IntEPBuffer[2] + (((u16)macp->IntEPBuffer[3]) << 8); + + if (intNum == (InterruptCtrl | macp->USBCSRAddress)){ + // Handle non-RxTx interrupt +@@ -2549,8 +2549,8 @@ + case EPINT_RetryFial_Event: + { + u8 *pMacAddr = macp->IntEPBuffer + 4; +- u8 NewRate = (u8)(*(u16 *)(macp->IntEPBuffer + 2)); +- //u8 NewRate = macp->IntEPBuffer[2]; ++ //u8 NewRate = (u8)(*(u16 *)(macp->IntEPBuffer + 2)); ++ u8 NewRate = (u8)macp->IntEPBuffer[2]; + u16 aid; + + +@@ -2568,7 +2568,7 @@ + //ZD1211DEBUG(2, "NewRate = %x\n", NewRate); + aid = zd_AidLookUp(pMacAddr); + zd_EventNotify(EVENT_TX_COMPLETE, ZD_RETRY_FAILED, 0xff, (U32)aid); +- macp->retryFailCnt += *(u16 *)(macp->IntEPBuffer + 10); ++ macp->retryFailCnt += le16_to_cpu(*(u16 *)(macp->IntEPBuffer + 10)); + break; + + } +@@ -2634,7 +2634,7 @@ + // in current design, no need to use spinlock + + +- intr_status = *(u16 *)(macp->IntEPBuffer3+4); ++ intr_status = le16_to_cpu(*(u16 *)(macp->IntEPBuffer3+4)); + //ZD1211DEBUG(2, "intr_status = %x\n", intr_status); + + if (!intr_status) +@@ -2765,7 +2765,7 @@ + + sw_tcb = macp->activeTxQ->first; + if (sw_tcb) +- sw_tcb->pTcb->CbStatus = CB_STATUS_COMPLETE; ++ sw_tcb->pTcb->CbStatus = cpu_to_le32(CB_STATUS_COMPLETE); + + zd1205_tx_isr(macp); + +@@ -2889,23 +2889,25 @@ + Tbd++; + + //Mac Header +- memcpy(dst, (u8 *)Tbd->TbdBufferAddrLowPart, Tbd->TbdCount); ++ memcpy(dst, (u8 *)le32_to_cpu(Tbd->TbdBufferAddrLowPart), ++ le32_to_cpu(Tbd->TbdCount)); + + ZD1211DEBUG(2, "MAC Header Length = %x\n", Tbd->TbdCount); +- dst += Tbd->TbdCount; ++ dst += le32_to_cpu(Tbd->TbdCount); + +- TotalLength += Tbd->TbdCount; ++ TotalLength += le32_to_cpu(Tbd->TbdCount); + + Tbd++; + + //MAC Body +- memcpy(dst, (u8 *)Tbd->TbdBufferAddrLowPart, Tbd->TbdCount); ++ memcpy(dst, (u8 *)le32_to_cpu(Tbd->TbdBufferAddrLowPart), ++ le32_to_cpu(Tbd->TbdCount)); + + ZD1211DEBUG(2, "Tx DATA Length = %x\n", Tbd->TbdCount); +- dst += Tbd->TbdCount; ++ dst += le32_to_cpu(Tbd->TbdCount); + + +- TotalLength += Tbd->TbdCount; ++ TotalLength += le32_to_cpu(Tbd->TbdCount); + Tbd++; + + ZD1211DEBUG(2, "TotalLength = %x\n", TotalLength); +@@ -2914,7 +2916,7 @@ + + + // write down total length +- *((u16 *)(macp->tx_buff+4)) = (u16)TotalLength + 14; ++ *((u16 *)(macp->tx_buff+4)) = cpu_to_le16((u16)TotalLength + 14); + + ZD1211DEBUG(2, "macp->tx_buff+4 = %x\n", *((u16 *)(macp->tx_buff+4))); + +diff -ur zdold/src/zd1211.h zd1211-4916-r0/src/zd1211.h +--- zdold/src/zd1211.h 2005-01-28 22:55:14.000000000 -0800 ++++ zd1211-4916-r0/src/zd1211.h 2005-03-01 14:12:15.023914712 -0800 +@@ -146,7 +146,9 @@ + typedef struct _USB_WRITE_REG { + u16 RequestID; + USB_WRITE_REG_PACKAGE WritePackage[cMAX_MULTI_WRITE_REG_NUM]; +-} USB_WRITE_REG, * PUSB_WRITE_REG; ++} __attribute__((__packed__)); ++ ++typedef struct _USB_WRITE_REG USB_WRITE_REG, * PUSB_WRITE_REG; + + + typedef struct _USB_SET_RF { +diff -ur zdold/src/zdshared.c zd1211-4916-r0/src/zdshared.c +--- zdold/src/zdshared.c 2005-01-28 22:55:15.000000000 -0800 ++++ zd1211-4916-r0/src/zdshared.c 2005-03-01 14:43:35.078103032 -0800 +@@ -416,6 +416,7 @@ + U16 len; + Frame_t *pf = pfrmDesc->mpdu; + ++ pf->header[2] = pf->header[3] = 0; // Initialize them to something? + setFrameType(pf, ST_PROBE_REQ); + pf->body = pfrmDesc->buffer; + body = pf->body; diff --git a/packages/zd1211/zd1211-4916/usb-ids.patch b/packages/zd1211/zd1211-4916/usb-ids.patch new file mode 100644 index 0000000000..3bb9b00e35 --- /dev/null +++ b/packages/zd1211/zd1211-4916/usb-ids.patch @@ -0,0 +1,21 @@ +--- zd1211-4916-r0/src/zdusb.h~ 2005-01-29 17:25:15.000000000 +1030 ++++ zd1211-4916-r0/src/zdusb.h 2005-08-24 10:39:06.000000000 +0930 +@@ -10,6 +10,8 @@ + #define PRODUCT_1211 0x1211 + #define VENDOR_ZYXEL 0x0586 //ZyXEL + #define PRODUCT_G220 0x3401 ++#define VENDOR_3COM 0x6891 //3COM ++#define PRODUCT_3CRUSB10075 0xa727 + + + #endif +--- zd1211-4916-r0/src/zdusb.c~ 2005-01-29 17:25:15.000000000 +1030 ++++ zd1211-4916-r0/src/zdusb.c 2005-08-24 10:39:30.000000000 +0930 +@@ -59,6 +59,7 @@ + static struct usb_device_id zd1211_ids [] = { + { USB_DEVICE(VENDOR_ZYDAS, PRODUCT_1211) }, + { USB_DEVICE(VENDOR_ZYXEL, PRODUCT_G220) }, ++ { USB_DEVICE(VENDOR_3COM, PRODUCT_3CRUSB10075) }, + { } /* Terminating entry */ + }; + diff --git a/packages/zd1211/zd1211_4916.bb b/packages/zd1211/zd1211_4916.bb new file mode 100644 index 0000000000..4d49409b5e --- /dev/null +++ b/packages/zd1211/zd1211_4916.bb @@ -0,0 +1,35 @@ +SRC_URI = "${SOURCEFORGE_MIRROR}/zd1211/sf-zd1211-${PV}-src.tar.gz \ + file://makefile.patch;patch=1 \ + file://syntax.patch;patch=1 \ + file://usb-endian.patch;patch=1 \ + file://usb-ids.patch;patch=1 \ + file://get-stats.patch;patch=1 \ + file://explicit-key-change.patch;patch=1 \ + file://copy-break.patch;patch=1" +S = "${WORKDIR}" +LICENSE = "GPL" + +inherit module-base +SECTION = "base" + +do_configure() { + : +} + +CFLAGS = "-DLINUX_OS -D__KERNEL__ -DMODULE -I${S}/src/includes -I${S}/src/includes/pcmcia -I${STAGING_KERNEL_DIR}/include" + +do_compile() { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ + KERNEL_SRC=${STAGING_KERNEL_DIR} \ + KERNEL_VERSION=${KERNEL_VERSION} \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + ${MAKE_TARGETS} +} + +do_install() { + install -d ${D}/opt/lib/modules/${KERNEL_VERSION}/wireless + install -m 0644 zd1211.o ${D}/opt/lib/modules/${KERNEL_VERSION}/wireless/zd1211.o +} + +FILES_${PN} = "/opt/lib/modules" -- cgit v1.2.3 From a9344c9ee7c39c2f8f116a88837c8263e8dd7582 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 26 Aug 2005 14:18:58 +0000 Subject: gpe-package 0.3: add to repo --- packages/gpe-package/gpe-package_0.3.bb | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 packages/gpe-package/gpe-package_0.3.bb diff --git a/packages/gpe-package/gpe-package_0.3.bb b/packages/gpe-package/gpe-package_0.3.bb new file mode 100644 index 0000000000..0084b7e3c3 --- /dev/null +++ b/packages/gpe-package/gpe-package_0.3.bb @@ -0,0 +1,10 @@ +LICENSE = "GPL" +PR = "r0" +inherit gpe pkgconfig + +DESCRIPTION = "A package manager GUI for GPE" +DEPENDS = "ipkg libgpewidget" +RDEPENDS = "gpe-icons" +SECTION = "gpe" +PRIORITY = "optional" + -- cgit v1.2.3 From f6fd159b63403e8164eda485560fa113ba35935c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 26 Aug 2005 14:21:38 +0000 Subject: conf/distro/preferred-gpe-versions-2.7.inc: updates libschedule -> 0.15 gpe-calendar -> 0.63 gpe-clock -> 0.21 gpe-package -> 0.3 --- conf/distro/preferred-gpe-versions-2.7.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc index 502e3594fd..484dd4966c 100644 --- a/conf/distro/preferred-gpe-versions-2.7.inc +++ b/conf/distro/preferred-gpe-versions-2.7.inc @@ -25,7 +25,7 @@ PREFERRED_VERSION_librsvg ?= "2.6.5" PREFERRED_VERSION_libgpewidget ?= "0.103" PREFERRED_VERSION_libgpepimc ?= "0.5" PREFERRED_VERSION_libgpevtype ?= "0.12" -PREFERRED_VERSION_libschedule ?= "0.14" +PREFERRED_VERSION_libschedule ?= "0.15" PREFERRED_VERSION_gpe-icons ?= "0.24" PREFERRED_VERSION_libgsm ?= "1.0.10" PREFERRED_VERSION_diet-x11 ?= "6.2.1" @@ -42,7 +42,7 @@ PREFERRED_VERSION_gpe-login ?= "0.81" PREFERRED_VERSION_gpe-session-scripts ?= "0.63" PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" PREFERRED_VERSION_gpe-todo ?= "0.54" -PREFERRED_VERSION_gpe-calendar ?= "0.61" +PREFERRED_VERSION_gpe-calendar ?= "0.63" PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8" PREFERRED_VERSION_gpe-contacts ?= "0.41" PREFERRED_VERSION_gpe-today ?= "0.08" @@ -51,7 +51,7 @@ PREFERRED_VERSION_dbus ?= "0.23.4" PREFERRED_VERSION_gpe-bluetooth ?= "0.42" PREFERRED_VERSION_gpe-su ?= "0.18" PREFERRED_VERSION_gpe-conf ?= "0.1.25" -PREFERRED_VERSION_gpe-clock ?= "0.20" +PREFERRED_VERSION_gpe-clock ?= "0.21" PREFERRED_VERSION_gpe-mininet ?= "0.5" PREFERRED_VERSION_gpe-mixer ?= "0.42" PREFERRED_VERSION_gpe-shield ?= "0.7" @@ -63,7 +63,7 @@ PREFERRED_VERSION_xmonobut ?= "0.4" PREFERRED_VERSION_gpe-edit ?= "0.29" PREFERRED_VERSION_gpe-gallery ?= "0.96" PREFERRED_VERSION_gpe-calculator ?= "0.2" -PREFERRED_VERSION_gpe-package ?= "0.2" +PREFERRED_VERSION_gpe-package ?= "0.3" PREFERRED_VERSION_gpe-soundbite ?= "1.0.6" PREFERRED_VERSION_gpe-terminal ?= "1.1" PREFERRED_VERSION_gpe-watch ?= "0.10" -- cgit v1.2.3 From 3ee0828904266168540bcc2672d20604666c4976 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Wed, 24 Aug 2005 16:06:11 +0000 Subject: Fix typo in -mtune value. --- conf/machine/tune-arm926ejs.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/tune-arm926ejs.conf b/conf/machine/tune-arm926ejs.conf index 4e62a749dc..563586c902 100644 --- a/conf/machine/tune-arm926ejs.conf +++ b/conf/machine/tune-arm926ejs.conf @@ -1,2 +1,2 @@ -TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" +TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s" PACKAGE_ARCH = "armv5te" -- cgit v1.2.3 From 27f7324b91c07cdf890f319d39e99c0b13eda4f0 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 24 Aug 2005 16:56:26 +0000 Subject: x11-common: Correct spitz resolution - confirmed on 2.4 and fixes Xserver on 2.6 kernels --- packages/x11/x11-common/etc/X11/Xserver | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/x11-common/etc/X11/Xserver b/packages/x11/x11-common/etc/X11/Xserver index e7e6dd1ddb..8492bfe214 100644 --- a/packages/x11/x11-common/etc/X11/Xserver +++ b/packages/x11/x11-common/etc/X11/Xserver @@ -63,7 +63,7 @@ case `module_id` in "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") ARGS="$ARGS -rgba rgb" ;; "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi") - ARGS="$ARGS -rgba rgb -screen 640x480@270" ;; + ARGS="$ARGS -rgba rgb -screen 480x640@270" ;; "Simpad") ARGS="$ARGS -rgba rgb" ;; "Generic OMAP1510/1610/1710") -- cgit v1.2.3 From 2ca9a3237a98beb6ab96ceb9b529da6b65cca154 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 24 Aug 2005 18:06:06 +0000 Subject: added hostap modules 0.4.4 (development version which works with kernel 2.6.13) --- .../hostap/hostap-modules-0.4.4/.mtn2git_empty | 0 .../hostap/hostap-modules-0.4.4/ipaq_compat.patch | 11 +++ .../hostap/hostap-modules-0.4.4/mtx_compat.diff | 20 ++++++ .../mtx_hostap_deferred_irq.diff | 81 ++++++++++++++++++++++ packages/hostap/hostap-modules_0.4.4.bb | 42 +++++++++++ 5 files changed, 154 insertions(+) create mode 100644 packages/hostap/hostap-modules-0.4.4/.mtn2git_empty create mode 100644 packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch create mode 100644 packages/hostap/hostap-modules-0.4.4/mtx_compat.diff create mode 100644 packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff create mode 100644 packages/hostap/hostap-modules_0.4.4.bb diff --git a/packages/hostap/hostap-modules-0.4.4/.mtn2git_empty b/packages/hostap/hostap-modules-0.4.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch b/packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch new file mode 100644 index 0000000000..b139ef38f1 --- /dev/null +++ b/packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch @@ -0,0 +1,11 @@ +--- hostap-driver-0.3.7/driver/modules/hostap_compat.h.old 2005-04-17 09:12:38.304421464 +0100 ++++ hostap-driver-0.3.7/driver/modules/hostap_compat.h 2005-04-17 09:13:04.413452288 +0100 +@@ -5,7 +5,7 @@ + #define NEW_MODULE_CODE + #endif + +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) && !defined(CONFIG_IPAQ_HANDHELD) + + #define HOSTAP_QUEUE struct tq_struct + diff --git a/packages/hostap/hostap-modules-0.4.4/mtx_compat.diff b/packages/hostap/hostap-modules-0.4.4/mtx_compat.diff new file mode 100644 index 0000000000..c2d6662d69 --- /dev/null +++ b/packages/hostap/hostap-modules-0.4.4/mtx_compat.diff @@ -0,0 +1,20 @@ +--- driver/modules/hostap_compat.h.orig 2004-08-09 16:16:48.359929856 +0200 ++++ driver/modules/hostap_compat.h 2004-08-09 16:17:12.383277752 +0200 +@@ -13,7 +13,7 @@ + MOD_INC_USE_COUNT; \ + if (schedule_task((q)) == 0) \ + MOD_DEC_USE_COUNT; +- ++/* + static inline void flush_scheduled_work(void) + { + flush_scheduled_tasks(); +@@ -27,7 +27,7 @@ + tq->routine = routine; + tq->data = data; + } +- ++*/ + #else /* kernel < 2.5.44 */ + + #define HOSTAP_QUEUE struct work_struct diff --git a/packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff b/packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff new file mode 100644 index 0000000000..e979b72d93 --- /dev/null +++ b/packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff @@ -0,0 +1,81 @@ +--- driver/modules/hostap_pci.c.orig 2004-11-30 06:41:48.000000000 +0100 ++++ driver/modules/hostap_pci.c 2005-01-17 19:47:33.710400496 +0100 +@@ -50,6 +50,13 @@ + }; + + ++#define DEFERRED_IRQ_INITIALIZATION ++ ++#ifdef DEFERRED_IRQ_INITIALIZATION ++struct net_device *devb[MAX_PARM_DEVICES]; ++#endif ++ ++ + #ifdef PRISM2_IO_DEBUG + + static inline void hfa384x_outb_debug(struct net_device *dev, int a, u8 v) +@@ -280,6 +287,10 @@ + + pci_set_drvdata(pdev, dev); + ++#ifdef DEFERRED_IRQ_INITIALIZATION ++ printk("%s: deferred initialization of IRQs\n", dev_info); ++ devb[cards_found-1] = dev; ++#else + if (request_irq(dev->irq, prism2_interrupt, SA_SHIRQ, dev->name, + dev)) { + printk(KERN_WARNING "%s: request_irq failed\n", dev->name); +@@ -295,7 +306,7 @@ + + printk(KERN_INFO "%s: Intersil Prism2.5 PCI: " + "mem=0x%lx, irq=%d\n", dev->name, phymem, dev->irq); +- ++#endif + return hostap_hw_ready(dev); + + fail: +@@ -399,18 +410,43 @@ + }; + + ++#ifdef DEFERRED_IRQ_INITIALIZATION ++static void deferred_init(int num_devices) ++{ ++ int n; ++ for (n=0; nirq, prism2_interrupt, SA_SHIRQ, devb[n]->name, ++ devb[n])) { ++ printk(KERN_WARNING "%s: request_irq failed\n", devb[n]->name); ++ } ++ if (prism2_hw_config(devb[n], 1)) { ++ printk(KERN_DEBUG "%s: hardware initialization failed\n", devb[n]->name) ++; ++ } ++ printk(KERN_INFO "%s: Intersil Prism2.5 PCI: irq=%d\n", devb[n]->name, devb[n]-> ++irq); ++ } ++} ++#endif ++ + static int __init init_prism2_pci(void) + { + printk(KERN_INFO "%s: %s\n", dev_info, version); + + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)) +- if (pci_register_driver(&prism2_pci_drv_id) <= 0) { ++ int n; ++ if ((n=pci_register_driver(&prism2_pci_drv_id)) <= 0) { + printk("hostap_pci: No devices found, driver not " + "installed.\n"); + pci_unregister_driver(&prism2_pci_drv_id); + return -ENODEV; + } + ++#ifdef DEFERRED_IRQ_INITIALIZATION ++ deferred_init(n); ++#endif ++ + return 0; + #else + return pci_register_driver(&prism2_pci_drv_id); diff --git a/packages/hostap/hostap-modules_0.4.4.bb b/packages/hostap/hostap-modules_0.4.4.bb new file mode 100644 index 0000000000..fd7a3eaff9 --- /dev/null +++ b/packages/hostap/hostap-modules_0.4.4.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset" +SECTION = "kernel/modules" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer " +LICENSE = "GPL" + +SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \ + file://hostap_cs.conf " + +SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \ + file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0" +SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 " + +S = "${WORKDIR}/hostap-driver-${PV}" + +inherit module + +# Hack Alert :D +ARCH_mipsel = "mips" +MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'" + +NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_crypt_wep" + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net \ + ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \ + ${D}${sysconfdir}/pcmcia + for i in ${NET_MODULES} + do + install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ + done + install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/ + install -m 0644 driver/etc/hostap_cs.conf ${D}${sysconfdir}/pcmcia/hostap_cs.conf + cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf +} + +PACKAGES = "hostap-modules-cs hostap-modules-pci hostap-modules" +FILES_hostap-modules-cs = "/lib/modules/${KERNEL_VERSION}/pcmcia/ /${sysconfdir}/pcmcia/" +FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNEL_OBJECT_SUFFIX}" +FILES_hostap-modules = "/lib/modules/" +RDEPENDS_hostap-modules-cs = "hostap-modules" +RDEPENDS_hostap-modules-pci = "hostap-modules" -- cgit v1.2.3 From 227d9e38b2b3cbb320551706159a285461ef9742 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 24 Aug 2005 18:16:14 +0000 Subject: updated pcmciautils to 007 --- packages/pcmciautils/pcmciautils_005.bb | 29 ----------------------------- packages/pcmciautils/pcmciautils_007.bb | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 packages/pcmciautils/pcmciautils_005.bb create mode 100644 packages/pcmciautils/pcmciautils_007.bb diff --git a/packages/pcmciautils/pcmciautils_005.bb b/packages/pcmciautils/pcmciautils_005.bb deleted file mode 100644 index ad8cf7e2f4..0000000000 --- a/packages/pcmciautils/pcmciautils_005.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "2.6 pcmcia utilities" -DEPENDS = "sysfsutils" -SECTION = "kernel/userland" -PRIORITY = "optional" - -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2" -S = "${WORKDIR}/pcmciautils-${PV}" - -inherit update-rc.d - -INITSCRIPT_NAME = "coldplug" -INITSCRIPT_PARAMS = "defaults" - -export HOSTCC = "${BUILD_CC}" -export etcdir = "${sysconfdir}" -export hotplugdir = "${sysconfdir}/hotplug" -export pcmciaconfdir = "${sysconfdir}/pcmcia" -LD = "${CC}" -CFLAGS =+ "-I${S}/src" - -PARALLEL_MAKE = "" -EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs'" - -do_install () { - oe_runmake 'DESTDIR=${D}' install -} - -CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" -RCONFLICTS_${PN} += "pcmcia-cs" diff --git a/packages/pcmciautils/pcmciautils_007.bb b/packages/pcmciautils/pcmciautils_007.bb new file mode 100644 index 0000000000..ad8cf7e2f4 --- /dev/null +++ b/packages/pcmciautils/pcmciautils_007.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "2.6 pcmcia utilities" +DEPENDS = "sysfsutils" +SECTION = "kernel/userland" +PRIORITY = "optional" + +SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2" +S = "${WORKDIR}/pcmciautils-${PV}" + +inherit update-rc.d + +INITSCRIPT_NAME = "coldplug" +INITSCRIPT_PARAMS = "defaults" + +export HOSTCC = "${BUILD_CC}" +export etcdir = "${sysconfdir}" +export hotplugdir = "${sysconfdir}/hotplug" +export pcmciaconfdir = "${sysconfdir}/pcmcia" +LD = "${CC}" +CFLAGS =+ "-I${S}/src" + +PARALLEL_MAKE = "" +EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs'" + +do_install () { + oe_runmake 'DESTDIR=${D}' install +} + +CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" +RCONFLICTS_${PN} += "pcmcia-cs" -- cgit v1.2.3 From b031c22b002b8d5e57d46ad6f80cd8b4ab44bfb9 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 24 Aug 2005 18:17:50 +0000 Subject: removed old versions of pcmciautils --- packages/pcmciautils/pcmciautils_001.bb | 34 ------------------------------- packages/pcmciautils/pcmciautils_002.bb | 36 --------------------------------- packages/pcmciautils/pcmciautils_003.bb | 29 -------------------------- 3 files changed, 99 deletions(-) delete mode 100644 packages/pcmciautils/pcmciautils_001.bb delete mode 100644 packages/pcmciautils/pcmciautils_002.bb delete mode 100644 packages/pcmciautils/pcmciautils_003.bb diff --git a/packages/pcmciautils/pcmciautils_001.bb b/packages/pcmciautils/pcmciautils_001.bb deleted file mode 100644 index 59e0cdb86f..0000000000 --- a/packages/pcmciautils/pcmciautils_001.bb +++ /dev/null @@ -1,34 +0,0 @@ -DEPENDS += "sysfsutils" -DESCRIPTION = "2.6 pcmcia utilities" -MAINTAINER = "Chris Larson " -SECTION = "base" -PRIORITY = "optional" - -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2" -S = "${WORKDIR}/pcmciautils-${PV}" - -inherit update-rc.d - -INITSCRIPT_NAME = "coldplug" -INITSCRIPT_PARAMS = "defaults" - -export HOSTCC = "${BUILD_CC}" -export etcdir = "${sysconfdir}" -export hotplugdir = "${sysconfdir}/hotplug" -export pcmciaconfdir = "${sysconfdir}/pcmcia" -LD = "${CC}" - -EXTRA_OEMAKE = "-e \ - 'STRIP=echo'" - -do_compile () { - oe_runmake build/ccdv - oe_runmake -} - -do_install () { - oe_runmake 'DESTDIR=${D}' install -} - -CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" -RCONFLICTS_${PN} += "pcmcia-cs" diff --git a/packages/pcmciautils/pcmciautils_002.bb b/packages/pcmciautils/pcmciautils_002.bb deleted file mode 100644 index 440d925313..0000000000 --- a/packages/pcmciautils/pcmciautils_002.bb +++ /dev/null @@ -1,36 +0,0 @@ -DEPENDS += "sysfsutils virtual/libintl" -DESCRIPTION = "2.6 pcmcia utilities" -MAINTAINER = "Chris Larson " -SECTION = "base" -PRIORITY = "optional" - -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2" -S = "${WORKDIR}/pcmciautils-${PV}" - -inherit update-rc.d - -INITSCRIPT_NAME = "coldplug" -INITSCRIPT_PARAMS = "defaults" - -export HOSTCC = "${BUILD_CC}" -export etcdir = "${sysconfdir}" -export hotplugdir = "${sysconfdir}/hotplug" -export pcmciaconfdir = "${sysconfdir}/pcmcia" -LD = "${CC}" -CFLAGS =+ "-I${S}/src" - -EXTRA_OEMAKE = "-e \ - 'STRIP=echo' \ - 'LIB_OBJS=-lc -lsysfs -lintl'" - -do_compile () { - oe_runmake build/ccdv - oe_runmake -} - -do_install () { - oe_runmake 'DESTDIR=${D}' install -} - -CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" -RCONFLICTS_${PN} += "pcmcia-cs" diff --git a/packages/pcmciautils/pcmciautils_003.bb b/packages/pcmciautils/pcmciautils_003.bb deleted file mode 100644 index ad8cf7e2f4..0000000000 --- a/packages/pcmciautils/pcmciautils_003.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "2.6 pcmcia utilities" -DEPENDS = "sysfsutils" -SECTION = "kernel/userland" -PRIORITY = "optional" - -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2" -S = "${WORKDIR}/pcmciautils-${PV}" - -inherit update-rc.d - -INITSCRIPT_NAME = "coldplug" -INITSCRIPT_PARAMS = "defaults" - -export HOSTCC = "${BUILD_CC}" -export etcdir = "${sysconfdir}" -export hotplugdir = "${sysconfdir}/hotplug" -export pcmciaconfdir = "${sysconfdir}/pcmcia" -LD = "${CC}" -CFLAGS =+ "-I${S}/src" - -PARALLEL_MAKE = "" -EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs'" - -do_install () { - oe_runmake 'DESTDIR=${D}' install -} - -CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" -RCONFLICTS_${PN} += "pcmcia-cs" -- cgit v1.2.3 From efab019e257e5bdec759536887d565a0f5a825e6 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 24 Aug 2005 18:57:07 +0000 Subject: mkdir the 'patches' directory before calling quilt --- conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index a6a137d4de..04603d393d 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -319,7 +319,7 @@ MKTEMPCMD = "mktemp -q ${TMPBASE}" # Program to be used to patch sources, use 'inherit patcher' to overwrite this: PATCHCLEANCMD = 'if [ -n "`quilt applied`" ]; then quilt pop -a -R -f || exit 1; fi' -PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -n $name $patch; chmod u+w patches/$name; quilt push" +PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; mkdir -p patches ; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -n $name $patch; chmod u+w patches/$name; quilt push" PATCH_DEPENDS = "quilt-native" # GNU patch tries to be intellgent about checking out read-only files from -- cgit v1.2.3 From d3eeeac0ab3f76477ae7cd8a8da18d70cd390e1e Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 24 Aug 2005 19:06:42 +0000 Subject: fix regexp to strip cvs kernel versions, too. (fixes #230) --- classes/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 8b2186dec6..2f3a0ce31e 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -229,7 +229,7 @@ python populate_packages_prepend () { kernelver = bb.data.getVar('PV', d, 1) + bb.data.getVar('KERNEL_LOCALVERSION', d, 1) kernelver_stripped = kernelver - m = re.match('^(.*-hh.*)\..*$', kernelver) + m = re.match('^(.*-hh.*)[\.\+].*$', kernelver) if m: kernelver_stripped = m.group(1) path = bb.data.getVar("PATH", d, 1) -- cgit v1.2.3 From 1d298ceb8b72cb6782bf62ef0cd1911cf41ef8fa Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 24 Aug 2005 19:30:47 +0000 Subject: makes the kernel-module-af-packet package add "alias net-pf-17 af_packet" to /etc/modules.conf (fixes #233). --- classes/kernel.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 2f3a0ce31e..ff9aeeab78 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -193,6 +193,7 @@ module_autoload_rfcomm = "rfcomm" module_autoload_sa1100-rtc = "sa1100-rtc" # alias defaults (alphabetically sorted) +module_conf_af_packet = "alias net-pf-17 af_packet" module_conf_bluez = "alias net-pf-31 bluez" module_conf_bnep = "alias bt-proto-4 bnep" module_conf_hci_uart = "alias tty-ldisc-15 hci_uart" -- cgit v1.2.3 From 4df9d82ef3a8f9a66fe18fd65340c289b4de8cc2 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 24 Aug 2005 19:36:56 +0000 Subject: install dexec.h into the staging area --- packages/libdaemon/libdaemon_0.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/libdaemon/libdaemon_0.6.bb b/packages/libdaemon/libdaemon_0.6.bb index 83afaacefe..578c9b7674 100644 --- a/packages/libdaemon/libdaemon_0.6.bb +++ b/packages/libdaemon/libdaemon_0.6.bb @@ -12,7 +12,7 @@ EXTRA_OECONF = "--disable-lynx --disable-doxygen" do_stage () { oe_libinstall -a -so -C src libdaemon ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/libdaemon - for i in dlog.h dfork.h dsignal.h dnonblock.h dpid.h; do + for i in dlog.h dexec.h dfork.h dsignal.h dnonblock.h dpid.h; do install -m 0644 ${S}/src/$i ${STAGING_INCDIR}/libdaemon/ done } -- cgit v1.2.3 From 964c5ef136724d6a60d4b3520df768db8a6e6035 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 24 Aug 2005 20:37:06 +0000 Subject: Add cairo 1.0.0 --- packages/cairo/cairo_1.0.0.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 packages/cairo/cairo_1.0.0.bb diff --git a/packages/cairo/cairo_1.0.0.bb b/packages/cairo/cairo_1.0.0.bb new file mode 100644 index 0000000000..aa97a9f4de --- /dev/null +++ b/packages/cairo/cairo_1.0.0.bb @@ -0,0 +1,15 @@ +SECTION = "libs" +PRIORITY = "optional" +MAINTAINER = "Phil Blundell " +DEPENDS = "x11 libpng fontconfig libxrender" +DESCRIPTION = "Cairo graphics library" +LICENSE = "MPL LGPL" +PR = "r1" + +SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage () { + oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} +} -- cgit v1.2.3 From d8e136911691c3b6888364b1a793dfb855114b5f Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Wed, 24 Aug 2005 20:47:48 +0000 Subject: bugzilla bug 83: list all supported architectures so that tune-xscale can be used --- conf/machine/h3900.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index 9e91dcfbbc..0363bd2f01 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -8,7 +8,7 @@ KERNEL ?= "kernel24" OVERRIDES =. "${KERNEL}:" TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm ipaqpxa h3900" +IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa h3900" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa" PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6" -- cgit v1.2.3 From a35f3ba7fbd5fe44358fc52c3c64ed9f0ecbfe15 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 24 Aug 2005 22:34:15 +0000 Subject: Move qc-usb --- .../qc-usb-messenger-0.8/.mtn2git_empty | 0 .../qc-usb-messenger-0.8/qc-messenger-0.8-fix | 25 +++++++++++++++++++ packages/qc-usb-messenger/qc-usb-messenger_0.8.bb | 29 ---------------------- packages/qc-usb/qc-usb-messenger_0.8.bb | 29 ++++++++++++++++++++++ 4 files changed, 54 insertions(+), 29 deletions(-) create mode 100644 packages/qc-usb-messenger/qc-usb-messenger-0.8/.mtn2git_empty create mode 100644 packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix delete mode 100644 packages/qc-usb-messenger/qc-usb-messenger_0.8.bb create mode 100644 packages/qc-usb/qc-usb-messenger_0.8.bb diff --git a/packages/qc-usb-messenger/qc-usb-messenger-0.8/.mtn2git_empty b/packages/qc-usb-messenger/qc-usb-messenger-0.8/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix b/packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix new file mode 100644 index 0000000000..ff3572db8d --- /dev/null +++ b/packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix @@ -0,0 +1,25 @@ +diff -Naur qc-usb-messenger-0.8/qc-memory.c qc-usb-messenger-0.8-fixed/qc-memory.c +--- qc-usb-messenger-0.8/qc-memory.c 2003-12-15 10:31:46.000000000 +0100 ++++ qc-usb-messenger-0.8-fixed/qc-memory.c 2005-02-22 17:53:50.000000000 +0100 +@@ -63,9 +63,9 @@ + #endif + + #if !HAVE_VMA +-static inline int qc_remap_page_range(unsigned long from, unsigned long addr, unsigned long size, pgprot_t prot) { return remap_page_range(from, addr, size, prot); } +-#undef remap_page_range +-#define remap_page_range(vma, start, addr, size, prot) qc_remap_page_range((start),(addr),(size),(prot)) ++static inline int qc_io_remap_page_range(unsigned long from, unsigned long addr, unsigned long size, pgprot_t prot) { return io_remap_page_range(from, addr, size, prot); } ++#undef io_remap_page_range ++#define io_remap_page_range(vma, start, addr, size, prot) qc_io_remap_page_range((start),(addr),(size),(prot)) + #endif + + #if LINUX_VERSION_CODE>=KERNEL_VERSION(2,5,3) || defined(pte_offset_map) +@@ -230,7 +230,7 @@ + pos = (unsigned long)src; + while ((long)size > 0) { + physaddr = kvirt_to_pa(pos); +- if (remap_page_range(vma, start, physaddr, PAGE_SIZE, PAGE_SHARED)) ++ if (io_remap_page_range(vma, start, physaddr, PAGE_SIZE, PAGE_SHARED)) + return -EAGAIN; + start += PAGE_SIZE; + pos += PAGE_SIZE; diff --git a/packages/qc-usb-messenger/qc-usb-messenger_0.8.bb b/packages/qc-usb-messenger/qc-usb-messenger_0.8.bb deleted file mode 100644 index 2720b3af59..0000000000 --- a/packages/qc-usb-messenger/qc-usb-messenger_0.8.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "Driver for QuickCam Messenger and Communicate usb cameras" -PRIORITY = "optional" -SECTION = "kernel/modules" -MAINTAINER = "Oyvind Repvik " -LICENSE = "GPL" -PR = "r1" - -SRC_URI = "http://home.mag.cx/messenger/source/${PN}-${PV}.tar.gz \ - file://qc-messenger-0.8-fix;patch=1" - -S = "${WORKDIR}/${PN}-${PV}" - -inherit module - -do_compile () { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP - oe_runmake 'KSRC=${STAGING_KERNEL_DIR}' \ - 'KDIR=${STAGING_KERNEL_DIR}' \ - 'CC="${KERNEL_CC}"' \ - 'LD="${KERNEL_LD}"' \ - 'LINUX_DIR=${STAGING_KERNEL_DIR}' \ - all -} - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc - install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc -} - diff --git a/packages/qc-usb/qc-usb-messenger_0.8.bb b/packages/qc-usb/qc-usb-messenger_0.8.bb new file mode 100644 index 0000000000..2720b3af59 --- /dev/null +++ b/packages/qc-usb/qc-usb-messenger_0.8.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Driver for QuickCam Messenger and Communicate usb cameras" +PRIORITY = "optional" +SECTION = "kernel/modules" +MAINTAINER = "Oyvind Repvik " +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "http://home.mag.cx/messenger/source/${PN}-${PV}.tar.gz \ + file://qc-messenger-0.8-fix;patch=1" + +S = "${WORKDIR}/${PN}-${PV}" + +inherit module + +do_compile () { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP + oe_runmake 'KSRC=${STAGING_KERNEL_DIR}' \ + 'KDIR=${STAGING_KERNEL_DIR}' \ + 'CC="${KERNEL_CC}"' \ + 'LD="${KERNEL_LD}"' \ + 'LINUX_DIR=${STAGING_KERNEL_DIR}' \ + all +} + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc + install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc +} + -- cgit v1.2.3 From 149b2582b0f451a828d1a0fa908d7ad0fc9f9470 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 24 Aug 2005 22:52:45 +0000 Subject: Re-add qc-usb-messenger to openslug feed --- packages/meta/openslug-packages.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 2febd8d2b3..80c0a5be09 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -97,6 +97,7 @@ OPENSLUG_PACKAGES = "\ puppy \ pwc \ python \ + qc-usb-messenger \ quilt \ reiserfsprogs reiser4progs \ rsync \ -- cgit v1.2.3 From c0c608e2e2219f4099590cce20c82b28f2e3d512 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 24 Aug 2005 22:53:46 +0000 Subject: Update DESCRIPTION --- packages/libdvb/libdvb_0.5.5.1.bb | 3 ++- packages/qc-usb-messenger/.mtn2git_empty | 0 .../qc-usb-messenger-0.8/.mtn2git_empty | 0 .../qc-usb-messenger-0.8/qc-messenger-0.8-fix | 25 ---------------------- 4 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 packages/qc-usb-messenger/.mtn2git_empty delete mode 100644 packages/qc-usb-messenger/qc-usb-messenger-0.8/.mtn2git_empty delete mode 100644 packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix diff --git a/packages/libdvb/libdvb_0.5.5.1.bb b/packages/libdvb/libdvb_0.5.5.1.bb index 62ce3c61e5..9de579917c 100644 --- a/packages/libdvb/libdvb_0.5.5.1.bb +++ b/packages/libdvb/libdvb_0.5.5.1.bb @@ -1,10 +1,11 @@ LICENSE = "GPL" DESCRIPTION = "Linux Digital Video Broadcast library" +DESCRIPTION_libdvb-dev = "Headers for libdvb development" HOMEPAGE = "http://www.metzlerbros.org/dvb/index.html" MAINTAINER = "Oyvind Repvik =KERNEL_VERSION(2,5,3) || defined(pte_offset_map) -@@ -230,7 +230,7 @@ - pos = (unsigned long)src; - while ((long)size > 0) { - physaddr = kvirt_to_pa(pos); -- if (remap_page_range(vma, start, physaddr, PAGE_SIZE, PAGE_SHARED)) -+ if (io_remap_page_range(vma, start, physaddr, PAGE_SIZE, PAGE_SHARED)) - return -EAGAIN; - start += PAGE_SIZE; - pos += PAGE_SIZE; -- cgit v1.2.3 From 0d9a48d586c544d2c1da58356a6d92c68a939f7e Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 24 Aug 2005 22:59:14 +0000 Subject: Update mpd to latest version --- packages/musicpd/mpd_0.11.5.bb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 packages/musicpd/mpd_0.11.5.bb diff --git a/packages/musicpd/mpd_0.11.5.bb b/packages/musicpd/mpd_0.11.5.bb new file mode 100644 index 0000000000..395d69e79e --- /dev/null +++ b/packages/musicpd/mpd_0.11.5.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Music Player Daemon (mpd)" +HOMEPAGE = "http://www.musicpd.org" +LICENSE = "GPLv2" +MAINTAINER = "Chris Larson " +SECTION = "console/multimedia" +DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile" +PR = "r2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz" + +inherit autotools + +# Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to +# be built, instead we use the OE built versions which should be installed +# in staging - remove the --with and replace with --enable to use the local +# versions. + +EXTRA_OECONF = "--enable-ogg \ + --with-id3tag-libraries=${STAGING_LIBDIR} \ + --with-id3tag-includes=${STAGING_INCDIR} \ + --with-mad-libraries=${STAGING_LIBDIR} \ + --with-mad-includes=${STAGING_INCDIR} \ + --without-faad" -- cgit v1.2.3 From c2626bcd2980854c6cddce5d2625ae22475732c5 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 24 Aug 2005 23:06:37 +0000 Subject: Update libao to latest version --- packages/libao/libao_0.8.6.bb | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 packages/libao/libao_0.8.6.bb diff --git a/packages/libao/libao_0.8.6.bb b/packages/libao/libao_0.8.6.bb new file mode 100644 index 0000000000..8c2601bce8 --- /dev/null +++ b/packages/libao/libao_0.8.6.bb @@ -0,0 +1,26 @@ +LICENSE = "GPL" +DESCRIPTION = "A cross platform audio library" +HOMEPAGE = "http://www.xiph.org/ao/" +SECTION = "libs" +PRIORITY = "optional" +PR = "r0" + +SRC_URI = "http://www.xiph.org/ao/src/libao-${PV}.tar.gz" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-esd --disable-esdtest \ + --disable-alsa --disable-alsa09 \ + --disable-arts --disable-nas" + +do_stage() { + install -d ${STAGING_INCDIR}/ao + install -m 0644 ${S}/include/ao/ao.h ${S}/include/ao/os_types.h \ + ${S}/include/ao/plugin.h ${STAGING_INCDIR}/ao/ + + oe_libinstall -so -C src libao ${STAGING_LIBDIR} + install -d ${STAGING_DATADIR}/aclocal + install -m 0644 ao.m4 ${STAGING_DATADIR}/aclocal/ +} + +FILES_${PN} += "${libdir}/ao/plugins-2/*.so" -- cgit v1.2.3 From e7736de5109c564c46a6bd7403c899fc513f273a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 24 Aug 2005 23:42:40 +0000 Subject: linux-oz-2.6: general cleanup of spitz patches. Disable debugging of common power/battery code --- packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb index 065d5d9eb8..2842eea8cb 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r11" +PR = "r12" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -51,7 +51,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${RPSRC}/corgi_irda-r2.patch;patch=1 \ ${RPSRC}/corgi_base_extras4-r0.patch;patch=1 \ ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ - ${RPSRC}/corgi_power-r24.patch;patch=1 \ + ${RPSRC}/sharpsl_bl_kick-r0.patch;patch=1 \ ${RPSRC}/corgi_power1-r1.patch;patch=1 \ ${DOSRC}/mmc-bulk-r0.patch;patch=1 \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ @@ -79,14 +79,16 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${DOSRC}/tosa-lcd-r3.patch;patch=1 \ ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \ ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \ + ${RPSRC}/pxafb_hsync-r0.patch;patch=1 \ ${RPSRC}/pxa27x_extraregs-r3.patch;patch=1 \ - ${RPSRC}/spitzbase-r5.patch;patch=1 \ + ${RPSRC}/sharpsl_ssp-r0.patch;patch=1 \ + ${RPSRC}/sharpsl_lcd-r0.patch;patch=1 \ + ${RPSRC}/sharpsl_ts-r0.patch;patch=1 \ + ${RPSRC}/sharpsl_bl-r0.patch;patch=1 \ + ${RPSRC}/spitz_base-r7.patch;patch=1 \ ${RPSRC}/spitzkbd-r1.patch;patch=1 \ - ${RPSRC}/spitzssp-r4.patch;patch=1 \ - ${RPSRC}/spitzbl-r1.patch;patch=1 \ - ${RPSRC}/spitzts-r1.patch;patch=1 \ ${RPSRC}/spitzcf-r1.patch;patch=1 \ - ${RPSRC}/spitz_power-r1.patch;patch=1 \ + ${RPSRC}/spitz_power-r3.patch;patch=1 \ ${RPSRC}/spitz_usbhost-r0.patch;patch=1 \ ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \ ${RPSRC}/scoop_susres-r0.patch;patch=1 \ -- cgit v1.2.3 From 58cf0d9868bda6ddc1611d2071afe23aa3b41ad7 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Thu, 25 Aug 2005 01:22:52 +0000 Subject: Add initscript. Remove/reinstall busybox syslog on install/remove. Should work entirely out of the box now --- packages/syslog-ng/syslog-ng_1.6.8.bb | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/packages/syslog-ng/syslog-ng_1.6.8.bb b/packages/syslog-ng/syslog-ng_1.6.8.bb index a4c2fde2d2..95e522b936 100644 --- a/packages/syslog-ng/syslog-ng_1.6.8.bb +++ b/packages/syslog-ng/syslog-ng_1.6.8.bb @@ -1,17 +1,29 @@ -PR = "r4" +PR = "r5" MAINTAINER = "Oyvind Repvik Date: Thu, 25 Aug 2005 01:28:06 +0000 Subject: Forgot INITSCRIPT_PARAMS. Duh. --- packages/syslog-ng/syslog-ng_1.6.8.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/syslog-ng/syslog-ng_1.6.8.bb b/packages/syslog-ng/syslog-ng_1.6.8.bb index 95e522b936..830b2922b8 100644 --- a/packages/syslog-ng/syslog-ng_1.6.8.bb +++ b/packages/syslog-ng/syslog-ng_1.6.8.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" MAINTAINER = "Oyvind Repvik Date: Thu, 25 Aug 2005 03:06:28 +0000 Subject: Add -f to update-rc.d --- packages/syslog-ng/syslog-ng_1.6.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/syslog-ng/syslog-ng_1.6.8.bb b/packages/syslog-ng/syslog-ng_1.6.8.bb index 830b2922b8..8e68022273 100644 --- a/packages/syslog-ng/syslog-ng_1.6.8.bb +++ b/packages/syslog-ng/syslog-ng_1.6.8.bb @@ -22,7 +22,7 @@ do_install_append() { } pkg_postinst() { - update-rc.d syslog remove + update-rc.d -f syslog remove } pkg_postrm() { -- cgit v1.2.3 From 0898ace54cb976203eefd94af7db6ef2917409f0 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Thu, 25 Aug 2005 03:08:03 +0000 Subject: Bump PR *sigh* --- packages/syslog-ng/syslog-ng_1.6.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/syslog-ng/syslog-ng_1.6.8.bb b/packages/syslog-ng/syslog-ng_1.6.8.bb index 8e68022273..bc41020b71 100644 --- a/packages/syslog-ng/syslog-ng_1.6.8.bb +++ b/packages/syslog-ng/syslog-ng_1.6.8.bb @@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" MAINTAINER = "Oyvind Repvik Date: Thu, 25 Aug 2005 11:19:36 +0000 Subject: linux-openzaurus-2.6.13: added lines to autoload the pxaficp_ir module, Irda will now work on boot with this kernel. --- packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/linux/li