Skip to content

Commit

Permalink
Merge branch 'stable' of ssh://github.com/freifunkMUC/site-ffm into next
Browse files Browse the repository at this point in the history 
Updated targets, adapted genpkglist.py for next-branch and regenerated site.mk
  • Loading branch information
@goligo
goligo committed May 4, 2021
2 parents b0c2161 + ca54159 commit 972936d
Show file tree
Hide file tree
Showing 5 changed files with 91 additions and 163 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/firmware.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
target: [ath79-generic, ath79-nand, bcm27xx-bcm2708, bcm27xx-bcm2709, bcm27xx-bcm2710, bcm27xx-bcm2711, ipq40xx-generic, ipq806x-generic, lantiq-xrx200, lantiq-xway, mpc85xx-p1020, ramips-mt7620, ramips-mt7621, ramips-mt76x8, ramips-rt305x, sunxi-cortexa7, x86-generic, x86-geode, x86-legacy, x86-64, mvebu-cortexa9, rockchip-armv8]
target: [ath79-generic, ath79-nand, bcm27xx-bcm2708, bcm27xx-bcm2709, bcm27xx-bcm2710, bcm27xx-bcm2711, ipq40xx-generic, ipq806x-generic, lantiq-xway, lantiq-xrx200, mediatek-mt7622, mpc85xx-p1010, mpc85xx-p1020, mvebu-cortexa9, ramips-mt7620, ramips-mt7621, ramips-mt76x8, ramips-rt305x, rockchip-armv8, sunxi-cortexa7, x86-64, x86-generic, x86-geode, x86-legacy]
runs-on: ubuntu-latest
steps:
- name: Maximize build space
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
strategy:
fail-fast: false
matrix:
target: [ath79-generic, ath79-nand, bcm27xx-bcm2708, bcm27xx-bcm2709, bcm27xx-bcm2710, bcm27xx-bcm2711, ipq40xx-generic, ipq806x-generic, lantiq-xrx200, lantiq-xway, mpc85xx-p1020, ramips-mt7620, ramips-mt7621, ramips-mt76x8, ramips-rt305x, sunxi-cortexa7, x86-generic, x86-geode, x86-legacy, x86-64, mvebu-cortexa9, rockchip-armv8]
target: [ath79-generic, ath79-nand, bcm27xx-bcm2708, bcm27xx-bcm2709, bcm27xx-bcm2710, bcm27xx-bcm2711, ipq40xx-generic, ipq806x-generic, lantiq-xway, lantiq-xrx200, mediatek-mt7622, mpc85xx-p1010, mpc85xx-p1020, mvebu-cortexa9, ramips-mt7620, ramips-mt7621, ramips-mt76x8, ramips-rt305x, rockchip-armv8, sunxi-cortexa7, x86-64, x86-generic, x86-geode, x86-legacy]
runs-on: ubuntu-latest
needs: create_release
steps:
Expand Down
1 change: 1 addition & 0 deletions CODEOWNERS
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @awlx @goligo @krombel @ce-4
27 changes: 15 additions & 12 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,30 @@ PATCH_DIR := ${GLUON_BUILD_DIR}/site/patches
SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key

GLUON_TARGETS ?= \
ath79-generic \
ath79-nand \
bcm27xx-bcm2708 \
bcm27xx-bcm2709 \
bcm27xx-bcm2710 \
bcm27xx-bcm2711 \
mpc85xx-p1020 \
ipq40xx-generic \
ipq806x-generic \
lantiq-xway \
lantiq-xrx200 \
ath79-generic \
ath79-nand \
mediatek-mt7622 \
mpc85xx-p1010 \
mpc85xx-p1020 \
mvebu-cortexa9 \
ramips-mt7620 \
ramips-mt7621 \
ramips-mt76x8 \
ramips-rt305x \
rockchip-armv8 \
sunxi-cortexa7 \
x86-64 \
x86-generic \
x86-geode \
x86-64 \
x86-legacy \
ipq40xx-generic \
ipq806x-generic \
ramips-mt7620 \
ramips-mt76x8 \
ramips-rt305x \
rockchip-armv8
x86-legacy

