Addded a ide-scsi fix, which was a bug in the kernel release. [Bug #28452]

8 files changed, 26 insertions, 95 deletions

diff --git a/sys-kernel/aa-sources/ChangeLog b/sys-kernel/aa-sources/ChangeLog
index d25ac3099002..915f0b704bbb 100644
--- a/sys-kernel/aa-sources/ChangeLog
+++ b/sys-kernel/aa-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/aa-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/ChangeLog,v 1.13 2003/09/07 19:01:56 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/ChangeLog,v 1.14 2003/09/11 21:35:24 plasmaroo Exp $
+
+  11 Sep 2003; <plasmaroo@gentoo.org> aa-sources-2.4.22-r1.ebuild,
+  aa-sources-2.4.22_pre6-r2.ebuild, aa-sources-2.4.22_pre7-r1.ebuild,
+  files/aa-sources-2.4.22-ide-scsi-missing-sym-fix.patch:
+  Added ide-scsi patch [bug #28452] and removed 2.4.22 pre-release
+  builds.
 
   08 Sep 2003; Martin Holzer <mholzer@gentoo.org>
   aa-sources-2.4.21_rc2-r1.ebuild, aa-sources-2.4.21_rc4-r1.ebuild,
diff --git a/sys-kernel/aa-sources/Manifest b/sys-kernel/aa-sources/Manifest
index 96f449319f56..b47c72a0a746 100644
--- a/sys-kernel/aa-sources/Manifest
+++ b/sys-kernel/aa-sources/Manifest
@@ -1,13 +1,10 @@
-MD5 c728958c4f659899ea3e4dbbe57e69cc ChangeLog 2337
+MD5 c3264aba246d6ebc1e8227d6245dba83 ChangeLog 2612
 MD5 6d46998813f2d56c90d49be112a8d2ed aa-sources-2.4.21_rc8-r1.ebuild 1099
-MD5 d5b4a9c272231ce5e8b977ffe340361f aa-sources-2.4.22_pre6-r2.ebuild 1100
 MD5 6d701ca6c0c9a9be612250adb9ccc6b8 aa-sources-2.4.21_rc2-r1.ebuild 1099
 MD5 d468fae9c47da7d838e1f15720764698 aa-sources-2.4.21_rc4-r1.ebuild 1099
-MD5 8a2afe6e677fc0c52ac1339112dfb819 aa-sources-2.4.22_pre7-r1.ebuild 1100
-MD5 c694b068c3f42ea58d9e3f9affbf3396 aa-sources-2.4.22-r1.ebuild 2031
-MD5 85a8d9e2f8745d63d60d28d42dcce907 files/digest-aa-sources-2.4.21_rc8-r1 195
-MD5 9e58330c6e93f3b08e7aac8bddfbfa16 files/digest-aa-sources-2.4.22_pre6-r2 197
+MD5 0bcf85041b4378294617b860a49047ec aa-sources-2.4.22-r1.ebuild 2162
 MD5 6d35038c9b70d9b1c75855bb70910947 files/digest-aa-sources-2.4.21_rc2-r1 195
 MD5 bdd1f97f055e5dc19131646a9d3c8ceb files/digest-aa-sources-2.4.21_rc4-r1 195
-MD5 bc6afec9a5091b463635da6b07a4e626 files/digest-aa-sources-2.4.22_pre7-r1 197
+MD5 85a8d9e2f8745d63d60d28d42dcce907 files/digest-aa-sources-2.4.21_rc8-r1 195
 MD5 017a713155afe3e4b9c5672eef0bc959 files/digest-aa-sources-2.4.22-r1 126
+MD5 fcfb3fc100621b77d191f86b66dd810a files/aa-sources-2.4.22-ide-scsi-missing-sym-fix.patch 465
diff --git a/sys-kernel/aa-sources/aa-sources-2.4.22-r1.ebuild b/sys-kernel/aa-sources/aa-sources-2.4.22-r1.ebuild
index 1b9784e2da0c..a6e73a37835f 100644
--- a/sys-kernel/aa-sources/aa-sources-2.4.22-r1.ebuild
+++ b/sys-kernel/aa-sources/aa-sources-2.4.22-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/aa-sources-2.4.22-r1.ebuild,v 1.3 2003/09/09 08:49:56 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/aa-sources-2.4.22-r1.ebuild,v 1.4 2003/09/11 21:35:24 plasmaroo Exp $
 
 IUSE="build"
 
@@ -60,5 +60,8 @@ src_unpack() {
 
 	bzcat ${DISTDIR}/${KV/-}.bz2|patch -p1 || die "-aa patch failed"
 
+	# http://lkml.org/lkml/2003/9/2/194 [plasmaroo//bug 28452]
+	epatch ${FILESDIR}/aa-sources-2.4.22-ide-scsi-missing-sym-fix.patch
+
 	kernel_universal_unpack
 }
diff --git a/sys-kernel/aa-sources/aa-sources-2.4.22_pre6-r2.ebuild b/sys-kernel/aa-sources/aa-sources-2.4.22_pre6-r2.ebuild
deleted file mode 100644
index 89b72745713c..000000000000
--- a/sys-kernel/aa-sources/aa-sources-2.4.22_pre6-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/aa-sources-2.4.22_pre6-r2.ebuild,v 1.3 2003/09/07 19:01:56 mholzer Exp $
-
-IUSE="build"
-
-# OKV=original kernel version, KV=patched kernel version.  
-
-ETYPE="sources"
-
-inherit kernel
-
-OKV="2.4.21"
-AAV=aa${PR/r/}
-KV="${PV/_/-}-${AAV}"
-S=${WORKDIR}/linux-${KV}
-
-EXTRAVERSION="`echo ${KV}|sed -e 's:[^-]*\(-.*$\):\1:'`"
-BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`"
-
-DESCRIPTION="Full sources for Andrea Arcangeli's Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-mirror://kernel/linux/kernel/v2.4/testing/patch-${PV/_/-}.bz2
-mirror://kernel/linux/kernel/people/andrea/kernels/v2.4/${KV//-/}.bz2"
-
-KEYWORDS="x86"
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-
-	cd linux-${KV}
-
-	bzcat ${DISTDIR}/patch-${PV/_/-}.bz2|patch -p1 || die "-marcelo patch failed"
-	bzcat ${DISTDIR}/${KV//-/}.bz2|patch -p1 || die "-aa patch failed"
-
-	kernel_universal_unpack
-}
-
diff --git a/sys-kernel/aa-sources/aa-sources-2.4.22_pre7-r1.ebuild b/sys-kernel/aa-sources/aa-sources-2.4.22_pre7-r1.ebuild
deleted file mode 100644
index 18baab66270c..000000000000
--- a/sys-kernel/aa-sources/aa-sources-2.4.22_pre7-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/aa-sources-2.4.22_pre7-r1.ebuild,v 1.3 2003/09/07 19:01:56 mholzer Exp $
-
-IUSE="build"
-
-# OKV=original kernel version, KV=patched kernel version.  
-
-ETYPE="sources"
-
-inherit kernel
-
-OKV="2.4.21"
-AAV=aa${PR/r/}
-KV="${PV/_/-}-${AAV}"
-S=${WORKDIR}/linux-${KV}
-
-EXTRAVERSION="`echo ${KV}|sed -e 's:[^-]*\(-.*$\):\1:'`"
-BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`"
-
-DESCRIPTION="Full sources for Andrea Arcangeli's Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-mirror://kernel/linux/kernel/v2.4/testing/patch-${PV/_/-}.bz2
-mirror://kernel/linux/kernel/people/andrea/kernels/v2.4/${KV//-/}.bz2"
-
-KEYWORDS="x86"
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-
-	cd linux-${KV}
-
-	bzcat ${DISTDIR}/patch-${PV/_/-}.bz2|patch -p1 || die "-marcelo patch failed"
-	bzcat ${DISTDIR}/${KV//-/}.bz2|patch -p1 || die "-aa patch failed"
-
-	kernel_universal_unpack
-}
-
diff --git a/sys-kernel/aa-sources/files/aa-sources-2.4.22-ide-scsi-missing-sym-fix.patch b/sys-kernel/aa-sources/files/aa-sources-2.4.22-ide-scsi-missing-sym-fix.patch
new file mode 100644
index 000000000000..310e740320bb
--- /dev/null
+++ b/sys-kernel/aa-sources/files/aa-sources-2.4.22-ide-scsi-missing-sym-fix.patch
@@ -0,0 +1,11 @@
+diff -urNp --exclude CVS --exclude BitKeeper x/kernel/ksyms.c x-new/kernel/ksyms.c
+--- x/kernel/ksyms.c	2003-09-02 16:43:44.000000000 +0200
++++ x-new/kernel/ksyms.c	2003-09-02 17:06:03.000000000 +0200
+@@ -625,6 +625,7 @@ EXPORT_SYMBOL(remove_bh);
+ EXPORT_SYMBOL(tasklet_init);
+ EXPORT_SYMBOL(tasklet_kill);
+ EXPORT_SYMBOL(__run_task_queue);
++EXPORT_SYMBOL(open_softirq);
+ EXPORT_SYMBOL(do_softirq);
+ EXPORT_SYMBOL(raise_softirq);
+ EXPORT_SYMBOL(cpu_raise_softirq);
diff --git a/sys-kernel/aa-sources/files/digest-aa-sources-2.4.22_pre6-r2 b/sys-kernel/aa-sources/files/digest-aa-sources-2.4.22_pre6-r2
deleted file mode 100644
index cedadc8d7f38..000000000000
--- a/sys-kernel/aa-sources/files/digest-aa-sources-2.4.22_pre6-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
-MD5 d62006939925ba07b4f835d9af0e2147 patch-2.4.22-pre6.bz2 3680467
-MD5 6c61fbcd1b833683c6c9506062f088d1 2.4.22pre6aa2.bz2 2225168
diff --git a/sys-kernel/aa-sources/files/digest-aa-sources-2.4.22_pre7-r1 b/sys-kernel/aa-sources/files/digest-aa-sources-2.4.22_pre7-r1
deleted file mode 100644
index 15be309838f3..000000000000
--- a/sys-kernel/aa-sources/files/digest-aa-sources-2.4.22_pre7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
-MD5 d0872bc47cbabbb4dfcf0b350ff83c19 patch-2.4.22-pre7.bz2 4213047
-MD5 15713a595c3900107d6b3823329f0fd4 2.4.22pre7aa1.bz2 1940520