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

Jump to bottom

modules: update to latest HEAD #3306

Merged
merged 2 commits into from
Jul 7, 2024
Merged

modules: update to latest HEAD #3306

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
5ab7964
modules: update openwrt
herbetom Jul 7, 2024
5e5433d
modules: update packages
herbetom Jul 7, 2024
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
4 changes: 2 additions & 2 deletions modules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ GLUON_FEEDS='gluon packages routing'

OPENWRT_REPO=https://github.com/openwrt/openwrt.git
OPENWRT_BRANCH=openwrt-23.05
OPENWRT_COMMIT=ef4fc5cc1da63f87eb3425f1b7737c149ea157e1
OPENWRT_COMMIT=4c03fe22b7c4228595ed5903631402dc7f4874d0

PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
PACKAGES_GLUON_COMMIT=3d08b0fee8dc5d96d8bcdb985fad1d5564de4022

PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
PACKAGES_PACKAGES_BRANCH=openwrt-23.05
PACKAGES_PACKAGES_COMMIT=da532f52c9e5c34d27a7a231f199a69761d49822
PACKAGES_PACKAGES_COMMIT=6d08bdf3729cd5605b07cafc23ffd7663f6d7620

PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
PACKAGES_ROUTING_BRANCH=openwrt-23.05
Expand Down
2 changes: 1 addition & 1 deletion patches/openwrt/0008-tools-flex-disable-parallel-build.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ occuring.
Signed-off-by: David Bauer <[email protected]>

diff --git a/tools/flex/Makefile b/tools/flex/Makefile
index 86ba5a4415d3a82aaf5e9897736b465cc7e30c42..f3b6d0b1495b30c278e5bf0d2b322b5ade79ec4f 100644
index 177136b78c77c31c56db2fc993d1273d3dd81562..cb4f95e8d0c45a9c328c7ce48235a0ba80c02c6e 100644
--- a/tools/flex/Makefile
+++ b/tools/flex/Makefile
@@ -15,7 +15,6 @@ PKG_SOURCE_URL:=https://github.com/westes/flex/releases/download/v$(PKG_VERSION)
Expand Down