summaryrefslogtreecommitdiff
path: root/libre/kernel26-libre/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'libre/kernel26-libre/PKGBUILD')
-rw-r--r--libre/kernel26-libre/PKGBUILD20
1 files changed, 0 insertions, 20 deletions
diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD
index e1dc6ab1d..ef53c66b2 100644
--- a/libre/kernel26-libre/PKGBUILD
+++ b/libre/kernel26-libre/PKGBUILD
@@ -10,7 +10,6 @@ pkgver=${_basekernel}.2
pkgrel=1
makedepends=('xmlto' 'docbook-xsl')
_patchname="patch-${pkgver}-${pkgrel}-LIBRE"
-#_patchname="patch-2.6.39.2-1-LIBRE"
arch=(i686 x86_64)
license=('GPL2')
url="http://linux-libre.fsfla.org/"
@@ -256,22 +255,3 @@ find $pkgdir -type d -exec chmod 755 {} \;
# remove a file already in kernel26 package
rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile
}
-md5sums=('923210b0c4190733bf314e48f588c112'
-<<<<<<< HEAD
- 'abad63eab1f9485f6b1af76f5109f1e4'
- '5d40a23419b48f5b49f1f10be0e733c3'
- 'af5937ac06a78907ceb499351bdff7ab'
- '25584700a0a679542929c4bed31433b6'
- 'ba583747f515e51ec0f16d535e4be6e0')
-md5sums=('8feab9fb6c177052cb79248a223fbf66'
- 'a480007d95472cc16825f5afe6e18e54'
-=======
->>>>>>> 4aea7f1d98a7fba9a021ade4c9d475b180687fe8
- 'abad63eab1f9485f6b1af76f5109f1e4'
- '5d40a23419b48f5b49f1f10be0e733c3'
- 'af5937ac06a78907ceb499351bdff7ab'
- '25584700a0a679542929c4bed31433b6'
- 'ba583747f515e51ec0f16d535e4be6e0'
- '2967cecc3af9f954ccc822fd63dca6ff'
- '8267264d9a8966e57fdacd1fa1fc65c4'
- 'ba583747f515e51ec0f16d535e4be6e0')