瀏覽代碼

Support Linux versions without patch versions in update

Fabian Mastenbroek 4 年之前
父節點
當前提交
d8b33b61aa
共有 2 個文件被更改,包括 14 次插入10 次删除
  1. 5 1
      scripts/check.sh
  2. 9 9
      scripts/version.sh

+ 5 - 1
scripts/check.sh

@@ -7,4 +7,8 @@ MAJOR=$(echo $1 | sed -e "s/^v//" -e "s/\.[^.]*$//")
 CURRENT=$(scripts/version.sh -L)
 NEW=$(curl -s https://www.kernel.org/releases.json | jq -r ".releases[]|select(.version | startswith(\"$MAJOR\")) | .version")
 
-[[ "$CURRENT" = "$NEW" ]] || echo $NEW
+if [[ "$(scripts/version.sh -p)" = "0" ]]; then
+    [[ "$(scripts/version.sh -n)" = "$NEW" ]] || echo $NEW
+else
+    [[ "$CURRENT" = "$NEW" ]] || echo $NEW
+fi

+ 9 - 9
scripts/version.sh

@@ -12,29 +12,28 @@ LINUX_VERSION=$LINUX_VERSION_MAJOR.$LINUX_VERSION_MINOR.$LINUX_VERSION_PATCHLEVE
 LINUX_PACKAGE_RELEASE=$(sed -n "s/^PKGREL=\(.*\)$/\1/p" < Makefile | xargs)
 LINUX_FLAVOR=$(sed -n "s/^PVE_BUILD_TYPE ?=\(.*\)$/\1/p" < Makefile | xargs)
 
-while getopts "MmprfdLBh" OPTION; do
+while getopts "MmnprfdLBh" OPTION; do
     case $OPTION in
     M)
         echo $LINUX_VERSION_MAJOR
         exit 0
         ;;
-
     m)
         echo $LINUX_VERSION_MINOR
         exit 0
-        ;; 
+        ;;
+    n)
+        echo $LINUX_VERSION_MAJOR.$LINUX_VERSION_MINOR
+        exit 0
+        ;;
     p)
         echo $LINUX_VERSION_PATCHLEVEL
         exit 0
-        ;; 
+        ;;
     r)
         echo $LINUX_PACKAGE_RELEASE
         exit 0
         ;;
-    f)
-        echo $LINUX_FLAVOR
-        exit 0
-        ;; 
     f)
         echo $LINUX_FLAVOR
         exit 0
@@ -48,9 +47,10 @@ while getopts "MmprfdLBh" OPTION; do
         exit 0
         ;;
     h)
-        echo "commit.sh [-Mmprfh]]"
+        echo "version.sh [-Mmnprfh]]"
         echo "  -M  major version"
         echo "  -m  minor version"
+        echo "  -n  major minor version"
         echo "  -p  patch version"
         echo "  -r  package release"
         echo "  -f  flavor name"