From 01a0c4bc740842efa3bf1a7e1d6c8be5656e4e2a Mon Sep 17 00:00:00 2001 From: root Date: Wed, 14 Mar 2012 00:01:30 +0000 Subject: Wed Mar 14 00:01:29 UTC 2012 --- kernels/aufs3-libre/PKGBUILD | 5 +++-- kernels/aufs3-libre/aufs3-libre.install | 2 +- kernels/linux-libre-aufs_friendly/PKGBUILD | 9 +++------ .../linux-libre-aufs_friendly/linux-libre-aufs_friendly.install | 4 ++-- kernels/linux-libre-rt/PKGBUILD | 7 ++----- kernels/linux-libre-rt/linux-libre-rt.install | 6 +++--- kernels/linux-libre-xen/PKGBUILD | 5 +---- 7 files changed, 15 insertions(+), 23 deletions(-) (limited to 'kernels') diff --git a/kernels/aufs3-libre/PKGBUILD b/kernels/aufs3-libre/PKGBUILD index 64bc71c9e..6c593e2c2 100644 --- a/kernels/aufs3-libre/PKGBUILD +++ b/kernels/aufs3-libre/PKGBUILD @@ -1,16 +1,17 @@ # Contributor: Paul Mattal # Maintainer: Calimero # Maintainer (Parabola): André Silva +# Contributor (Parabola): Márcio Silva pkgname=aufs3-libre pkgver=3.2_20120109 -pkgrel=1 +pkgrel=2 # Set to whatever the tree of your aufs-libre-friendly kernel is, and set the right dependency. #_kernver=${pkgver%_*}-LIBRE #depends=('aufs_friendly') -_kernver=3.2-aufs_friendly +_kernver=3.2-LIBRE-AUFS_FRIENDLY depends=('linux-libre-aufs_friendly' 'linux-libre-aufs_friendly-headers') pkgdesc="Another UnionFS implementation" diff --git a/kernels/aufs3-libre/aufs3-libre.install b/kernels/aufs3-libre/aufs3-libre.install index 6e92c8e9a..e08b76b54 100644 --- a/kernels/aufs3-libre/aufs3-libre.install +++ b/kernels/aufs3-libre/aufs3-libre.install @@ -1,5 +1,5 @@ post_install() { - KERNEL_VERSION=3.2-aufs_friendly + KERNEL_VERSION=3.2-LIBRE-AUFS_FRIENDLY depmod $(cat /lib/modules/extramodules-$KERNEL_VERSION/version) } diff --git a/kernels/linux-libre-aufs_friendly/PKGBUILD b/kernels/linux-libre-aufs_friendly/PKGBUILD index 49b0adba1..41ccc96bb 100644 --- a/kernels/linux-libre-aufs_friendly/PKGBUILD +++ b/kernels/linux-libre-aufs_friendly/PKGBUILD @@ -6,6 +6,7 @@ # Maintainer (Parabola): Sorin-Mihai Vârgolici # Maintainer (Parabola): André Silva # Maintainer (Parabola): Michał Masłowski +# Contributor (Parabola): Márcio Silva # In order to just get linux-libre as it used to be, with the exported symbols for AUFS-libre: @@ -17,12 +18,12 @@ # Comment this line pkgname=('linux-libre-aufs_friendly' 'linux-libre-aufs_friendly-headers') # Build stock -LIBRE kernel with AUFS-libre support -_kernelname=${pkgname#linux-libre} +_kernelname=-LIBRE-AUFS_FRIENDLY _basekernel=3.2 _sublevel=9 pkgver=${_basekernel}.${_sublevel} _lxopkgver=${_basekernel}.7 # nearly always the same as pkgver -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -204,10 +205,6 @@ package_linux-libre-aufs_friendly() { install -D -m644 "${srcdir}/${pkgname}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset" # set correct depmod command for install - sed \ - -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \ - -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \ - -i "${startdir}/${pkgname}.install" sed \ -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgname}\"|g" \ -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgname}.img\"|g" \ 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 eb2293d00..09ca175a6 100644 --- a/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install +++ b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-aufs_friendly -KERNEL_VERSION=3.2.9-1-LIBRE-AUFS_FRIENDLY +KERNEL_VERSION=3.2.9-2-LIBRE-AUFS_FRIENDLY post_install () { # updating module dependencies @@ -14,7 +14,7 @@ post_install () { fi # compat symlinks for the official kernels only - if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then + if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-aufs_friendly" ]; then loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)" [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf" if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 47f4e371c..6f14461fe 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -6,11 +6,12 @@ # Contributor (Parabola): Nicolás Reynolds # Contributor (Parabola): Jorge Lopez # Contributor (Parabola): André Silva +# Contributor (Parabola): Márcio Silva pkgbase=linux-libre-rt pkgname=('linux-libre-rt' 'linux-libre-rt-headers') # Build stock -LIBRE kernel with RT support # pkgname=linux-custom # Build kernel with a different name -_kernelname=${pkgname#linux-libre} +_kernelname=-LIBRE-RT _basekernel=3.2 _releasever=6 _rtpatchver=rt13 @@ -135,10 +136,6 @@ package_linux-libre-rt() { install -D -m644 "${srcdir}/${pkgname}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset" # set correct depmod command for install - sed \ - -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \ - -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \ - -i "${startdir}/${pkgname}.install" sed \ -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgname}\"|g" \ -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgname}.img\"|g" \ diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install index 5c40a32e9..79c6aea4d 100644 --- a/kernels/linux-libre-rt/linux-libre-rt.install +++ b/kernels/linux-libre-rt/linux-libre-rt.install @@ -1,8 +1,8 @@ # arg 1: the new package version # arg 2: the old package version -KERNEL_NAME= -KERNEL_VERSION=3.2.2-LIBRE +KERNEL_NAME=-rt +KERNEL_VERSION=3.2.6-2-LIBRE-RT post_install () { # updating module dependencies @@ -12,7 +12,7 @@ post_install () { mkinitcpio -p linux-libre${KERNEL_NAME} # compat symlinks for the official kernels only - if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then + if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-rt" ]; then loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)" [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf" if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 38205d2aa..72d62953e 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -4,6 +4,7 @@ # Contributor (Parabola): Nicolás Reynolds # Contributor (Parabola): Sorin-Mihai Vârgolici # Contributor (Parabola): André Silva +# Contributor (Parabola): Márcio Silva pkgbase=linux-libre-xen pkgname=('linux-libre-xen' 'linux-libre-xen-headers') # Build stock -LIBRE kernel with Xen guest support @@ -130,10 +131,6 @@ package_linux-libre-xen() { install -D -m644 "${srcdir}/${pkgname}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset" # set correct depmod command for install - sed \ - -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \ - -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \ - -i "${startdir}/${pkgname}.install" sed \ -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgname}\"|g" \ -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgname}.img\"|g" \ -- cgit v1.2.3-54-g00ecf