diff options
Diffstat (limited to 'kernels/linux-libre-rt')
-rw-r--r-- | kernels/linux-libre-rt/PKGBUILD | 30 | ||||
-rw-r--r-- | kernels/linux-libre-rt/config.i686 | 2 | ||||
-rw-r--r-- | kernels/linux-libre-rt/config.x86_64 | 2 | ||||
-rw-r--r-- | kernels/linux-libre-rt/linux-libre-rt.install | 40 |
4 files changed, 21 insertions, 53 deletions
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 77ebe521f..f7b3cf6f4 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -9,12 +9,12 @@ pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -_releasever=10 -_rtpatchver=rt6 +_releasever=13 +_rtpatchver=rt13 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} pkgrel=1 -_lxopkgver=${_basekernel}.10 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.13 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -33,16 +33,16 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5c7787be882c343e41fb49136ff60aec' - '1a05d0c781ac02fed58ad405a8b8355a' - '23d715c891ecfb436cb2a4c4ea5286af' - '5ed195b8c44e1e00c1885077566e1f81' - 'f97a0be3b9252e788a0cf67e93cb5c6f' + '2242024493dcb72a8777e11198f5e743' + '977361725db4bbd680797a794d7aa398' + '293b9b28b2c5c8f52e374b50dc5437ac' + '4986bd75ff1b6a69606b4ffd235af192' '82496e68851d1960543a07ba51cdb44a' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - 'c1a8440ffdae7c352d77bc4002cb6d3d') + '0bb62b946f06edc2f5b0249b7fc773e4') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -148,7 +148,7 @@ build() { } _package() { - pkgdesc="The ${pkgbase} kernel and modules with realtime preemption" + pkgdesc="The ${pkgbase^} kernel and modules with realtime preemption" [ "${pkgbase}" = "linux-libre" ] && groups=('base') depends=('coreutils' 'linux-libre-firmware' 'kmod') optdepends=('crda: to set the correct wireless channels of your country') @@ -187,14 +187,16 @@ _package() { # add vmlinux install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux" - # install fallback mkinitcpio.conf file and preset file for kernel - install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - # set correct depmod command for install + cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" + true && install=${install}.pkg sed \ -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \ -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \ - -i "${startdir}/${pkgbase}.install" + -i "${startdir}/${install}" + + # install mkinitcpio preset file for kernel + install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" sed \ -e "1s|'linux*.*'|'${pkgbase}'|" \ -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \ @@ -228,7 +230,7 @@ _package() { } _package-headers() { - pkgdesc="Header files and scripts for building modules for ${pkgbase} kernel" + pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel" provides=("kernel26${_kernelname}-headers=${pkgver}" "linux${_kernelname}-headers=${pkgver}") conflicts=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers") replaces=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers") diff --git a/kernels/linux-libre-rt/config.i686 b/kernels/linux-libre-rt/config.i686 index d6e6d82c9..3286e32e9 100644 --- a/kernels/linux-libre-rt/config.i686 +++ b/kernels/linux-libre-rt/config.i686 @@ -5656,7 +5656,7 @@ CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_PNFS_BLOCK=m CONFIG_PNFS_OBJLAYOUT=m -CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y diff --git a/kernels/linux-libre-rt/config.x86_64 b/kernels/linux-libre-rt/config.x86_64 index d4cef655e..af01ee790 100644 --- a/kernels/linux-libre-rt/config.x86_64 +++ b/kernels/linux-libre-rt/config.x86_64 @@ -5427,7 +5427,7 @@ CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_PNFS_BLOCK=m CONFIG_PNFS_OBJLAYOUT=m -CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install index 4b78a3997..434a0207c 100644 --- a/kernels/linux-libre-rt/linux-libre-rt.install +++ b/kernels/linux-libre-rt/linux-libre-rt.install @@ -2,10 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-rt -KERNEL_VERSION=3.8.10-1-rt6-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' +KERNEL_VERSION= post_install () { # updating module dependencies @@ -15,40 +12,9 @@ post_install () { echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." mkinitcpio -p linux-libre${KERNEL_NAME} fi - - # compat symlinks for the official kernels only - 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 - # add compat symlinks for the initramfs images - ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img - ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \ - boot/kernel26${KERNEL_NAME}-fallback.img - ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME} - fi - fi } post_upgrade() { - pacman -Q grub &>/dev/null - hasgrub=$? - pacman -Q grub-common &>/dev/null - hasgrub2=$? - pacman -Q lilo &>/dev/null - haslilo=$? - # reminder notices - if [ $haslilo -eq 0 ]; then - echo ">>>" - if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then - echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting." - else - echo ">>> You appear to be using the LILO bootloader. You should run" - echo ">>> 'lilo' before rebooting." - fi - echo ">>>" - fi - if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then echo "WARNING: /boot appears to be a separate partition but is not mounted." fi @@ -64,6 +30,6 @@ post_upgrade() { post_remove() { # also remove the compat symlinks - rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}.img - rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}-fallback.img + rm -f boot/initramfs-linux-libre${KERNEL_NAME}.img + rm -f boot/initramfs-linux-libre${KERNEL_NAME}-fallback.img } |