Update readme

thangnd85 · Sep 19, 2021 · c9bcfbb · c9bcfbb
1 parent 1dfb967
commit c9bcfbb
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 86 deletions.
diff --git a/.github/workflows/build-armbian.yml b/.github/workflows/build-armbian.yml
@@ -10,11 +10,11 @@ on:
   workflow_dispatch:
     inputs:
       ssh:
-        description: 'SSH connection'
+        description: 'SSH connection to Actions'
         required: false
         default: 'false'
   schedule:
-    cron: '0 17 * * 0'
+    - cron: '0 17 * * 0'
 
 env:
   ARMBIAN_BOARD: lepotato

diff --git a/.github/workflows/use-releases-file-to-build.yml b/.github/workflows/use-releases-file-to-build.yml
@@ -11,11 +11,11 @@ on:
   workflow_dispatch:
     inputs:
       ssh:
-        description: 'SSH connection'
+        description: 'SSH connection to Actions'
         required: false
         default: 'false'
   #schedule:
-    #- cron: '0 22 * * *'
+    #- cron: '0 17 * * 0'
 
 env:
   UPLOAD_FIRMWARE: false

diff --git a/README.md b/README.md
@@ -35,6 +35,13 @@ Login in to armbian → input command:
 ```yaml
 armbian-update
 ```
+## Armbian firmware compilation method
+
+Different amlogic armbian firmware, use the corresponding soc code to generate. Please choose according to your box soc model. `A single soc` can be directly input `sudo ./make s905d`. When `multiple soc` is compiled at the same time, please use `_` to connect multiple soc, such as `sudo ./make s905d_s905x3_s922x`
+
+```yaml
+sudo ./make s905x3_s905x2_s905x_s905w_s905d_s922x_s912
+```
 
 ## Kernel
 

diff --git a/kernel.sh b/kernel.sh
@@ -4,6 +4,7 @@
 # Copyright (C) 2021 https://github.com/ophub/build-armbian
 #========================================================================================================================
 
+#===== Do not modify the following parameter settings, Start =====
 make_path=${PWD}
 tmp_path=${make_path}/tmp_kernel
 armbian_tmp=${tmp_path}/armbian_tmp
@@ -12,91 +13,87 @@ dtb_tmp=${tmp_path}/dtb_tmp
 modules_tmp=${tmp_path}/modules_tmp
 armbian_outputpath=${make_path}/build/output/images
 armbian_dtbpath=https://github.com/ophub/amlogic-s9xxx-openwrt/trunk/amlogic-s9xxx/amlogic-dtb
+#===== Do not modify the following parameter settings, End =======
 
 die() {
     echo -e " [ \033[1;31m Error \033[0m ] ${1}"
     exit 1
 }
 
