diff options
| -rw-r--r-- | .SRCINFO | 24 | ||||
| -rw-r--r-- | 0005-BFQ-Fix.patch | 33 | ||||
| -rw-r--r-- | 0006-BFQ-Fix.patch | 24 | ||||
| -rw-r--r-- | 99-linux.hook | 11 | ||||
| -rw-r--r-- | PKGBUILD | 111 | ||||
| -rw-r--r-- | config | 2 | ||||
| -rw-r--r-- | config.x86_64 | 2 | ||||
| -rw-r--r-- | linux-rt-bfq.install | 27 | ||||
| -rw-r--r-- | linux-rt-bfq.preset | 14 | ||||
| -rw-r--r-- | linux.install | 27 | ||||
| -rw-r--r-- | linux.preset | 14 |
11 files changed, 182 insertions, 107 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Mon Oct 31 20:22:28 UTC 2016 +# Fri Nov 18 16:40:07 UTC 2016 pkgbase = linux-rt-bfq pkgver = 4.8.6_rt5 - pkgrel = 1 + pkgrel = 2 url = http://algo.ing.unimo.it arch = i686 arch = x86_64 @@ -22,11 +22,14 @@ pkgbase = linux-rt-bfq source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.8.0-v8r4/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-to-.patch source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.8.0-v8r4/0004-Turn-BFQ-v7r11-into-BFQ-v8r4-for-4.8.0.patch source = http://repo-ck.com/source/gcc_patch/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch.gz - source = linux-rt-bfq.preset source = change-default-console-loglevel.patch + source = fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch source = config source = config.x86_64 - source = fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch + source = 99-linux.hook + source = linux.preset + source = 0005-BFQ-Fix.patch + source = 0006-BFQ-Fix.patch sha512sums = a48a065f21e1c7c4de4cf8ca47b8b8d9a70f86b64e7cfa6e01be490f78895745b9c8790734b1d22182cf1f930fb87eaaa84e62ec8cc1f64ac4be9b949e7c0358 sha512sums = SKIP sha512sums = 8a3c9bbba1bb8fc49b073509320fedec085b5de0507826baced59a2acfd0bef9b3a79a2510ccffa6bf1e21098bb13efff028f87ea239b19047e9afa61c149558 @@ -37,16 +40,19 @@ pkgbase = linux-rt-bfq sha512sums = dc0649dfe2a5ce8e8879a62df29a4a1959eb1a84e5d896a9cb119d6a85a9bad1b17135371799e0be96532e17c66043d298e4a14b18fad3078a1f425108f888c9 sha512sums = 135afcffee2439e2260a71202658dce9ec5f555de3291b2d49a5cffdd953c6d7851b8a90e961576895555142a618e52220a7e4a46521ca4ba19d37df71887581 sha512sums = 87ae76889ab84ced46c237374c124786551982f8ff7325102af9153aed1ab7be72bec4db1f7516426c5ee34c5ce17221679eb2f129c5cbdeec05c0d3cb7f785d - sha512sums = 62fdd5c0a060a051b64093d71fbb028781061ccb7a28c5b06739a0b24dac0945740d9b73ff170784f60005a589774bcc14f56523ec51557eb3a677f726ec34cf - sha512sums = 14d530c8d727e5253474b3d46a7e30933bcc0aa9a6cf597ab6557c12779e2ce627d49258a3623f48421b48cd1a29012f7e3ff984387488c101d94d98fe0aae9d + sha512sums = 8e8f407262f3f573654e7f0fceec6075fd2da0258a384206d28e5f59698168609e575f3d855adb8bb476b0684da409dab22f7ddc0f00e9c10c67debe4409c30b sha512sums = d9d28e02e964704ea96645a5107f8b65cae5f4fb4f537e224e5e3d087fd296cb770c29ac76e0ce95d173bc420ea87fb8f187d616672a60a0cae618b0ef15b8c8 - sha512sums = 3fba4c1c172aa823c58901656fcbd30241f7e60486619d1095447e4c902b94e4a9f568d68a124001951cff6e873ce55f338975808b30e3ba2ee2380561660133 - sha512sums = a6200ad0c8bc44b97233c0cbd4c419c37727f06e735f2c6b60a28e94bfdc6d31d7f26d24f9f898c62fceefe08dfd3bdbd5d71acf2b5fcedbda8ea3881d284daa sha512sums = 86f717f596c613db3bc40624fd956ed379b8a2a20d1d99e076ae9061251fe9afba39cf536623eccd970258e124b8c2c05643e3d539f37bd910e02dc5dd498749 + sha512sums = 8e7afab44b381b77ba45b3ef18a229ed0c12de6b6a4a353796b2e0e0214119d2c31eb30d250c4ece90a515eb56af6cdd1c02299a9a3b1d7a8cbb3ac65cb8fef2 + sha512sums = 71e98fdf610795c5ace42384d43d56a4c18ba7225525aca6947af57697b412a2fa078dda891850e17892e9d093808a504ba36351a867ba302fc7c70f8bb423e6 + sha512sums = d6faa67f3ef40052152254ae43fee031365d0b1524aa0718b659eb75afc21a3f79ea8d62d66ea311a800109bed545bc8f79e8752319cd378eef2cbd3a09aba22 + sha512sums = 2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf + sha512sums = 3889679e288d51f6fecc7ed6581ccde34acbf1e4861f5c9ca237a1ad13158502757d3fc457d7b6caf1c8c99c9dba842265004154a71cffb8ec14e1030e49e312 + sha512sums = 3c3f3b6407d9a1a63cd91c2b5c35e6c932afa5bf33f1b2e8a530dbd9eacda8c8f956616c4cc9228657624da58e354ba5714252237d84ff3386fd65cf44f06ddc pkgname = linux-rt-bfq pkgdesc = Linux Kernel and modules with the RT patch and the BFQ scheduler. - install = linux-rt-bfq.install + install = linux.install depends = coreutils depends = linux-firmware depends = mkinitcpio>=0.7 diff --git a/0005-BFQ-Fix.patch b/0005-BFQ-Fix.patch new file mode 100644 index 000000000000..ad66ca69a2ba --- /dev/null +++ b/0005-BFQ-Fix.patch @@ -0,0 +1,33 @@ +From 69f18bb587a4805b2b18bb4ba91dced87a8fda06 Mon Sep 17 00:00:00 2001 +From: Paolo Valente <paolo.valente@linaro.org> +Date: Sat, 22 Oct 2016 15:26:33 +0200 +Subject: [PATCH 86/86] BUGFIX: Replace max wrongly used for modulo numbers + +Signed-off-by: Paolo Valente <paolo.valente@linaro.org> +--- + block/bfq-iosched.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c +index eef6ff4..c161ff0 100644 +--- a/block/bfq-iosched.c ++++ b/block/bfq-iosched.c +@@ -2179,9 +2179,13 @@ static void __bfq_set_in_service_queue(struct bfq_data *bfqd, + * not only expires, but also remains with no + * request. + */ +- bfqq->last_wr_start_finish += jiffies - +- max_t(unsigned long, bfqq->last_wr_start_finish, +- bfqq->budget_timeout); ++ if (time_after(bfqq->budget_timeout, ++ bfqq->last_wr_start_finish)) ++ bfqq->last_wr_start_finish += ++ jiffies - bfqq->budget_timeout; ++ else ++ bfqq->last_wr_start_finish = jiffies; ++ + if (time_is_after_jiffies(bfqq->last_wr_start_finish)) { + pr_crit( + "BFQ WARNING:last %lu budget %lu jiffies %lu", +Contact GitHub API Training Shop Blog About + diff --git a/0006-BFQ-Fix.patch b/0006-BFQ-Fix.patch new file mode 100644 index 000000000000..fa361f2778e5 --- /dev/null +++ b/0006-BFQ-Fix.patch @@ -0,0 +1,24 @@ +From 69f18bb587a4805b2b18bb4ba91dced87a8fda06 Mon Sep 17 00:00:00 2001 +From: Paolo Valente <paolo.valente@linaro.org> +Date: Sat, 22 Oct 2016 15:26:33 +0200 +Subject: [PATCH 86/86] BUGFIX: Remove wrong conversion in use of bfq_fifo_expirebug + +Signed-off-by: Paolo Valente <paolo.valente@linaro.org> +--- + block/bfq-iosched.c | 3 +-- + 1 file changed, 1 insertions(+), 2 deletions(-) + +diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c +index eef6ff4..c161ff0 100644 +--- a/block/bfq-iosched.c ++++ b/block/bfq-iosched.c +@@ -4268,8 +4268,7 @@ + + bfq_add_request(rq); + +- rq->fifo_time = ktime_get_ns() + +- jiffies_to_nsecs(bfqd->bfq_fifo_expire[rq_is_sync(rq)]); ++ rq->fifo_time = ktime_get_ns() + bfqd->bfq_fifo_expire[rq_is_sync(rq)]; + list_add_tail(&rq->queuelist, &bfqq->fifo); + + bfq_rq_enqueued(bfqd, bfqq, rq); diff --git a/99-linux.hook b/99-linux.hook new file mode 100644 index 000000000000..9851151995bc --- /dev/null +++ b/99-linux.hook @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Target = boot/vmlinuz-%PKGBASE% +Target = usr/lib/initcpio/* + +[Action] +Description = Updating %PKGBASE% initcpios +When = PostTransaction +Exec = /usr/bin/mkinitcpio -p %PKGBASE% @@ -49,13 +49,12 @@ _use_current= ### Do not edit below this line unless you know what you're doing pkgbase=linux-rt-bfq -pkgname=('linux-rt-bfq' 'linux-rt-bfq-headers' 'linux-rt-bfq-docs') -_kernelname=-rt-bfq +# pkgname=('linux-rt-bfq' 'linux-rt-bfq-headers' 'linux-rt-bfq-docs') _srcname=linux-4.8 _pkgver=4.8.6 _rtpatchver=rt5 pkgver=${_pkgver}_${_rtpatchver} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://algo.ing.unimo.it" license=('GPL2') @@ -78,13 +77,22 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" "${_bfqpath}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${_bfqrel}-to-.patch" "${_bfqpath}/0004-Turn-BFQ-${_bfqrel}-into-BFQ-${_bfqver}-for-4.8.0.patch" "http://repo-ck.com/source/gcc_patch/${_gcc_patch}.gz" - 'linux-rt-bfq.preset' 'change-default-console-loglevel.patch' + 'fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch' + # the main kernel config files 'config' 'config.x86_64' - 'fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch') + # pacman hook for initramfs regeneration + '99-linux.hook' + # standard config files for mkinitcpio ramdisk + 'linux.preset' + # patches from https://github.com/linusw/linux-bfq/commits/bfq-v8 + '0005-BFQ-Fix.patch' + '0006-BFQ-Fix.patch') +_kernelname=${pkgbase#linux} + prepare() { - cd ${_srcname} + cd "${srcdir}/${_srcname}" ### Add upstream patch msg "Add upstream patch" @@ -107,7 +115,7 @@ prepare() { ### Patch source with BFQ msg "Patching source with BFQ patches" - for p in "${srcdir}"/000{1,2,3,4}-*BFQ*.patch; do + for p in "${srcdir}"/000{1,2,3,4,5,6}-*BFQ*.patch; do msg " $p" patch -Np1 -i "$p" done @@ -227,57 +235,53 @@ prepare() { } build() { - cd ${_srcname} - msg "Running make bzImage and modules" - make ${MAKEFLAGS} LOCALVERSION= bzImage modules + cd "${srcdir}/${_srcname}" + + make ${MAKEFLAGS} LOCALVERSION= bzImage modules } -package_linux-rt-bfq() { +_package() { pkgdesc='Linux Kernel and modules with the RT patch and the BFQ scheduler.' depends=('coreutils' 'linux-firmware' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country' 'modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig') - backup=("etc/mkinitcpio.d/linux-rt-bfq.preset") - install=linux-rt-bfq.install - - cd ${_srcname} + backup=("etc/mkinitcpio.d/${pkgbase}.preset") + install=linux.install + cd "${srcdir}/${_srcname}" + KARCH=x86 - # get kernel version + # get kernel version _kernver="$(make LOCALVERSION= kernelrelease)" _basekernel=${_kernver%%-*} _basekernel=${_basekernel%.*} mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot} make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install - cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-linux-rt-bfq" + cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}" # set correct depmod command for install - cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" + sed -e "s|%PKGBASE%|${pkgbase}|g;s|%KERNVER%|${_kernver}|g" \ + "${startdir}/${install}" > "${startdir}/${install}.pkg" true && install=${install}.pkg - sed \ - -e "s/KERNEL_NAME=.*/KERNEL_NAME=-rt-bfq/g" \ - -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \ - -i "${startdir}/${install}" # install mkinitcpio preset file for kernel - install -D -m644 "${srcdir}/linux-rt-bfq.preset" "${pkgdir}/etc/mkinitcpio.d/linux-rt-bfq.preset" - sed \ - -e "1s|'linux.*'|'linux-rt-bfq'|" \ - -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-linux-rt-bfq\"|" \ - -e "s|default_image=.*|default_image=\"/boot/initramfs-linux-rt-bfq.img\"|" \ - -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-linux-rt-bfq-fallback.img\"|" \ - -i "${pkgdir}/etc/mkinitcpio.d/linux-rt-bfq.preset" + sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/linux.preset" | + install -D -m644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" + + # install pacman hook for initramfs regeneration + sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/99-linux.hook" | + install -D -m644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/99-${pkgbase}.hook" # remove build and source links rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build} # remove the firmware rm -rf "${pkgdir}/lib/firmware" # make room for external modules - ln -s "../extramodules-${_basekernel}${_kernelname:bfq}" "${pkgdir}/lib/modules/${_kernver}/extramodules" + ln -s "../extramodules-${_basekernel}${_kernelname:--ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules" # add real version for building modules and running depmod from post_install/upgrade - mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:bfq}" - echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:bfq}/version" + mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}" + echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}/version" # Now we call depmod... depmod -b "${pkgdir}" -F System.map "${_kernver}" @@ -290,20 +294,13 @@ package_linux-rt-bfq() { install -D -m644 vmlinux "${pkgdir}/usr/lib/modules/${_kernver}/build/vmlinux" } -package_linux-rt-bfq-headers() { +_package-headers() { pkgdesc='Header files and scripts to build modules for linux-rt-bfq.' depends=('linux-rt-bfq') install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" - cd ${_srcname} - - KARCH=x86 - - # get kernel version - _kernver="$(make LOCALVERSION= kernelrelease)" - _basekernel=${_kernver%%-*} - _basekernel=${_basekernel%.*} + cd "${srcdir}/${_srcname}" install -D -m644 Makefile \ @@ -435,18 +432,11 @@ package_linux-rt-bfq-headers() { rm -rf "${pkgdir}"/usr/lib/modules/${_kernver}/build/arch/{alpha,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} } -package_linux-rt-bfq-docs() { +_package-docs() { pkgdesc="Kernel hackers manual - HTML documentation that comes with the linux-rt-bfq kernel" depends=('linux-rt-bfq') - cd ${_srcname} - - KARCH=x86 - - # get kernel version - _kernver="$(make LOCALVERSION= kernelrelease)" - _basekernel=${_kernver%%-*} - _basekernel=${_basekernel%.*} + cd "${srcdir}/${_srcname}" mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build" cp -al Documentation "${pkgdir}/usr/lib/modules/${_kernver}/build" @@ -457,6 +447,14 @@ package_linux-rt-bfq-docs() { rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/DocBook/Makefile" } +pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs") +for _p in ${pkgname[@]}; do + eval "package_${_p}() { + $(declare -f "_package${_p#${pkgbase}}") + _package${_p#${pkgbase}} + }" +done + sha512sums=('a48a065f21e1c7c4de4cf8ca47b8b8d9a70f86b64e7cfa6e01be490f78895745b9c8790734b1d22182cf1f930fb87eaaa84e62ec8cc1f64ac4be9b949e7c0358' 'SKIP' '8a3c9bbba1bb8fc49b073509320fedec085b5de0507826baced59a2acfd0bef9b3a79a2510ccffa6bf1e21098bb13efff028f87ea239b19047e9afa61c149558' @@ -467,12 +465,15 @@ sha512sums=('a48a065f21e1c7c4de4cf8ca47b8b8d9a70f86b64e7cfa6e01be490f78895745b9c 'dc0649dfe2a5ce8e8879a62df29a4a1959eb1a84e5d896a9cb119d6a85a9bad1b17135371799e0be96532e17c66043d298e4a14b18fad3078a1f425108f888c9' '135afcffee2439e2260a71202658dce9ec5f555de3291b2d49a5cffdd953c6d7851b8a90e961576895555142a618e52220a7e4a46521ca4ba19d37df71887581' '87ae76889ab84ced46c237374c124786551982f8ff7325102af9153aed1ab7be72bec4db1f7516426c5ee34c5ce17221679eb2f129c5cbdeec05c0d3cb7f785d' - '62fdd5c0a060a051b64093d71fbb028781061ccb7a28c5b06739a0b24dac0945740d9b73ff170784f60005a589774bcc14f56523ec51557eb3a677f726ec34cf' - '14d530c8d727e5253474b3d46a7e30933bcc0aa9a6cf597ab6557c12779e2ce627d49258a3623f48421b48cd1a29012f7e3ff984387488c101d94d98fe0aae9d' + '8e8f407262f3f573654e7f0fceec6075fd2da0258a384206d28e5f59698168609e575f3d855adb8bb476b0684da409dab22f7ddc0f00e9c10c67debe4409c30b' 'd9d28e02e964704ea96645a5107f8b65cae5f4fb4f537e224e5e3d087fd296cb770c29ac76e0ce95d173bc420ea87fb8f187d616672a60a0cae618b0ef15b8c8' - '3fba4c1c172aa823c58901656fcbd30241f7e60486619d1095447e4c902b94e4a9f568d68a124001951cff6e873ce55f338975808b30e3ba2ee2380561660133' - 'a6200ad0c8bc44b97233c0cbd4c419c37727f06e735f2c6b60a28e94bfdc6d31d7f26d24f9f898c62fceefe08dfd3bdbd5d71acf2b5fcedbda8ea3881d284daa' - '86f717f596c613db3bc40624fd956ed379b8a2a20d1d99e076ae9061251fe9afba39cf536623eccd970258e124b8c2c05643e3d539f37bd910e02dc5dd498749') + '86f717f596c613db3bc40624fd956ed379b8a2a20d1d99e076ae9061251fe9afba39cf536623eccd970258e124b8c2c05643e3d539f37bd910e02dc5dd498749' + '8e7afab44b381b77ba45b3ef18a229ed0c12de6b6a4a353796b2e0e0214119d2c31eb30d250c4ece90a515eb56af6cdd1c02299a9a3b1d7a8cbb3ac65cb8fef2' + '71e98fdf610795c5ace42384d43d56a4c18ba7225525aca6947af57697b412a2fa078dda891850e17892e9d093808a504ba36351a867ba302fc7c70f8bb423e6' + 'd6faa67f3ef40052152254ae43fee031365d0b1524aa0718b659eb75afc21a3f79ea8d62d66ea311a800109bed545bc8f79e8752319cd378eef2cbd3a09aba22' + '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf' + '3889679e288d51f6fecc7ed6581ccde34acbf1e4861f5c9ca237a1ad13158502757d3fc457d7b6caf1c8c99c9dba842265004154a71cffb8ec14e1030e49e312' + '3c3f3b6407d9a1a63cd91c2b5c35e6c932afa5bf33f1b2e8a530dbd9eacda8c8f956616c4cc9228657624da58e354ba5714252237d84ff3386fd65cf44f06ddc') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds @@ -576,7 +576,7 @@ CONFIG_CRASH_DUMP=y CONFIG_KEXEC_JUMP=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y -# CONFIG_RANDOMIZE_BASE is not set +CONFIG_RANDOMIZE_BASE=y CONFIG_X86_NEED_RELOCS=y CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y diff --git a/config.x86_64 b/config.x86_64 index 8125facfeb89..47bba1c6ac20 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -599,7 +599,7 @@ CONFIG_CRASH_DUMP=y CONFIG_KEXEC_JUMP=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y -# CONFIG_RANDOMIZE_BASE is not set +CONFIG_RANDOMIZE_BASE=y CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set diff --git a/linux-rt-bfq.install b/linux-rt-bfq.install deleted file mode 100644 index 0d5fe6c079f2..000000000000 --- a/linux-rt-bfq.install +++ /dev/null @@ -1,27 +0,0 @@ -KERNEL_NAME=-rt-bfq -KERNEL_VERSION= - -post_install () { - # updating module dependencies - echo ">>> Updating module dependencies. Please wait ..." - depmod ${KERNEL_VERSION} - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux${KERNEL_NAME} -} - -post_upgrade() { - 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 - # updating module dependencies - echo ">>> Updating module dependencies. Please wait ..." - depmod ${KERNEL_VERSION} - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux${KERNEL_NAME} -} - -post_remove() { - # also remove the compat symlinks - rm -f boot/initramfs-linux${KERNEL_NAME}.img - rm -f boot/initramfs-linux${KERNEL_NAME}-fallback.img -} diff --git a/linux-rt-bfq.preset b/linux-rt-bfq.preset deleted file mode 100644 index f74a69342e58..000000000000 --- a/linux-rt-bfq.preset +++ /dev/null @@ -1,14 +0,0 @@ -# mkinitcpio preset file for the 'linux-rt-bfq' package - -ALL_config="/etc/mkinitcpio.conf" -ALL_kver="/boot/vmlinuz-linux-rt-bfq" - -PRESETS=('default' 'fallback') - -#default_config="/etc/mkinitcpio.conf" -default_image="/boot/initramfs-linux-rt-bfq.img" -#default_options="" - -#fallback_config="/etc/mkinitcpio.conf" -fallback_image="/boot/initramfs-linux-rt-bfq-fallback.img" -fallback_options="-S autodetect" diff --git a/linux.install b/linux.install new file mode 100644 index 000000000000..046277584140 --- /dev/null +++ b/linux.install @@ -0,0 +1,27 @@ +post_install () { + # updating module dependencies + echo ">>> Updating module dependencies. Please wait ..." + depmod %KERNVER% +} + +post_upgrade() { + 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 + + # updating module dependencies + echo ">>> Updating module dependencies. Please wait ..." + depmod %KERNVER% + + if [ $(vercmp $2 3.13) -lt 0 ]; then + echo ">>> WARNING: AT keyboard support is no longer built into the kernel." + echo ">>> In order to use your keyboard during early init, you MUST" + echo ">>> include the 'keyboard' hook in your mkinitcpio.conf." + fi +} + +post_remove() { + # also remove the compat symlinks + rm -f boot/initramfs-%PKGBASE%.img + rm -f boot/initramfs-%PKGBASE%-fallback.img +} diff --git a/linux.preset b/linux.preset new file mode 100644 index 000000000000..66709a8c1537 --- /dev/null +++ b/linux.preset @@ -0,0 +1,14 @@ +# mkinitcpio preset file for the '%PKGBASE%' package + +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="/boot/vmlinuz-%PKGBASE%" + +PRESETS=('default' 'fallback') + +#default_config="/etc/mkinitcpio.conf" +default_image="/boot/initramfs-%PKGBASE%.img" +#default_options="" + +#fallback_config="/etc/mkinitcpio.conf" +fallback_image="/boot/initramfs-%PKGBASE%-fallback.img" +fallback_options="-S autodetect" |