$ git diff --patch-with-stat --summary 64a4132b05c68dc8506bf6515c005325cc5937e7..b42532762fff57c01520ca665e9ad1311ee84acc
.abf.yml | 2 +-
kernel-release-clang.spec | 18 ++++++----
vbox-6.1-fix-build-on-znver1-hosts.patch | 62 ++++++++++++++++++++++++++++++++
vbox-6.1.2-clang.patch | 48 +++++++++++++++++++++++++
4 files changed, 122 insertions(+), 8 deletions(-)
create mode 100644 vbox-6.1-fix-build-on-znver1-hosts.patch
create mode 100644 vbox-6.1.2-clang.patch
diff --git a/.abf.yml b/.abf.yml
index 1c6d7fe..870f3eb 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -2,4 +2,4 @@ sources:
linux-5.4.tar.sign: 254f24565049861a1abfaa0d504a1214d2b0fd0a
linux-5.4.tar.xz: 98ae49ad49397d5a4dcb3ff9a082223edf7c5bbd
saa716x-driver.tar.xz: f9b6ef1cd6f1f71f53d9a8aadfba2cf6b5c3d7b6
- patch-5.4.11.xz: 2d3f43261c888fd1f59b5a364eef0886a5f3664c
+ patch-5.4.13.xz: d04bc20135d87dfb432cdfea2db74697dd097622
diff --git a/kernel-release-clang.spec b/kernel-release-clang.spec
index a73367d..950b34e 100644
--- a/kernel-release-clang.spec
+++ b/kernel-release-clang.spec
@@ -21,7 +21,7 @@
# compose tar.xz name and release
%define kernelversion 5
%define patchlevel 4
-%define sublevel 11
+%define sublevel 13
%define relc %{nil}
# Only ever wrong on x.0 releases...
%define previous %{kernelversion}.%(echo $((%{patchlevel}-1)))
@@ -125,8 +125,8 @@
# BUILDSTDERR: # pragma GCC diagnostic ignored "-Wold-style-declaration" /* 2.6.18-411.0.0.0.1.el5/build/include/asm/apic.h:110: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration] */
# BUILDSTDERR: ^
# BUILDSTDERR: 1 error generated.
-%ifarch %{ix86} %{x86_64}
-%bcond_with virtualbox
+%ifarch %{x86_64}
+%bcond_without virtualbox
%else
%bcond_with virtualbox
%endif
@@ -339,6 +339,8 @@ Patch148: saa716x-5.4.patch
# https://patchwork.kernel.org/project/linux-fsdevel/list/?submitter=582
Patch300: v15-fs-Add-VirtualBox-guest-shared-folder-vboxsf-support.diff
Source300: virtualbox-kernel-5.3.patch
+Source301: vbox-6.1-fix-build-on-znver1-hosts.patch
+Source302: vbox-6.1.2-clang.patch
%endif
# Better support for newer x86 processors
@@ -668,12 +670,12 @@ needs debugging info from the kernel, this package may help. \
#
%if %{with build_desktop}
%ifarch %{ix86}
-%define summary_desktop Linux Kernel for desktop use with i686 & 4GB RAM
+%define summary_desktop_clang Linux Kernel for desktop use with i686 & 4GB RAM
%define info_desktop This kernel is compiled for desktop use, single or \
multiple i686 processor(s)/core(s) and less than 4GB RAM, using HZ_1000, \
voluntary preempt, CFS cpu scheduler and BFQ i/o scheduler.
%else
-%define summary_desktop Linux Kernel for desktop use with %{_arch}
+%define summary_desktop_clang Linux Kernel for desktop use with %{_arch}
%define info_desktop This kernel is compiled for desktop use, single or \
multiple %{_arch} processor(s)/core(s), using HZ_1000, \
voluntary preempt, CFS cpu scheduler and BFQ i/o scheduler, ONDEMAND governor.
@@ -684,12 +686,12 @@ voluntary preempt, CFS cpu scheduler and BFQ i/o scheduler, ONDEMAND governor.
#
%if %{with build_server}
%ifarch %{ix86}
-%define summary_server Linux Kernel for server use with i686 & 64GB RAM
+%define summary_server_clang Linux Kernel for server use with i686 & 64GB RAM
%define info_server This kernel is compiled for server use, single or \
multiple i686 processor(s)/core(s) and up to 64GB RAM using PAE, using \
no preempt, HZ_100, CFS cpu scheduler and BFQ i/o scheduler, PERFORMANCE governor.
%else
-%define summary_server Linux Kernel for server use with %{_arch}
+%define summary_server_clang Linux Kernel for server use with %{_arch}
%define info_server This kernel is compiled for server use, single or \
CFS cpu scheduler and BFQ i/o scheduler, PERFORMANCE governor.
%endif
@@ -981,6 +983,8 @@ sed -i -e 's,\$(KBUILD_EXTMOD),drivers/pci/vboxpci,g' drivers/pci/vboxpci/Makefi
sed -i -e "s,^KERN_DIR.*,KERN_DIR := $(pwd)," drivers/pci/vboxpci/Makefile*
echo 'obj-m += vboxpci/' >>drivers/pci/Makefile
#patch -p1 -z .300a~ -b <%{S:300}
+patch -p1 -z .301a~ -b <%{S:301}
+patch -p1 -z .302a~ -b <%{S:302}
%endif
# get rid of unwanted files
diff --git a/vbox-6.1-fix-build-on-znver1-hosts.patch b/vbox-6.1-fix-build-on-znver1-hosts.patch
new file mode 100644
index 0000000..5b445f3
--- /dev/null
+++ b/vbox-6.1-fix-build-on-znver1-hosts.patch
@@ -0,0 +1,62 @@
+diff -up linux-5.4/drivers/net/vboxnetadp/Makefile-footer.gmk.omv~ linux-5.4/drivers/net/vboxnetadp/Makefile-footer.gmk
+diff -up linux-5.4/drivers/net/vboxnetadp/Makefile-header.gmk.omv~ linux-5.4/drivers/net/vboxnetadp/Makefile-header.gmk
+--- linux-5.4/drivers/net/vboxnetadp/Makefile-header.gmk.omv~ 2020-01-10 04:53:22.802591600 +0100
++++ linux-5.4/drivers/net/vboxnetadp/Makefile-header.gmk 2020-01-10 05:03:53.869705397 +0100
+@@ -45,7 +45,7 @@
+ # (We have to support basic cross building (ARCH=i386|x86_64).)
+ # While at it, warn about BUILD_* vars found to help with user problems.
+ #
+-ifeq ($(filter-out x86_64 amd64 AMD64,$(shell rpm --eval %_target_cpu)),)
++ifeq ($(filter-out x86_64 znver1 amd64 AMD64,$(shell rpm --eval %_target_cpu)),)
+ BUILD_TARGET_ARCH_DEF := amd64
+ else
+ BUILD_TARGET_ARCH_DEF := x86
+diff -up linux-5.4/drivers/net/vboxnetadp/Makefile.omv~ linux-5.4/drivers/net/vboxnetadp/Makefile
+diff -up linux-5.4/drivers/net/vboxnetflt/Makefile-header.gmk.omv~ linux-5.4/drivers/net/vboxnetflt/Makefile-header.gmk
+--- linux-5.4/drivers/net/vboxnetflt/Makefile-header.gmk.omv~ 2020-01-10 05:05:55.430922624 +0100
++++ linux-5.4/drivers/net/vboxnetflt/Makefile-header.gmk 2020-01-10 05:06:03.820937637 +0100
+@@ -45,7 +45,7 @@
+ # (We have to support basic cross building (ARCH=i386|x86_64).)
+ # While at it, warn about BUILD_* vars found to help with user problems.
+ #
+-ifeq ($(filter-out x86_64 amd64 AMD64,$(shell rpm --eval %_target_cpu)),)
++ifeq ($(filter-out x86_64 znver1 amd64 AMD64,$(shell rpm --eval %_target_cpu)),)
+ BUILD_TARGET_ARCH_DEF := amd64
+ else
+ BUILD_TARGET_ARCH_DEF := x86
+diff -up linux-5.4/drivers/pci/vboxpci/Makefile-header.gmk.omv~ linux-5.4/drivers/pci/vboxpci/Makefile-header.gmk
+--- linux-5.4/drivers/pci/vboxpci/Makefile-header.gmk.omv~ 2020-01-10 05:06:38.683000037 +0100
++++ linux-5.4/drivers/pci/vboxpci/Makefile-header.gmk 2020-01-10 05:06:44.727010858 +0100
+@@ -45,7 +45,7 @@
+ # (We have to support basic cross building (ARCH=i386|x86_64).)
+ # While at it, warn about BUILD_* vars found to help with user problems.
+ #
+-ifeq ($(filter-out x86_64 amd64 AMD64,$(shell rpm --eval %_target_cpu)),)
++ifeq ($(filter-out x86_64 znver1 amd64 AMD64,$(shell rpm --eval %_target_cpu)),)
+ BUILD_TARGET_ARCH_DEF := amd64
+ else
+ BUILD_TARGET_ARCH_DEF := x86
+diff -up linux-5.4/drivers/staging/vboxvideo/Makefile-header.gmk.omv~ linux-5.4/drivers/staging/vboxvideo/Makefile-header.gmk
+--- linux-5.4/drivers/staging/vboxvideo/Makefile-header.gmk.omv~ 2020-01-10 05:06:12.900953886 +0100
++++ linux-5.4/drivers/staging/vboxvideo/Makefile-header.gmk 2020-01-10 05:06:19.168965103 +0100
+@@ -45,7 +45,7 @@
+ # (We have to support basic cross building (ARCH=i386|x86_64).)
+ # While at it, warn about BUILD_* vars found to help with user problems.
+ #
+-ifeq ($(filter-out x86_64 amd64 AMD64,$(shell rpm --eval %_target_cpu)),)
++ifeq ($(filter-out x86_64 znver1 amd64 AMD64,$(shell rpm --eval %_target_cpu)),)
+ BUILD_TARGET_ARCH_DEF := amd64
+ else
+ BUILD_TARGET_ARCH_DEF := x86
+diff -up linux-5.4/drivers/virt/vboxdrv/Makefile-header.gmk.omv~ linux-5.4/drivers/virt/vboxdrv/Makefile-header.gmk
+--- linux-5.4/drivers/virt/vboxdrv/Makefile-header.gmk.omv~ 2020-01-10 05:06:25.343976157 +0100
++++ linux-5.4/drivers/virt/vboxdrv/Makefile-header.gmk 2020-01-10 05:06:31.955987995 +0100
+@@ -45,7 +45,7 @@
+ # (We have to support basic cross building (ARCH=i386|x86_64).)
+ # While at it, warn about BUILD_* vars found to help with user problems.
+ #
+-ifeq ($(filter-out x86_64 amd64 AMD64,$(shell rpm --eval %_target_cpu)),)
++ifeq ($(filter-out x86_64 znver1 amd64 AMD64,$(shell rpm --eval %_target_cpu)),)
+ BUILD_TARGET_ARCH_DEF := amd64
+ else
+ BUILD_TARGET_ARCH_DEF := x86
diff --git a/vbox-6.1.2-clang.patch b/vbox-6.1.2-clang.patch
new file mode 100644
index 0000000..0a9a30e
--- /dev/null
+++ b/vbox-6.1.2-clang.patch
@@ -0,0 +1,48 @@
+diff -up linux-5.4/drivers/net/vboxnetadp/r0drv/linux/the-linux-kernel.h.omv~ linux-5.4/drivers/net/vboxnetadp/r0drv/linux/the-linux-kernel.h
+--- linux-5.4/drivers/net/vboxnetadp/r0drv/linux/the-linux-kernel.h.omv~ 2020-01-16 02:15:32.203720125 +0100
++++ linux-5.4/drivers/net/vboxnetadp/r0drv/linux/the-linux-kernel.h 2020-01-16 02:26:32.191749227 +0100
+@@ -42,7 +42,7 @@
+ #endif
+ #if RT_GNUC_PREREQ(4, 2)
+ # pragma GCC diagnostic ignored "-Wunused-parameter"
+-# if !defined(__cplusplus) && RT_GNUC_PREREQ(4, 3)
++# if !defined(__cplusplus) && RT_GNUC_PREREQ(4, 3) && !defined(__clang__)
+ # pragma GCC diagnostic ignored "-Wold-style-declaration" /* 2.6.18-411.0.0.0.1.el5/build/include/asm/apic.h:110: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration] */
+ # endif
+ #endif
+diff -up linux-5.4/drivers/net/vboxnetflt/r0drv/linux/the-linux-kernel.h.omv~ linux-5.4/drivers/net/vboxnetflt/r0drv/linux/the-linux-kernel.h
+--- linux-5.4/drivers/net/vboxnetflt/r0drv/linux/the-linux-kernel.h.omv~ 2020-01-16 02:26:37.468749460 +0100
++++ linux-5.4/drivers/net/vboxnetflt/r0drv/linux/the-linux-kernel.h 2020-01-16 02:26:45.408749810 +0100
+@@ -42,7 +42,7 @@
+ #endif
+ #if RT_GNUC_PREREQ(4, 2)
+ # pragma GCC diagnostic ignored "-Wunused-parameter"
+-# if !defined(__cplusplus) && RT_GNUC_PREREQ(4, 3)
++# if !defined(__cplusplus) && RT_GNUC_PREREQ(4, 3) && !defined(__clang__)
+ # pragma GCC diagnostic ignored "-Wold-style-declaration" /* 2.6.18-411.0.0.0.1.el5/build/include/asm/apic.h:110: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration] */
+ # endif
+ #endif
+diff -up linux-5.4/drivers/pci/vboxpci/r0drv/linux/the-linux-kernel.h.omv~ linux-5.4/drivers/pci/vboxpci/r0drv/linux/the-linux-kernel.h
+--- linux-5.4/drivers/pci/vboxpci/r0drv/linux/the-linux-kernel.h.omv~ 2020-01-16 02:38:20.330780453 +0100
++++ linux-5.4/drivers/pci/vboxpci/r0drv/linux/the-linux-kernel.h 2020-01-16 02:38:28.955780833 +0100
+@@ -42,7 +42,7 @@
+ #endif
+ #if RT_GNUC_PREREQ(4, 2)
+ # pragma GCC diagnostic ignored "-Wunused-parameter"
+-# if !defined(__cplusplus) && RT_GNUC_PREREQ(4, 3)
++# if !defined(__cplusplus) && RT_GNUC_PREREQ(4, 3) && !defined(__clang__)
+ # pragma GCC diagnostic ignored "-Wold-style-declaration" /* 2.6.18-411.0.0.0.1.el5/build/include/asm/apic.h:110: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration] */
+ # endif
+ #endif
+diff -up linux-5.4/drivers/virt/vboxdrv/r0drv/linux/the-linux-kernel.h.omv~ linux-5.4/drivers/virt/vboxdrv/r0drv/linux/the-linux-kernel.h
+--- linux-5.4/drivers/virt/vboxdrv/r0drv/linux/the-linux-kernel.h.omv~ 2020-01-16 02:48:06.263806289 +0100
++++ linux-5.4/drivers/virt/vboxdrv/r0drv/linux/the-linux-kernel.h 2020-01-16 02:48:11.967806541 +0100
+@@ -42,7 +42,7 @@
+ #endif
+ #if RT_GNUC_PREREQ(4, 2)
+ # pragma GCC diagnostic ignored "-Wunused-parameter"
+-# if !defined(__cplusplus) && RT_GNUC_PREREQ(4, 3)
++# if !defined(__cplusplus) && RT_GNUC_PREREQ(4, 3) && !defined(__clang__)
+ # pragma GCC diagnostic ignored "-Wold-style-declaration" /* 2.6.18-411.0.0.0.1.el5/build/include/asm/apic.h:110: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration] */
+ # endif
+ #endif