Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Gluon to v2023.2 and remove x86-64 workaround #339

Merged
merged 2 commits into from
Jan 7, 2024
Merged

Bump Gluon to v2023.2 and remove x86-64 workaround #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abe815b
bump Gluon to v2023.2
grische Dec 18, 2023
8a9ef22
github: remove x86-64 build workaround
grische Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/workflows/firmware.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@ jobs:
- name: Install build dependencies
run: |
sudo -E ./scripts/install_build_dependencies.sh
- name: pre-build without ffmuc-mesh-vpn-wireguard-vxlan (workaround for x86-64)
if: matrix.target == 'x86-64'
run: |
sed -i '/ffmuc-mesh-vpn-wireguard-vxlan/d' site.mk
make BROKEN=1 GLUON_TARGETS=${{ matrix.target }} V=s
git checkout site.mk
- name: build target ${{ matrix.target }}
id: compile
run: |
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GLUON_BUILD_DIR := gluon-build
GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
GLUON_GIT_REF := dc841ea4a37b4e74777e07617042bc92aad2483b # master at 2023-12-13
GLUON_GIT_REF := v2023.2

PATCH_DIR := ./patches
SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
Expand Down
322 changes: 0 additions & 322 deletions contrib/genpkglist.py
View file
Open in desktop

This file was deleted.

Loading