Merge branch 'dev' into gcc9

.github/workflows/openwrt.yml

@@ -219,13 +219,14 @@ jobs:
           let make_process=$(nproc)+1
           make -j${make_process} IGNORE_ERRORS="y m n" |& tee logs/log.out
       - name: Create issues
+        working-directory: ./${{matrix.source}}_sdk
         run: |
-          ./scripts/issues-create -cpo ${{github.repository}} -l ${{matrix.source}}_sdk/logs -o logs/issues.json
+          ../scripts/issues-create -cpo ${{github.repository}} -l logs -o logs/issues.json
           ISSUES_REPO="ElonH/testAction"
           [[ ${{matrix.source}} == ctcgfw ]] && ISSUES_REPO="project-openwrt/openwrt-isco"
           [[ ${{matrix.source}} == latest ]] && ISSUES_REPO="project-openwrt/openwrt-latest-isco"
           echo "issues repo: $ISSUES_REPO"
-          ./scripts/issues-push -i logs/issues.json -ipo "$ISSUES_REPO" -u "${{github.actor}}" -t "${{secrets.RELEASE_TOKEN}}" || true
+          ../scripts/issues-push -i logs/issues.json -ipo "$ISSUES_REPO" -u "${{github.actor}}" -t "${{secrets.RELEASE_TOKEN}}" || true
           echo "--------------"
           echo "mini-config:"
           cat logs/minial_config || true
@@ -267,11 +268,11 @@ jobs:
           body: |
             Activate `ootoc` in `latest`
             ``` bash
-            bash <(wget -qO- https://cdn.jsdelivr.net/gh/${{github.repository}}@master/feeds/scripts/activate-ootoc.sh) latest ${{steps.tag.outputs.tagName}}
+            bash <(wget -qO- https://cdn.jsdelivr.net/gh/${{github.repository}}@${{steps.tag.outputs.tagName}}/feeds/scripts/activate-ootoc.sh) ${{github.repository}} latest ${{steps.tag.outputs.tagName}}
             ```
             Activate `ootoc` in `ctcgfw`
             ``` bash
-            bash <(wget -qO- https://cdn.jsdelivr.net/gh/${{github.repository}}@master/feeds/scripts/activate-ootoc.sh) ctcgfw ${{steps.tag.outputs.tagName}}
+            bash <(wget -qO- https://cdn.jsdelivr.net/gh/${{github.repository}}@${{steps.tag.outputs.tagName}}/feeds/scripts/activate-ootoc.sh) ${{github.repository}} ctcgfw ${{steps.tag.outputs.tagName}}
             ```
       - name: Remove old artifacts
         uses: c-hive/gha-remove-artifacts@v1

DerivateIndex.md

@@ -5,7 +5,7 @@
 - ramips - MediaTek Ralink MIPS
   - mt7621 - MT7621 based board ([Derren-Bryan](https://github.com/Derren-Bryan/opde-ramips-mt7621))
 - ipq40xx - Qualcomm Atheros IPQ40XX
-  - generic - Generic (TODO: waiting)
+  - generic - Generic ([Derren-Bryan](https://github.com/Derren-Bryan/opde-ipq40xx-generic))
 
 ## Join in opde
 

README.md

@@ -23,11 +23,12 @@ OpenWrt Development Environment
     >  - no need to download whole Packages.tar(~1GB), `ootoc` will automatically fetch data what it need
 
     ``` bash
-    bash <(wget -qO- https://cdn.jsdelivr.net/gh/ElonH/opde@master/feeds/scripts/activate-ootoc.sh) [source] [version tag]
+    bash <(wget -qO- https://cdn.jsdelivr.net/gh/ElonH/opde@master/feeds/scripts/activate-ootoc.sh) [repo] [source] [version tag]
     ```
 
     > Note:  
     > [source]-Firmware-[version tag].tar is your downloaded firmware.  
+    > repo: eg: 'ElonH/opde' or derivate repo
     > source: 'latest' or 'ctcgfw'.  
     > version tag: the tag in release (eg: snapshot, v20.03.1 etc.)
 

feeds/scripts/activate-ootoc.sh

@@ -1,10 +1,11 @@
 #!/bin/bash
-# $1: source, 'latest' or 'ctcgfw'
-# $2: version tag, the tag in release (eg: v20.03.1 etc.)
+# $1: repo, eg: 'ElonH/opde'
+# $2: source, 'latest' or 'ctcgfw'
+# $3: version tag, the tag in release (eg: v20.03.1 etc.)
 uci set ootoc.global.enabled='1'
-OOTOC_URL="https://github.com/ElonH/BuildOpenWRT/releases/download"
-uci set ootoc.server.tar_url="$OOTOC_URL/$2/$1-Packages-$2.tar"
-uci set ootoc.server.aux_url="$OOTOC_URL/$2/$1-Packages-$2.yml"
+OOTOC_URL="https://github.com/$1/releases/download"
+uci set ootoc.server.tar_url="$OOTOC_URL/$3/$2-Packages-$3.tar"
+uci set ootoc.server.aux_url="$OOTOC_URL/$3/$2-Packages-$3.yml"
 uci commit
 /etc/init.d/ootoc enable
 /etc/init.d/ootoc restart