summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle Devir2019-11-30 02:21:55 +1000
committerKyle Devir2019-11-30 02:21:55 +1000
commit4a978c0e95901557d4f16899dbcce6d2e4f1f1c9 (patch)
treef3f8e6d6f0ba32da45c684aad25ef6ba72f835f2
parent06b880b4dd2da0f8a1339bb22ca6314b6e574e98 (diff)
downloadaur-4a978c0e95901557d4f16899dbcce6d2e4f1f1c9.tar.gz
5.13.14.arch1, sync with Arch vanilla kernel changes
-rwxr-xr-x.SRCINFO20
-rwxr-xr-xPKGBUILD36
-rw-r--r--config2
3 files changed, 47 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 64f955ce19cf..b1bb5ddb1ab6 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-bcachefs-git
pkgdesc = Linux
- pkgver = v5.3.13.arch1.r859600.e04bb6cd44cd
+ pkgver = v5.3.14.arch1.r859692.b38ab57cca97
pkgrel = 1
url = https://github.com/koverstreet/bcachefs
arch = x86_64
@@ -8,6 +8,11 @@ pkgbase = linux-bcachefs-git
makedepends = bc
makedepends = kmod
makedepends = libelf
+ makedepends = xmlto
+ makedepends = python-sphinx
+ makedepends = python-sphinx_rtd_theme
+ makedepends = graphviz
+ makedepends = imagemagick
makedepends = git
options = !strip
source = git+https://github.com/koverstreet/bcachefs#branch=master
@@ -19,7 +24,7 @@ pkgbase = linux-bcachefs-git
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
sha512sums = SKIP
sha512sums = SKIP
- sha512sums = 9ce38cfa57475b74098229956a8b97a82bda8aeff831728542b4939e67c4af8e929c4cf8e27b0549829e5f011859369b2ab19b4fdfeb096afb339bc1bff8c622
+ sha512sums = 221652eced3ada8fd6a1be9ecbf0e9a553330f20bb9e080d340a28359759a364e9a14c6a789857599f223ec98b4800e2c1f3cbf2e8f012ba789cb23116439acd
sha512sums = 9ae28fd6b4099a44f2b45078383b172a974677863c622ffdecf095664524681b95a224fe8abbb1d0f3a3d7924f755908d3beb4c8c5d415068b101403c307f2d0
sha512sums = a7c5608f2478ea7f1f6a3ab0cf60d37715097fabdd19777603b385d2a0b0009e5da7fd9fc0ca0addee3f3fab8fff35f7e45696fd6b6c6bc8dc8fb366cbde5e0c
@@ -31,11 +36,14 @@ pkgname = linux-bcachefs-git
depends = bcachefs-tools-git
optdepends = crda: to set the correct wireless channels of your country
optdepends = linux-firmware: firmware images needed for some devices
- provides = linux-bcachefs-git=v5.3.13.arch1.r859600.e04bb6cd44cd
+ provides = linux-bcachefs-git=v5.3.14.arch1.r859692.b38ab57cca97
pkgname = linux-bcachefs-git-headers
pkgdesc = Header files and scripts for building modules for Linux kernel ~ featuring Kent Overstreet's bcachefs filesystem
- depends = linux-bcachefs-git=v5.3.13.arch1.r859600.e04bb6cd44cd
- provides = linux-bcachefs-git-headers=v5.3.13.arch1.r859600.e04bb6cd44cd
- provides = linux-headers=v5.3.13.arch1.r859600.e04bb6cd44cd
+ depends = linux-bcachefs-git=v5.3.14.arch1.r859692.b38ab57cca97
+ provides = linux-bcachefs-git-headers=v5.3.14.arch1.r859692.b38ab57cca97
+ provides = linux-headers=v5.3.14.arch1.r859692.b38ab57cca97
+
+pkgname = linux-bcachefs-git-docs
+ pkgdesc = Documentation for the Linux kernel
diff --git a/PKGBUILD b/PKGBUILD
index 88641183d62f..dcae0777f899 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -59,10 +59,10 @@ _subarch=
_localmodcfg=
pkgbase=linux-bcachefs-git
-pkgver=v5.3.13.arch1.r859600.e04bb6cd44cd
+pkgver=v5.3.14.arch1.r859692.b38ab57cca97
pkgrel=1
pkgdesc="Linux"
-_srcver_tag=v5.3.13-arch1
+_srcver_tag=v5.3.14-arch1
url="https://github.com/koverstreet/bcachefs"
arch=(x86_64)
license=(GPL2)
@@ -70,6 +70,11 @@ makedepends=(
bc
kmod
libelf
+ xmlto
+ python-sphinx
+ python-sphinx_rtd_theme
+ graphviz
+ imagemagick
git
)
options=('!strip')
@@ -96,7 +101,7 @@ validpgpkeys=(
)
sha512sums=('SKIP'
'SKIP'
- '9ce38cfa57475b74098229956a8b97a82bda8aeff831728542b4939e67c4af8e929c4cf8e27b0549829e5f011859369b2ab19b4fdfeb096afb339bc1bff8c622'
+ '221652eced3ada8fd6a1be9ecbf0e9a553330f20bb9e080d340a28359759a364e9a14c6a789857599f223ec98b4800e2c1f3cbf2e8f012ba789cb23116439acd'
'9ae28fd6b4099a44f2b45078383b172a974677863c622ffdecf095664524681b95a224fe8abbb1d0f3a3d7924f755908d3beb4c8c5d415068b101403c307f2d0'
'a7c5608f2478ea7f1f6a3ab0cf60d37715097fabdd19777603b385d2a0b0009e5da7fd9fc0ca0addee3f3fab8fff35f7e45696fd6b6c6bc8dc8fb366cbde5e0c')
@@ -171,7 +176,7 @@ prepare() {
build() {
cd $_reponame
- make bzImage modules
+ make bzImage modules htmldocs
}
_package() {
@@ -293,9 +298,32 @@ _package-headers() {
chmod -Rc u=rwX,go=rX "$pkgdir"
}
+_package-docs() {
+ pkgdesc="Documentation for the $pkgdesc kernel"
+
+ cd $_srcname
+ local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
+
+ msg2 "Installing documentation..."
+ local src dst
+ while read -rd '' src; do
+ dst="${src#Documentation/}"
+ dst="$builddir/Documentation/${dst#output/}"
+ install -Dm644 "$src" "$dst"
+ done < <(find Documentation -name '.*' -prune -o ! -type d -print0)
+
+ msg2 "Adding symlink..."
+ mkdir -p "$pkgdir/usr/share/doc"
+ ln -sr "$builddir/Documentation" "$pkgdir/usr/share/doc/$pkgbase"
+
+ msg2 "Fixing permissions..."
+ chmod -Rc u=rwX,go=rX "$pkgdir"
+}
+
pkgname=(
"$pkgbase"
"$pkgbase-headers"
+ "$pkgbase-docs"
)
for _p in "${pkgname[@]}"; do
eval "package_$_p() {
diff --git a/config b/config
index dc178bc870e3..6215d44e0c7d 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.3.13-arch1 Kernel Configuration
+# Linux/x86 5.3.14 Kernel Configuration
#
#