1690b51d21081b483bf19cffd9be66f92b5d93e4 to experimental · firmware / FFS Gluon

Some changes are not shown.

For a faster browsing experience, only 101 of 954 files are shown. Download one of the files below to see all changes.

.ecrc0 → 100644

+3
−0

Original line number
Diff line number
Diff line

{

  "Exclude": ["docs/_build"]

}

.editorconfig0 → 100644

+67
−0

Original line number
Diff line number
Diff line

# Top-most EditorConfig file

root = true

[*]

end_of_line = lf

insert_final_newline = true

indent_style = tab

charset = utf-8

[Dockerfile]

indent_style = space

indent_size = 4

[/patches/**]

indent_style = unset

indent_size = unset

[*.c]

[*.css]

[*.dia]

indent_style = space

indent_size = 2

[*.h]

[*.html]

[*.js]

[*{.json,.ecrc}]

indent_style = space

indent_size = 2

[*.lua]

[{Makefile,*.mk}]

indent_style = unset

[*.md]

indent_style = space

indent_size = 4

[*.pl]

[*.py]

indent_style = space

indent_size = 4

[*.rst]

indent_style = space

indent_size = 2

[*.sh]

[*.yml]

indent_style = space

indent_size = 2

[CMakeLists.txt]

indent_style = space

indent_size = 2

[{docs,contrib/ci}/*site*/**/*.conf]

indent_style = space

indent_size = 2

.github/ISSUE_TEMPLATE/bug_report.md0 → 100644

+71
−0

Original line number
Diff line number
Diff line

---

name: Bug report

about: Report a bug in a recent version of Gluon

label: bug

---

<!--

Please carefully fill out the questionnaire below to help improve the

timely triaging of issues. Walk through the questions below and use

them as an inspiration for what information you can provide.

Make use of codeblocks (three backticks before and after) where

appropriate (configuration excerpts, log output, etc.). Example:

```

your code goes here

```

You can use the "Preview" tab to check how your issue is going to look

before you actually send it in.

Thank you for taking the time to report a bug with the Gluon project.

-->

### Bug report

**What is the problem?**

<!--

- What is not working as expected?

- How is it misbehaving?

- When did the problem first start showing up?

- What were you doing when you first noticed the problem?

- On which devices (vendor, model and revision) is it misbehaving?

- Does the issue appear on multiple devices or targets?

-->

**What is the expected behaviour?**

<!--

- How do you think it should work instead?

- Did it work like that before?

-->

**Gluon Version:**

<!--

Please provide a usable Git reference before applying custom patches:

By using a Git reference:

    $ git describe --always

    v2018.2-17-g3abadc28

Or the URL to the relevant Gluon commit

    https://github.com/freifunk-gluon/gluon/commit/<commit hash here>

-->

**Site Configuration:**

<!--

Please provide the URL to your site configuration repository and the

explicit commit used to build the firmware experiencing the problem.

Additionally excerpts of problem-related configuration parts are 

often helpful.

-->

**Custom patches:**

<!--

Be upfront about any custom patches you have applied to your Gluon build, as they might

be part of your problem.

-->

.github/dependabot.yml0 → 100644

+12
−0

Original line number
Diff line number
Diff line

# Docs: <https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/customizing-dependency-updates>

version: 2

updates:

  - package-ecosystem: github-actions

    directory: /

    schedule: {interval: monthly}

  - package-ecosystem: pip

    directory: /docs/

    schedule: {interval: monthly}

.github/filters.yml0 → 100644

+345
−0

Original line number
Diff line number
Diff line

{

  "armsr-armv7": [

    "targets/armsr-armv7",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk",

    "targets/armsr.inc"

  ],

  "armsr-armv8": [

    "targets/armsr-armv8",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk",

    "targets/armsr.inc"

  ],

  "ath79-generic": [

    "targets/ath79-generic",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk"

  ],

  "ath79-nand": [

    "targets/ath79-nand",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk"

  ],

  "ath79-mikrotik": [

    "targets/ath79-mikrotik",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk",

    "targets/mikrotik.inc"

  ],

  "bcm27xx-bcm2708": [

    "targets/bcm27xx-bcm2708",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk",

    "targets/bcm27xx.inc"

  ],

  "bcm27xx-bcm2709": [

    "targets/bcm27xx-bcm2709",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk",

    "targets/bcm27xx.inc"

  ],

  "ipq40xx-generic": [

    "targets/ipq40xx-generic",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk"

  ],

  "ipq40xx-mikrotik": [

    "targets/ipq40xx-mikrotik",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk",

    "targets/mikrotik.inc"

  ],

  "ipq806x-generic": [

    "targets/ipq806x-generic",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk"

  ],

  "lantiq-xrx200": [

    "targets/lantiq-xrx200",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk"

  ],

  "lantiq-xrx200_legacy": [

    "targets/lantiq-xrx200_legacy",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk"

  ],

  "lantiq-xway": [

    "targets/lantiq-xway",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk"

  ],

  "mediatek-filogic": [

    "targets/mediatek-filogic",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk"

  ],

  "mediatek-mt7622": [

    "targets/mediatek-mt7622",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk"

  ],

  "mvebu-cortexa53": [

    "targets/mvebu-cortexa53",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk"

  ],

  "mpc85xx-p1010": [

    "targets/mpc85xx-p1010",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk"

  ],

  "mpc85xx-p1020": [

    "targets/mpc85xx-p1020",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk"

  ],

  "qualcommax-ipq807x": [

    "targets/qualcommax-ipq807x",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk"

  ],

  "ramips-mt7620": [

    "targets/ramips-mt7620",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk"

  ],

  "ramips-mt7621": [

    "targets/ramips-mt7621",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk"

  ],

  "ramips-mt76x8": [

    "targets/ramips-mt76x8",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk"

  ],

  "rockchip-armv8": [

    "targets/rockchip-armv8",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk"

  ],

  "sunxi-cortexa7": [

    "targets/sunxi-cortexa7",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk"

  ],

  "x86-generic": [

    "targets/x86-generic",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk",

    "targets/x86.inc"

  ],

  "x86-geode": [

    "targets/x86-geode",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk"

  ],

  "x86-legacy": [

    "targets/x86-legacy",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk",

    "targets/x86.inc"

  ],

  "x86-64": [

    "targets/x86-64",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk",

    "targets/x86.inc",

    "contrib/ci/minimal-site/**",

    "package/**"

  ],

  "bcm27xx-bcm2710": [

    "targets/bcm27xx-bcm2710",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk",

    "targets/bcm27xx.inc"

  ],

  "bcm27xx-bcm2711": [

    "targets/bcm27xx-bcm2711",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk",

    "targets/bcm27xx.inc"

  ],

  "ipq40xx-chromium": [

    "targets/ipq40xx-chromium",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk"

  ],

  "kirkwood-generic": [

    "targets/kirkwood-generic",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk"

  ],

  "mvebu-cortexa9": [

    "targets/mvebu-cortexa9",

    ".github/workflows/build-gluon.yml",

    "modules",

    "Makefile",

    "patches/**",

    "scripts/**",

    "targets/generic",

    "targets/targets.mk"

  ]

}

.github/labeler.yml0 → 100644

+89
−0

Original line number
Diff line number
Diff line

---

"3. topic: batman-adv":

  - changed-files:

    - any-glob-to-any-file:

      - docs/package/gluon-mesh-batman-adv*

      - package/gluon-alfred/**

      - package/gluon-client-bridge/**

      - package/gluon-mesh-batman-adv/**

      - package/libbatadv/**

"3. topic: build":

  - changed-files:

    - any-glob-to-any-file:

      - Makefile

      - scripts/**

"3. topic: config-mode":

  - changed-files:

    - any-glob-to-any-file:

      - docs/dev/web/config-mode.rst

      - docs/package/gluon-config-mode-*

      - package/gluon-config-mode-*/**

      - package/gluon-web*/**

"3. topic: continuous integration":

  - changed-files:

    - any-glob-to-any-file:

      - .github/workflows/*

      - contrib/actions/**

      - contrib/ci/**

"3. topic: docs":

  - changed-files:

    - any-glob-to-any-file:

      - docs/**

"3. topic: fastd":

  - changed-files:

    - any-glob-to-any-file:

      - docs/features/fastd*

      - package/gluon-mesh-vpn-fastd/**

"3. topic: firewall":

  - changed-files:

    - any-glob-to-any-file:

      - package/**/*-firewall

      - package/gluon-ebtables-*/**

"3. topic: hardware":

  - changed-files:

    - any-glob-to-any-file:

      - package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac

      - package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua

      - targets/*

"3. topic: multidomain":

  - changed-files:

    - any-glob-to-any-file:

      - docs/features/multidomain*

      - docs/multidomain-site-example/**

      - package/gluon-config-mode-domain-select/**

      - package/gluon-scheduled-domain-switch/**

"3. topic: olsr":

  - changed-files:

    - any-glob-to-any-file:

      - package/gluon-l3roamd/**

      - package/gluon-mesh-olsrd/**

      - package/gluon-mmfd/**

"3. topic: package":

  - changed-files:

    - any-glob-to-any-file:

      - package/**

"3. topic: respondd":

  - changed-files:

    - any-glob-to-any-file:

      - package/**/*respondd*

      - package/gluon-respondd/**

"3. topic: status-page":

  - changed-files:

    - any-glob-to-any-file:

      - package/gluon-status-page/**

"3. topic: tests":

  - changed-files:

    - any-glob-to-any-file:

      - tests/**

"3. topic: wireguard":

  - changed-files:

    - any-glob-to-any-file:

      - package/gluon-mesh-vpn-wireguard/**

"3. topic: wireless":

  - changed-files:

    - any-glob-to-any-file:

      - package/gluon-mesh-wireless-sae/**

      - package/gluon-private-wifi/**

      - package/gluon-web-private-wifi/**

      - package/gluon-web-wifi-config/**

      - package/gluon-wireless-encryption-wpa3/**

.github/workflows/backport.yml0 → 100644

+20
−0

Original line number
Diff line number
Diff line

name: Backport

on:

  pull_request_target:

    types: [closed, labeled]

permissions:

  contents: write # so it can comment

  pull-requests: write # so it can create pull requests

jobs:

  backport:

    name: Backport Pull Request

    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-22.04

    steps:

      - uses: actions/checkout@v5

      - name: Create backport PRs

        uses: korthout/backport-action@v3.3.0

        with:

          # Config README: https://github.com/korthout/backport-action#backport-action

          pull_description: |-

            Automatic backport to `${target_branch}`, triggered by a label in #${pull_number}.

.github/workflows/build-container.yml0 → 100644

+48
−0

Original line number
Diff line number
Diff line

# Based on the example from https://docs.github.com/en/actions/publishing-packages/publishing-docker-images

name: Create and publish a Docker image

on:

  push:

    branches:

      - 'main'

      - 'next'

      - 'v202[0-9].[0-9].x'

    tags:

      - 'v*'

  pull_request:

env:

  REGISTRY: ghcr.io

  IMAGE_NAME: ${{ github.repository }}-build

jobs:

  build-and-push-image:

    runs-on: ubuntu-22.04

    permissions: write-all

    steps:

      - name: Checkout repository

        uses: actions/checkout@v5

      - name: Set up QEMU

        uses: docker/setup-qemu-action@v3

      - name: Set up Docker Buildx

        uses: docker/setup-buildx-action@v3

      - name: Log in to the Container registry

        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef

        if: ${{ github.repository_owner == 'freifunk-gluon' && github.event_name == 'push' }}

        with:

          registry: ${{ env.REGISTRY }}

          username: ${{ github.actor }}

          password: ${{ secrets.GITHUB_TOKEN }}

      - name: Extract metadata (tags, labels) for Docker

        id: meta

        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f

        with:

          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

      - name: Build and push Docker image

        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83

        with:

          context: ./contrib/docker

          push: ${{ github.repository_owner == 'freifunk-gluon' && github.event_name == 'push' }}

          platforms: linux/amd64,linux/arm64

          tags: ${{ steps.meta.outputs.tags }}

          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/build-docs.yml0 → 100644

+29
−0

Original line number
Diff line number
Diff line

name: Build Documentation

on:

  push:

    paths:

      - 'docs/**'

      - '.github/workflows/build-docs.yml'

  pull_request:

    types: [opened, synchronize, reopened]

    paths:

      - 'docs**/'

      - '.github/workflows/build-docs.yml'

permissions:

  contents: read

jobs:

  build-documentation:

    name: docs

    runs-on: ubuntu-24.04

    steps:

      - uses: actions/checkout@v5

      - name: Install Dependencies

        run: sudo pip3 install -r docs/requirements.txt

      - name: Build documentation

        run: make -C docs html

      - name: Archive build output

        uses: actions/upload-artifact@v4

        with:

          name: docs_output

          path: docs/_build/html

.github/workflows/build-gluon.yml0 → 100644

+80
−0

Original line number
Diff line number
Diff line

name: Build Gluon

on:

  push:

    branches:

      - main

      - next

      - 'v20[2-9][0-9].[0-9].x'

  pull_request:

    types: [opened, synchronize, reopened]

  workflow_dispatch:

permissions:

  contents: read

concurrency:

  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}-${{ github.event.pull_request.number || github.run_id }}

  cancel-in-progress: true

