From d50a8c83325d4f8f13e10abc69fba35b49788120 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 18 Aug 2016 20:15:05 +0200 Subject: [PATCH] nvidia_linux-4.8_rc2: Put modules in correct directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adapt the script to take the extra version into account, and put the modules into the correct directory. * before: /usr/share/nvidia/kernel/4.8.0.mx64.95 * after: /usr/share/nvidia/kernel/4.8.0-rc2.mx64.95 Here are some examples used for testing. ``` $ test=$(beeversion --format "%V.mx64.%r" linux-4.8_rc2-95.x86_64); if [[ $test =~ ^([0-9]+\.[0-9]+)_?(.*)(\.mx64.*) ]]; then echo "${BASH_REMATCH[1]}.0-${BASH_REMATCH[2]}${BASH_REMATCH[3]}"; fi 4.8.0-rc2.mx64.95 test=$(beeversion --format "%V.mx64.%r" linux-4.8-95.x86_64); if [[ $test =~ ^([0-9]+\.[0-9]+)_?(.*)(\.mx64.*) ]]; then echo "${BASH_REMATCH[1]}.0-${BASH_REMATCH[2]}${BASH_REMATCH[3]}"; fi 4.8.0-.mx64.95 $ test=$(beeversion --format "%V.mx64.%r" linux-4.8_rc2-95.x86_64); if [[ $test =~ ^([0-9]+\.[0-9]+)(_?.*)(\.mx64.*) ]]; then echo "${BASH_REMATCH[1]}.0${BASH_REMATCH[2]}${BASH_REMATCH[3]}"; fi 4.8.0_rc2.mx64.95 $ test=$(beeversion --format "%V.mx64.%r" linux-4.8-95.x86_64); if [[ $test =~ ^([0-9]+\.[0-9]+)(_?.*)(\.mx64.*) ]]; then echo "${BASH_REMATCH[1]}.0${BASH_REMATCH[2]}${BASH_REMATCH[3]}"; fi 4.8.0.mx64.95 ``` As you can see, it currently doesn’t work, when the package has no extra version. --- ...95-367.18-0.bee => nvidia_linux-4.8_rc2-95-367.18-1.bee | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) rename nvidia_linux-4.8_rc2-95-367.18-0.bee => nvidia_linux-4.8_rc2-95-367.18-1.bee (91%) diff --git a/nvidia_linux-4.8_rc2-95-367.18-0.bee b/nvidia_linux-4.8_rc2-95-367.18-1.bee similarity index 91% rename from nvidia_linux-4.8_rc2-95-367.18-0.bee rename to nvidia_linux-4.8_rc2-95-367.18-1.bee index 284851dbd..86e39d9db 100755 --- a/nvidia_linux-4.8_rc2-95-367.18-0.bee +++ b/nvidia_linux-4.8_rc2-95-367.18-1.bee @@ -39,11 +39,12 @@ PATCHURL+=('/src/mariux/patches/0003-kernel-Adapt-source-for-Linux-4.8.patch') LINUXPKG=${PKGEXTRANAME}.${ARCH} -LINUXKLOCALVER=$(beeversion --format "%v.mx64.%r" "${LINUXPKG}") +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]}" +# '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