From 4b7cf29f3884db7034bc78bf9810f2419e684dc0 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Mon, 22 Aug 2016 11:49:44 +0200
Subject: [PATCH 1/2] linux: Add release candidate version 4.8-rc3

Announcement for Linux 4.8-rc3 [1]:

> After last weeks somewhat unusual patch statistics (only 1/6th
> drivers), we're not back to the normal programming with rc3, and we
> have the usual situation with roughly ~60% of the patch being driver
> updates. It's spread out, but most of it tends to be networking, GPU,
> USB and a new EDAC driver.  But all of it is fairly small.
>
> Outside of the driver department, we've got core networking, some
> filesystem updates (mainly xfs, although in the diffstat afs shows up
> too, but that's really from the networking changes) and a smattering
> of updates all over: documentation, scheduler, some miinor arch
> updates etc.
>
> And some perf tooling fixes.
>
> It all looks pretty sane, I'm not seeing anything hugely scary here.
> Go test it out,
>
>               Linus

[1] https://lkml.org/lkml/2016/8/21/378
---
 linux-4.8_rc2-95.bee => linux-4.8_rc3-98.bee | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename linux-4.8_rc2-95.bee => linux-4.8_rc3-98.bee (95%)

diff --git a/linux-4.8_rc2-95.bee b/linux-4.8_rc3-98.bee
similarity index 95%
rename from linux-4.8_rc2-95.bee
rename to linux-4.8_rc3-98.bee
index 9dea21157..e7a78bd5d 100755
--- a/linux-4.8_rc2-95.bee
+++ b/linux-4.8_rc3-98.bee
@@ -2,17 +2,17 @@
 
 # note: CONFIG=/boot/config-WHATEVER BEE_MAKEFLAGS='-j 40' ./linux-xxx.bee
 
-KERNELVERSION=4.8.0-rc2
+KERNELVERSION=4.8.0-rc3
 
 echo $KERNELVERSION
 
-SRCURL[0]="https://cdn.kernel.org/pub/linux/kernel/v4.x/testing/linux-4.8-rc2.tar.xz"
+SRCURL[0]="https://cdn.kernel.org/pub/linux/kernel/v4.x/testing/linux-4.8-rc3.tar.xz"
 
 # EXCLUDE=""
 
 #CONFIG=
 
-KERNELLOCAL=".mx64.95"
+KERNELLOCAL=".mx64.98"
 FULLKERNELVERSION="${KERNELVERSION}${KERNELLOCAL}"
 
 B=${S}

From 98d3690eb4498c66a9fda94fc31ba6113eb39f92 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Mon, 22 Aug 2016 11:55:13 +0200
Subject: [PATCH 2/2] nvidia_linux: Build 367.18 for Linux 4.8-rc3

---
 nvidia_linux-4.8_rc3-98-367.18-0.bee | 91 ++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100755 nvidia_linux-4.8_rc3-98-367.18-0.bee

diff --git a/nvidia_linux-4.8_rc3-98-367.18-0.bee b/nvidia_linux-4.8_rc3-98-367.18-0.bee
new file mode 100755
index 000000000..510e1889d
--- /dev/null
+++ b/nvidia_linux-4.8_rc3-98-367.18-0.bee
@@ -0,0 +1,91 @@
+#!/bin/env beesh
+
+# calculate package extra versions and legacy level
+# - use extraversions to define nvidia extraversion and/or legacy level
+# - legacy level should be the last part of extraversion
+# - legacy level 2 to 5 will be calculated from version number..
+
+mxnvversion=${PKGEXTRAVERSION##*_}
+: ${mxnvversion=current}
+
+nvextraversion="${PKGEXTRAVERSION_DASH}"
+
+if [ "${mxnvversion:0:6}" = "legacy" -o "${mxnvversion}" = "current" ] ; then
+    nvextraversion="${nvextraversion%_*}"
+    nvextraversion="${nvextraversion#-${mxnvversion}}"
+else
+    if [ "${PKGVERSION:0:4}" = "340." ] ; then
+        mxnvversion="legacy5"
+    elif [ "${PKGVERSION:0:4}" = "304." ] ; then
+        mxnvversion="legacy4"
+    elif [ "${PKGVERSION:0:7}" = "173.14." ] ; then
+        mxnvversion="legacy3"
+    elif [ "${PKGVERSION:0:6}" = "96.43." ] ; then
+        mxnvversion="legacy2"
+    else
+        mxnvversion="current"
+    fi
+fi
+
+print_info "calculated mxnvversion    = '${mxnvversion}'"
+print_info "calculated nvextraversion = '${nvextraversion}'"
+
+NVIDIA_ARCHIVE="NVIDIA-Linux-x86_64-${PKGVERSION}${nvextraversion}.run"
+
+SRCURL[0]="ftp://download.nvidia.com/XFree86/Linux-x86_64/${PKGVERSION}/${NVIDIA_ARCHIVE}"
+PATCHURL+=('/src/mariux/patches/0001-nvidia-uvm-Remove-definition-of-radix_tree_empty.patch')
+PATCHURL+=('/src/mariux/patches/0002-nvidia-drm-Update-code-for-new-function-signature.patch')
+PATCHURL+=('/src/mariux/patches/0003-kernel-Adapt-source-for-Linux-4.8.patch')
+
+LINUXPKG=${PKGEXTRANAME}.${ARCH}
+
+LINUXKLOCALVER=$(beeversion --format "%v%d.mx64.%r" "${LINUXPKG}")
+
+# '4.4.mx64.75' to '4.4.0.mx64.75'
+# '4.8-rc2.mx64.95' to '4.8.0-rc2.mx64.95'
+if [[ $LINUXKLOCALVER =~ ^([0-9]+\.[0-9]+)(-?.*)(\.mx64.*) ]]; then
+    LINUXKLOCALVER="${BASH_REMATCH[1]}.0${BASH_REMATCH[2]}${BASH_REMATCH[3]}"
+fi
+
+
+build_in_sourcedir
+sourcesubdir_append kernel
+
+: ${BEE_TMP_TMPDIR:=/tmp}
+
+mee_extract() {
+    LINUXBUILDARCHIVE="${BEE_BUILDARCHIVEDIR}/${LINUXPKG}.beebuild.tar.bz2"
+
+    print_info "extracting nvidia archive .."
+
+    start_cmd rmdir ${S}
+    start_cmd sh ${F}/${NVIDIA_ARCHIVE} -x --target ${S}
+
+    if [ -d "/usr/src/linux/${LINUXPKG}/source" ] ; then
+        LINUXSRCDIR="/usr/src/linux/${LINUXPKG}/source"
+    elif [ -d "${BEE_TMP_TMPDIR}/${LINUXPKG}/source" ] ; then
+        LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source"
+    else
+        print_info "extracting linux build ${LINUXPKG} .."
+        start_cmd gtar -xf "${LINUXBUILDARCHIVE}" -C ${BEE_TMP_TMPDIR}
+        LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source"
+    fi
+
+    print_info "using kernel sources from ${LINUXSRCDIR} .."
+}
+
+mee_build_pre() {
+    ln -s ${LINUXSRCDIR}/include ${S}/include
+}
+
+mee_build() {
+	start_cmd make SYSSRC=${LINUXSRCDIR} module
+}
+
+mee_install() {
+    mkdir -pv ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION}
+
+    cp -v *.ko ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION}/
+
+    ln -s ${PKGVERSION} ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${mxnvversion}
+}