diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-13 10:18:14 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-13 10:18:14 +0100 |
| commit | d27bbcebde95f792e0660af3657878216b2590c3 (patch) | |
| tree | ebd693dbaeb22eb25643e06b80facc1e0f073e77 /kernels | |
| parent | 68dc88e3f45d6cb33a56ca10ec02f7e990636d31 (diff) | |
| parent | 0671250710c3e7312a4693ac45ebbaacf471d1dc (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/curl/PKGBUILD
core/lvm2/PKGBUILD
core/openvpn/PKGBUILD
extra/diffstat/PKGBUILD
extra/libxcb/PKGBUILD
extra/xorg-xkbutils/PKGBUILD
extra/xorg-xvinfo/PKGBUILD
Diffstat (limited to 'kernels')
| -rw-r--r-- | kernels/linux-libre-pae/PKGBUILD | 4 | ||||
| -rw-r--r-- | kernels/linux-libre-pae/linux-libre-pae.install | 2 | ||||
| -rw-r--r-- | kernels/linux-libre-xen/PKGBUILD | 6 | ||||
| -rw-r--r-- | kernels/linux-libre-xen/linux-libre-xen.install | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index f169fa92a..970585286 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.7 -pkgver=${_basekernel}.6 +pkgver=${_basekernel}.7 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -23,7 +23,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' 'fat-3.6.x.patch') md5sums=('06bf9601d859531e7378eb43d4ca7dd3' - '90b2c4b9a05b108219bd44ac4804db84' + '6645c512b49498f17183298ab1ae98f2' '48a1026f5d36a915b8ef68f8138a7c18' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index f0bb07f04..007925fdd 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.7.6-1-LIBRE-PAE +KERNEL_VERSION=3.7.7-1-LIBRE-PAE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index e8a96277f..fa4b38b9c 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -6,8 +6,8 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.7 -pkgver=${_basekernel}.6 -pkgrel=2 +pkgver=${_basekernel}.7 +pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -23,7 +23,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' 'fat-3.6.x.patch') md5sums=('06bf9601d859531e7378eb43d4ca7dd3' - '90b2c4b9a05b108219bd44ac4804db84' + '6645c512b49498f17183298ab1ae98f2' '36aadecfb87577e90931025f46cd9d53' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index da0b7de36..b72fbbaf9 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.7.6-1-LIBRE-XEN +KERNEL_VERSION=3.7.7-1-LIBRE-XEN # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' |