summaryrefslogtreecommitdiff
path: root/packages/linux
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2006-04-11 06:32:39 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-11 06:32:39 +0000
commit4cbd322d0f3861f9186f104d126844c5442f9a25 (patch)
tree3b537e6ded2db48e3703581d5f52124da355d357 /packages/linux
parent3b3f3f4da734d0f86331f1469c6c391dbda1368c (diff)
unslung-kernel, unslung-image: Now that 6.8-beta is released, moved mainline to R63 and dropped R29 (people can get it from SVN if they want to build old versions)
Diffstat (limited to 'packages/linux')
-rw-r--r--packages/linux/unslung-kernel/ext3flash-on-disk1.patch41
-rw-r--r--packages/linux/unslung-kernel/ext3flash.patch28
-rw-r--r--packages/linux/unslung-kernel/limit1gb.patch11
-rw-r--r--packages/linux/unslung-kernel_2.4.22.l2.3r29.bb35
-rw-r--r--packages/linux/unslung-kernel_2.4.22.l2.3r63.bb3
5 files changed, 0 insertions, 118 deletions
diff --git a/packages/linux/unslung-kernel/ext3flash-on-disk1.patch b/packages/linux/unslung-kernel/ext3flash-on-disk1.patch
deleted file mode 100644
index 80170f08ce..0000000000
--- a/packages/linux/unslung-kernel/ext3flash-on-disk1.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- linux-2.4.22/drivers/scsi/scsi_scan.c.orig 2004-11-06 14:01:22.000000000 +1030
-+++ linux-2.4.22/drivers/scsi/scsi_scan.c 2004-11-06 15:00:33.000000000 +1030
-@@ -704,6 +704,7 @@
- /* restrict device on certain port grant */
- SDpnt->host->hostt->removable = SDpnt->removable;
-
-+#if 0
- if ( SDpnt->removable && (USB_DEVPATH_1 == SDpnt->host->hostt->port) )
- {
- create_proc_read_entry("usb_err",
-@@ -718,8 +719,9 @@
- shpnt->porttype = 1;
- return 0;
- }
-+#endif
- // add by super
-- if (SDpnt->removable){
-+ if (SDpnt->removable && (USB_DEVPATH_2 == SDpnt->host->hostt->port)){
- printk("is removable disk \n");
- *IXP425_GPIO_GPOUTR &= 0xfffb;
- create_proc_read_entry("usb_conn",
---- linux-2.4.22/drivers/usb/storage/usb.c.orig 2004-11-06 14:01:06.000000000 +1030
-+++ linux-2.4.22/drivers/usb/storage/usb.c 2004-11-06 15:01:23.000000000 +1030
-@@ -787,6 +787,7 @@
- ss->htmplt.removable = 1;
- }
- #endif
-+#if 0
- /* restrict device on certain port */
- if ( ss->htmplt.removable && (USB_DEVPATH_1 == dev->devpath[0]))
- if ( ss->htmplt.removable ^ (USB_DEVPATH_2 == dev->devpath[0]) )
-@@ -803,7 +804,8 @@
- free_us_data( pre_ss, ss );
- return NULL;
- }
-- if (ss->htmplt.removable){
-+#endif
-+ if (ss->htmplt.removable && (USB_DEVPATH_2 == dev->devpath[0])){
- printk("is removable disk \n");
- *IXP425_GPIO_GPOUTR &= 0xfffb;
- create_proc_read_entry("usb_conn",
diff --git a/packages/linux/unslung-kernel/ext3flash.patch b/packages/linux/unslung-kernel/ext3flash.patch
deleted file mode 100644
index b61346c62b..0000000000
--- a/packages/linux/unslung-kernel/ext3flash.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- linux-2.4.22/drivers/scsi/scsi_scan.c.orig 2004-09-23 22:26:35.000000000 +0930
-+++ linux-2.4.22/drivers/scsi/scsi_scan.c 2004-09-23 22:38:30.000000000 +0930
-@@ -704,6 +704,7 @@
- /* restrict device on certain port grant */
- SDpnt->host->hostt->removable = SDpnt->removable;
-
-+#if 0
- if ( SDpnt->removable && (USB_DEVPATH_1 == SDpnt->host->hostt->port) )
- {
- create_proc_read_entry("usb_err",
-@@ -729,6 +730,7 @@
- NULL
- );
- }else {
-+#endif
- printk("%x port connect!!!!!\n",SDpnt->host->hostt->port);
- if(0x31 == SDpnt->host->hostt->port){
- *IXP425_GPIO_GPOUTR &= 0xfff7;
-@@ -747,7 +749,9 @@
- NULL
- );
- }
-+#if 0
- }
-+#endif
- //end
- /*
- * Check the peripheral qualifier field - this tells us whether LUNS
diff --git a/packages/linux/unslung-kernel/limit1gb.patch b/packages/linux/unslung-kernel/limit1gb.patch
deleted file mode 100644
index 17f78ef785..0000000000
--- a/packages/linux/unslung-kernel/limit1gb.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-2.4.22/drivers/scsi/scsi_scan.c.orig 2004-09-23 22:26:35.000000000 +0930
-+++ linux-2.4.22/drivers/scsi/scsi_scan.c 2004-09-23 22:42:09.000000000 +0930
-@@ -694,7 +694,7 @@
- (buffer[2] << 8) |
- buffer[3]);
- printk("The capacity is %d\n",capacity);
-- if(capacity<20000000){
-+ if(capacity<2000000){
- SDpnt->removable = 1;
- }
- kfree(buffer);
diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb
deleted file mode 100644
index cda40e1c0b..0000000000
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-SECTION = "kernel"
-
-include nslu2-linksys-kernel_2.4.22.bb
-
-DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device"
-MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>"
-PR = "r5"
-
-KERNEL_SUFFIX = "unslung"
-
-CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc mem=32M@0x00000000"
-
-UNSLUNG_KERNEL_EXTRA_SRC_URI ?=
-
-SRC_URI += "file://limit1gb.patch;patch=1 \
- file://gl811e.patch;patch=1 \
- file://ext3flash-on-disk1.patch;patch=1 \
- file://usbnet.patch;patch=1 \
- file://missing-usb-ioctls.patch;patch=1 \
- file://anonymiser.patch;patch=1 \
- file://ppp_mppe.patch;patch=1 \
- file://nfs-blocksize.patch;patch=1 \
- file://pl2303.patch;patch=1 \
- file://linux-kernel-R25_to_R29.patch;patch=1 \
- ${UNSLUNG_KERNEL_EXTRA_SRC_URI}"
-
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/unslung-kernel', '${FILE_DIRNAME}/nslu2-linksys-kernel-2.4.22', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-python () {
- # Don't build unslung kernel unless we're targeting an nslu2
- mach = bb.data.getVar("MACHINE", d, 1)
- dist = bb.data.getVar("DISTRO", d, 1)
- if mach != 'nslu2' or dist != 'unslung':
- raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2")
-}
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 b8d3c13a32..797d386f8c 100644
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
+++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
@@ -12,9 +12,6 @@ CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc mem=32M@0x
UNSLUNG_KERNEL_EXTRA_SRC_URI ?=
-# file://limit1gb.patch;patch=1 \
-# file://ext3flash-on-disk1.patch;patch=1 \
-
SRC_URI += "file://linux-kernel-R25_to_R29.patch;patch=1 \
file://linux-kernel-R29_to_R63.patch;patch=1 \
file://flash-is-now-hdd.patch;patch=1 \