-build_kernel() {
-    echo "Start build kernel for amlogic-s9xxx-openwrt ..."
-
-        mkdir -p ${armbian_tmp} ${kernel_tmp} ${dtb_tmp} ${modules_tmp}
-
-    cd  ${tmp_path}
-        echo "copy armbian to tmp folder ..."
-        cp ${armbian_outputpath}/*.img . && sync
-        armbian_old=$( ls *.img 2>/dev/null | head -n 1 )
-        echo "armbian: ${armbian_old}"
-
-        echo "mount armbian ..."
-        loop_old=$(losetup -P -f --show "${armbian_old}")
-        [ ${loop_old} ] || die "losetup ${armbian_old} failed."
-
-        if ! mount ${loop_old}p1 ${armbian_tmp}; then
-            die "mount ${loop_old}p1 failed!"
-        fi
-        sync && sleep 3
-
-        echo "Copy modules files"
-        cp -rf ${armbian_tmp}/lib/modules/* ${modules_tmp} && sync
-        if [ $( ls ${modules_tmp}/ -l 2>/dev/null | grep "^d" | wc -l ) -eq 0 ]; then
-           die "The modules files is Missing!"
-        fi
-        armbian_version=$(ls ${modules_tmp}/)
-        echo "armbian_version: ${armbian_version}"
-        kernel_version=$(echo ${armbian_version} | grep -oE '[1-9].[0-9]{1,2}.[0-9]+')
-        mkdir -p ${kernel_version}
-        echo "kernel_version: ${kernel_version}"
-
-        echo "Copy five boo kernel files"
-        cp -f ${armbian_tmp}/boot/{config-*,initrd.img-*,System.map-*,uInitrd-*,vmlinuz-*} ${kernel_tmp} && sync
-        if [ ! -f ${kernel_tmp}/config-* -o ! -f ${kernel_tmp}/initrd.img-* -o ! -f ${kernel_tmp}/System.map-* -o ! -f ${kernel_tmp}/uInitrd-* -o ! -f ${kernel_tmp}/vmlinuz-* ]; then
-           die "The five boot kernel files is Missing!"
-        fi
-
-        echo "supplement .dtb file from github.com ..."
-        svn checkout ${armbian_dtbpath} ${dtb_tmp} >/dev/null 2>&1
-        echo "Copy .dtb files"
-        cp -f ${armbian_tmp}/boot/dtb-*/amlogic/*.dtb ${dtb_tmp} && sync
-        sync
-
-    cd  ${modules_tmp}
-        echo "Package modules-${armbian_version}.tar.gz"
-        tar -czf modules-${armbian_version}.tar.gz *
-        mv -f modules-${armbian_version}.tar.gz ../${kernel_version} && sync
-
-    cd  ${dtb_tmp}
-        echo "Package dtb-amlogic-${armbian_version}.tar.gz"
-        rm -rf $(find . -type d) 2>/dev/null && sync
-        rm -rf .svn && sync
-        tar -czf dtb-amlogic-${armbian_version}.tar.gz *
-        mv -f dtb-amlogic-${armbian_version}.tar.gz ../${kernel_version} && sync
-
-    cd  ${kernel_tmp}
-        echo "Package boot-${armbian_version}.tar.gz"
-        tar -czf boot-${armbian_version}.tar.gz *
-        mv -f boot-${armbian_version}.tar.gz ../${kernel_version} && sync
-
-    cd  ${tmp_path}
-        echo "umount old armbian ..."
-        umount -f ${armbian_tmp} 2>/dev/null
-        losetup -d ${loop_old} 2>/dev/null
-        echo "mv ${kernel_version} folder to ${armbian_outputpath}"
-        mv -f ${kernel_version} ${armbian_outputpath}/ && sync
-
-    cd ${armbian_outputpath}
-        echo "kernel save path: ${armbian_outputpath}/${kernel_version}.tar.gz"
-        tar -czf amlogic-s9xxx-openwrt-kernel-${kernel_version}.tar.gz ${kernel_version} && sync
-        rm -rf ${kernel_version} && sync
-
-    cd  ${make_path}
-        echo "delete tmp folders ..."
-        rm -rf ${tmp_path} && sync
-
-    echo "build kernel complete ..."
-}
-
-build_kernel
-wait
+echo "Start build kernel for amlogic-s9xxx-openwrt ..."
+
+    mkdir -p ${armbian_tmp} ${kernel_tmp} ${dtb_tmp} ${modules_tmp}
+
+cd  ${tmp_path}
+    echo "copy armbian to tmp folder ..."
+    cp ${armbian_outputpath}/*.img . && sync
+    armbian_old=$( ls *.img 2>/dev/null | head -n 1 )
+    echo "armbian: ${armbian_old}"
+
+    echo "mount armbian ..."
+    loop_old=$(losetup -P -f --show "${armbian_old}")
+    [ ${loop_old} ] || die "losetup ${armbian_old} failed."
+
+    if ! mount ${loop_old}p1 ${armbian_tmp}; then
+        die "mount ${loop_old}p1 failed!"
+    fi
+    sync && sleep 3
+
+    echo "Copy modules files"
+    cp -rf ${armbian_tmp}/lib/modules/* ${modules_tmp} && sync
+    if [ $( ls ${modules_tmp}/ -l 2>/dev/null | grep "^d" | wc -l ) -eq 0 ]; then
+       die "The modules files is Missing!"
+    fi
+    armbian_version=$(ls ${modules_tmp}/)
+    echo "armbian_version: ${armbian_version}"
+    kernel_version=$(echo ${armbian_version} | grep -oE '[1-9].[0-9]{1,2}.[0-9]+')
+    mkdir -p ${kernel_version}
+    echo "kernel_version: ${kernel_version}"
+
+    echo "Copy five boo kernel files"
+    cp -f ${armbian_tmp}/boot/{config-*,initrd.img-*,System.map-*,uInitrd-*,vmlinuz-*} ${kernel_tmp} && sync
+    if [ ! -f ${kernel_tmp}/config-* -o ! -f ${kernel_tmp}/initrd.img-* -o ! -f ${kernel_tmp}/System.map-* -o ! -f ${kernel_tmp}/uInitrd-* -o ! -f ${kernel_tmp}/vmlinuz-* ]; then
+       die "The five boot kernel files is Missing!"
+    fi
+
+    echo "supplement .dtb file from github.com ..."
+    svn checkout ${armbian_dtbpath} ${dtb_tmp} >/dev/null 2>&1
+    echo "Copy .dtb files"
+    cp -f ${armbian_tmp}/boot/dtb-*/amlogic/*.dtb ${dtb_tmp} && sync
+    sync
+
+cd  ${modules_tmp}
+    echo "Package modules-${armbian_version}.tar.gz"
+    tar -czf modules-${armbian_version}.tar.gz *
+    mv -f modules-${armbian_version}.tar.gz ../${kernel_version} && sync
+
+cd  ${dtb_tmp}
+    echo "Package dtb-amlogic-${armbian_version}.tar.gz"
+    rm -rf $(find . -type d) 2>/dev/null && sync
+    rm -rf .svn && sync
+    tar -czf dtb-amlogic-${armbian_version}.tar.gz *
+    mv -f dtb-amlogic-${armbian_version}.tar.gz ../${kernel_version} && sync
+
+cd  ${kernel_tmp}
+    echo "Package boot-${armbian_version}.tar.gz"
+    tar -czf boot-${armbian_version}.tar.gz *
+    mv -f boot-${armbian_version}.tar.gz ../${kernel_version} && sync
+
+cd  ${tmp_path}
+    echo "umount old armbian ..."
+    umount -f ${armbian_tmp} 2>/dev/null
+    losetup -d ${loop_old} 2>/dev/null
+    echo "mv ${kernel_version} folder to ${armbian_outputpath}"
+    mv -f ${kernel_version} ${armbian_outputpath}/ && sync
+
+cd ${armbian_outputpath}
+    echo "kernel save path: ${armbian_outputpath}/${kernel_version}.tar.gz"
+    tar -czf amlogic-s9xxx-openwrt-kernel-${kernel_version}.tar.gz ${kernel_version} && sync
+    rm -rf ${kernel_version} && sync
+
+cd  ${make_path}
+    echo "delete tmp folders ..."
+    rm -rf ${tmp_path} && sync
+
+echo "build kernel complete ..."
 
diff --git a/make b/make
@@ -292,7 +292,7 @@ for b in ${build_armbian[*]}; do
     now_remaining_space=$(df -hT ${PWD} | grep '/dev/' | awk '{print $5}' | sed 's/.$//')
     if  [[ "${now_remaining_space}" -le "2" ]]; then
         echo "Remaining space is less than 2G, exit this packaging. \n"
-        break 2
+        break
     else
         echo "Remaining space is ${now_remaining_space}G."
     fi