fix: packtype and channelid

pack.sh

@@ -8,6 +8,7 @@ usage() {
                     --chroot-type <pack type>
                     --orgcode <organization code>
                     --channelid <channel id>
+                    --packtype <pack type>
                     --help"
     exit 1
 }
@@ -19,6 +20,7 @@ DEPLOY="elf"
 ORGCODE=""
 CHANNELID=""
 IMAGE_FILE=""
+PACK_TYPE="other"
 
 # new append
 NOUPLOAD="false"
@@ -36,6 +38,7 @@ do
         --chroot-type) CHROOT_TYPE="$2"; shift 2 ;;
         --orgcode) ORGCODE="$2"; shift 2;;
         --channelid) CHANNELID="$2"; shift 2;;
+        --packtype) PACK_TYPE="$2"; shift 2;;
         --help) usage ;;
         --) shift; break;;
         *) usage ;;
@@ -87,7 +90,7 @@ build_image() {
         rm -f "$systemfile_ext4"
     fi
     aml_image_v2_packer -r "/$build_dir/image.cfg" "$build_dir" "${packge_dir}/$(basename "$img")"
-    rm -rf "$build_dir/"
+    rm -rf "$build_dir"
 }
 
 generate_vendor_confg() {
@@ -101,6 +104,8 @@ generate_vendor_confg() {
     sed -i'' "s#__ORGCODE__#$ORGCODE#g"  "$yaml_file_src"
     sed -i'' "s#__CHROOT_TYPE__#$CHROOT_TYPE#g"  "$yaml_file_src"
     sed -i'' "s#__DEPLOY__#$DEPLOY#g"  "$yaml_file_src"
+    sed -i'' "s#__CHANNEL_ID__#$CHANNELID#g"  "$yaml_file_src"
+    sed -i'' "s#__PACK_TYPE__#$PACK_TYPE#g"  "$yaml_file_src"
     aio -m enc -i "$yaml_file_src" -o "$yaml_file"
 }
 
@@ -137,7 +142,7 @@ upload() {
         echo "RESULT: ${VENDOR} ${IMG_URL} ${MD5SUM} ${TITLE}"
 
         rm -f "$outfile" "$outfile_7z"
-        rm -rf "$packge_dir/"
+        rm -rf "$packge_dir"
     fi
 }
 

vendor.yaml.src

@@ -5,3 +5,5 @@ info:
   mode: arm32
   chroottype: __CHROOT_TYPE__
   deploy: __DEPLOY__
+  packtype: __PACK_TYPE__
+  channelid: __CHANNEL_ID__