diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-10-16 20:08:12 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-10-16 20:08:12 -0400 |
commit | 4a0d84ee70b7ed0343eeb0c09df08c991ff7d95c (patch) | |
tree | 37e7b194c0bafd56472413dcf948e94b4765baef /kernels | |
parent | 68fa07be35a2514835c1272884219adc110abc3b (diff) | |
parent | 7701a796e16a4196b4e0602d37b9fabbcb077ba8 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'kernels')
71 files changed, 81 insertions, 40 deletions
diff --git a/kernels/aufs2-libre/PKGBUILD b/kernels/aufs2-libre/PKGBUILD index bd177ef9c..bd177ef9c 100644..100755 --- a/kernels/aufs2-libre/PKGBUILD +++ b/kernels/aufs2-libre/PKGBUILD diff --git a/kernels/aufs2-libre/aufs2-libre.install b/kernels/aufs2-libre/aufs2-libre.install index 883882a54..883882a54 100644..100755 --- a/kernels/aufs2-libre/aufs2-libre.install +++ b/kernels/aufs2-libre/aufs2-libre.install diff --git a/kernels/aufs2-libre/aufs2-module-2.6.36.patch b/kernels/aufs2-libre/aufs2-module-2.6.36.patch index 3b43f7aed..3b43f7aed 100644..100755 --- a/kernels/aufs2-libre/aufs2-module-2.6.36.patch +++ b/kernels/aufs2-libre/aufs2-module-2.6.36.patch diff --git a/kernels/aufs2-libre/create-tarball.sh b/kernels/aufs2-libre/create-tarball.sh index 6801f00bd..6801f00bd 100644..100755 --- a/kernels/aufs2-libre/create-tarball.sh +++ b/kernels/aufs2-libre/create-tarball.sh diff --git a/kernels/aufs3-libre/PKGBUILD b/kernels/aufs3-libre/PKGBUILD index 456b84e51..456b84e51 100644..100755 --- a/kernels/aufs3-libre/PKGBUILD +++ b/kernels/aufs3-libre/PKGBUILD diff --git a/kernels/aufs3-libre/aufs3-libre.install b/kernels/aufs3-libre/aufs3-libre.install index 6468252fd..6468252fd 100644..100755 --- a/kernels/aufs3-libre/aufs3-libre.install +++ b/kernels/aufs3-libre/aufs3-libre.install diff --git a/kernels/linux-libre-aufs_friendly/Kbuild b/kernels/linux-libre-aufs_friendly/Kbuild index 8a9d7dceb..8a9d7dceb 100644..100755 --- a/kernels/linux-libre-aufs_friendly/Kbuild +++ b/kernels/linux-libre-aufs_friendly/Kbuild diff --git a/kernels/linux-libre-aufs_friendly/Kbuild.platforms b/kernels/linux-libre-aufs_friendly/Kbuild.platforms index 90a226888..90a226888 100644..100755 --- a/kernels/linux-libre-aufs_friendly/Kbuild.platforms +++ b/kernels/linux-libre-aufs_friendly/Kbuild.platforms diff --git a/kernels/linux-libre-aufs_friendly/PKGBUILD b/kernels/linux-libre-aufs_friendly/PKGBUILD index 7f2101b18..9dc2cbbce 100644..100755 --- a/kernels/linux-libre-aufs_friendly/PKGBUILD +++ b/kernels/linux-libre-aufs_friendly/PKGBUILD @@ -35,9 +35,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'i915-fix-ghost-tv-output.patch' 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") - -_kernelname=${pkgbase#linux-libre} -_localversionname=-LIBRE-AUFS_FRIENDLY md5sums=('5487da14ca81715a469c7594d39722fa' 'ce7d959667b9f158b1fb814b5806950a' '9824d09d2a659db17a6468e27ccc29ad' @@ -58,6 +55,9 @@ if [ "$CARCH" != "mips64el" ]; then unset md5sums[${#md5sums[@]}-1] fi +_kernelname=${pkgbase#linux-libre} +_localversionname=-LIBRE-AUFS_FRIENDLY + build() { cd "${srcdir}/linux-${_basekernel}" diff --git a/kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch b/kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch index 99a63d024..99a63d024 100644..100755 --- a/kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch +++ b/kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch diff --git a/kernels/linux-libre-aufs_friendly/aufs3-libre-standalone.patch b/kernels/linux-libre-aufs_friendly/aufs3-libre-standalone.patch index 584d592ef..584d592ef 100644..100755 --- a/kernels/linux-libre-aufs_friendly/aufs3-libre-standalone.patch +++ b/kernels/linux-libre-aufs_friendly/aufs3-libre-standalone.patch diff --git a/kernels/linux-libre-aufs_friendly/boot-logo.patch b/kernels/linux-libre-aufs_friendly/boot-logo.patch index c392928a5..c392928a5 100644..100755 --- a/kernels/linux-libre-aufs_friendly/boot-logo.patch +++ b/kernels/linux-libre-aufs_friendly/boot-logo.patch diff --git a/kernels/linux-libre-aufs_friendly/change-default-console-loglevel.patch b/kernels/linux-libre-aufs_friendly/change-default-console-loglevel.patch index 63435d84f..63435d84f 100644..100755 --- a/kernels/linux-libre-aufs_friendly/change-default-console-loglevel.patch +++ b/kernels/linux-libre-aufs_friendly/change-default-console-loglevel.patch diff --git a/kernels/linux-libre-aufs_friendly/config.i686 b/kernels/linux-libre-aufs_friendly/config.i686 index 7ef304fb7..7ef304fb7 100644..100755 --- a/kernels/linux-libre-aufs_friendly/config.i686 +++ b/kernels/linux-libre-aufs_friendly/config.i686 diff --git a/kernels/linux-libre-aufs_friendly/config.x86_64 b/kernels/linux-libre-aufs_friendly/config.x86_64 index 1a687faf0..1a687faf0 100644..100755 --- a/kernels/linux-libre-aufs_friendly/config.x86_64 +++ b/kernels/linux-libre-aufs_friendly/config.x86_64 diff --git a/kernels/linux-libre-aufs_friendly/ext4-options.patch b/kernels/linux-libre-aufs_friendly/ext4-options.patch index ea48c384b..ea48c384b 100644..100755 --- a/kernels/linux-libre-aufs_friendly/ext4-options.patch +++ b/kernels/linux-libre-aufs_friendly/ext4-options.patch diff --git a/kernels/linux-libre-aufs_friendly/i915-fix-ghost-tv-output.patch b/kernels/linux-libre-aufs_friendly/i915-fix-ghost-tv-output.patch index 3b631361a..3b631361a 100644..100755 --- a/kernels/linux-libre-aufs_friendly/i915-fix-ghost-tv-output.patch +++ b/kernels/linux-libre-aufs_friendly/i915-fix-ghost-tv-output.patch diff --git a/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install index 019c659ed..019c659ed 100644..100755 --- a/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install +++ b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install diff --git a/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.preset b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.preset index c802eda83..c802eda83 100644..100755 --- a/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.preset +++ b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.preset diff --git a/kernels/linux-libre-lts-api-headers/PKGBUILD b/kernels/linux-libre-lts-api-headers/PKGBUILD new file mode 100755 index 000000000..6bf0e3ca6 --- /dev/null +++ b/kernels/linux-libre-lts-api-headers/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: $ +# Maintainer: André Silva <emulatorman@lavabit.com> + +pkgname=linux-libre-lts-api-headers +_basekernel=3.0 +_sublevel=44 +pkgver=${_basekernel}.${_sublevel} +pkgrel=1 +pkgdesc="Kernel libre lts headers sanitized for use in userspace - stable longtime supported kernel package suitable for servers" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.gnu.org/software/libc" +license=('GPL2') +provides=("linux-api-headers=3.5" "linux-libre-api-headers=3.5") +conflicts=('linux-api-headers' 'linux-libre-api-headers') +replaces=('linux-api-headers' 'linux-libre-api-headers') +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") +md5sums=('5f64180fe7df4e574dac5911b78f5067' + '6daa8be01b49423178082ebf5f615a24') + +build() { + cd ${srcdir}/linux-${_basekernel} + + if [ "${_basekernel}" != "${pkgver}" ]; then + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" + fi + + make mrproper + make headers_check +} + +package() { + cd ${srcdir}/linux-${_basekernel} + make INSTALL_HDR_PATH=${pkgdir}/usr headers_install + + # use headers from libdrm + rm -rf ${pkgdir}/usr/include/drm + + # clean-up unnecessary files generated during install + find ${pkgdir} \( -name .install -o -name ..install.cmd \) -delete +} diff --git a/kernels/linux-libre-lts-rt/.directory b/kernels/linux-libre-lts-rt/.directory index 7a883fed9..7a883fed9 100644..100755 --- a/kernels/linux-libre-lts-rt/.directory +++ b/kernels/linux-libre-lts-rt/.directory diff --git a/kernels/linux-libre-lts-rt/Kbuild b/kernels/linux-libre-lts-rt/Kbuild index 8a9d7dceb..8a9d7dceb 100644..100755 --- a/kernels/linux-libre-lts-rt/Kbuild +++ b/kernels/linux-libre-lts-rt/Kbuild diff --git a/kernels/linux-libre-lts-rt/Kbuild.platforms b/kernels/linux-libre-lts-rt/Kbuild.platforms index 90a226888..90a226888 100644..100755 --- a/kernels/linux-libre-lts-rt/Kbuild.platforms +++ b/kernels/linux-libre-lts-rt/Kbuild.platforms diff --git a/kernels/linux-libre-lts-rt/PKGBUILD b/kernels/linux-libre-lts-rt/PKGBUILD index 74a883c1b..daf2d1c16 100644..100755 --- a/kernels/linux-libre-lts-rt/PKGBUILD +++ b/kernels/linux-libre-lts-rt/PKGBUILD @@ -11,12 +11,12 @@ pkgbase=linux-libre-lts-rt # Build stock -LIBRE-LTS-RT kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_releasever=41 -_rtpatchver=rt61 +_releasever=43 +_rtpatchver=rt65 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} pkgrel=1 -_lxopkgver=${_basekernel}.41 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.43 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -36,13 +36,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'i915-fix-ghost-tv-output.patch' 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") - -_kernelname=${pkgbase#linux-libre} -_localversionname=-LIBRE-LTS-RT -_aurversionkernelname=-rt-lts # in this case, in the aur version on Archlinux, the kernel name is different than ours md5sums=('5f64180fe7df4e574dac5911b78f5067' - 'b4ebaa2ebf8418c75aba96fd4dd6daf3' - '11bb95e505726abd1e1adfa522ef178f' + 'c4b4e6d908e70fc6f991a1789a3ac620' + 'bcca49907b1c1e74f6ff6afced5ff959' '7266f5e7af09cc6e4b15d7a952e3b350' '5387f0cf51652c071190789569adf9c7' '85f04a9555bdc295f7c387a6564f0c81' @@ -52,13 +48,17 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' 'c8299cf750a84e12d60b372c8ca7e1e8' - '1f082cc9e5a18e227f7a044ff429914a') + '2c4870ef22f87ef885f3be392d1aaa90') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] unset md5sums[${#md5sums[@]}-1] fi +_kernelname=${pkgbase#linux-libre} +_localversionname=-LIBRE-LTS-RT +_aurversionkernelname=-rt-lts # in this case, in the aur version on Archlinux, the kernel name is different than ours + build() { cd "${srcdir}/linux-${_basekernel}" @@ -236,11 +236,11 @@ _package() { mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS-RT}" echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS-RT}/version" - # move module tree /lib -> /usr/lib - mv "$pkgdir/lib" "$pkgdir/usr" - # Now we call depmod... depmod -b "$pkgdir" -F System.map "$_kernver" + + # move module tree /lib -> /usr/lib + mv "$pkgdir/lib" "$pkgdir/usr" } _package-headers() { diff --git a/kernels/linux-libre-lts-rt/boot-logo.patch b/kernels/linux-libre-lts-rt/boot-logo.patch index c392928a5..c392928a5 100644..100755 --- a/kernels/linux-libre-lts-rt/boot-logo.patch +++ b/kernels/linux-libre-lts-rt/boot-logo.patch diff --git a/kernels/linux-libre-lts-rt/change-default-console-loglevel.patch b/kernels/linux-libre-lts-rt/change-default-console-loglevel.patch index 63435d84f..63435d84f 100644..100755 --- a/kernels/linux-libre-lts-rt/change-default-console-loglevel.patch +++ b/kernels/linux-libre-lts-rt/change-default-console-loglevel.patch diff --git a/kernels/linux-libre-lts-rt/config.i686 b/kernels/linux-libre-lts-rt/config.i686 index 39bc1c678..39bc1c678 100644..100755 --- a/kernels/linux-libre-lts-rt/config.i686 +++ b/kernels/linux-libre-lts-rt/config.i686 diff --git a/kernels/linux-libre-lts-rt/config.x86_64 b/kernels/linux-libre-lts-rt/config.x86_64 index 826a006b2..826a006b2 100644..100755 --- a/kernels/linux-libre-lts-rt/config.x86_64 +++ b/kernels/linux-libre-lts-rt/config.x86_64 diff --git a/kernels/linux-libre-lts-rt/ext4-options.patch b/kernels/linux-libre-lts-rt/ext4-options.patch index 812b05f04..812b05f04 100644..100755 --- a/kernels/linux-libre-lts-rt/ext4-options.patch +++ b/kernels/linux-libre-lts-rt/ext4-options.patch diff --git a/kernels/linux-libre-lts-rt/i915-fix-ghost-tv-output.patch b/kernels/linux-libre-lts-rt/i915-fix-ghost-tv-output.patch index 3b631361a..3b631361a 100644..100755 --- a/kernels/linux-libre-lts-rt/i915-fix-ghost-tv-output.patch +++ b/kernels/linux-libre-lts-rt/i915-fix-ghost-tv-output.patch diff --git a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install index 7f7e3a11f..d2f0ae05a 100644..100755 --- a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install +++ b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts-rt -KERNEL_VERSION=3.0.41-1-rt61-LIBRE-LTS-RT +KERNEL_VERSION=3.0.43-1-rt65-LIBRE-LTS-RT # 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' @@ -33,7 +33,7 @@ post_install () { post_upgrade() { pacman -Q grub &>/dev/null hasgrub=$? - pacman -Q grub2-common &>/dev/null + pacman -Q grub-common &>/dev/null hasgrub2=$? pacman -Q lilo &>/dev/null haslilo=$? diff --git a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.preset b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.preset index 5b84d8b9f..5b84d8b9f 100644..100755 --- a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.preset +++ b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.preset diff --git a/kernels/linux-libre-lts-xen/PKGBUILD b/kernels/linux-libre-lts-xen/PKGBUILD index 71a136f93..b4915b8d2 100644..100755 --- a/kernels/linux-libre-lts-xen/PKGBUILD +++ b/kernels/linux-libre-lts-xen/PKGBUILD @@ -23,9 +23,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' 'ext4-options.patch') - -_kernelname=${pkgbase#linux-libre} -_localversionname=-LIBRE-LTS-XEN md5sums=('5f64180fe7df4e574dac5911b78f5067' '2748e4e15dada12fe284e9ae341a4652' '162fda63a1b6f9e0bf801e30cbb52195' @@ -35,6 +32,9 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' '263725f20c0b9eb9c353040792d644e5' 'bb7fd1aa23016c8057046b84fd4eb528') +_kernelname=${pkgbase#linux-libre} +_localversionname=-LIBRE-LTS-XEN + build() { cd "${srcdir}/linux-${_basekernel}" diff --git a/kernels/linux-libre-lts-xen/boot-logo.patch b/kernels/linux-libre-lts-xen/boot-logo.patch index c392928a5..c392928a5 100644..100755 --- a/kernels/linux-libre-lts-xen/boot-logo.patch +++ b/kernels/linux-libre-lts-xen/boot-logo.patch diff --git a/kernels/linux-libre-lts-xen/change-default-console-loglevel.patch b/kernels/linux-libre-lts-xen/change-default-console-loglevel.patch index 63435d84f..63435d84f 100644..100755 --- a/kernels/linux-libre-lts-xen/change-default-console-loglevel.patch +++ b/kernels/linux-libre-lts-xen/change-default-console-loglevel.patch diff --git a/kernels/linux-libre-lts-xen/config.i686 b/kernels/linux-libre-lts-xen/config.i686 index 03d91513e..03d91513e 100644..100755 --- a/kernels/linux-libre-lts-xen/config.i686 +++ b/kernels/linux-libre-lts-xen/config.i686 diff --git a/kernels/linux-libre-lts-xen/ext4-options.patch b/kernels/linux-libre-lts-xen/ext4-options.patch index ea48c384b..ea48c384b 100644..100755 --- a/kernels/linux-libre-lts-xen/ext4-options.patch +++ b/kernels/linux-libre-lts-xen/ext4-options.patch diff --git a/kernels/linux-libre-lts-xen/fix-i915.patch b/kernels/linux-libre-lts-xen/fix-i915.patch index 25d4bca87..25d4bca87 100644..100755 --- a/kernels/linux-libre-lts-xen/fix-i915.patch +++ b/kernels/linux-libre-lts-xen/fix-i915.patch diff --git a/kernels/linux-libre-lts-xen/i915-fix-ghost-tv-output.patch b/kernels/linux-libre-lts-xen/i915-fix-ghost-tv-output.patch index 3b631361a..3b631361a 100644..100755 --- a/kernels/linux-libre-lts-xen/i915-fix-ghost-tv-output.patch +++ b/kernels/linux-libre-lts-xen/i915-fix-ghost-tv-output.patch diff --git a/kernels/linux-libre-lts-xen/i915-gpu-finish.patch b/kernels/linux-libre-lts-xen/i915-gpu-finish.patch index 5840c9181..5840c9181 100644..100755 --- a/kernels/linux-libre-lts-xen/i915-gpu-finish.patch +++ b/kernels/linux-libre-lts-xen/i915-gpu-finish.patch diff --git a/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install b/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install index a369c337c..a369c337c 100644..100755 --- a/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install +++ b/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install diff --git a/kernels/linux-libre-lts-xen/linux-libre-lts-xen.preset b/kernels/linux-libre-lts-xen/linux-libre-lts-xen.preset index 84c7c4be6..84c7c4be6 100644..100755 --- a/kernels/linux-libre-lts-xen/linux-libre-lts-xen.preset +++ b/kernels/linux-libre-lts-xen/linux-libre-lts-xen.preset diff --git a/kernels/linux-libre-rt/3.4.4-fix-backlight-regression.patch b/kernels/linux-libre-rt/3.4.4-fix-backlight-regression.patch index a0cf0b1db..a0cf0b1db 100644..100755 --- a/kernels/linux-libre-rt/3.4.4-fix-backlight-regression.patch +++ b/kernels/linux-libre-rt/3.4.4-fix-backlight-regression.patch diff --git a/kernels/linux-libre-rt/Kbuild b/kernels/linux-libre-rt/Kbuild index 8a9d7dceb..8a9d7dceb 100644..100755 --- a/kernels/linux-libre-rt/Kbuild +++ b/kernels/linux-libre-rt/Kbuild diff --git a/kernels/linux-libre-rt/Kbuild.platforms b/kernels/linux-libre-rt/Kbuild.platforms index 90a226888..90a226888 100644..100755 --- a/kernels/linux-libre-rt/Kbuild.platforms +++ b/kernels/linux-libre-rt/Kbuild.platforms diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 6348f4093..455905e98 100644..100755 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -11,12 +11,12 @@ pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.4 -_releasever=9 -_rtpatchver=rt17 +_releasever=11 +_rtpatchver=rt19 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} -pkgrel=1.1 -_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver +pkgrel=1 +_lxopkgver=${_basekernel}.11 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -36,12 +36,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'i915-fix-ghost-tv-output.patch' '3.4.4-fix-backlight-regression.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") - -_kernelname=${pkgbase#linux-libre} -_localversionname=-LIBRE-RT md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' - '6ef5ab23e1999605f0185a6fc4d224f2' - '8ddc7ee43b418e06121bd09fa0e97bf6' + '00eaf4013fc8cfe73498d910b0b5c826' + 'be2541bbe5455203b054c6acc3f999bf' 'd176ceb303ecfb2303d9659ea2dd91c7' 'bcb219ab37ed19912126189cfca30538' '82496e68851d1960543a07ba51cdb44a' @@ -51,13 +48,16 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' '80a46681386bb87813989faeb92bdd9a' - '9ead3a0a09633b4da08983b2584b4c6f') + '4537ac9f15f96430c431d0ac22f43b80') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] unset md5sums[${#md5sums[@]}-1] fi +_kernelname=${pkgbase#linux-libre} +_localversionname=-LIBRE-RT + build() { cd "${srcdir}/linux-${_basekernel}" @@ -235,11 +235,11 @@ _package() { mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-RT}" echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-RT}/version" - # move module tree /lib -> /usr/lib - mv "$pkgdir/lib" "$pkgdir/usr" - # Now we call depmod... depmod -b "$pkgdir" -F System.map "$_kernver" + + # move module tree /lib -> /usr/lib + mv "$pkgdir/lib" "$pkgdir/usr" } _package-headers() { @@ -310,7 +310,7 @@ _package-headers() { cp drivers/media/video/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/" - for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102; do + for i in bt8xx cpia2 cx25840 cx88 em28xx pwc saa7134 sn9c102; do mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}" cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}" done diff --git a/kernels/linux-libre-rt/boot-logo.patch b/kernels/linux-libre-rt/boot-logo.patch index c392928a5..c392928a5 100644..100755 --- a/kernels/linux-libre-rt/boot-logo.patch +++ b/kernels/linux-libre-rt/boot-logo.patch diff --git a/kernels/linux-libre-rt/change-default-console-loglevel.patch b/kernels/linux-libre-rt/change-default-console-loglevel.patch index 63435d84f..63435d84f 100644..100755 --- a/kernels/linux-libre-rt/change-default-console-loglevel.patch +++ b/kernels/linux-libre-rt/change-default-console-loglevel.patch diff --git a/kernels/linux-libre-rt/config.i686 b/kernels/linux-libre-rt/config.i686 index 31ce556cf..31ce556cf 100644..100755 --- a/kernels/linux-libre-rt/config.i686 +++ b/kernels/linux-libre-rt/config.i686 diff --git a/kernels/linux-libre-rt/config.x86_64 b/kernels/linux-libre-rt/config.x86_64 index f8819f623..f8819f623 100644..100755 --- a/kernels/linux-libre-rt/config.x86_64 +++ b/kernels/linux-libre-rt/config.x86_64 diff --git a/kernels/linux-libre-rt/i915-fix-ghost-tv-output.patch b/kernels/linux-libre-rt/i915-fix-ghost-tv-output.patch index 3b631361a..3b631361a 100644..100755 --- a/kernels/linux-libre-rt/i915-fix-ghost-tv-output.patch +++ b/kernels/linux-libre-rt/i915-fix-ghost-tv-output.patch diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install index 1f57ce546..54d0c0a89 100644..100755 --- a/kernels/linux-libre-rt/linux-libre-rt.install +++ b/kernels/linux-libre-rt/linux-libre-rt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-rt -KERNEL_VERSION=3.4.9-1.1-rt17-LIBRE-RT +KERNEL_VERSION=3.4.11-1-rt19-LIBRE-RT # 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' @@ -33,7 +33,7 @@ post_install () { post_upgrade() { pacman -Q grub &>/dev/null hasgrub=$? - pacman -Q grub2-common &>/dev/null + pacman -Q grub-common &>/dev/null hasgrub2=$? pacman -Q lilo &>/dev/null haslilo=$? diff --git a/kernels/linux-libre-rt/linux-libre-rt.preset b/kernels/linux-libre-rt/linux-libre-rt.preset index cd522e792..cd522e792 100644..100755 --- a/kernels/linux-libre-rt/linux-libre-rt.preset +++ b/kernels/linux-libre-rt/linux-libre-rt.preset diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 7f14d134d..11b614694 100644..100755 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -26,9 +26,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' 'ext4-options.patch') - -_kernelname=${pkgbase#linux-libre} -_localversionname=-LIBRE-XEN md5sums=('5487da14ca81715a469c7594d39722fa' '6d9d139e4b53802615833372728cc0e4' '08169715a665016e8e54a92f98768494' @@ -38,6 +35,9 @@ md5sums=('5487da14ca81715a469c7594d39722fa' '263725f20c0b9eb9c353040792d644e5' 'bb7fd1aa23016c8057046b84fd4eb528') +_kernelname=${pkgbase#linux-libre} +_localversionname=-LIBRE-XEN + build() { cd "${srcdir}/linux-${_basekernel}" diff --git a/kernels/linux-libre-xen/boot-logo.patch b/kernels/linux-libre-xen/boot-logo.patch index c392928a5..c392928a5 100644..100755 --- a/kernels/linux-libre-xen/boot-logo.patch +++ b/kernels/linux-libre-xen/boot-logo.patch diff --git a/kernels/linux-libre-xen/change-default-console-loglevel.patch b/kernels/linux-libre-xen/change-default-console-loglevel.patch index 63435d84f..63435d84f 100644..100755 --- a/kernels/linux-libre-xen/change-default-console-loglevel.patch +++ b/kernels/linux-libre-xen/change-default-console-loglevel.patch diff --git a/kernels/linux-libre-xen/config.i686 b/kernels/linux-libre-xen/config.i686 index 7de310e0b..7de310e0b 100644..100755 --- a/kernels/linux-libre-xen/config.i686 +++ b/kernels/linux-libre-xen/config.i686 diff --git a/kernels/linux-libre-xen/ext4-options.patch b/kernels/linux-libre-xen/ext4-options.patch index ea48c384b..ea48c384b 100644..100755 --- a/kernels/linux-libre-xen/ext4-options.patch +++ b/kernels/linux-libre-xen/ext4-options.patch diff --git a/kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch b/kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch index 3b631361a..3b631361a 100644..100755 --- a/kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch +++ b/kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index b670328cd..b670328cd 100644..100755 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install diff --git a/kernels/linux-libre-xen/linux-libre-xen.preset b/kernels/linux-libre-xen/linux-libre-xen.preset index 6d5019d92..6d5019d92 100644..100755 --- a/kernels/linux-libre-xen/linux-libre-xen.preset +++ b/kernels/linux-libre-xen/linux-libre-xen.preset diff --git a/kernels/xe-guest-utilities/PKGBUILD b/kernels/xe-guest-utilities/PKGBUILD index b866a6f58..b866a6f58 100644..100755 --- a/kernels/xe-guest-utilities/PKGBUILD +++ b/kernels/xe-guest-utilities/PKGBUILD diff --git a/kernels/xe-guest-utilities/ip_address.patch b/kernels/xe-guest-utilities/ip_address.patch index 1e589ef37..1e589ef37 100644..100755 --- a/kernels/xe-guest-utilities/ip_address.patch +++ b/kernels/xe-guest-utilities/ip_address.patch diff --git a/kernels/xe-guest-utilities/xe-guest-utilities-parabola.patch b/kernels/xe-guest-utilities/xe-guest-utilities-parabola.patch index a433f6887..a433f6887 100644..100755 --- a/kernels/xe-guest-utilities/xe-guest-utilities-parabola.patch +++ b/kernels/xe-guest-utilities/xe-guest-utilities-parabola.patch diff --git a/kernels/xen/24341.patch b/kernels/xen/24341.patch index 5554004d3..5554004d3 100644..100755 --- a/kernels/xen/24341.patch +++ b/kernels/xen/24341.patch diff --git a/kernels/xen/24344.patch b/kernels/xen/24344.patch index 642b90867..642b90867 100644..100755 --- a/kernels/xen/24344.patch +++ b/kernels/xen/24344.patch diff --git a/kernels/xen/24345.patch b/kernels/xen/24345.patch index e75a1b38c..e75a1b38c 100644..100755 --- a/kernels/xen/24345.patch +++ b/kernels/xen/24345.patch diff --git a/kernels/xen/PKGBUILD b/kernels/xen/PKGBUILD index c51ffeaa9..c51ffeaa9 100644..100755 --- a/kernels/xen/PKGBUILD +++ b/kernels/xen/PKGBUILD diff --git a/kernels/xen/dom0_xz_decompression.patch b/kernels/xen/dom0_xz_decompression.patch index 277ebcfd2..277ebcfd2 100644..100755 --- a/kernels/xen/dom0_xz_decompression.patch +++ b/kernels/xen/dom0_xz_decompression.patch diff --git a/kernels/xen/parabolainit.patch b/kernels/xen/parabolainit.patch index 645a66edd..645a66edd 100644..100755 --- a/kernels/xen/parabolainit.patch +++ b/kernels/xen/parabolainit.patch diff --git a/kernels/xen/xen.patch b/kernels/xen/xen.patch index 8b1b5585d..8b1b5585d 100644..100755 --- a/kernels/xen/xen.patch +++ b/kernels/xen/xen.patch |