jobs:

  changed:

    permissions:

      contents: read  # for dorny/paths-filter to fetch a list of changed files

      pull-requests: read  # for dorny/paths-filter to read pull requests

    runs-on: ubuntu-22.04

    outputs:

      targets: ${{ steps.filter.outputs.changes }}

    steps:

      - uses: actions/checkout@v5

      # Filter targets based on changed files

      - uses: dorny/paths-filter@v3

        id: filter

        with:

          filters: .github/filters.yml

  build_firmware:

    needs: changed

    if: ${{ needs.changed.outputs.targets != '[]' && needs.changed.outputs.targets != '' }}

    strategy:

      fail-fast: false

      matrix:

        # Read back changed targets to create build matrix

        target: ${{ fromJSON(needs.changed.outputs.targets) }}

    runs-on: ubuntu-22.04

    steps:

      - uses: actions/checkout@v5

      - name: Show system information

        run: contrib/actions/show-system-info.sh

      - name: Remove non-required software

        run: contrib/actions/free-runner-space.sh

      - name: Build Docker container

        run: docker build -t gluon-ci-container contrib/docker

      - name: Build Gluon

        run: docker run --rm -v $PWD:/gluon-ci -w /gluon-ci --user "$(id -u):$(id -g)" gluon-ci-container contrib/actions/run-build.sh ${{ matrix.target }}

      - name: Check Image size

        run: contrib/check-image-size.py --github-actions --overhead 256 output/meta/openwrt-profiles/${{ matrix.target }}.json

      - name: Archive build logs

        if: ${{ !cancelled() }}

        uses: actions/upload-artifact@v4

        with:

          name: ${{ matrix.target }}_logs

          path: openwrt/logs

      - name: Archive build output

        uses: actions/upload-artifact@v4

        with:

          name: ${{ matrix.target }}_output

          path: output

      - name: Archive metadata

        uses: actions/upload-artifact@v4

        with:

          name: ${{ matrix.target }}_metadata

          path: output/meta

