summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorYurii Kolesnykov2019-05-11 22:57:43 +0300
committerYurii Kolesnykov2019-05-11 22:57:43 +0300
commit778fd1704247d3d3d8620e9fe920926a1fb28a06 (patch)
tree3b19266e5a06d58139f38b4812e4ac3d9c395eca
parent25f50da085f8a59aacb14caeda38b55118dd1ab3 (diff)
downloadaur-778fd1704247d3d3d8620e9fe920926a1fb28a06.tar.gz
fix build by porting updates from linux-mainline
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD32
-rw-r--r--config11
3 files changed, 21 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c22dc106402..064a02e116d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-amd-staging-drm-next-git
pkgdesc = Linux kernel with AMDGPU DC patches
- pkgver = 5.1.810962.c9115f8904ee
+ pkgver = 5.1.811355.276cfd531ed6
pkgrel = 1
url = https://cgit.freedesktop.org/~agd5f/linux/
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 5373a4294e3..3d152c8b1d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ _srcname=${pkgbase}
_kernel_rel=5.1
_branch=amd-staging-drm-next
_kernelname=${pkgbase#linux}
-pkgver=5.1.810962.c9115f8904ee
+pkgver=5.1.811355.276cfd531ed6
pkgrel=1
arch=(x86_64)
url='https://cgit.freedesktop.org/~agd5f/linux/'
@@ -26,7 +26,7 @@ source=("${pkgbase}::git://people.freedesktop.org/~agd5f/linux#branch=${_branch}
linux.preset # standard config files for mkinitcpio ramdisk
)
sha256sums=('SKIP'
- 'a115b399bcb0b32317433a838c27efde1009a6d3a2feae49deed86df28fe8d2f'
+ '1745dfca6d7ec20c033c22fd14651552dfd8077dfdd388256a8728d61fcd2e36'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
'834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
@@ -66,7 +66,9 @@ prepare() {
build() {
cd $_srcname
- make bzImage modules htmldocs
+#mainline: disabled for 5.1-rc5
+#make bzImage modules htmldocs
+ make bzImage modules
}
_package() {
@@ -217,17 +219,19 @@ _package-docs() {
mkdir -p "$builddir"
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)
+ #mainline: disabled for 5.1-rc5
+
+ #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"
diff --git a/config b/config
index 0edf8d6b353..a78f5fb239c 100644
--- a/config
+++ b/config
@@ -4,10 +4,10 @@
#
#
-# Compiler: gcc (GCC) 8.2.1 20181127
+# Compiler: gcc (GCC) 8.3.0
#
CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=80201
+CONFIG_GCC_VERSION=80300
CONFIG_CLANG_VERSION=0
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_IRQ_WORK=y
@@ -5513,13 +5513,6 @@ CONFIG_DRM_AMD_DC_DCN1_0=y
CONFIG_DRM_AMD_DC_DCN1_01=y
# CONFIG_DEBUG_KERNEL_DC is not set
CONFIG_HSA_AMD=y
-
-#
-# AMD Library routines
-#
-CONFIG_CHASH=m
-# CONFIG_CHASH_STATS is not set
-# CONFIG_CHASH_SELFTEST is not set
CONFIG_DRM_NOUVEAU=m
CONFIG_NOUVEAU_DEBUG=5
CONFIG_NOUVEAU_DEBUG_DEFAULT=3