From 23b01885702b1e15cd25e121d77b8177f49352b3 Mon Sep 17 00:00:00 2001 From: lephisto Date: Thu, 11 Jun 2015 20:24:02 +0200 Subject: [PATCH 1/5] Text changed... Info changed.. --- i18n/de.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/i18n/de.po b/i18n/de.po index 82c5f22..5936d35 100644 --- a/i18n/de.po +++ b/i18n/de.po @@ -14,7 +14,9 @@ msgid "gluon-config-mode:welcome" msgstr "" "Willkommen zum Einrichtungsassistenten für deinen neuen Regensburger " "Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen " -"entsprechend aus und sende es ab." +"entsprechend aus und sende es ab. Die Angabe einer Kontaktmöglichkeit " +"ist optional, ist jedoch nicht öffentlich einsehbar. Daher wäre es gut, " +"wenn wir eine Möglichkeit haben, euch zu kontaktieren. " msgid "gluon-config-mode:pubkey" msgstr "" From d4199ca11e710e39ca08cc7ab71ef2b7572daf1d Mon Sep 17 00:00:00 2001 From: Matthias Freund Date: Sat, 16 Apr 2016 21:16:23 +0200 Subject: [PATCH 2/5] Changing from gluon-announced to gluon-respondd as desired by gluon 2016.1 --- site.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.mk b/site.mk index e3e819b..c194cbe 100644 --- a/site.mk +++ b/site.mk @@ -1,7 +1,7 @@ GLUON_SITE_PACKAGES := \ gluon-mesh-batman-adv-15 \ gluon-alfred \ - gluon-announced \ + gluon-respondd \ gluon-autoupdater \ gluon-config-mode-core \ gluon-config-mode-autoupdater \ From 4be584eba6f0b81c68905cd562b1788445843c4a Mon Sep 17 00:00:00 2001 From: Matthias Freund Date: Sat, 16 Apr 2016 21:24:18 +0200 Subject: [PATCH 3/5] Add some extra packages on devices with sufficient storage Based on https://github.com/tecff/site-ffa/. --- site.mk | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 169 insertions(+) diff --git a/site.mk b/site.mk index c194cbe..c3ee2b5 100644 --- a/site.mk +++ b/site.mk @@ -28,6 +28,175 @@ GLUON_SITE_PACKAGES := \ gluon-ebtables-filter-multicast-ffmuc +# basic support for USB stack +USB_PACKAGES_BASIC := \ + kmod-usb-core \ + kmod-usb2 + +# storage support for USB devices +USB_PACKAGES_STORAGE := \ + block-mount \ + blkid \ + kmod-fs-ext4 \ + kmod-fs-vfat \ + kmod-usb-storage \ + kmod-usb-storage-extras \ + kmod-nls-cp1250 \ + kmod-nls-cp1251 \ + kmod-nls-cp437 \ + kmod-nls-cp775 \ + kmod-nls-cp850 \ + kmod-nls-cp852 \ + kmod-nls-cp866 \ + kmod-nls-iso8859-1 \ + kmod-nls-iso8859-13 \ + kmod-nls-iso8859-15 \ + kmod-nls-iso8859-2 \ + kmod-nls-koi8r \ + kmod-nls-utf8 \ + swap-utils + +# network support for USB devices +USB_PACKAGES_NET := \ + kmod-mii \ + kmod-nls-base \ + kmod-usb-net \ + kmod-usb-net-asix \ + kmod-usb-net-asix-ax88179 \ + kmod-usb-net-cdc-eem \ + kmod-usb-net-cdc-ether \ + kmod-usb-net-cdc-mbim \ + kmod-usb-net-cdc-ncm \ + kmod-usb-net-cdc-subset \ + kmod-usb-net-dm9601-ether \ + kmod-usb-net-hso \ + kmod-usb-net-huawei-cdc-ncm \ + kmod-usb-net-ipheth \ + kmod-usb-net-kalmia \ + kmod-usb-net-kaweth \ + kmod-usb-net-mcs7830 \ + kmod-usb-net-pegasus \ + kmod-usb-net-qmi-wwan \ + kmod-usb-net-rndis \ + kmod-usb-net-rtl8152 \ + kmod-usb-net-sierrawireless \ + kmod-usb-net-smsc95xx +# broken +# kmod-usb-net-rtl8150 \ +# additional USB network devices (ie Edimax) +USB_PACKAGES_NET_ADD := \ + kmod-rtl8192cu \ + kmod-rtl8187 \ + kmod-ath9k-htc \ + kmod-ath9k-common \ + kmod-ath \ + kmod-rt73-usb \ + kmod-carl9170 \ + kmod-brcmfmac + +# network support for PCI devices +PCI_PACKAGES_NET := \ + kmod-3c59x \ + kmod-e100 \ + kmod-e1000 \ + kmod-e1000e \ + kmod-forcedeth \ + kmod-natsemi \ + kmod-ne2k-pci \ + kmod-pcnet32 \ + kmod-r8169 \ + kmod-sis900 \ + kmod-sky2 \ + kmod-tg3 \ + kmod-tulip \ + kmod-via-rhine +# broken +# kmod-ixgbe \ +# kmod-r8139too \ +# additional packages +TOOLS_PACKAGES := \ + iperf \ + socat \ + tcpdump \ + usbutils \ + vnstat +# broken +# pciutils \ + +# +# $(GLUON_TARGET) specific settings: +# + +# x86-generic +ifeq ($(GLUON_TARGET),x86-generic) +# support the usb stack on x86 devices +# and add a few common USB and PCI NICs +GLUON_SITE_PACKAGES += \ + kmod-usb-hid \ + kmod-hid-generic \ + $(USB_PACKAGES_BASIC) \ + $(USB_PACKAGES_STORAGE) \ + $(USB_PACKAGES_NET) \ + $(PCI_PACKAGES_NET) \ + $(TOOLS_PACKAGES) \ + $(USB_PACKAGES_NET_ADD) +endif + +# x86-64 +ifeq ($(GLUON_TARGET),x86-64) +# support the usb stack on x86-64 devices +# and add a few common USB and PCI NICs +GLUON_SITE_PACKAGES += \ + kmod-usb-hid \ + kmod-hid-generic \ + $(USB_PACKAGES_BASIC) \ + $(USB_PACKAGES_STORAGE) \ + $(USB_PACKAGES_NET) \ + $(PCI_PACKAGES_NET) \ + $(TOOLS_PACKAGES) \ + $(USB_PACKAGES_NET_ADD) +endif + +# Raspberry Pi A/B/B+ +ifeq ($(GLUON_TARGET),brcm2708-bcm2708) +GLUON_SITE_PACKAGES += \ + kmod-usb-hid \ + kmod-hid-generic \ + $(USB_PACKAGES_BASIC) \ + $(USB_PACKAGES_STORAGE) \ + $(USB_PACKAGES_NET) \ + $(TOOLS_PACKAGES) \ + $(USB_PACKAGES_NET_ADD) +endif + +# Raspberry Pi 2 +ifeq ($(GLUON_TARGET),brcm2708-bcm2709) +GLUON_SITE_PACKAGES += \ + kmod-usb-hid \ + kmod-hid-generic \ + $(USB_PACKAGES_BASIC) \ + $(USB_PACKAGES_STORAGE) \ + $(USB_PACKAGES_NET) \ + $(TOOLS_PACKAGES) \ + $(USB_PACKAGES_NET_ADD) +endif + +# ar71xx-generic +GLUON_TLWR842_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE) +GLUON_TLWR1043_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE) +GLUON_TLWR2543_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE) +GLUON_TLWDR4300_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE) +GLUON_WNDR3700_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE) +GLUON_WRT160NL_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE) +GLUON_ARCHERC7_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE) +GLUON_GLINET_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE) +GLUON_WZRHPG450H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE) +GLUON_WZRHPAG300H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE) + +# mpc85xx-generic +GLUON_TLWDR4900_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE) + + DEFAULT_GLUON_RELEASE := snapshot~$(shell date '+%Y%m%d') # Allow overriding the release number from the command line From 54644c61ea28dc8d52ae15bd82b79dd628c65985 Mon Sep 17 00:00:00 2001 From: Matthias Freund Date: Sat, 16 Apr 2016 21:46:45 +0200 Subject: [PATCH 4/5] always hide the fastd key in wizard ref https://github.com/freifunkMUC/site-ffm/issues/16 --- i18n/de.po | 1 + i18n/en.po | 1 + 2 files changed, 2 insertions(+) diff --git a/i18n/de.po b/i18n/de.po index 5936d35..c5bb317 100644 --- a/i18n/de.po +++ b/i18n/de.po @@ -20,6 +20,7 @@ msgstr "" msgid "gluon-config-mode:pubkey" msgstr "" +" " msgid "gluon-config-mode:reboot" msgstr "" diff --git a/i18n/en.po b/i18n/en.po index 3c19e32..33bb5a4 100644 --- a/i18n/en.po +++ b/i18n/en.po @@ -17,6 +17,7 @@ msgstr "" msgid "gluon-config-mode:pubkey" msgstr "" +" " msgid "gluon-config-mode:reboot" msgstr "" From 12a0c204cc9ba71af4404ed834dabff6e18d2ad7 Mon Sep 17 00:00:00 2001 From: Matthias Freund Date: Sun, 17 Apr 2016 21:46:32 +0200 Subject: [PATCH 5/5] add all targets supported by gluon to target list https://github.com/freifunk-gluon/gluon/blob/master/targets/targets.mk --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b72c760..af5cbf2 100644 --- a/Makefile +++ b/Makefile @@ -8,8 +8,10 @@ GLUON_TARGETS ?= \ ar71xx-generic \ ar71xx-nand \ mpc85xx-generic \ + x86-64 \ x86-generic \ - x86-kvm_guest + x86-kvm_guest \ + x86-xen_domu GLUON_RELEASE := $(shell git describe --tags 2>/dev/null) ifneq (,$(shell git describe --exact-match --tags 2>/dev/null))