diff --git a/.SRCINFO b/.SRCINFO index 2ba9baa..da57a4f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,8 @@ pkgbase = linux-vfio - pkgver = 5.3.7.arch1 + pkgdesc = Linux + pkgver = 5.3.13.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.13-arch1 arch = x86_64 license = GPL2 makedepends = xmlto @@ -9,39 +10,35 @@ pkgbase = linux-vfio makedepends = inetutils makedepends = bc makedepends = libelf + makedepends = python-sphinx + makedepends = python-sphinx_rtd_theme + makedepends = graphviz + makedepends = imagemagick makedepends = git options = !strip - source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.3.7-arch1 + source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.3.13-arch1 source = config - source = 60-linux.hook - source = 90-linux.hook - source = linux.preset source = add-acs-overrides.patch source = i915-vga-arbiter.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA sha256sums = SKIP - sha256sums = 7d09d1d79a4ecb82502b4483cf989ede3f643e05613de45e12563dfe85d80423 - sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 - sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919 - sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 + sha256sums = 10ee7800902b1d82f9c184b367c9d904f4dc48f6d9ce3277327e825d7ab690d1 sha256sums = dbf4ac4b873ce6972e63b78d74ddba18f2701716163bb7f4b4fe5e909346a6e1 sha256sums = 3d711ad5eda51c42b20575a66683cd416fe7a02a3162d8a7107f2b2c82d328ce pkgname = linux-vfio - pkgdesc = The Linux-vfio kernel and modules - install = linux.install + pkgdesc = The Linux kernel and modules depends = coreutils - depends = linux-firmware depends = kmod - depends = mkinitcpio + depends = initramfs optdepends = crda: to set the correct wireless channels of your country - backup = etc/mkinitcpio.d/linux-vfio.preset + optdepends = linux-firmware: firmware images needed for some devices pkgname = linux-vfio-headers - pkgdesc = Header files and scripts for building modules for Linux-vfio kernel + pkgdesc = Headers and scripts for building modules for the Linux kernel pkgname = linux-vfio-docs - pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-vfio kernel + pkgdesc = Kernel hacker's manual for the Linux kernel diff --git a/60-linux.hook b/60-linux.hook deleted file mode 100644 index b33873c..0000000 --- a/60-linux.hook +++ /dev/null @@ -1,12 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/lib/modules/%KERNVER%/* -Target = usr/lib/modules/%EXTRAMODULES%/* - -[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 be0d886..0000000 --- a/90-linux.hook +++ /dev/null @@ -1,11 +0,0 @@ -[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% diff --git a/PKGBUILD b/PKGBUILD index 255e4f5..fdbd396 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,24 +1,25 @@ -# Maintainer: Dan Ziemba -# Maintainer: Mark Weiman +# Maintainer: Jan Alexander Steffens (heftig) pkgbase=linux-vfio -_srcver=5.3.7-arch1 -pkgver=${_srcver//-/.} +pkgver=5.3.13.1 pkgrel=1 +pkgdesc='Linux' +_srctag=v${pkgver%.*}-arch${pkgver##*.} +url="https://git.archlinux.org/linux.git/log/?h=$_srctag" arch=(x86_64) -url="https://git.archlinux.org/linux.git/log/?h=v$_srcver" license=(GPL2) -makedepends=(xmlto kmod inetutils bc libelf git) +makedepends=( + xmlto kmod inetutils bc libelf + python-sphinx python-sphinx_rtd_theme graphviz imagemagick + git +) options=('!strip') _srcname=archlinux-linux source=( - "$_srcname::git+https://git.archlinux.org/linux.git?signed#tag=v$_srcver" - 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 - add-acs-overrides.patch # patch for acs overrides - i915-vga-arbiter.patch # patch for i915 VGA arbiter + "$_srcname::git+https://git.archlinux.org/linux.git?signed#tag=$_srctag" + config # the main kernel config file + add-acs-overrides.patch + i915-vga-arbiter.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds @@ -26,15 +27,13 @@ validpgpkeys=( '8218F88849AAC522E94CF470A5E9288C4FA415FA' # Jan Alexander Steffens (heftig) ) sha256sums=('SKIP' - '7d09d1d79a4ecb82502b4483cf989ede3f643e05613de45e12563dfe85d80423' - 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' - '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' - 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' + '10ee7800902b1d82f9c184b367c9d904f4dc48f6d9ce3277327e825d7ab690d1' 'dbf4ac4b873ce6972e63b78d74ddba18f2701716163bb7f4b4fe5e909346a6e1' '3d711ad5eda51c42b20575a66683cd416fe7a02a3162d8a7107f2b2c82d328ce') -_kernelname=${pkgbase#linux} -: ${_kernelname:=-ARCH} +export KBUILD_BUILD_HOST=archlinux +export KBUILD_BUILD_USER=$pkgbase +export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" prepare() { cd $_srcname @@ -42,7 +41,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 local src for src in "${source[@]}"; do @@ -57,78 +56,52 @@ prepare() { cp ../config .config make olddefconfig - make -s kernelrelease > ../version - msg2 "Prepared %s version %s" "$pkgbase" "$(<../version)" + make -s kernelrelease > version + msg2 "Prepared %s version %s" "$pkgbase" "$( "$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" } _package-headers() { - pkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel" - - local builddir="$pkgdir/usr/lib/modules/$(/dev/null && ! mountpoint -q /boot; then - echo "WARNING: /boot appears to be a separate partition but is not mounted." - fi -} - -post_remove() { - rm -f boot/initramfs-%PKGBASE%.img - rm -f boot/initramfs-%PKGBASE%-fallback.img -} diff --git a/linux.preset b/linux.preset deleted file mode 100644 index 66709a8..0000000 --- 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"