.github/workflows/bump-gluon.yml0 → 100644

+51
−0

Original line number
Diff line number
Diff line

---

name: "Update OpenWrt base"

on:

  workflow_dispatch:

    inputs:

      branch:

        description: "Branch to create update for"

        required: true

        default: "main"

jobs:

  update-openwrt:

    runs-on: ubuntu-22.04

    env:

      COMMIT_NAME: Gluon CI Bot

      COMMIT_EMAIL: bot@freifunk-gluon.github.io

    steps:

      - name: Clone Gluon

        uses: actions/checkout@v5

        with:

          ref: ${{ github.event.inputs.branch }}

      - name: Configure Git User and E-Mail

        run: git config --global user.name "${{ env.COMMIT_NAME }}" && git config --global user.email "${{ env.COMMIT_EMAIL }}"

      - name: Get update branch name

        id: branch-name

        run: echo "branch-name=update-openwrt-${{ github.event.inputs.branch }}-$(date +%s)" >> $GITHUB_OUTPUT

      - name: Link example Site

        run: ln -s docs/site-example site

      - name: Invoke update-modules

        run: make update-modules

      - name: Refresh patches

        run: make refresh-patches

      - name: Check if unstaged commits exist

        run: git diff --exit-code || echo "::warning::Patches need a manual refresh"

      - name: Checkout individual branch name

        run: git checkout -b ${{ steps.branch-name.outputs.branch-name }}

      - name: Push branch

        run: git push origin HEAD

      - name: Emit PR creation message

        run:

          echo "::notice::Create pull-request at https://github.com/${{ github.repository }}/compare/${{ github.event.inputs.branch }}...${{ steps.branch-name.outputs.branch-name }}?quick_pull=1"

