diff --git a/localbuild.sh b/localbuild.sh index d43f33a7..b15d8f2d 100755 --- a/localbuild.sh +++ b/localbuild.sh @@ -32,8 +32,8 @@ function create() { exit 1 fi - sudo apt-get update - sudo apt-get install -y locales busybox dialog curl xz-utils cpio sed + sudo apt update + 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) diff --git a/scripts/func.py b/scripts/func.py index fbdaf941..6f334108 100644 --- a/scripts/func.py +++ b/scripts/func.py @@ -34,7 +34,10 @@ def getmodels(workpath, jsonpath, xlsxpath): M_productvers = M_data.get("productvers", []) productvers = {} for P in M_productvers: - productvers[P] = M_productvers[P].get("kver", "") + 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} if jsonpath: diff --git a/sourcebuild.sh b/sourcebuild.sh index 15c1accf..e39c4410 100755 --- a/sourcebuild.sh +++ b/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" || ( - echo -e "Can't cp ${LOOPX}p1." +sudo cp -rf "files/mnt/p2/"* "/tmp/mnt/p2" || ( + echo -e "Can't cp ${LOOPX}p2." exit 1 ) -cp -rf "files/mnt/p3/"* "/tmp/mnt/p3" || ( - echo -e "Can't cp ${LOOPX}p1." +sudo cp -rf "files/mnt/p3/"* "/tmp/mnt/p3" || ( + echo -e "Can't cp ${LOOPX}p2." exit 1 )