summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/debianslug.conf2
-rw-r--r--conf/distro/openslug.conf2
-rw-r--r--packages/e2fsprogs/e2fsprogs_1.38.bb7
-rw-r--r--packages/linux/linux-openzaurus-2.6.16/24-hostap_cs_id.diff107
-rw-r--r--packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch (renamed from packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r1.patch)14
-rw-r--r--packages/linux/linux-openzaurus_2.6.16.bb5
6 files changed, 118 insertions, 19 deletions
diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index 1063356217..32dd55d978 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -30,7 +30,7 @@ DEBIANSLUG_EXTRA_BBFILES ?= ""
# not absolutely required for boot.
# NOTE: only jffs2 support is an absolute requirement of boot, even
# the ext2/ext3 support is optional!
-DEBIANSLUG_EXT2_PROGS = "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck"
+DEBIANSLUG_EXT2_PROGS = "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks"
DEBIANSLUG_REISER_PROGS = "reiserfsprogs"
# The standard firmware contents and additional packages built as requirements
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 09f3691b65..9c9ce228b4 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -30,7 +30,7 @@ OPENSLUG_EXTRA_BBFILES ?= ""
# not absolutely required for boot.
# NOTE: only jffs2 support is an absolute requirement of boot, even
# the ext2/ext3 support is optional!
-OPENSLUG_EXT2_PROGS = "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck"
+OPENSLUG_EXT2_PROGS = "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks"
OPENSLUG_REISER_PROGS = "reiserfsprogs"
# The standard firmware contents and additional packages built as requirements
diff --git a/packages/e2fsprogs/e2fsprogs_1.38.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb
index e13aac5951..c27cf4c3fa 100644
--- a/packages/e2fsprogs/e2fsprogs_1.38.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.38.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "EXT2 Filesystem Utilities"
HOMEPAGE = "http://e2fsprogs.sourceforge.net"
LICENSE = "GPL"
SECTION = "base"
-PR = "r5"
+PR = "r6"
SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
file://no-hardlinks.patch;patch=1"
@@ -38,12 +38,13 @@ do_stage () {
# blkid used to be part of e2fsprogs but is useful outside, add it
# as an RDEPENDS so that anything relying on it being in e2fsprogs
# still works
-RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-uuidgen"
+RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-badblocks"
-PACKAGES =+ "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs"
+PACKAGES =+ "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks"
FILES_e2fsprogs-blkid = "${base_sbindir}/blkid"
FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen"
FILES_e2fsprogs-fsck = "${base_sbindir}/fsck"
FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*"
FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
+FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" \ No newline at end of file
diff --git a/packages/linux/linux-openzaurus-2.6.16/24-hostap_cs_id.diff b/packages/linux/linux-openzaurus-2.6.16/24-hostap_cs_id.diff
new file mode 100644
index 0000000000..b90ead9e4f
--- /dev/null
+++ b/packages/linux/linux-openzaurus-2.6.16/24-hostap_cs_id.diff
@@ -0,0 +1,107 @@
+Add more IDs for PCMCIA cards
+
+From: Pavel Roskin <proski@gnu.org>
+
+Add string IDs for cards that were covered by 0x0156,0x0002, which is no
+longer used in hostap_cs due to conflict with Orinoco cards.
+
+Also add more IDs for cards that are supported by linux-wlan-ng. Thanks
+to Arnold Schulz <arnysch@gmx.net> for providing the list.
+
+Signed-off-by: Pavel Roskin <proski@gnu.org>
+---
+
+ drivers/net/wireless/hostap/hostap_cs.c | 46 +++++++++++++++++++++++++++++++
+ 1 files changed, 46 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
+index 55bed92..9ac1aec 100644
+--- a/drivers/net/wireless/hostap/hostap_cs.c
++++ b/drivers/net/wireless/hostap/hostap_cs.c
+@@ -832,9 +832,11 @@ static int hostap_cs_resume(struct pcmci
+ static struct pcmcia_device_id hostap_cs_ids[] = {
+ PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100),
+ PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300),
++ PCMCIA_DEVICE_MANF_CARD(0x0089, 0x0002),
+ PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777),
+ PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000),
+ PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002),
++ PCMCIA_DEVICE_MANF_CARD(0x01ff, 0x0008),
+ PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002),
+ PCMCIA_DEVICE_MANF_CARD(0x026f, 0x030b),
+ PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612),
+@@ -844,7 +846,10 @@ static struct pcmcia_device_id hostap_cs
+ PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001),
+ PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001),
+ PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300),
++ PCMCIA_DEVICE_MANF_CARD(0x9005, 0x0021),
++ PCMCIA_DEVICE_MANF_CARD(0xc001, 0x0008),
+ PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),
++ PCMCIA_DEVICE_MANF_CARD(0xc250, 0x0002),
+ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002),
+ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005),
+ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010),
+@@ -862,22 +867,63 @@ static struct pcmcia_device_id hostap_cs
+ "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02",
+ 0xe6ec52ce, 0x08649af2, 0x4b74baa0),
+ PCMCIA_DEVICE_PROD_ID123(
++ "Belkin", "11Mbps Wireless Notebook Network Adapter",
++ "Version 01.02", 0x3805a391, 0xad4c7744, 0x4b74baa0),
++ PCMCIA_DEVICE_PROD_ID123(
+ "D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02",
+ 0x71b18589, 0xb6f1b0ab, 0x4b74baa0),
+ PCMCIA_DEVICE_PROD_ID123(
+ "Instant Wireless ", " Network PC CARD", "Version 01.02",
+ 0x11d901af, 0x6e9bd926, 0x4b74baa0),
+ PCMCIA_DEVICE_PROD_ID123(
++ "Intersil", "PRISM Freedom PCMCIA Adapter", "ISL37100P",
++ 0x4b801a17, 0xf222ec2d, 0x630d52b2),
++ PCMCIA_DEVICE_PROD_ID123(
++ "OEM", "PRISM2 IEEE 802.11 PC-Card", "Version 01.02",
++ 0xfea54c90, 0x48f2bdd6, 0x4b74baa0),
++ PCMCIA_DEVICE_PROD_ID123(
++ "Pretec", "CompactWLAN Card 802.11b", "2.5",
++ 0x1cadd3e5, 0xe697636c, 0x7a5bfcf1),
++ PCMCIA_DEVICE_PROD_ID123(
+ "SMC", "SMC2632W", "Version 01.02",
+ 0xc4f8b18b, 0x474a1f2a, 0x4b74baa0),
++ PCMCIA_DEVICE_PROD_ID123(
++ "The Linksys Group, Inc.", "Instant Wireless Network PC Card",
++ "ISL37300P", 0xa5f472c2, 0x590eb502, 0xc9049a39),
++ PCMCIA_DEVICE_PROD_ID123(
++ "U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02",
++ 0xc7b8df9d, 0x1700d087, 0x4b74baa0),
++ PCMCIA_DEVICE_PROD_ID12("ASUS", "802_11b_PC_CARD_25",
++ 0x78fc06ee, 0xdb9aa842),
++ PCMCIA_DEVICE_PROD_ID12("ASUS", "802_11B_CF_CARD_25",
++ 0x78fc06ee, 0x45a50c1e),
+ PCMCIA_DEVICE_PROD_ID12("BUFFALO", "WLI-CF-S11G",
+ 0x2decece3, 0x82067c18),
+ PCMCIA_DEVICE_PROD_ID12("Compaq", "WL200_11Mbps_Wireless_PCI_Card",
+ 0x54f7c49c, 0x15a75e5b),
++ PCMCIA_DEVICE_PROD_ID12("corega K.K.", "Wireless LAN PCC-11",
++ 0x5261440f, 0xa6405584),
++ PCMCIA_DEVICE_PROD_ID12("corega K.K.", "Wireless LAN PCCA-11",
++ 0x5261440f, 0xdf6115f9),
++ PCMCIA_DEVICE_PROD_ID12("D", "Link DRC-650 11Mbps WLAN Card",
++ 0x71b18589, 0xf144e3ac),
++ PCMCIA_DEVICE_PROD_ID12("Digital Data Communications", "WPC-0100",
++ 0xfdd73470, 0xe0b6f146),
+ PCMCIA_DEVICE_PROD_ID12("INTERSIL", "HFA384x/IEEE",
+ 0x74c5e40d, 0xdb472a18),
++ PCMCIA_DEVICE_PROD_ID12("LeArtery",
++ "SYNCBYAIR 11Mbps Wireless LAN PC Card",
++ 0x7e3b326a, 0x49893e92),
+ PCMCIA_DEVICE_PROD_ID12("Linksys", "Wireless CompactFlash Card",
+ 0x0733cc81, 0x0c52f395),
++ PCMCIA_DEVICE_PROD_ID12("NETGEAR MA401 Wireless PC", "Card",
++ 0xa37434e9, 0x9762e8f1),
++ PCMCIA_DEVICE_PROD_ID12("OTC", "Wireless AirEZY 2411-PCC WLAN Card",
++ 0x4ac44287, 0x235a6bed),
++ PCMCIA_DEVICE_PROD_ID12("PLANEX", "GeoWave/GW-CF110",
++ 0x209f40ab, 0xd9715264),
++ PCMCIA_DEVICE_PROD_ID12("PLANEX", "GeoWave/GW-NS110",
++ 0x209f40ab, 0x46263178),
+ PCMCIA_DEVICE_PROD_ID12(
+ "ZoomAir 11Mbps High", "Rate wireless Networking",
+ 0x273fe3db, 0x32a1eaee),
diff --git a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r1.patch b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch
index c14482babb..c7be5b3373 100644
--- a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r1.patch
+++ b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch
@@ -31,15 +31,5 @@ This patch made them bound into hostap like it was before.
Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
---- linux/drivers/net/wireless/hostap/hostap_cs.c.orig 2006-04-09 12:42:34.944903728 +0200
-+++ linux/drivers/net/wireless/hostap/hostap_cs.c 2006-04-09 12:42:37.474519168 +0200
-@@ -912,6 +912,9 @@
- PCMCIA_DEVICE_PROD_ID123(
- "SMC", "SMC2632W", "Version 01.02",
- 0xc4f8b18b, 0x474a1f2a, 0x4b74baa0),
-+ PCMCIA_DEVICE_PROD_ID123(
-+ "Pretec", "CompactWLAN Card 802.11b", "2.5",
-+ 0x1cadd3e5, 0xe697636c, 0x7a5bfcf1),
- PCMCIA_DEVICE_PROD_ID12("BUFFALO", "WLI-CF-S11G",
- 0x2decece3, 0x82067c18),
- PCMCIA_DEVICE_PROD_ID12("Compaq", "WL200_11Mbps_Wireless_PCI_Card",
+// will add some here
+
diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb
index 87450bab3a..932775c038 100644
--- a/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/packages/linux/linux-openzaurus_2.6.16.bb
@@ -1,6 +1,6 @@
include linux-openzaurus.inc
-PR = "r7"
+PR = "r8"
# Handy URLs
# git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -83,7 +83,8 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
${RPSRC}/pxa-linking-bug.patch;patch=1 \
file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
file://connectplus-remove-ide-HACK.patch;patch=1 \
- file://hrw-pcmcia-ids-r1.patch;patch=1 \
+ file://24-hostap_cs_id.diff;patch=1 \
+ file://hrw-pcmcia-ids-r2.patch;patch=1 \
file://defconfig-c7x0 \
file://defconfig-ipaq-pxa270 \
file://defconfig-collie \
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-19 07:44:42 +0000