.github/workflows/check-ci.yml0 → 100644

+22
−0

Original line number
Diff line number
Diff line

name: Check generated CI

on:

  push:

  pull_request:

    types: [opened, synchronize, reopened]

permissions:

  contents: read

jobs:

  check-ci:

    name: Check generated CI

    runs-on: ubuntu-22.04

    steps:

      - uses: actions/checkout@v5

      - name: Install example site

        run: ln -s ./docs/site-example ./site

      - name: Update CI

        run: make update-ci

      - name: Show diff

        run: git status; git diff

      - name: Patch status

        run: git diff-files --quiet

.github/workflows/check-patches.yml0 → 100644

+30
−0

Original line number
Diff line number
Diff line

---

name: Check patches

on:

  push:

    paths:

      - 'modules'

      - 'patches/**'

      - '.github/workflows/check-patches.yml'

  pull_request:

    types: [opened, synchronize, reopened]

    paths:

      - 'modules'

      - 'patches/**'

      - '.github/workflows/check-patches.yml'

permissions:

  contents: read

jobs:

  check-patches:

    name: Check patches

    runs-on: ubuntu-22.04

    steps:

      - uses: actions/checkout@v5

      - name: Refresh patches

        run: make refresh-patches GLUON_SITEDIR="contrib/ci/minimal-site"

      - name: Show diff

        run: git status; git diff

      - name: Patch status

        run: git diff-files --quiet

