nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'freifunk-gluon:master' into add-fritzbox-7430

Browse Source
This commit is contained in:
Felix 2022-04-02 15:26:55 +02:00 committed by GitHub
commit 3a431d5195
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/backport.yml vendored
View File

@ -8,7 +8,7 @@ jobs:
if: github.repository_owner == 'freifunk-gluon' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name))
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Create backport PRs

4
.github/workflows/build-docs.yml vendored
View File

@ -14,13 +14,13 @@ jobs:
name: docs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install Dependencies
run: sudo pip3 install sphinx-rtd-theme
- name: Build documentation
run: make -C docs html
- name: Archive build output
uses: actions/upload-artifact@v2.3.1
uses: actions/upload-artifact@v3
with:
name: docs_output
path: docs/_build/html

8
.github/workflows/build-gluon.yml vendored
View File

@ -14,7 +14,7 @@ jobs:
outputs:
targets: ${{ steps.filter.outputs.changes }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
# Filter targets based on changed files
- uses: dorny/paths-filter@v2
@ -32,7 +32,7 @@ jobs:
target: ${{ fromJSON(needs.changed.outputs.targets) }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install Dependencies
run: sudo contrib/actions/install-dependencies.sh
@ -42,13 +42,13 @@ jobs:
- name: Archive build logs
if: ${{ !cancelled() }}
uses: actions/upload-artifact@v2.3.1
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.target }}_logs
path: openwrt/logs
- name: Archive build output
uses: actions/upload-artifact@v2.3.1
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.target }}_output
path: output

2
.github/workflows/check-patches.yml vendored
View File

@ -17,7 +17,7 @@ jobs:
name: Check patches
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Refresh patches
run: make refresh-patches GLUON_SITEDIR="contrib/ci/minimal-site"
- name: Show diff

2
.github/workflows/labels.yml vendored
View File

@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
if: github.repository_owner == 'freifunk-gluon'
steps:
- uses: actions/labeler@v3
- uses: actions/labeler@v4
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
sync-labels: true

4
.github/workflows/lint.yml vendored
View File

@ -8,7 +8,7 @@ jobs:
name: Lua
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install Dependencies
run: sudo apt-get -y update && sudo apt-get -y install lua-check
- name: Install example site
@ -20,7 +20,7 @@ jobs:
name: Shell
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install Dependencies
run: sudo apt-get -y update && sudo apt-get -y install shellcheck
- name: Install example site

5
docs/user/supported_devices.rst
View File

@ -31,6 +31,7 @@ ath79-generic
* GL.iNet
- GL-AR150
- GL-AR300M-Lite
* Joy-IT
@ -71,8 +72,9 @@ ath79-generic
* TP-Link
- Archer A7 (v5)
- Archer C5 (v1)
- Archer C6 (v2)
- Archer C7 (v2)
- Archer C7 (v2, v5)
- CPE210 (v1.0, v1.1, v2.0)
- CPE220 (v3.0)
- CPE510 (v1.0, v1.1)
@ -81,6 +83,7 @@ ath79-generic
- EAP225-Outdoor (v1)
- TL-WDR3600 (v1)
- TL-WDR4300 (v1)
- TL-WR810N (v1)
- TL-WR1043N/ND (v3, v4)
- WBS210 (v2.0)

6
modules
View File

@ -2,15 +2,15 @@ GLUON_FEEDS='packages routing gluon'
OPENWRT_REPO=https://github.com/openwrt/openwrt.git
OPENWRT_BRANCH=openwrt-21.02
OPENWRT_COMMIT=cd17ca7d6f305ff93ee5436b883bc5ad3767e3a7
OPENWRT_COMMIT=ee62912b2db0018cd370f2c110e1391ee779cc6d
PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
PACKAGES_PACKAGES_BRANCH=openwrt-21.02
PACKAGES_PACKAGES_COMMIT=ee69afe6f1c0ff9d257b5478ae6d50b18e023519
PACKAGES_PACKAGES_COMMIT=7157e9b4d6a1beed83ff86e1a071b1e922c240a3
PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
PACKAGES_ROUTING_BRANCH=openwrt-21.02
PACKAGES_ROUTING_COMMIT=7c7d11e2904494820d5c28249bff8abd46493184
PACKAGES_ROUTING_COMMIT=c96b10188bcdc58b5c1198a8d3839fbe45274279
PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
PACKAGES_GLUON_COMMIT=308166e3c6b2d571606dd1dbfadd2bb8e31d8f90

16
targets/ath79-generic
View File

@ -89,6 +89,10 @@ device('enterasys-ws-ap3705', 'enterasys_ws-ap3705i', {
-- GL.iNet
device('gl.inet-gl-ar150', 'glinet_gl-ar150', {
factory = false,
})
device('gl.inet-gl-ar300m-lite', 'glinet_gl-ar300m-lite', {
factory = false,
})
@ -262,6 +266,10 @@ device('tp-link-archer-c2-v3', 'tplink_archer-c2-v3', {
broken = true, -- 64M ath9k + ath10k
})
device('tp-link-archer-c5-v1', 'tplink_archer-c5-v1', {
packages = ATH10K_PACKAGES_QCA9880,
})
device('tp-link-archer-c6-v2', 'tplink_archer-c6-v2', {
packages = ATH10K_PACKAGES_QCA9888,
})
@ -270,6 +278,10 @@ device('tp-link-archer-c7-v2', 'tplink_archer-c7-v2', {
packages = ATH10K_PACKAGES_QCA9880,
})
device('tp-link-archer-c7-v5', 'tplink_archer-c7-v5', {
packages = ATH10K_PACKAGES_QCA9880,
})
device('tp-link-archer-d50-v1', 'tplink_archer-d50-v1', {
packages = ATH10K_PACKAGES_QCA9880,
factory = false,
@ -298,12 +310,14 @@ device('tp-link-cpe510-v2', 'tplink_cpe510-v2')
device('tp-link-cpe510-v3', 'tplink_cpe510-v3')
device('tp-link-eap225-outdoor-v1', 'tplink_eap225-outdoor-v1', {
packages = ATH10K_PACKAGES_QCA9888,
packages = ATH10K_PACKAGES_QCA9888,
})
device('tp-link-tl-wdr3600-v1', 'tplink_tl-wdr3600-v1')
device('tp-link-tl-wdr4300-v1', 'tplink_tl-wdr4300-v1')
device('tp-link-tl-wr810n-v1', 'tplink_tl-wr810n-v1')
device('tp-link-tl-wr1043nd-v3', 'tplink_tl-wr1043nd-v3', {
manifest_aliases = {
'tp-link-tl-wr1043n-nd-v3', -- upgrade from OpenWrt 19.07