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

Bump gluon to latest master (OpenWRT 23.05) #327

Merged
merged 4 commits into from
Dec 14, 2023
Merged

Bump gluon to latest master (OpenWRT 23.05) #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eed2db3
contrib: remove RE305 from genpkglist
grische Dec 13, 2023
213ce17
Bump gluon to latest master
grische Dec 7, 2023
9adfc3c
contrib: replace openssl with mbedtls
grische Dec 13, 2023
284ed9c
targets: add mediatek-filogic
grische Dec 7, 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
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 := v2023.1
GLUON_GIT_REF := dc841ea4a37b4e74777e07617042bc92aad2483b # master at 2023-12-13

PATCH_DIR := ./patches
SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
Expand Down
3 changes: 1 addition & 2 deletions contrib/genpkglist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ def render(self):

PKGS_TLS = PackageList('TLS', [
'ca-bundle',
'libustream-openssl'
'libustream-mbedtls'
])
pkglists.append(PKGS_TLS)

Expand Down Expand Up @@ -277,7 +277,6 @@ def render(self):
'netgear-r6120',
'ravpower-rp-wd009'], pkglists=[PKGS_USB, PKGS_USB_NET, PKGS_USB_SERIAL, PKGS_USB_STORAGE]). \
exclude([
'tp-link-re305'
], pkglists=[PKGS_TLS])

for target in ['x86-64', 'x86-generic', 'x86-geode']:
Expand Down
28 changes: 0 additions & 28 deletions patches/targets-drop-TP-Link-RE305.patch
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions patches/targets-drop-TP-Link-RE450-and-RE355.patch
View file
Open in desktop

This file was deleted.

11 changes: 6 additions & 5 deletions patches/targets-raspberry-pi-4.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ new file mode 100644
index 00000000..ba631911
--- /dev/null
+++ b/targets/bcm27xx-bcm2711
@@ -0,0 +1,9 @@
@@ -0,0 +1,10 @@
+include 'bcm27xx.inc'
+
+device('raspberry-pi-4-model-b', 'rpi-4', {
+device('raspberrypi-4-model-b', 'rpi-4', {
+ manifest_aliases = {
+ 'raspberry-pi-4-model-b',
+ 'raspberry-pi-4-model-b-rev-1.1',
+ 'raspberry-pi-4-model-b-rev-1.2',
+ 'raspberry-pi-4-model-b-rev-1.4',
Expand All @@ -17,9 +18,9 @@ diff --git a/targets/targets.mk b/targets/targets.mk
index 92b58ab8..05a74935 100644
--- a/targets/targets.mk
+++ b/targets/targets.mk
@@ -22,5 +22,6 @@ $(eval $(call GluonTarget,x86,64))
ifneq ($(BROKEN),)
@@ -26,5 +26,6 @@ $(eval $(call GluonTarget,x86,64))

ifeq ($(BROKEN),1)
$(eval $(call GluonTarget,bcm27xx,bcm2710)) # BROKEN: Untested
+$(eval $(call GluonTarget,bcm27xx,bcm2711)) # BROKEN: Untested
$(eval $(call GluonTarget,mvebu,cortexa9)) # BROKEN: No 11s support
Expand Down
1 change: 1 addition & 0 deletions scripts/install_build_dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ apt-get -y --no-install-recommends install \
patch \
perl \
python3 \
python3-distutils \
qemu-utils \
rsync \
tar \
Expand Down
8 changes: 5 additions & 3 deletions site.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,11 @@ EXCLUDE_PCI_NET := \

INCLUDE_TLS := \
ca-bundle \
libustream-openssl
libustream-mbedtls

EXCLUDE_TLS := \
-ca-bundle \
-libustream-openssl
-libustream-mbedtls

ifeq ($(GLUON_TARGET),ath79-generic)
GLUON_SITE_PACKAGES += $(INCLUDE_TLS)
Expand Down Expand Up @@ -232,6 +232,9 @@ ifeq ($(GLUON_TARGET),lantiq-xway)

endif

# no pkglists for target mediatek-filogic


ifeq ($(GLUON_TARGET),mediatek-mt7622)
GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)

Expand Down Expand Up @@ -274,7 +277,6 @@ ifeq ($(GLUON_TARGET),ramips-mt76x8)
GLUON_gl.inet-microuter-n300_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
GLUON_netgear-r6120_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
GLUON_ravpower-rp-wd009_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
GLUON_tp-link-re305_SITE_PACKAGES += $(EXCLUDE_TLS)
endif

# no pkglists for target realtek-rtl838x
Expand Down
1 change: 1 addition & 0 deletions targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ ipq40xx-mikrotik
ipq806x-generic
lantiq-xrx200
lantiq-xway
mediatek-filogic
mediatek-mt7622
mpc85xx-p1010
mpc85xx-p1020
Expand Down
Loading