Merge branch 'experimental' of https://github.com/ffrgb/site-ffrgb into experimental

This commit is contained in:
Bastian 2016-05-06 16:54:57 +02:00
commit 217ad6438f
4 changed files with 178 additions and 3 deletions

View File

@ -10,8 +10,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))

View File

@ -14,10 +14,13 @@ 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 ""
" "
msgid "gluon-config-mode:reboot"
msgstr ""

View File

@ -17,6 +17,7 @@ msgstr ""
msgid "gluon-config-mode:pubkey"
msgstr ""
" "
msgid "gluon-config-mode:reboot"
msgstr ""

171
site.mk
View File

@ -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 \
@ -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