diff options
| -rw-r--r-- | libre/aif-libre/PKGBUILD | 1 | ||||
| -rw-r--r-- | libre/linux-libre/PKGBUILD | 21 | ||||
| -rw-r--r-- | libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch | 1 | ||||
| -rw-r--r-- | libre/pacman/PKGBUILD | 6 | ||||
| -rw-r--r-- | libre/pacman/rePKGBUILD | 2 |
5 files changed, 14 insertions, 17 deletions
diff --git a/libre/aif-libre/PKGBUILD b/libre/aif-libre/PKGBUILD index cea7cf297..fbf03418a 100644 --- a/libre/aif-libre/PKGBUILD +++ b/libre/aif-libre/PKGBUILD @@ -36,4 +36,3 @@ build() { } # vim:set ts=2 sw=2 et: - diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 8adb823a9..35ee930ea 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock - # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux-libre} _basekernel=3.0 -pkgver=${_basekernel}.3 +pkgver=${_basekernel}.4 pkgrel=1 arch=('i686' 'x86_64') url="http://linux-libre.fsfla.org/" @@ -25,14 +25,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li 'boot-logo.patch' 'fix-i915.patch' 'change-default-console-loglevel.patch') -md5sums=('44e7bc20c235a193f9b6123a8d5e9509' - '5d03ffc61ddb0a7f591df038af3a3eee' - '66dff8af6b00eb8d054b2af85aaa5ef7' - '1a98b8b8f2140ac8f95c3814cba8cc95' - 'a8a3843046926eb7ab81312cd438c5c5' - '04b21c79df0a952c22d681dd4f4562df' - '263725f20c0b9eb9c353040792d644e5' - '9d3c56a4b999c8bfbd4018089a62f662') build() { cd "${srcdir}/linux-${_basekernel}" @@ -138,7 +130,7 @@ package_linux-libre() { package_linux-libre-headers() { pkgdesc="Header files and scripts for building modules for linux-libre kernel" - provides=('kernel26-headers' "linux-headers=$pkgver") + provides=("kernel26-headers=${pkgver}" "linux-headers=${pkgver}" "kernel26-libre-headers=${pkgver}") conflicts=('kernel26-headers' 'kernel26-libre-headers' 'linux-headers') replaces=('kernel26-headers' 'kernel26-libre-headers' 'linux-headers') @@ -283,4 +275,11 @@ package_linux-libre-docs() { # remove a file already in linux package rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" } - +md5sums=('44e7bc20c235a193f9b6123a8d5e9509' + 'f17e9c5f801be0b17efe78aaff0f2a0e' + '66dff8af6b00eb8d054b2af85aaa5ef7' + '1a98b8b8f2140ac8f95c3814cba8cc95' + 'a8a3843046926eb7ab81312cd438c5c5' + '04b21c79df0a952c22d681dd4f4562df' + '263725f20c0b9eb9c353040792d644e5' + '9d3c56a4b999c8bfbd4018089a62f662') diff --git a/libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch b/libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch index 503d3367f..a14e1de69 100644 --- a/libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch +++ b/libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch @@ -30,4 +30,3 @@ index 3ace945..b0b0882 100644 -- 1.7.6 - diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 28793ed4c..1768684e1 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -3,7 +3,7 @@ pkgname=pacman pkgver=3.5.4 -pkgrel=3 +pkgrel=4 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" @@ -26,7 +26,7 @@ md5sums=('2dd3a85d55ee3dd89abd349aa837447c' '7aaccf24479f396d4a5987c8ccd2f3a2' '150a2854816cd67b1608e00f99701c1c' 'be10d3d2e533515a0470237761415568' - '7fca372cdfc5d01896490563ee4e13be') + '749a4ddc6d8418d8d031f1c9b4e09d6f') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' @@ -66,7 +66,7 @@ package() { install -m644 $srcdir/pacman.conf.mips64el $pkgdir/etc/pacman.conf mycarch="mips64el" mychost="mips64el-unknown-linux-gnu" - myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop" + myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" myldflags="" ;; esac diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD index 2fd342c18..af613dc74 100644 --- a/libre/pacman/rePKGBUILD +++ b/libre/pacman/rePKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar> source PKGBUILD -#CARCH=x86_64 +CARCH=x86_64 unset build package md5sums source _repo=core source=(PKGBUILD |