diff options
author | Guy Martin <gmsoft@gentoo.org> | 2004-06-22 13:22:32 +0000 |
---|---|---|
committer | Guy Martin <gmsoft@gentoo.org> | 2004-06-22 13:22:32 +0000 |
commit | fe8b1663169ff758e8b69889b4bb1902076f7c06 (patch) | |
tree | 11135bcdae4ecfb1e389828535b2dce787f83d7f /sys-kernel | |
parent | Keyworded for hppa, bug #53226 (diff) | |
download | historical-fe8b1663169ff758e8b69889b4bb1902076f7c06.tar.gz historical-fe8b1663169ff758e8b69889b4bb1902076f7c06.tar.bz2 historical-fe8b1663169ff758e8b69889b4bb1902076f7c06.zip |
Removed old versions. Added the ncr53c8xx patch.
Diffstat (limited to 'sys-kernel')
-rw-r--r-- | sys-kernel/hppa-dev-sources/ChangeLog | 18 | ||||
-rw-r--r-- | sys-kernel/hppa-dev-sources/Manifest | 13 | ||||
-rw-r--r-- | sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.5_p2 | 2 | ||||
-rw-r--r-- | sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.5_p6 | 2 | ||||
-rw-r--r-- | sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.5_p8 | 10 | ||||
-rw-r--r-- | sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.6_p4 | 6 | ||||
-rw-r--r-- | sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.6_p4-r1 | 2 | ||||
-rw-r--r-- | sys-kernel/hppa-dev-sources/files/ncr53c8xx.diff | 137 | ||||
-rw-r--r-- | sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.5_p6.ebuild | 34 | ||||
-rw-r--r-- | sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.5_p8.ebuild | 43 | ||||
-rw-r--r-- | sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.6_p4-r1.ebuild (renamed from sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.5_p2.ebuild) | 19 | ||||
-rw-r--r-- | sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.6_p4.ebuild | 43 |
12 files changed, 168 insertions, 161 deletions
diff --git a/sys-kernel/hppa-dev-sources/ChangeLog b/sys-kernel/hppa-dev-sources/ChangeLog index 40429d59a919..fac539326f57 100644 --- a/sys-kernel/hppa-dev-sources/ChangeLog +++ b/sys-kernel/hppa-dev-sources/ChangeLog @@ -1,6 +1,22 @@ # ChangeLog for sys-kernel/hppa-dev-sources # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-dev-sources/ChangeLog,v 1.13 2004/05/19 00:15:02 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-dev-sources/ChangeLog,v 1.14 2004/06/22 13:22:32 gmsoft Exp $ + +*hppa-dev-sources-2.6.6_p4-r1 (22 Jun 2004) + + 22 Jun 2004; Guy Martin <gmsoft@gentoo.org> + hppa-dev-sources-2.6.5_p2.ebuild, hppa-dev-sources-2.6.5_p6.ebuild, + hppa-dev-sources-2.6.5_p8.ebuild, hppa-dev-sources-2.6.6_p4-r1.ebuild, + hppa-dev-sources-2.6.6_p4.ebuild, files/ncr53c8xx.diff: + Removed old versions. Added the ncr53c8xx patch. + +*hppa-dev-sources-2.6.6_p4-r1 (22 Jun 2004) + + 22 Jun 2004; Guy Martin <gmsoft@gentoo.org> + hppa-dev-sources-2.6.5_p2.ebuild, hppa-dev-sources-2.6.5_p6.ebuild, + hppa-dev-sources-2.6.5_p8.ebuild, hppa-dev-sources-2.6.6_p4-r1.ebuild, + hppa-dev-sources-2.6.6_p4.ebuild, files/ncr53c8xx.diff: + Removed old versions. Added the ncr53c8xx patch. *hppa-dev-sources-2.6.6_p4 (18 May 2004) diff --git a/sys-kernel/hppa-dev-sources/Manifest b/sys-kernel/hppa-dev-sources/Manifest index 4fc018bfc85a..4faaae6025ba 100644 --- a/sys-kernel/hppa-dev-sources/Manifest +++ b/sys-kernel/hppa-dev-sources/Manifest @@ -1,10 +1,5 @@ -MD5 37b418ad0b2bcaca7282c630b7110c2a ChangeLog 2074 -MD5 f03efc88ecdb7a23a2f3e8a6062bae3a hppa-dev-sources-2.6.5_p8.ebuild 1720 MD5 f1b3ae515c1f32812ecbf25193148a90 metadata.xml 223 -MD5 03c32fc41f5ffadb4a79957d9a6a2a86 hppa-dev-sources-2.6.6_p4.ebuild 1720 -MD5 c63b7e86b113431d268104f0f7baa2ac hppa-dev-sources-2.6.5_p2.ebuild 1202 -MD5 fe292836e07bcea23c1783c978586392 hppa-dev-sources-2.6.5_p6.ebuild 1202 -MD5 af47f52a4e7e942e2169c00223fafed9 files/digest-hppa-dev-sources-2.6.5_p6 129 -MD5 44b73607e0a7ce8e18f94071f0840b9e files/digest-hppa-dev-sources-2.6.5_p8 645 -MD5 1f1fa231c259c19b69f92d10f704de6b files/digest-hppa-dev-sources-2.6.5_p2 128 -MD5 c82bc51607699a2cfbeb5708e31b9f67 files/digest-hppa-dev-sources-2.6.6_p4 387 +MD5 d019b740c0d7d3741c912dfb0de9df39 hppa-dev-sources-2.6.6_p4-r1.ebuild 1078 +MD5 c9ad2ce251d5d3ca431d683317306f18 ChangeLog 2761 +MD5 c857b174f7e6a6b0ab2e26f9306ad0a0 files/ncr53c8xx.diff 3701 +MD5 b60da7697cdef1cea118a7766e2acc8e files/digest-hppa-dev-sources-2.6.6_p4-r1 129 diff --git a/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.5_p2 b/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.5_p2 deleted file mode 100644 index 9db48eb92db7..000000000000 --- a/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.5_p2 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 9a76bf64c1151369b250f967d83077aa linux-2.6.5.tar.bz2 34684611 -MD5 a6d833fd4ad59cf4c339320e5051663b patch-2.6.5-pa2.gz 99930 diff --git a/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.5_p6 b/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.5_p6 deleted file mode 100644 index 0e0127ac5e9d..000000000000 --- a/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.5_p6 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 9a76bf64c1151369b250f967d83077aa linux-2.6.5.tar.bz2 34684611 -MD5 2f665644156037e68e64ba24ef9692fa patch-2.6.5-pa6.gz 102678 diff --git a/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.5_p8 b/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.5_p8 deleted file mode 100644 index 0e3ec3af2794..000000000000 --- a/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.5_p8 +++ /dev/null @@ -1,10 +0,0 @@ -MD5 9a76bf64c1151369b250f967d83077aa linux-2.6.5.tar.bz2 34684611 -MD5 098010741bfa912b0295b0e20535a81b patch-2.6.5-pa0.gz 98345 -MD5 0d7d8a1ce70f17a9b4072fe046ebfb26 patch-2.6.5-pa0-pa1.gz 231 -MD5 cb56408f2abc8edd87b87df45a6c054f patch-2.6.5-pa1-pa2.gz 1998 -MD5 74e612fb1980243be75b80e9929c8663 patch-2.6.5-pa2-pa3.gz 499 -MD5 75fa0b8dd531cdf6a25cc1502f2c571e patch-2.6.5-pa3-pa4.gz 1828 -MD5 0221033d5770c3367228b3a9f069f54c patch-2.6.5-pa4-pa5.gz 1346 -MD5 c6aee2a4ee24f75c153ce666cbb13dd7 patch-2.6.5-pa5-pa6.gz 2802 -MD5 b0f9f5ee9eacca54b742c90092a6fd9d patch-2.6.5-pa6-pa7.gz 1784 -MD5 c2747fa3b443e6565ecacea466853ec8 patch-2.6.5-pa7-pa8.gz 995 diff --git a/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.6_p4 b/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.6_p4 deleted file mode 100644 index 66588c018129..000000000000 --- a/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.6_p4 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 5218790bc3db41e77a7422969639a9ad linux-2.6.6.tar.bz2 34896138 -MD5 4f4b336c68b4583c8c80e68f0323a415 patch-2.6.6-pa0.gz 131596 -MD5 b8914830852577c1953e863db344bfc9 patch-2.6.6-pa0-pa1.gz 1678 -MD5 a723b55e01db035325c40ecca04b41df patch-2.6.6-pa1-pa2.gz 1175 -MD5 1278fdd60f630f55dcd84bb2d037e4c2 patch-2.6.6-pa2-pa3.gz 909 -MD5 c5bacd1eb51771c918c01df1836f5a3c patch-2.6.6-pa3-pa4.gz 614 diff --git a/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.6_p4-r1 b/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.6_p4-r1 new file mode 100644 index 000000000000..db4828fdb953 --- /dev/null +++ b/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.6_p4-r1 @@ -0,0 +1,2 @@ +MD5 5218790bc3db41e77a7422969639a9ad linux-2.6.6.tar.bz2 34896138 +MD5 665cd5b095259c02ffeaf52f8fd6d243 patch-2.6.6-pa4.gz 133095 diff --git a/sys-kernel/hppa-dev-sources/files/ncr53c8xx.diff b/sys-kernel/hppa-dev-sources/files/ncr53c8xx.diff new file mode 100644 index 000000000000..564afdee9a46 --- /dev/null +++ b/sys-kernel/hppa-dev-sources/files/ncr53c8xx.diff @@ -0,0 +1,137 @@ +--- linux-2.6.7-pa1-wrk/drivers/scsi/ncr53c8xx.h.orig 2004-06-18 20:30:09.000000000 +0200 ++++ linux-2.6.7-pa1-wrk/drivers/scsi/ncr53c8xx.h 2004-06-18 21:15:45.703972000 +0200 +@@ -48,6 +48,18 @@ + + #include "sym53c8xx_defs.h" + ++/* ++ Build a scatter/gather entry. ++ see sym53c8xx_2/sym_hipd.h for more detailed sym_build_sge() ++ implementation ;) ++ */ ++ ++#define ncr_build_sge(np, data, badd, len) \ ++do { \ ++ (data)->addr = cpu_to_scr(badd); \ ++ (data)->size = cpu_to_scr(len); \ ++} while (0) ++ + /*========================================================== + ** + ** Structures used by the detection routine to transmit +--- linux-2.6.7-pa1-wrk/drivers/scsi/ncr53c8xx.c.orig 2004-05-30 01:28:20.000000000 +0200 ++++ linux-2.6.7-pa1-wrk/drivers/scsi/ncr53c8xx.c 2004-06-18 21:53:34.803972000 +0200 +@@ -91,7 +91,7 @@ + */ + + /* Name and version of the driver */ +-#define SCSI_NCR_DRIVER_NAME "ncr53c8xx-3.4.3e" ++#define SCSI_NCR_DRIVER_NAME "ncr53c8xx-3.4.3f" + + #define SCSI_NCR_DEBUG_FLAGS (0) + +@@ -839,7 +839,7 @@ + struct scr_tblmove smsg ; + struct scr_tblmove cmd ; + struct scr_tblmove sense ; +- struct scr_tblmove data [MAX_SCATTER]; ++ struct scr_tblmove data[MAX_SCATTER]; + }; + + +@@ -3845,7 +3845,7 @@ + + direction = scsi_data_direction(cmd); + if (direction != SCSI_DATA_NONE) { +- segments = ncr_scatter (np, cp, cp->cmd); ++ segments = ncr_scatter(np, cp, cp->cmd); + if (segments < 0) { + ncr_free_ccb(np, cp); + return(DID_ERROR); +@@ -7575,44 +7575,57 @@ + ** sizes to the data segment array. + */ + +-static int ncr_scatter(struct ncb *np, struct ccb *cp, struct scsi_cmnd *cmd) ++static int ncr_scatter_no_sglist(struct ncb *np, struct ccb *cp, struct scsi_cmnd *cmd) + { +- struct scr_tblmove *data; +- int segment = 0; +- int use_sg = (int) cmd->use_sg; ++ struct scr_tblmove *data = &cp->phys.data[MAX_SCATTER - 1]; ++ int segment; + +- data = cp->phys.data; +- cp->data_len = 0; ++ cp->data_len = cmd->request_bufflen; + +- if (!use_sg) { +- if (cmd->request_bufflen) { +- u_long baddr = map_scsi_single_data(np, cmd); +- +- data = &data[MAX_SCATTER - 1]; +- data[0].addr = cpu_to_scr(baddr); +- data[0].size = cpu_to_scr(cmd->request_bufflen); +- cp->data_len = cmd->request_bufflen; ++ if (cmd->request_bufflen) { ++ dma_addr_t baddr = map_scsi_single_data(np, cmd); ++ if (baddr) { ++ ncr_build_sge(np, data, baddr, cmd->request_bufflen); + segment = 1; ++ } else { ++ segment = -2; + } ++ } else { ++ segment = 0; + } +- else if (use_sg <= MAX_SCATTER) { ++ ++ return segment; ++} ++ ++static int ncr_scatter(struct ncb *np, struct ccb *cp, struct scsi_cmnd *cmd) ++{ ++ int segment = 0; ++ int use_sg = (int) cmd->use_sg; ++ ++ cp->data_len = 0; ++ ++ if (!use_sg) ++ segment = ncr_scatter_no_sglist(np, cp, cmd); ++ else if ((use_sg = map_scsi_sg_data(np, cmd)) > 0) { + struct scatterlist *scatter = (struct scatterlist *)cmd->buffer; ++ struct scr_tblmove *data; ++ ++ if (use_sg > MAX_SCATTER) { ++ unmap_scsi_data(np, cmd); ++ return -1; ++ } ++ ++ data = &cp->phys.data[MAX_SCATTER - use_sg]; + +- use_sg = map_scsi_sg_data(np, cmd); +- data = &data[MAX_SCATTER - use_sg]; ++ for (segment = 0; segment < use_sg; segment++) { ++ dma_addr_t baddr = sg_dma_address(&scatter[segment]); ++ unsigned int len = sg_dma_len(&scatter[segment]); + +- while (segment < use_sg) { +- u_long baddr = scsi_sg_dma_address(&scatter[segment]); +- unsigned int len = scsi_sg_dma_len(&scatter[segment]); +- +- data[segment].addr = cpu_to_scr(baddr); +- data[segment].size = cpu_to_scr(len); +- cp->data_len += len; +- ++segment; ++ ncr_build_sge(np, &data[segment], baddr, len); ++ cp->data_len += len; + } +- } +- else { +- return -1; ++ } else { ++ segment = -2; + } + + return segment; + diff --git a/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.5_p6.ebuild b/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.5_p6.ebuild deleted file mode 100644 index bb2503c0d66d..000000000000 --- a/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.5_p6.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.5_p6.ebuild,v 1.1 2004/04/13 03:12:09 vapier Exp $ -#OKV=original kernel version, KV=patched kernel version. They can be the same. - -ETYPE="sources" -inherit kernel -OKV="${PV/_p*/}" -PATCH_LEVEL="${PV/${OKV}_p/}" -KV=${OKV}-pa${PATCH_LEVEL} -EXTRAVERSION="-pa${PATCH_LEVEL}" -S=${WORKDIR}/linux-${KV} - -PATCH_SET="${PATCH_LEVEL}" -PATCH_COUNT="$(( `echo ${PATCH_SET} | wc -w` - 1 ))" - -DESCRIPTION="Full sources for the Linux kernel with patch for hppa" -SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2 - http://ftp.parisc-linux.org/cvs/linux-2.6/patch-${OKV}-pa${PATCH_LEVEL}.gz" -HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://parisc-linux.org" -KEYWORDS="-* hppa" -SLOT="${KV}" - - -src_unpack() { - unpack linux-${OKV}.tar.bz2 - mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${KV} - cd ${S} - - einfo Applying ${OKV}-pa`echo ${PATCH_SET} | awk '{ print $1 }'` - zcat ${DISTDIR}/patch-${OKV}-pa`echo ${PATCH_SET} | awk '{ print $1 }'`.gz | patch -sp 1 - - ARCH=parisc kernel_universal_unpack -} diff --git a/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.5_p8.ebuild b/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.5_p8.ebuild deleted file mode 100644 index 6f5222022ed5..000000000000 --- a/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.5_p8.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.5_p8.ebuild,v 1.1 2004/04/20 17:19:27 gmsoft Exp $ -#OKV=original kernel version, KV=patched kernel version. They can be the same. - -ETYPE="sources" -inherit kernel-2 -OKV="${PV/_p*/}" -PATCH_LEVEL="${PV/${OKV}_p/}" -KV=${OKV}-pa${PATCH_LEVEL} -EXTRAVERSION="-pa${PATCH_LEVEL}" -S=${WORKDIR}/linux-${KV} - -PATCH_SET="`seq 0 ${PATCH_LEVEL}`" -PATCH_COUNT="$(( `echo ${PATCH_SET} | wc -w` - 1 ))" - - -DESCRIPTION="Full sources for the Linux kernel with patch for hppa" -SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2 http://ftp.parisc-linux.org/cvs/linux-2.6/patch-${OKV}-pa`echo ${PATCH_SET} | awk '{ print $1 }'`.gz -`for i in \`seq 1 ${PATCH_COUNT}\`; do echo http://ftp.parisc-linux.org/cvs/linux-2.6/patch-${OKV}-pa\`echo ${PATCH_SET} | awk \"{ print \\\\\$$i }\"\`-pa\`echo ${PATCH_SET} | awk \"{ print \\\\\$$((i + 1)) }\"\`.gz; done`" -HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://parisc-linux.org" -KEYWORDS="hppa -*" -SLOT="${KV}" - - -src_unpack() { - unpack linux-${OKV}.tar.bz2 - mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${KV} - cd ${S} - - einfo Applying ${OKV}-pa`echo ${PATCH_SET} | awk '{ print $1 }'` - zcat ${DISTDIR}/patch-${OKV}-pa`echo ${PATCH_SET} | awk '{ print $1 }'`.gz | patch -sp 1 - - for i in `seq 1 ${PATCH_COUNT}` - do - a=`echo ${PATCH_SET} | awk "{ print \\\$$i }"` - b=`echo ${PATCH_SET} | awk "{ print \\\$$((i + 1)) }"` - einfo Applying patch from ${OKV}-pa${a} to ${OKV}-pa${b} - zcat ${DISTDIR}/patch-${OKV}-pa${a}-pa${b}.gz | patch -sp 1 - done - - kernel_universal_unpack -} diff --git a/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.5_p2.ebuild b/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.6_p4-r1.ebuild index 360a888f0756..ca1796483fc7 100644 --- a/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.5_p2.ebuild +++ b/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.6_p4-r1.ebuild @@ -1,24 +1,22 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.5_p2.ebuild,v 1.2 2004/04/13 03:12:09 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.6_p4-r1.ebuild,v 1.1 2004/06/22 13:22:32 gmsoft Exp $ #OKV=original kernel version, KV=patched kernel version. They can be the same. ETYPE="sources" -inherit kernel +inherit kernel-2 OKV="${PV/_p*/}" PATCH_LEVEL="${PV/${OKV}_p/}" -KV=${OKV}-pa${PATCH_LEVEL} EXTRAVERSION="-pa${PATCH_LEVEL}" +[ ! "${PR}" = "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}" +KV=${OKV}${EXTRAVERSION} S=${WORKDIR}/linux-${KV} -PATCH_SET="${PATCH_LEVEL}" -PATCH_COUNT="$(( `echo ${PATCH_SET} | wc -w` - 1 ))" DESCRIPTION="Full sources for the Linux kernel with patch for hppa" -SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2 - http://ftp.parisc-linux.org/cvs/linux-2.6/patch-${OKV}-pa${PATCH_LEVEL}.gz" +SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2 http://ftp.parisc-linux.org/cvs/linux-2.6/patch-${OKV}-pa${PATCH_LEVEL}.gz" HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://parisc-linux.org" -KEYWORDS="-* hppa" +KEYWORDS="hppa -*" SLOT="${KV}" @@ -27,8 +25,7 @@ src_unpack() { mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${KV} cd ${S} - einfo Applying ${OKV}-pa`echo ${PATCH_SET} | awk '{ print $1 }'` - zcat ${DISTDIR}/patch-${OKV}-pa`echo ${PATCH_SET} | awk '{ print $1 }'`.gz | patch -sp 1 + epatch ${DISTDIR}/patch-${OKV}-pa${PATCH_LEVEL}.gz + epatch ${FILESDIR}/ncr53c8xx.diff - ARCH=parisc kernel_universal_unpack } diff --git a/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.6_p4.ebuild b/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.6_p4.ebuild deleted file mode 100644 index 177b810c8fd1..000000000000 --- a/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.6_p4.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.6_p4.ebuild,v 1.1 2004/05/19 00:15:02 gmsoft Exp $ -#OKV=original kernel version, KV=patched kernel version. They can be the same. - -ETYPE="sources" -inherit kernel-2 -OKV="${PV/_p*/}" -PATCH_LEVEL="${PV/${OKV}_p/}" -KV=${OKV}-pa${PATCH_LEVEL} -EXTRAVERSION="-pa${PATCH_LEVEL}" -S=${WORKDIR}/linux-${KV} - -PATCH_SET="`seq 0 ${PATCH_LEVEL}`" -PATCH_COUNT="$(( `echo ${PATCH_SET} | wc -w` - 1 ))" - - -DESCRIPTION="Full sources for the Linux kernel with patch for hppa" -SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2 http://ftp.parisc-linux.org/cvs/linux-2.6/patch-${OKV}-pa`echo ${PATCH_SET} | awk '{ print $1 }'`.gz -`for i in \`seq 1 ${PATCH_COUNT}\`; do echo http://ftp.parisc-linux.org/cvs/linux-2.6/patch-${OKV}-pa\`echo ${PATCH_SET} | awk \"{ print \\\\\$$i }\"\`-pa\`echo ${PATCH_SET} | awk \"{ print \\\\\$$((i + 1)) }\"\`.gz; done`" -HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://parisc-linux.org" -KEYWORDS="hppa -*" -SLOT="${KV}" - - -src_unpack() { - unpack linux-${OKV}.tar.bz2 - mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${KV} - cd ${S} - - einfo Applying ${OKV}-pa`echo ${PATCH_SET} | awk '{ print $1 }'` - zcat ${DISTDIR}/patch-${OKV}-pa`echo ${PATCH_SET} | awk '{ print $1 }'`.gz | patch -sp 1 - - for i in `seq 1 ${PATCH_COUNT}` - do - a=`echo ${PATCH_SET} | awk "{ print \\\$$i }"` - b=`echo ${PATCH_SET} | awk "{ print \\\$$((i + 1)) }"` - einfo Applying patch from ${OKV}-pa${a} to ${OKV}-pa${b} - zcat ${DISTDIR}/patch-${OKV}-pa${a}-pa${b}.gz | patch -sp 1 - done - - kernel_universal_unpack -} |