Update to 4.18.4-arch1-1

This commit is contained in:
Mark Weiman 2018-08-25 15:22:45 -04:00
parent ea08fe1b77
commit 814f1303d3
3 changed files with 234 additions and 119 deletions

View File

@ -1,7 +1,7 @@
pkgbase = linux-vfio pkgbase = linux-vfio
pkgver = 4.17.14.arch1 pkgver = 4.18.4.arch1
pkgrel = 1 pkgrel = 1
url = https://git.archlinux.org/linux.git/log/?h=v4.17.14-arch1 url = https://git.archlinux.org/linux.git/log/?h=v4.18.4-arch1
arch = x86_64 arch = x86_64
license = GPL2 license = GPL2
makedepends = xmlto makedepends = xmlto
@ -10,8 +10,10 @@ pkgbase = linux-vfio
makedepends = bc makedepends = bc
makedepends = libelf makedepends = libelf
makedepends = git makedepends = git
makedepends = python-sphinx
makedepends = graphviz
options = !strip options = !strip
source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v4.17.14-arch1 source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v4.18.4-arch1
source = config source = config
source = 60-linux.hook source = 60-linux.hook
source = 90-linux.hook source = 90-linux.hook
@ -22,7 +24,7 @@ pkgbase = linux-vfio
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA
sha256sums = SKIP sha256sums = SKIP
sha256sums = 0269d9a56f0d0306c9bd5c179a7e32214b0a1c082d3bca581661203b27305f17 sha256sums = bb700544d499a92dab141a218cc1eac62fdff0b67682748cb827035269c02a55
sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919 sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65

View File

@ -1,16 +1,14 @@
# $Id$ # Maintainer: Dan Ziemba <zman0900@gmail.com>
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Mark Weiman <markzz@archlinux.net>
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
pkgbase=linux-vfio pkgbase=linux-vfio
_srcver=4.17.14-arch1 _srcver=4.18.4-arch1
pkgver=${_srcver//-/.} pkgver=${_srcver//-/.}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)
url="https://git.archlinux.org/linux.git/log/?h=v$_srcver" url="https://git.archlinux.org/linux.git/log/?h=v$_srcver"
license=(GPL2) license=(GPL2)
makedepends=(xmlto kmod inetutils bc libelf git) makedepends=(xmlto kmod inetutils bc libelf git python-sphinx graphviz)
options=('!strip') options=('!strip')
_srcname=archlinux-linux _srcname=archlinux-linux
source=( source=(
@ -28,7 +26,7 @@ validpgpkeys=(
'8218F88849AAC522E94CF470A5E9288C4FA415FA' # Jan Alexander Steffens (heftig) '8218F88849AAC522E94CF470A5E9288C4FA415FA' # Jan Alexander Steffens (heftig)
) )
sha256sums=('SKIP' sha256sums=('SKIP'
'0269d9a56f0d0306c9bd5c179a7e32214b0a1c082d3bca581661203b27305f17' 'bb700544d499a92dab141a218cc1eac62fdff0b67682748cb827035269c02a55'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
@ -65,7 +63,7 @@ prepare() {
build() { build() {
cd $_srcname cd $_srcname
make bzImage modules make bzImage modules htmldocs
} }
_package() { _package() {
@ -86,7 +84,7 @@ _package() {
msg2 "Installing modules..." msg2 "Installing modules..."
local modulesdir="$pkgdir/usr/lib/modules/$kernver" local modulesdir="$pkgdir/usr/lib/modules/$kernver"
mkdir -p "$modulesdir" mkdir -p "$modulesdir"
make INSTALL_MOD_PATH="$pkgdir/usr" DEPMOD=/doesnt/exist modules_install make INSTALL_MOD_PATH="$pkgdir/usr" modules_install
# a place for external modules, # a place for external modules,
# with version file for building modules and running depmod from hook # with version file for building modules and running depmod from hook
@ -98,11 +96,7 @@ _package() {
# remove build and source links # remove build and source links
rm "$modulesdir"/{source,build} rm "$modulesdir"/{source,build}
msg2 "Running depmod..."
depmod -b "$pkgdir/usr" -E Module.symvers -e "$kernver"
msg2 "Installing hooks..." msg2 "Installing hooks..."
# sed expression for following substitutions # sed expression for following substitutions
local subst=" local subst="
s|%PKGBASE%|$pkgbase|g s|%PKGBASE%|$pkgbase|g
@ -199,6 +193,10 @@ _package-headers() {
esac esac
done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0) done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0)
msg2 "Adding symlink..."
mkdir -p "$pkgdir/usr/src"
ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase-$pkgver"
msg2 "Fixing permissions..." msg2 "Fixing permissions..."
chmod -Rc u=rwX,go=rX "$pkgdir" chmod -Rc u=rwX,go=rX "$pkgdir"
} }
@ -214,6 +212,22 @@ _package-docs() {
mkdir -p "$builddir" mkdir -p "$builddir"
cp -t "$builddir" -a Documentation cp -t "$builddir" -a Documentation
msg2 "Removing doctrees..."
rm -r "$builddir/Documentation/output/.doctrees"
msg2 "Moving HTML docs..."
local src dst
while read -rd '' src; do
dst="$builddir/Documentation/${src#$builddir/Documentation/output/}"
mkdir -p "${dst%/*}"
mv "$src" "$dst"
rmdir -p --ignore-fail-on-non-empty "${src%/*}"
done < <(find "$builddir/Documentation/output" -type f -print0)
msg2 "Adding symlink..."
mkdir -p "$pkgdir/usr/share/doc"
ln -sr "$builddir/Documentation" "$pkgdir/usr/share/doc/$pkgbase"
msg2 "Fixing permissions..." msg2 "Fixing permissions..."
chmod -Rc u=rwX,go=rX "$pkgdir" chmod -Rc u=rwX,go=rX "$pkgdir"
} }

303
config

File diff suppressed because it is too large Load Diff