fix

Author: anaelorlinski

.github/workflows/NanoPi-Build.yml

@@ -105,7 +105,7 @@ jobs:
       continue-on-error: true
       run: |
         cd build/openwrt
-        let make_process=$(nproc)+2
+        let make_process=$(nproc)+1
         make toolchain/install -j${make_process}
     
     - name: If toolchain Error
@@ -203,7 +203,7 @@ jobs:
       continue-on-error: true
       run: |
         cd build/openwrt
-        let make_process=$(nproc)+2
+        let make_process=$(nproc)+1
         make -j${make_process} || make -j${make_process}
     
     - name: If compile openwrt Error
@@ -250,6 +250,7 @@ jobs:
     - name: Create release
       id: create_release
       uses: ncipollo/release-action@v1.9.0
+      if: ${{ !cancelled() }}
       with:
         name: OpenWrt ${{ env.OPENWRT_BRANCH }} ${{ env.BUILD_DATE }} 
         allowUpdates: true

openwrt-21.02/seed/ao-R4S-full.seed

@@ -22,7 +22,7 @@ CONFIG_IPERF_ENABLE_MULTICAST=y
 CONFIG_KERNEL_ARM_PMU=y
 CONFIG_KERNEL_BLK_DEV_THROTTLING_LOW=y
 CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y
-CONFIG_KERNEL_BUILD_DOMAIN="zzz"
+CONFIG_KERNEL_BUILD_DOMAIN="openwrt"
 CONFIG_KERNEL_BUILD_USER="ao"
 CONFIG_KERNEL_CFQ_GROUP_IOSCHED=y
 CONFIG_KERNEL_CGROUP_DEVICE=y

openwrt-21.02/seed/ao-R4S-mini.seed

@@ -15,7 +15,7 @@ CONFIG_IFSTAT_SNMP=y
 CONFIG_IPERF_ENABLE_MULTICAST=y
 CONFIG_KERNEL_ARM_PMU=y
 CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y
-CONFIG_KERNEL_BUILD_DOMAIN="zzz"
+CONFIG_KERNEL_BUILD_DOMAIN="openwrt"
 CONFIG_KERNEL_BUILD_USER="ao"
 # CONFIG_KERNEL_CGROUPS is not set
 CONFIG_KERNEL_EXT4_FS_POSIX_ACL=y

openwrt-21.02/steps/04-prepare_package.sh

@@ -31,12 +31,14 @@ cp -R ../stangri_repo/vpn-policy-routing feeds/packages/net/
 #./scripts/feeds install -p stangri_repo luci-app-vpn-policy-routing
 
 # Time stamp with $Build_Date=$(date +%Y.%m.%d)
-echo "Build date github action $BUILD_DATE"
-echo -e '\nAO Build@'$(date "+%Y.%m.%d")'\n'  >> package/base-files/files/etc/banner
-sed -i '/DISTRIB_REVISION/d' package/base-files/files/etc/openwrt_release
-echo "DISTRIB_REVISION='$(date "+%Y.%m.%d")'" >> package/base-files/files/etc/openwrt_release
+MANUAL_DATE="$(date +%Y.%m.%d) (manual build)"
+BUILD_DATE=${BUILD_DATE:-$MANUAL_DATE}
+echo "Write build date in openwrt : $BUILD_DATE"
+echo -e '\nAO Build@'${BUILD_DATE}'\n'  >> package/base-files/files/etc/banner
+#sed -i '/DISTRIB_REVISION/d' package/base-files/files/etc/openwrt_release
+#echo "DISTRIB_REVISION='${BUILD_DATE}'" >> package/base-files/files/etc/openwrt_release
 sed -i '/DISTRIB_DESCRIPTION/d' package/base-files/files/etc/openwrt_release
-echo "DISTRIB_DESCRIPTION='AO Build@$(date "+%Y.%m.%d")'" >> package/base-files/files/etc/openwrt_release
+echo "DISTRIB_DESCRIPTION='AO Build@${BUILD_DATE}'" >> package/base-files/files/etc/openwrt_release
 sed -i '/luciversion/d' feeds/luci/modules/luci-base/luasrc/version.lua
 
 rm -rf .config