ifneq (,$(shell git describe --exact-match --tags 2>/dev/null))
GLUON_BRANCH := stable
Expand Down Expand Up @@ -89,7 +92,7 @@ gluon-patch:
fi
(cd ${GLUON_BUILD_DIR}; git checkout -B patching)
if [ -d "gluon-build/site/patches" -a "gluon-build/site/patches/*.patch" ]; then \
(cd ${GLUON_BUILD_DIR}; git apply --ignore-space-change --ignore-whitespace --whitespace=nowarn site/patches/*.patch) || ( \
(cd ${GLUON_BUILD_DIR}; git apply --ignore-space-change --ignore-whitespace --whitespace=nowarn --verbose site/patches/*.patch) || ( \
cd ${GLUON_BUILD_DIR}; \
git clean -fd; \
git checkout -B patched; \
Expand Down
95 changes: 21 additions & 74 deletions contrib/genpkglist.py
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
#!/usr/bin/env python3

## Source: https://git.darmstadt.ccc.de/ffda/site/blob/master/contrib/genpkglist.py

import os
from collections import defaultdict

from jinja2 import Template

# path to your gluon checkout, will be used to find targets and devices
GLUON_DIR = '/srv/gluon/'
GLUON_DIR = './gluon-build/'


class PackageList:
Expand Down Expand Up @@ -158,7 +155,7 @@ def render(self):
])
pkglists.append(PKGS_USB_NET)

PKGS_PCI = PackageList('USB', ['pciutils'])
PKGS_PCI = PackageList('PCI', ['pciutils'])
pkglists.append(PKGS_PCI)

PKGS_PCI_NET = PackageList('PCI_NET', [
Expand All @@ -168,86 +165,39 @@ def render(self):

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

#
# package assignment
#

targets.get('ar71xx-generic'). \
targets.get('ath79-generic'). \
add_pkglist(PKGS_USB). \
add_pkglist(PKGS_USB_NET). \
add_pkglist(PKGS_USB_SERIAL). \
add_pkglist(PKGS_USB_STORAGE). \
add_pkglist(PKGS_TLS). \
exclude([ # devices without usb ports
'alfa-network-hornet-ub',
'alfa-network-tube2h',
'alfa-network-n2-n5',
'allnet-all0315n',
'avm-fritz-wlan-repeater-300e',
'avm-fritz-wlan-repeater-450e',
'd-link-dap-1330-rev-a1',
'd-link-dir-825-rev-b1',
'meraki-mr12',
'meraki-mr16',
'ocedo-koala',
'openmesh-mr1750',
'openmesh-mr600',
'openmesh-mr900',
'openmesh-om2p',
'openmesh-om5p',
'openmesh-om5p-ac',
'tp-link-cpe210-v1.0',
'tp-link-cpe210-v2.0',
'tp-link-cpe210-v3.0',
'tp-link-cpe510-v1.0',
'tp-link-wbs210-v1.20',
'tp-link-wbs510-v1.20',
'tp-link-archer-c25-v1',
'tp-link-archer-c58-v1',
'tp-link-archer-c60-v1',
'tp-link-re355',
'tp-link-re450',
'ubiquiti-airgateway',
'ubiquiti-airgateway-pro',
'ubiquiti-bullet-m',
'ubiquiti-rocket-m',
'ubiquiti-nanostation-m',
'ubiquiti-loco-m-xw',
'ubiquiti-nanostation-m-xw',
'ubiquiti-rocket-m-xw',
'ubiquiti-rocket-m-ti',
'ubiquiti-unifi',
'ubiquiti-unifi-ap-pro',
'ubiquiti-unifiap-outdoor',
'ubiquiti-unifiap-outdoor+',
'ubiquiti-ls-sr71',
'ubiquiti-unifi-ac-lite',
'ubiquiti-unifi-ac-pro',
'ubiquiti-unifi-ac-mesh'], pkglists=[PKGS_USB, PKGS_USB_NET, PKGS_USB_SERIAL, PKGS_USB_STORAGE]). \
exclude([ # devices with less than 64M memory
'linksys-wrt160nl',
'tp-link-tl-wr710n-v1',
'tp-link-tl-wr710n-v2.1',
'tp-link-tl-wr842n-nd-v1',
'tp-link-tl-wr842n-nd-v2',
'tp-link-tl-wr1043n-nd-v1',
'ubiquiti-airrouter'])

for target in ['ar71xx-nand', 'ipq40xx-generic', 'ipq806x-generic', 'mpc85xx-generic', 'mvebu-cortexa9', 'ramips-mt7620', 'sunxi-cortexa7']:
'devolo-wifi-pro-1200e',
'devolo-wifi-pro-1200i',
'devolo-wifi-pro-1750c',
'devolo-wifi-pro-1750i',
'devolo-wifi-pro-1750x',
'ocedo-raccoon',
'tp-link-archer-c6-v2',
'tp-link-cpe220-v3'], pkglists=[PKGS_USB, PKGS_USB_NET, PKGS_USB_SERIAL, PKGS_USB_STORAGE])

for target in ['ath79-nand', 'ipq40xx-generic', 'ipq806x-generic', 'lantiq-xway', 'lantiq-xrx200', 'mpc85xx-p1010', 'mpc85xx-p1020', 'mvebu-cortexa9', 'ramips-mt7620', 'ramips-mt7621', 'ramips-rt305x', 'rockchip-armv8', 'sunxi-cortexa7']:
targets.get(target). \
add_pkglist(PKGS_USB). \
add_pkglist(PKGS_USB_NET). \
add_pkglist(PKGS_USB_SERIAL). \
add_pkglist(PKGS_USB_STORAGE). \
add_pkglist(PKGS_TLS)

targets.get('mpc85xx-p1020').add_pkglist(PKGS_TLS)

for target in ['brcm2708-bcm2708', 'brcm2708-bcm2709', 'brcm2708-bcm2710']:
for target in ['bcm27xx-bcm2708', 'bcm27xx-bcm2709', 'bcm27xx-bcm2710', 'bcm27xx-bcm2711']:
targets.get(target). \
add_pkglist(PKGS_USB). \
add_pkglist(PKGS_USB_NET). \
Expand All @@ -256,15 +206,8 @@ def render(self):
add_pkglist(PKGS_USB_HID). \
add_pkglist(PKGS_TLS)

targets.get('ramips-mt7621'). \
add_pkglist(PKGS_USB). \
add_pkglist(PKGS_USB_NET). \
add_pkglist(PKGS_USB_SERIAL). \
add_pkglist(PKGS_USB_STORAGE). \
add_pkglist(PKGS_TLS). \
exclude([ # devices without usb ports
'ubnt-erx',
'ubnt-erx-sfp'], pkglists=[PKGS_USB, PKGS_USB_NET, PKGS_USB_SERIAL, PKGS_USB_STORAGE])
targets.get('mediatek-mt7622'). \
add_pkglist(PKGS_TLS)

targets.get('ramips-mt76x8'). \
add_pkglist(PKGS_USB). \
Expand All @@ -273,7 +216,11 @@ def render(self):
add_pkglist(PKGS_USB_STORAGE). \
add_pkglist(PKGS_TLS). \
exclude([ # devices without usb ports
'cudy-wr1000',
'gl.inet-vixmini',
'tp-link-archer-c50-v3',
'tp-link-archer-c50-v4',
'tp-link-tl-wa801nd-v5',
'tp-link-tl-wr841n-v13'], pkglists=[PKGS_USB, PKGS_USB_NET, PKGS_USB_SERIAL, PKGS_USB_STORAGE])

for target in ['x86-64', 'x86-generic', 'x86-geode']:
Expand Down
Loading

0 comments on commit 972936d

Please sign in to comment.