Skip to content

Commit

Permalink
Merge pull request #101 from mariux64/add-linux-4.8-rc3
Browse files Browse the repository at this point in the history
Add Linux 4.8-rc3
  • Loading branch information
donald authored Aug 23, 2016
2 parents 19b158a + 98d3690 commit 6f271b3
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 3 deletions.
6 changes: 3 additions & 3 deletions linux-4.8_rc2-95.bee → linux-4.8_rc3-98.bee
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
91 changes: 91 additions & 0 deletions nvidia_linux-4.8_rc3-98-367.18-0.bee
Original file line number Diff line number Diff line change
@@ -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}
}

0 comments on commit 6f271b3

Please sign in to comment.