diff options
author | Kyle Devir | 2019-10-30 20:24:53 +1000 |
---|---|---|
committer | Kyle Devir | 2019-10-30 20:24:53 +1000 |
commit | dc4947ed89272a3dbc327364d17419f85e470c0a (patch) | |
tree | 9712de099183360b1011c1c3fc2f587b0e1709eb | |
parent | df504658d63353b7ad0c80838321e2357842936f (diff) | |
download | aur-dc4947ed89272a3dbc327364d17419f85e470c0a.tar.gz |
5.3.8.1, sync with vanilla Arch kernel changes
-rw-r--r-- | .SRCINFO | 30 | ||||
-rw-r--r-- | 60-linux.hook | 11 | ||||
-rw-r--r-- | 90-linux.hook | 11 | ||||
-rw-r--r-- | PKGBUILD | 45 | ||||
-rw-r--r-- | linux.install | 19 | ||||
-rw-r--r-- | linux.preset | 14 |
6 files changed, 19 insertions, 111 deletions
@@ -1,7 +1,7 @@ pkgbase = linux-pds - pkgver = 5.3.7.arch1 + pkgver = 5.3.8.1 pkgrel = 1 - url = https://git.archlinux.org/linux.git/log/?h=v5.3.7-arch1 + url = https://git.archlinux.org/linux.git/log/?h=v5.3.8-arch1 arch = x86_64 license = GPL2 makedepends = xmlto @@ -9,18 +9,15 @@ pkgbase = linux-pds makedepends = inetutils makedepends = bc makedepends = libelf - makedepends = git makedepends = python-sphinx makedepends = python-sphinx_rtd_theme makedepends = graphviz makedepends = imagemagick + makedepends = git options = !strip - source = git+https://git.archlinux.org/linux?signed#tag=v5.3.7-arch1 + source = git+https://git.archlinux.org/linux?signed#tag=v5.3.8-arch1 source = git+https://github.com/graysky2/kernel_gcc_patch source = config - source = 60-linux.hook - source = 90-linux.hook - source = linux.preset source = 01-Undead-PDS-0.99o-rebase-by-TkG.patch source = 02-Glitched-PDS-by-TkG.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 @@ -29,33 +26,28 @@ pkgbase = linux-pds sha512sums = SKIP sha512sums = SKIP sha512sums = 6e7596a069a20732fa7b2b9fb9dadf167401f56fc4564dc3763e72ae3a573b5f096f31bae835778296d68d8deb58e7cb1a6d9ab669b0e460a767bffbaacbb548 - sha512sums = 6b57a66b870b2f525e2dedd8f224b89474fd4ec6ea18484b0a67a1a2b9a4fc95d025cac181504406ea42a35d6c1b184c0d4e38c92815022935fc55746c69c7c1 - sha512sums = 2718b58dbbb15063bacb2bde6489e5b3c59afac4c0e0435b97fe720d42c711b6bcba926f67a8687878bd51373c9cf3adb1915a11666d79ccb220bf36e0788ab7 - sha512sums = 2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf sha512sums = 2aef8b8949fec12d237facc57d5feddf0e7c1c878c94fb4eb8a845c110d5cfcc83492e73475de04ce98069e9ab1bb6b4a0a4559d445fbf264442dd8b0af9a8f1 sha512sums = a5ff06602840327e10d623c195b7e1676f967e5aa04de04e9435766fab2b596a44da21f808bfdd632dcf64800456337b7b4c03de2a268980238a310b3644ceae pkgname = linux-pds pkgdesc = The Linux-pds kernel and modules ~ featuring Alfred Chen's PDS CPU scheduler, rebased by TkG - install = linux.install depends = coreutils depends = kmod depends = initramfs depends = thrash-protect optdepends = crda: to set the correct wireless channels of your country optdepends = linux-firmware: firmware images needed for some devices - provides = linux-pds=5.3.7.arch1 - backup = etc/mkinitcpio.d/linux-pds.preset + provides = linux-pds=5.3.8.1 pkgname = linux-pds-headers pkgdesc = Header files and scripts for building modules for Linux-pds kernel ~ featuring Alfred Chen's PDS CPU scheduler, rebased by TkG - depends = linux-pds=5.3.7.arch1 - provides = linux-pds-headers=5.3.7.arch1 - provides = linux-headers=5.3.7.arch1 + depends = linux-pds=5.3.8.1 + provides = linux-pds-headers=5.3.8.1 + provides = linux-headers=5.3.8.1 pkgname = linux-pds-docs pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-pds kernel ~ featuring Alfred Chen's PDS CPU scheduler, rebased by TkG - depends = linux-pds=5.3.7.arch1 - provides = linux-pds-docs=5.3.7.arch1 - provides = linux-docs=5.3.7.arch1 + depends = linux-pds=5.3.8.1 + provides = linux-pds-docs=5.3.8.1 + provides = linux-docs=5.3.8.1 diff --git a/60-linux.hook b/60-linux.hook deleted file mode 100644 index 584ce35372b0..000000000000 --- a/60-linux.hook +++ /dev/null @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/lib/modules/%KERNVER%/* - -[Action] -Description = Updating %PKGBASE% module dependencies... -When = PostTransaction -Exec = /usr/bin/depmod %KERNVER% diff --git a/90-linux.hook b/90-linux.hook deleted file mode 100644 index fca45abe1a62..000000000000 --- a/90-linux.hook +++ /dev/null @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Target = usr/lib/modules/%KERNVER%/vmlinuz -Target = usr/lib/initcpio/* - -[Action] -Description = Updating %PKGBASE% initcpios... -When = PostTransaction -Exec = /usr/bin/mkinitcpio -p %PKGBASE% @@ -1,7 +1,5 @@ # Maintainer: Kyle De'Vir (QuartzDragon) <kyle[dot]devir[at]mykolab[dot]com> # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Thomas Baechler <thomas@archlinux.org> ### BUILD OPTIONS # Set these variables to ANYTHING that is not null to enable them @@ -67,11 +65,11 @@ _subarch= _localmodcfg= pkgbase=linux-pds -_srcver_tag=5.3.7-arch1 -pkgver=${_srcver_tag//-/.} +pkgver=5.3.8.1 pkgrel=1 -arch=(x86_64) +_srcver_tag=${pkgver%.*}-arch${pkgver##*.} url="https://git.archlinux.org/linux.git/log/?h=v$_srcver_tag" +arch=(x86_64) license=(GPL2) makedepends=( xmlto @@ -79,11 +77,11 @@ makedepends=( inetutils bc libelf - git python-sphinx python-sphinx_rtd_theme graphviz imagemagick + git ) options=('!strip') @@ -100,9 +98,6 @@ source=( "git+$_repo_url?signed#tag=v$_srcver_tag" "git+$_repo_url_gcc_patch" config # the main kernel config file - 60-linux.hook # pacman hook for depmod - 90-linux.hook # pacman hook for initramfs regeneration - linux.preset # standard config files for mkinitcpio ramdisk 01-Undead-PDS-0.99o-rebase-by-TkG.patch 02-Glitched-PDS-by-TkG.patch ) @@ -114,14 +109,12 @@ validpgpkeys=( sha512sums=('SKIP' 'SKIP' '6e7596a069a20732fa7b2b9fb9dadf167401f56fc4564dc3763e72ae3a573b5f096f31bae835778296d68d8deb58e7cb1a6d9ab669b0e460a767bffbaacbb548' - '6b57a66b870b2f525e2dedd8f224b89474fd4ec6ea18484b0a67a1a2b9a4fc95d025cac181504406ea42a35d6c1b184c0d4e38c92815022935fc55746c69c7c1' - '2718b58dbbb15063bacb2bde6489e5b3c59afac4c0e0435b97fe720d42c711b6bcba926f67a8687878bd51373c9cf3adb1915a11666d79ccb220bf36e0788ab7' - '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf' '2aef8b8949fec12d237facc57d5feddf0e7c1c878c94fb4eb8a845c110d5cfcc83492e73475de04ce98069e9ab1bb6b4a0a4559d445fbf264442dd8b0af9a8f1' 'a5ff06602840327e10d623c195b7e1676f967e5aa04de04e9435766fab2b596a44da21f808bfdd632dcf64800456337b7b4c03de2a268980238a310b3644ceae') -_kernelname=${pkgbase#linux} -: ${_kernelname:=-ARCH} +export KBUILD_BUILD_HOST=archlinux +export KBUILD_BUILD_USER=$pkgbase +export KBUILD_BUILD_TIMESTAMP="@${SOURCE_DATE_EPOCH:-$(date +%s)}" prepare() { cd $_reponame @@ -129,7 +122,7 @@ prepare() { msg2 "Setting version..." scripts/setlocalversion --save-scmversion echo "-$pkgrel" > localversion.10-pkgrel - echo "$_kernelname" > localversion.20-pkgname + echo "${pkgbase#linux}" > localversion.20-pkgname # https://github.com/graysky2/kernel_gcc_patch msg2 "Patching to enabled additional gcc CPU optimizatons..." @@ -209,8 +202,6 @@ _package() { "linux-firmware: firmware images needed for some devices" ) provides=("$pkgbase=$pkgver") - backup=("etc/mkinitcpio.d/$pkgbase.preset") - install=linux.install cd $_reponame local kernver="$(<version)" @@ -220,7 +211,6 @@ _package() { # systemd expects to find the kernel here to allow hibernation # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344 install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz" - install -Dm644 "$modulesdir/vmlinuz" "$pkgdir/boot/vmlinuz-$pkgbase" # Used by mkinitcpio to name the kernel echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase" @@ -231,25 +221,6 @@ _package() { # remove build and source links rm "$modulesdir"/{source,build} - msg2 "Installing hooks..." - # sed expression for following substitutions - local subst=" - s|%PKGBASE%|$pkgbase|g - s|%KERNVER%|$kernver|g - " - - # hack to allow specifying an initially nonexisting install file - sed "$subst" "$startdir/$install" > "$startdir/$install.pkg" - true && install=$install.pkg - - # fill in mkinitcpio preset and pacman hooks - sed "$subst" ../linux.preset | install -Dm644 /dev/stdin \ - "$pkgdir/etc/mkinitcpio.d/$pkgbase.preset" - sed "$subst" ../60-linux.hook | install -Dm644 /dev/stdin \ - "$pkgdir/usr/share/libalpm/hooks/60-$pkgbase.hook" - sed "$subst" ../90-linux.hook | install -Dm644 /dev/stdin \ - "$pkgdir/usr/share/libalpm/hooks/90-$pkgbase.hook" - msg2 "Fixing permissions..." chmod -Rc u=rwX,go=rX "$pkgdir" } diff --git a/linux.install b/linux.install deleted file mode 100644 index 6cbfb722522b..000000000000 --- a/linux.install +++ /dev/null @@ -1,19 +0,0 @@ -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 -} - -post_install() { - echo "While using PDS, priority policies might induce thrashing in memory-starved scenarios, however" - echo "thrash-protect can remedy this, therefore, run 'systemctl enable thrash-protect.service', and then reboot." -} - -post_remove() { - rm -f boot/initramfs-%PKGBASE%.img - rm -f boot/initramfs-%PKGBASE%-fallback.img - - echo "If you no longer wish to use thrash-protect, run 'systemctl disable thrash-protect.service', and then reboot." -} - -# vim:set ft=sh ts=8 sts=2 sw=2 et: diff --git a/linux.preset b/linux.preset deleted file mode 100644 index 66709a8c1537..000000000000 --- a/linux.preset +++ /dev/null @@ -1,14 +0,0 @@ -# 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" |