update 2024-04-11 22:40:09

docs/models.json

@@ -53,8 +53,8 @@
     "SA6400": {
         "platform": "epyc7002",
         "productvers": {
-            "7.1": "5.10.55",
+            "7.1": "7.1-5.10.55",
-            "7.2": "5.10.55"
+            "7.2": "7.2-5.10.55"
         }
     },
     "DS2422+": {

localbuild.sh

@@ -32,8 +32,8 @@ function create() {
     exit 1
   fi
 
-  sudo apt-get update
+  sudo apt update
-  sudo apt-get install -y locales busybox dialog curl xz-utils cpio sed
+  sudo apt install -y locales busybox dialog curl xz-utils cpio sed
   sudo locale-gen de_DE.UTF-8 en_US.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 ru_RU.UTF-8 uk_UA.UTF-8 vi_VN.UTF-8 zh_CN.UTF-8 zh_HK.UTF-8 zh_TW.UTF-8
 
   YQ=$(command -v yq)

scripts/func.py

@@ -34,6 +34,9 @@ def getmodels(workpath, jsonpath, xlsxpath):
             M_productvers = M_data.get("productvers", [])
             productvers = {}
             for P in M_productvers:
+                if M_productvers[P].get("kpre", "") != "":
+                    productvers[P] = M_productvers[P].get("kpre", "") + "-" + M_productvers[P].get("kver", "")
+                else:
                     productvers[P] = M_productvers[P].get("kver", "")
             models[M_name] = {"platform": M_platform, "productvers": productvers}
 

sourcebuild.sh

@@ -78,11 +78,11 @@ sudo mount ${LOOPX}p1 "/tmp/mnt/p1" || (
   exit 1
 )
 sudo mount ${LOOPX}p2 "/tmp/mnt/p2" || (
-  echo -e "Can't mount ${LOOPX}p1."
+  echo -e "Can't mount ${LOOPX}p2."
   exit 1
 )
 sudo mount ${LOOPX}p3 "/tmp/mnt/p3" || (
-  echo -e "Can't mount ${LOOPX}p1."
+  echo -e "Can't mount ${LOOPX}p3."
   exit 1
 )
 
@@ -92,12 +92,12 @@ sudo cp -rf "files/mnt/p1/"* "/tmp/mnt/p1" || (
   echo -e "Can't cp ${LOOPX}p1."
   exit 1
 )
-cp -rf "files/mnt/p2/"* "/tmp/mnt/p2" || (
+sudo cp -rf "files/mnt/p2/"* "/tmp/mnt/p2" || (
-  echo -e "Can't cp ${LOOPX}p1."
+  echo -e "Can't cp ${LOOPX}p2."
   exit 1
 )
-cp -rf "files/mnt/p3/"* "/tmp/mnt/p3" || (
+sudo cp -rf "files/mnt/p3/"* "/tmp/mnt/p3" || (
-  echo -e "Can't cp ${LOOPX}p1."
+  echo -e "Can't cp ${LOOPX}p2."
   exit 1
 )