From 0985bf8178f77c4594c815f3e625b623baadf66e Mon Sep 17 00:00:00 2001 From: thomas Date: Mon, 23 Jul 2018 10:20:03 +0200 Subject: [PATCH] nvidia_linux-4.14.56: Remove obsolete legacy logic in build --- nvidia_linux-4.14.56-215-390.25-0.bee | 34 ++------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/nvidia_linux-4.14.56-215-390.25-0.bee b/nvidia_linux-4.14.56-215-390.25-0.bee index 7657b8ef1..0d094d948 100755 --- a/nvidia_linux-4.14.56-215-390.25-0.bee +++ b/nvidia_linux-4.14.56-215-390.25-0.bee @@ -1,36 +1,6 @@ #!/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" +NVIDIA_ARCHIVE="NVIDIA-Linux-x86_64-${PKGVERSION}.run" SRCURL[0]="https://download.nvidia.com/XFree86/Linux-x86_64/${PKGVERSION}/${NVIDIA_ARCHIVE}" @@ -83,5 +53,5 @@ mee_install() { cp -v *.ko ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION}/ - ln -s ${PKGVERSION} ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${mxnvversion} + ln -s ${PKGVERSION} ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/current }