.github/workflows/labels.yml0 → 100644

+21
−0

Original line number
Diff line number
Diff line

name: "Label PRs"

on:

  # only execute base branch actions

  pull_request_target:

permissions:

  contents: read

jobs:

  labels:

    permissions:

      contents: read  # for actions/labeler to determine modified files

      pull-requests: write  # for actions/labeler to add labels to PRs

    runs-on: ubuntu-22.04

    if: github.repository_owner == 'freifunk-gluon'

    steps:

    - uses: actions/labeler@v6

      with:

        repo-token: ${{ secrets.GITHUB_TOKEN }}

        sync-labels: true

.github/workflows/lint.yml0 → 100644

+54
−0

Original line number
Diff line number
Diff line

name: Lint

on:

  push:

  pull_request:

    types: [opened, synchronize, reopened]

permissions:

  contents: read

jobs:

  lua:

    name: Lua

    runs-on: ubuntu-22.04

    steps:

      - uses: actions/checkout@v5

      - name: Install Dependencies

        run: sudo apt-get -y update && sudo apt-get -y install lua-check

      - name: Install example site

        run: ln -s ./docs/site-example ./site

      - name: Lint Lua code

        run: make lint-lua

  sh:

    name: Shell

    runs-on: ubuntu-22.04

    steps:

      - uses: actions/checkout@v5

      - name: Install Dependencies

        run: sudo apt-get -y update && sudo apt-get -y install shellcheck

      - name: Install example site

        run: ln -s ./docs/site-example ./site

      - name: Lint shell code

        run: make lint-sh

  editorconfig:

    name: Editorconfig

    runs-on: ubuntu-22.04

    steps:

      - uses: actions/checkout@v5

      - name: Install Dependencies

        run: sudo apt install curl tar

      - name: Install editorconfig-checker

        env:

          VERSION: 2.7.0

          OS: linux

          ARCH: amd64

        run: |

          curl -O -L -C - https://github.com/editorconfig-checker/editorconfig-checker/releases/download/$VERSION/ec-$OS-$ARCH.tar.gz

          tar xzf ec-$OS-$ARCH.tar.gz

          sudo mv ./bin/ec-$OS-$ARCH /usr/bin/editorconfig-checker

          sudo chmod +x /usr/bin/editorconfig-checker

      - name: Install example site

        run: ln -s ./docs/site-example ./site

      - name: Lint editorconfig

        run: make lint-editorconfig

.gitignore

+5
−1

Original line number
Diff line number
Diff line

