summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Gorski2019-11-06 15:39:58 +0100
committerPiotr Gorski2019-11-06 15:39:58 +0100
commitd3a39d31b28824ec7305adbd71a93e45620a29bb (patch)
treed246db0db66592ee07b68c5ba1332831d900aea1
parentaae01ab780b6ae67c5208ae28a13f7a9531d5a16 (diff)
downloadaur-d3a39d31b28824ec7305adbd71a93e45620a29bb.tar.gz
Port more changes from linux trunk
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD13
2 files changed, 12 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3d7eb85084d..1cc47672a40 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,6 @@
pkgbase = linux-next-git
- pkgver = 20191105.r0.g51309b9d73f5
+ pkgdesc = Linux NEXT
+ pkgver = 20191106.r0.gdcd34bd23418
pkgrel = 1
url = http://www.kernel.org/
arch = x86_64
@@ -22,7 +23,7 @@ pkgbase = linux-next-git
sha512sums = eb0ad29fe37123af7f8b22a1c7736c8066aafdd8c79e831d7b2320cd5bde366097066e1fdefd2a2e848743305451a24ca8b91e742eb3f3913dfbadbe9ecea2a7
pkgname = linux-next-git
- pkgdesc = The Linux-next-git kernel and modules
+ pkgdesc = The Linux NEXT kernel and modules
depends = coreutils
depends = kmod
depends = initramfs
@@ -31,10 +32,10 @@ pkgname = linux-next-git
optdepends = modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig
pkgname = linux-next-git-headers
- pkgdesc = Header files and scripts for building modules for Linux-next-git kernel
+ pkgdesc = Headers and scripts for building modules for the Linux NEXT kernel
depends = linux-next-git
pkgname = linux-next-git-docs
- pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-next-git kernel
+ pkgdesc = Kernel hacker's manual for the Linux NEXT kernel
depends = linux-next-git
diff --git a/PKGBUILD b/PKGBUILD
index 70ebc0528fd..be867cf4bc7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -47,9 +47,10 @@ _1k_HZ_ticks=
### Do not edit below this line unless you know what you're doing
pkgbase=linux-next-git
-pkgver=20191105.r0.g51309b9d73f5
+pkgver=20191106.r0.gdcd34bd23418
_srcname=linux-next
pkgrel=1
+pkgdesc='Linux NEXT'
arch=('x86_64')
url="http://www.kernel.org/"
license=('GPL2')
@@ -181,7 +182,7 @@ build() {
}
_package() {
- pkgdesc="The ${pkgbase/linux/Linux} kernel and modules"
+ pkgdesc="The $pkgdesc kernel and modules"
depends=('coreutils' 'kmod' 'initramfs')
optdepends=('crda: to set the correct wireless channels of your country'
'linux-firmware: firmware images needed for some devices'
@@ -210,7 +211,7 @@ _package() {
}
_package-headers() {
- pkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel"
+ pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
depends=('linux-next-git')
cd $_srcname
@@ -290,7 +291,7 @@ _package-headers() {
_package-docs() {
- pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase/linux/Linux} kernel"
+ pkgdesc="Kernel hacker's manual for the $pkgdesc kernel"
depends=('linux-next-git')
cd $_srcname
@@ -300,8 +301,8 @@ _package-docs() {
mkdir -p "$builddir"
cp -t "$builddir" -a Documentation
- msg2 "Removing doctrees..."
- rm -r "$builddir/Documentation/output/.doctrees"
+ msg2 "Removing unneeded files..."
+ rm -rv "$builddir"/Documentation/{,output/}.[^.]*
msg2 "Moving HTML docs..."
local src dst