Skip to content

nvidia_linux: fix 'Compiler version check' for gcc 7.5 #1526

Merged
merged 1 commit into from
Dec 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ mee_build_pre() {
}

mee_build() {
start_cmd make SYSSRC=${LINUXSRCDIR} module
IGNORE_CC_MISMATCH=1 \
make SYSSRC=${LINUXSRCDIR} module
}

mee_install() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ mee_build_pre() {
}

mee_build() {
start_cmd make SYSSRC=${LINUXSRCDIR} module
IGNORE_CC_MISMATCH=1 \
make SYSSRC=${LINUXSRCDIR} module
}

mee_install() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ mee_build_pre() {
}

mee_build() {
start_cmd make SYSSRC=${LINUXSRCDIR} module
IGNORE_CC_MISMATCH=1 \
make SYSSRC=${LINUXSRCDIR} module
}

mee_install() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ mee_build_pre() {
}

mee_build() {
start_cmd make SYSSRC=${LINUXSRCDIR} module
IGNORE_CC_MISMATCH=1 \
make SYSSRC=${LINUXSRCDIR} module
}

mee_install() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ mee_build_pre() {
}

mee_build() {
start_cmd make SYSSRC=${LINUXSRCDIR} module
IGNORE_CC_MISMATCH=1 \
make SYSSRC=${LINUXSRCDIR} module
}

mee_install() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ mee_build_pre() {
}

mee_build() {
start_cmd make SYSSRC=${LINUXSRCDIR} module
IGNORE_CC_MISMATCH=1 \
make SYSSRC=${LINUXSRCDIR} module
}

mee_install() {
Expand Down
59 changes: 0 additions & 59 deletions nvidia_linux-4.19.57-286-418.56-0.bee

This file was deleted.

60 changes: 60 additions & 0 deletions nvidia_linux-4.19.57-286-418.56-1.bee
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
#!/bin/env beesh

NVIDIA_ARCHIVE="NVIDIA-Linux-x86_64-${PKGVERSION}.run"

SRCURL[0]="https://download.nvidia.com/XFree86/Linux-x86_64/${PKGVERSION}/${NVIDIA_ARCHIVE}"

PATCHURL+=()

LINUXPKG=${PKGEXTRANAME}.${ARCH}

LINUXKLOCALVER=$(beeversion --format "%v.mx64.%r" "${LINUXPKG}")

# '4.4.mx64.75' to '4.4.0.mx64.75'
if [[ $LINUXKLOCALVER =~ ^([0-9]+\.[0-9]+)(\.mx64.*) ]]; then
LINUXKLOCALVER="${BASH_REMATCH[1]}.0${BASH_REMATCH[2]}"
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() {
IGNORE_CC_MISMATCH=1 \
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}/current
}