*~

/lede

/openwrt

/output

/site

/tmp

/packages

.bash_history

.subversion

.wget-hsts

/.scmversion

.luacheckrc0 → 100644

+119
−0

Original line number
Diff line number
Diff line

codes = true

std = "min"

self = false

read_globals = {

	"getfenv",

	"setfenv",

	"unpack",

}

include_files = {

	"**/*.lua",

	"package/**/luasrc/**/*",

	"targets/*",

	"package/features",

}

exclude_files = {

	"**/*.mk",

}

files["package/**/check_site.lua"] = {

	read_globals = {

		"alternatives",

		"extend",

		"in_domain",

		"in_site",

		"value",

		"need",

		"need_alphanumeric_key",

		"need_array",

		"need_array_elements_exclusive",

		"need_array_of",

		"need_boolean",

		"need_chanlist",

		"need_domain_name",

		"need_number",

		"need_number_range",

		"need_one_of",

		"need_string",

		"need_string_array",

		"need_string_array_match",

		"need_string_match",

		"need_table",

		"need_value",

		"obsolete",

		"table_keys",

		"this_domain",

	},

}

files["package/**/luasrc/lib/gluon/config-mode/*"] = {

	globals = {

		"MultiListValue",

		"DynamicList",

		"Flag",

		"Form",

		"i18n",

		"ListValue",

		"renderer.render",

		"renderer.render_string",

		"Section",

		"TextValue",

		"_translate",

		"translate",

		"translatef",

		"Value",

		"Element",

	},

}

files["package/**/luasrc/lib/gluon/**/controller/*"] = {

	read_globals = {

		"_",

		"alias",

		"call",

		"entry",

		"model",

		"node",

		"template",

	},

}

files["package/**/luasrc/lib/gluon/ebtables/*"] = {

	read_globals = {

		"chain",

		"rule",

	},

	max_line_length = false,

}

files["targets/*"] = {

	read_globals = {

		"class",

		"config",

		"defaults",

		"device",

		"env",

		"exec",

		"exec_capture",

		"exec_capture_raw",

		"exec_raw",

		"factory_image",

		"include",

		"istrue",

		"no_opkg",

		"packages",

		"sysupgrade_image",

		"try_config",

	},

}

files["package/features"] = {

	read_globals = {

		"_",

		"feature",

		"when",

	},

}

.readthedocs.yaml0 → 100644

+20
−0

Original line number
Diff line number
Diff line

# .readthedocs.yaml

# Read the Docs configuration file

# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required

version: 2

# Build documentation in the docs/ directory with Sphinx

sphinx:

  configuration: docs/conf.py

# Optionally set the version of Python and requirements required to build your docs

python:

   install:

   - requirements: docs/requirements.txt

build:

    os: ubuntu-22.04

    tools:

        python: "3.11"

CONTRIBUTING.md

+9
−9

Original line number
Diff line number
Diff line

@@ -23,19 +23,19 @@ using other parts or why the proposed change breaks other parts of the system.

They might even refuse the idea altogether - after all, they have to sleep well

after merging the changes, too.

