diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-24 13:37:15 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-24 13:37:15 -0300 |
commit | aa59a87bb8860445bb3a4b233b44812b65b8c363 (patch) | |
tree | 2c86c94b07d2205834540b0d4c8ead7f264f56d5 /libre/linux-libre | |
parent | eca1d6fadc95df0eab55f607f67e69ff5329f590 (diff) | |
parent | 120df4e0db159525806a9b33364483e76f9d51d3 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/catalyst-dkms/PKGBUILD
community-testing/catalyst-dkms/catalyst.install
community-testing/lxdm/PKGBUILD
community-testing/lxdm/lxdm-pam
extra/tdb/PKGBUILD
extra/usbview/PKGBUILD
multilib/lib32-libldap/PKGBUILD
testing/bison/PKGBUILD
testing/ekiga/PKGBUILD
testing/evince/PKGBUILD
testing/gthumb/PKGBUILD
testing/nautilus/PKGBUILD
testing/opal/PKGBUILD
testing/opal/opal-ffmpeg.patch
testing/openssh/PKGBUILD
testing/openssh/sshd.service
testing/openssh/sshd.socket
testing/openssh/sshdgenkeys.service
testing/yelp/PKGBUILD
Diffstat (limited to 'libre/linux-libre')
-rw-r--r-- | libre/linux-libre/PKGBUILD | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 0b2250069..539685452 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -13,7 +13,7 @@ _basekernel=3.6 _sublevel=3 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.3 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -43,7 +43,7 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380' '9d3c56a4b999c8bfbd4018089a62f662' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '34508a324c3704662e9fc115d07735a3') + '656c0ceb21fe98a3d18e35201755efd1') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] |