diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-05-30 12:41:17 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-05-30 12:41:17 -0300 |
| commit | e68d976a35ac019eaad2d80b2818748211176d5b (patch) | |
| tree | 716c653396b08e05e12b6acc97d06bb7cb9fd72c /libre/linux-libre/PKGBUILD | |
| parent | e855f30d427d16dc9b9eada81e48c6acd2400793 (diff) | |
| parent | 35c8fd0c42370098fe43db71c93aa22b4d41507b (diff) | |
| download | abslibre-e68d976a35ac019eaad2d80b2818748211176d5b.tar.gz abslibre-e68d976a35ac019eaad2d80b2818748211176d5b.tar.bz2 abslibre-e68d976a35ac019eaad2d80b2818748211176d5b.zip | |
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Conflicts:
libre/your-freedom/PKGBUILD
Diffstat (limited to 'libre/linux-libre/PKGBUILD')
| -rw-r--r-- | libre/linux-libre/PKGBUILD | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 6f87f8738..ae3f19ae1 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -11,18 +11,19 @@ pkgbase=linux-libre pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE -_basekernel=3.3 -_sublevel=6 -pkgver=${_basekernel}.${_sublevel} +_basekernel=3.4 +#_sublevel=6 +#pkgver=${_basekernel}.${_sublevel} +pkgver=${_basekernel} _lxopkgver=${_basekernel}.5 # nearly always the same as pkgver -pkgrel=1 +pkgrel=1.2 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl') options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" + #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" # the main kernel config files 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk @@ -32,19 +33,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' - 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") -md5sums=('5487da14ca81715a469c7594d39722fa' - '6d9d139e4b53802615833372728cc0e4' - '225fc118e655b0e4031aaf45656b872c' - 'e6b45d3ba0415d2dfbda9cdbf6dbf6f4' +md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' + #'6d9d139e4b53802615833372728cc0e4' + '631bee7d8e6e125f859fc51200699685' + '54f6db6c3b747fbee10cb02460ba66f0' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' - 'bb7fd1aa23016c8057046b84fd4eb528' 'de092ff42e61e88a67f50c351c2ad7c0') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. @@ -77,10 +76,6 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" - # fix ext4 module to mount ext3/2 correct - # https://bugs.archlinux.org/task/28653 - patch -Np1 -i "${srcdir}/ext4-options.patch" - if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ @@ -353,7 +348,7 @@ package_linux-libre-headers() { done # remove unneeded architectures - rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa} + rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} if [ "$CARCH" = "mips64el" ]; then rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86 else |