The preferred way to discuss in the IRC channel ([#gluon] on irc.hackint.org)

or on the [mailing list], however, you can also open a new issue on Github to

The preferred way to discuss is in the IRC channel ([#gluon] on irc.hackint.org)

or on the [mailing list], however, you can also open a new issue on GitHub to

discuss there. We maintain a [list of rejected features] and we'd like to

kindly ask you to review it first. In general, looking for duplicates may save

you some time.

Develop on top of master

------------------------

Develop on top of main

----------------------

If you are not developing something specific to a release (like for example a

security fix to a feature that got completely rewritten since the release),

develop it on top of the master branch. New features and even feature changes

develop it on top of the main branch. New features and even feature changes

aren't usually backported to old releases, but will be included in the upcoming

release, which will be built from master.

release, which will be built from main.

Use descriptive commit messages

-------------------------------

@@ -47,7 +47,7 @@ triggered and what you did to fix it. If in question, have a glance at the

existing commit messages to get the idea.

[packages]: http://gluon.readthedocs.org/en/latest/user/site.html#packages

[#gluon]: https://webirc.hackint.org/#gluon

[packages]: https://gluon.readthedocs.io/en/latest/user/site.html#packages

[#gluon]: https://chat.hackint.org/?join=gluon

[mailing list]: mailto:gluon@luebeck.freifunk.net

[list of rejected features]: https://github.com/freifunk-gluon/gluon/issues?q=label%3Arejected

[list of rejected features]: https://github.com/freifunk-gluon/gluon/issues?q=label%3A%222.+status%3A+rejected%22

LICENSE

+7
−4

Original line number
Diff line number
Diff line

BSD 2-Clause License

The code of Project Gluon may be distributed under the following terms, unless

noted otherwise in individual files or subtrees.

Copyright (c) 2013-2017, Project Gluon

Copyright (c) Project Gluon

All rights reserved.

Redistribution and use in source and binary forms, with or without

@@ -25,10 +27,11 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LEDE and OpenWrt are licensed under the terms of the GNU General Public License

Version 2, which can be found at lede/LICENSE after the lede repository has been

OpenWrt is licensed under the terms of the GNU General Public License Version 2,

which can be found at openwrt/LICENSE after the OpenWrt repository has been

obtained. This applies to the following repositories:

 * lede

 * openwrt

 * packages/openwrt

 * packages/routing

 * packages/luci

Makefile

+175
−88

Original line number
Diff line number
Diff line

@@ -4,45 +4,123 @@ LC_ALL:=C

LANG:=C

export LC_ALL LANG

.SHELLFLAGS = -ec

# check for spaces & resolve possibly relative paths

define mkabspath

   ifneq (1,$(words [$($(1))]))

     $$(error $(1) must not contain spaces)

   endif

   override $(1) := $(abspath $($(1)))

endef

GLUON_SITEDIR ?= $(CURDIR)/site

GLUON_TMPDIR ?= $(CURDIR)/tmp

GLUON_OUTPUTDIR ?= $(CURDIR)/output

GLUON_IMAGEDIR ?= $(GLUON_OUTPUTDIR)/images

GLUON_PACKAGEDIR ?= $(GLUON_OUTPUTDIR)/packages

export GLUON_TMPDIR GLUON_IMAGEDIR GLUON_PACKAGEDIR DEVICES

escape = '$(subst ','\'',$(1))'

GLUON_SITEDIR ?= site

$(eval $(call mkabspath,GLUON_SITEDIR))

$(GLUON_SITEDIR)/site.mk:

ifeq ($(realpath $(GLUON_SITEDIR)/site.mk),)

$(error No site configuration was found. Please check out a site configuration to $(GLUON_SITEDIR))

endif

include $(GLUON_SITEDIR)/site.mk

GLUON_RELEASE ?= $(error GLUON_RELEASE not set. GLUON_RELEASE can be set in site.mk or on the command line)

GLUON_DEPRECATED ?= 0

ifneq ($(GLUON_BRANCH),)

  $(warning *** Warning: GLUON_BRANCH has been deprecated, please set GLUON_AUTOUPDATER_BRANCH and GLUON_AUTOUPDATER_ENABLED instead.)

  GLUON_AUTOUPDATER_BRANCH ?= $(GLUON_BRANCH)

  GLUON_AUTOUPDATER_ENABLED ?= 1

endif

export GLUON_RELEASE GLUON_ATH10K_MESH GLUON_REGION GLUON_DEBUG

ifneq ($(GLUON_FEATURES)$(GLUON_FEATURES_standard)$(GLUON_FEATURES_tiny),)

  $(error GLUON_FEATURES is obsolete, please use the image-customization.lua file instead)

endif

ifneq ($(GLUON_SITE_PACKAGES)$(GLUON_SITE_PACKAGES_standard)$(GLUON_SITE_PACKAGES_tiny),)

  $(error GLUON_SITE_PACKAGES is obsolete, please use the image-customization.lua file instead)

endif

GLUON_AUTOUPDATER_ENABLED ?= 0

# initialize (possibly already user set) directory variables

GLUON_TMPDIR ?= tmp

GLUON_OUTPUTDIR ?= output

GLUON_IMAGEDIR ?= $(GLUON_OUTPUTDIR)/images

GLUON_PACKAGEDIR ?= $(GLUON_OUTPUTDIR)/packages

GLUON_DEBUGDIR ?= $(GLUON_OUTPUTDIR)/debug

GLUON_METADIR ?= $(GLUON_OUTPUTDIR)/meta

GLUON_TARGETSDIR ?= targets

GLUON_PATCHESDIR ?= patches

$(eval $(call mkabspath,GLUON_TMPDIR))

$(eval $(call mkabspath,GLUON_OUTPUTDIR))

$(eval $(call mkabspath,GLUON_IMAGEDIR))

$(eval $(call mkabspath,GLUON_PACKAGEDIR))

$(eval $(call mkabspath,GLUON_TARGETSDIR))

$(eval $(call mkabspath,GLUON_PATCHESDIR))

GLUON_VERSION := $(shell scripts/getversion.sh '.')

# Set default SITE_VERSION if not set by user

GLUON_SITE_VERSION ?= $(shell scripts/getversion.sh '$(GLUON_SITEDIR)')

GLUON_MULTIDOMAIN ?= 0

GLUON_AUTOREMOVE ?= 0

GLUON_DEBUG ?= 1

GLUON_MINIFY ?= 1

# Can be overridden via environment/command line/... to use the Gluon

# build system for non-Gluon builds

define GLUON_BASE_FEEDS ?=

src-link gluon_base ../../package

endef

GLUON_VARS = \

	GLUON_VERSION GLUON_SITE_VERSION \

	GLUON_RELEASE GLUON_REGION GLUON_MULTIDOMAIN GLUON_AUTOREMOVE GLUON_DEBUG GLUON_MINIFY GLUON_DEPRECATED \

	GLUON_DEVICES GLUON_TARGETSDIR GLUON_PATCHESDIR GLUON_TMPDIR GLUON_IMAGEDIR GLUON_PACKAGEDIR GLUON_DEBUGDIR \

	GLUON_METADIR GLUON_SITEDIR GLUON_AUTOUPDATER_BRANCH GLUON_AUTOUPDATER_ENABLED GLUON_LANGS GLUON_BASE_FEEDS \

	GLUON_TARGET BOARD SUBTARGET

unexport $(GLUON_VARS)

GLUON_ENV = $(foreach var,$(GLUON_VARS),$(var)=$(call escape,$($(var))))

show-release:

	@echo '$(GLUON_RELEASE)'

update: FORCE

	@GLUON_SITEDIR='$(GLUON_SITEDIR)' scripts/update.sh

	@GLUON_SITEDIR='$(GLUON_SITEDIR)' scripts/patch.sh

	@GLUON_SITEDIR='$(GLUON_SITEDIR)' scripts/feeds.sh

	@

	export $(GLUON_ENV)

	scripts/update.sh

	scripts/patch.sh

	scripts/feeds.sh

update-patches: FORCE

	@GLUON_SITEDIR='$(GLUON_SITEDIR)' scripts/update.sh

	@GLUON_SITEDIR='$(GLUON_SITEDIR)' scripts/update-patches.sh

	@GLUON_SITEDIR='$(GLUON_SITEDIR)' scripts/patch.sh

	@

	export $(GLUON_ENV)

	scripts/update.sh

	scripts/update-patches.sh

	scripts/patch.sh

refresh-patches: FORCE

	@

	export $(GLUON_ENV)

	scripts/update.sh

	scripts/patch.sh

	scripts/update-patches.sh

update-feeds: FORCE

	@GLUON_SITEDIR='$(GLUON_SITEDIR)' scripts/feeds.sh

	@$(GLUON_ENV) scripts/feeds.sh

update-modules: FORCE

	@scripts/update-modules.sh

Compare revisions

Source

Target

Files

Some changes are not shown.

.ecrc

.editorconfig

.github/ISSUE_TEMPLATE/bug_report.md

.github/dependabot.yml

.github/filters.yml

.github/labeler.yml

.github/workflows/backport.yml

.github/workflows/build-container.yml

.github/workflows/build-docs.yml

.github/workflows/build-gluon.yml

.github/workflows/bump-gluon.yml

.github/workflows/check-ci.yml

.github/workflows/check-patches.yml

.github/workflows/labels.yml

.github/workflows/lint.yml

.gitignore

.luacheckrc

.readthedocs.yaml

CONTRIBUTING.md

LICENSE

Makefile