Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
7db9bfc273 | ||
|
|
dce540bee5 | ||
|
|
be55bd4d52 | ||
|
|
ad1c3a2f6c | ||
|
7559df3050 | ||
|
|
45c62c32cb | ||
|
|
c6a3afa130 | ||
|
5ec5304f80 | ||
|
|
224321c230 | ||
|
|
76998cb5ed | ||
|
fbf6807fb8 | ||
|
|
e9caeaf30d | ||
|
|
75f2c45ec2 | ||
|
|
bcca4a2f11 | ||
|
|
45f05c9a84 |
@ -19,7 +19,7 @@ the future development of Gluon.
|
||||
|
||||
Please refrain from using the `master` branch for anything else but development purposes!
|
||||
Use the most recent release instead. You can list all relaseses by running `git tag`
|
||||
and switch to one by running `git checkout v2017.1 && make update`.
|
||||
and switch to one by running `git checkout v2017.1.1 && make update`.
|
||||
|
||||
If you're using the autoupdater, do not autoupdate nodes with anything but releases.
|
||||
If you upgrade using random master commits the nodes *will break* eventually.
|
||||
|
||||
@ -54,9 +54,9 @@ copyright = '2015-2017, Project Gluon'
|
||||
# built documents.
|
||||
#
|
||||
# The short X.Y version.
|
||||
version = '2017.1'
|
||||
version = '2017.1.1'
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = '2017.1'
|
||||
release = '2017.1.1'
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
|
||||
@ -64,6 +64,7 @@ Several Freifunk communities in Germany use Gluon as the foundation of their Fre
|
||||
:caption: Releases
|
||||
:maxdepth: 1
|
||||
|
||||
releases/v2017.1.1
|
||||
releases/v2017.1
|
||||
releases/v2016.2.6
|
||||
releases/v2016.2.5
|
||||
|
||||
41
docs/releases/v2017.1.1.rst
Normal file
41
docs/releases/v2017.1.1.rst
Normal file
@ -0,0 +1,41 @@
|
||||
Gluon 2017.1.1
|
||||
==============
|
||||
|
||||
Bugfixes
|
||||
~~~~~~~~
|
||||
|
||||
* The autoupdater manifest has been extended to allow automatic upgrades from
|
||||
old *x86-kvm* and *x86-xen_domu* systems to the new *x86-generic* image
|
||||
(`869ceb4 <https://github.com/freifunk-gluon/gluon/commit/869ceb425cd5f9db3eafddcc52377fd94c6ba0dd>`_)
|
||||
|
||||
* Make flash writable again on Ubiquiti PicoStations with certain bootloader
|
||||
versions (and possibly other devices)
|
||||
(`9a787c9 <https://github.com/freifunk-gluon/gluon/commit/9a787c9878069158151c843b8fd9aa338815d61e>`_)
|
||||
|
||||
Units affected by this issue running Gluon v2017.1 can't leave config mode and
|
||||
no regular sysupgrades are possible. TFTP recovery is necessary to make them
|
||||
work again.
|
||||
|
||||
* Add workaround to prevent sporadic segfaults of busybox (ash) when running shell scripts on ar71xx
|
||||
(`#1157 <https://github.com/freifunk-gluon/gluon/issues/1157>`_)
|
||||
|
||||
* Disable batman-adv multicast optimizations to work around issue causing large
|
||||
amounts of management traffic
|
||||
(`819758f <https://github.com/freifunk-gluon/gluon/commit/819758f4250af8820851945ba1a6c17748b0ab4b>`_)
|
||||
|
||||
Multicast optimizations will be enabled again when a proper fix is available.
|
||||
|
||||
Known issues
|
||||
~~~~~~~~~~~~
|
||||
|
||||
* Default TX power on many Ubiquiti devices is too high, correct offsets are unknown (`#94 <https://github.com/freifunk-gluon/gluon/issues/94>`_)
|
||||
|
||||
Reducing the TX power in the Advanced Settings is recommended.
|
||||
|
||||
* The MAC address of the WAN interface is modified even when Mesh-on-WAN is disabled (`#496 <https://github.com/freifunk-gluon/gluon/issues/496>`_)
|
||||
|
||||
This may lead to issues in environments where a fixed MAC address is expected (like VMware when promicious mode is disallowed).
|
||||
|
||||
* Inconsistent respondd API (`#522 <https://github.com/freifunk-gluon/gluon/issues/522>`_)
|
||||
|
||||
The current API is inconsistent and will be replaced eventually. The old API will still be supported for a while.
|
||||
@ -13,6 +13,10 @@ many hacks that were required to make the build work with older OpenWrt releases
|
||||
The *output/modules* directory is now called *output/packages* and provides a
|
||||
replacement for the whole repository with target-specific packages of LEDE (in
|
||||
contrast to packages that are common for all targets of the same architecture).
|
||||
Another change to the build system makes it necessary that the same *GLUON_RELEASE*
|
||||
value that is used to build the images is also set for ``make manifest``.
|
||||
|
||||
GCC 4.8 or newer is now required to build Gluon.
|
||||
|
||||
**Note: There is an issue in all Gluon versions before 2016.2.6 that will
|
||||
lead to x86 systems losing their configuration when upgrading to Gluon 2017.1!**
|
||||
@ -127,7 +131,8 @@ site.mk
|
||||
^^^^^^^
|
||||
|
||||
* The *gluon-legacy* package does not exist anymore
|
||||
* All *gluon-luci-* packages have been renamed to *gluon-web-*
|
||||
* All *gluon-luci-* packages have been renamed to *gluon-web-*;
|
||||
*gluon-luci-portconfig* is now called *gluon-web-network*
|
||||
* The *gluon-next-node* package has been merged into the Gluon core and must not
|
||||
be specified in *site.mk* anymore
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
-- This is an example site configuration for Gluon v2017.1
|
||||
-- This is an example site configuration for Gluon v2017.1.1
|
||||
--
|
||||
-- Take a look at the documentation located at
|
||||
-- http://gluon.readthedocs.org/ for details.
|
||||
|
||||
@ -25,7 +25,6 @@ GLUON_SITE_PACKAGES := \
|
||||
gluon-setup-mode \
|
||||
gluon-status-page \
|
||||
haveged \
|
||||
iptables \
|
||||
iwinfo
|
||||
|
||||
## DEFAULT_GLUON_RELEASE
|
||||
|
||||
@ -8,7 +8,7 @@ Gluon's releases are managed using `Git tags`_. If you are just getting
|
||||
started with Gluon we recommend to use the latest stable release of Gluon.
|
||||
|
||||
Take a look at the `list of gluon releases`_ and notice the latest release,
|
||||
e.g. *v2017.1*. Always get Gluon using git and don't try to download it
|
||||
e.g. *v2017.1.1*. Always get Gluon using git and don't try to download it
|
||||
as a Zip archive as the archive will be missing version information.
|
||||
|
||||
Please keep in mind that there is no "default Gluon" build; a site configuration
|
||||
@ -43,7 +43,7 @@ Building the images
|
||||
-------------------
|
||||
|
||||
To build Gluon, first check out the repository. Replace *RELEASE* with the
|
||||
version you'd like to checkout, e.g. *v2017.1*.
|
||||
version you'd like to checkout, e.g. *v2017.1.1*.
|
||||
|
||||
::
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ msgid "Advanced settings"
|
||||
msgstr "Erweiterte Einstellungen"
|
||||
|
||||
msgid ""
|
||||
"Alternatively, you can set a password to access you node. Please choose a "
|
||||
"Alternatively, you can set a password to access your node. Please choose a "
|
||||
"secure password you don't use anywhere else.<br /><br />If you set an empty "
|
||||
"password, login via password will be disabled. This is the default."
|
||||
msgstr ""
|
||||
|
||||
@ -17,7 +17,7 @@ msgid "Advanced settings"
|
||||
msgstr "Paramètres avancés"
|
||||
|
||||
msgid ""
|
||||
"Alternatively, you can set a password to access you node. Please choose a "
|
||||
"Alternatively, you can set a password to access your node. Please choose a "
|
||||
"secure password you don't use anywhere else.<br /><br />If you set an empty "
|
||||
"password, login via password will be disabled. This is the default."
|
||||
msgstr ""
|
||||
|
||||
@ -8,7 +8,7 @@ msgid "Advanced settings"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"Alternatively, you can set a password to access you node. Please choose a "
|
||||
"Alternatively, you can set a password to access your node. Please choose a "
|
||||
"secure password you don't use anywhere else.<br /><br />If you set an empty "
|
||||
"password, login via password will be disabled. This is the default."
|
||||
msgstr ""
|
||||
|
||||
@ -33,7 +33,7 @@ end
|
||||
|
||||
local f_password = Form(translate("Password"),
|
||||
translate(
|
||||
"Alternatively, you can set a password to access you node. Please choose a secure password you don't use anywhere else.<br /><br />"
|
||||
"Alternatively, you can set a password to access your node. Please choose a secure password you don't use anywhere else.<br /><br />"
|
||||
.. "If you set an empty password, login via password will be disabled. This is the default."
|
||||
), 'password'
|
||||
)
|
||||
|
||||
@ -0,0 +1,139 @@
|
||||
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
Date: Tue, 20 Jun 2017 11:01:27 +0200
|
||||
Subject: generic: mtd: backport unlock support and asserted fixes for certain Winbond/Spansion flash chips
|
||||
|
||||
diff --git a/target/linux/generic/patches-4.4/049-0001-mtd-spi-nor-wait-until-lock-unlock-operations-are-re.patch b/target/linux/generic/patches-4.4/049-0001-mtd-spi-nor-wait-until-lock-unlock-operations-are-re.patch
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..c8aafe2ebbf7368f47e8f4d7a24dd5e45583a136
|
||||
--- /dev/null
|
||||
+++ b/target/linux/generic/patches-4.4/049-0001-mtd-spi-nor-wait-until-lock-unlock-operations-are-re.patch
|
||||
@@ -0,0 +1,66 @@
|
||||
+From 32321e950d8a237d7e8f3a9b76220007dfa87544 Mon Sep 17 00:00:00 2001
|
||||
+Message-Id: <32321e950d8a237d7e8f3a9b76220007dfa87544.1462572686.git.mschiffer@universe-factory.net>
|
||||
+From: =?UTF-8?q?Ezequiel=20Garc=C3=ADa?= <ezequiel@vanguardiasur.com.ar>
|
||||
+Date: Mon, 28 Dec 2015 17:54:51 -0300
|
||||
+Subject: [PATCH] mtd: spi-nor: wait until lock/unlock operations are ready
|
||||
+
|
||||
+On Micron and Numonyx devices, the status register write command
|
||||
+(WRSR), raises a work-in-progress bit (WIP) on the status register.
|
||||
+The datasheets for these devices specify that while the status
|
||||
+register write is in progress, the status register WIP bit can still
|
||||
+be read to check the end of the operation.
|
||||
+
|
||||
+This commit adds a wait_till_ready call on lock/unlock operations,
|
||||
+which is required for Micron and Numonyx but should be harmless for
|
||||
+others. This is needed to prevent applications from issuing erase or
|
||||
+program operations before the unlock operation is completed.
|
||||
+
|
||||
+Reported-by: Stas Sergeev <stsp@list.ru>
|
||||
+Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
|
||||
+Signed-off-by: Brian Norris <computersforpeace@gmail.com>
|
||||
+---
|
||||
+ drivers/mtd/spi-nor/spi-nor.c | 12 ++++++++++--
|
||||
+ 1 file changed, 10 insertions(+), 2 deletions(-)
|
||||
+
|
||||
+--- a/drivers/mtd/spi-nor/spi-nor.c
|
||||
++++ b/drivers/mtd/spi-nor/spi-nor.c
|
||||
+@@ -463,6 +463,7 @@ static int stm_lock(struct spi_nor *nor,
|
||||
+ u8 status_old, status_new;
|
||||
+ u8 mask = SR_BP2 | SR_BP1 | SR_BP0;
|
||||
+ u8 shift = ffs(mask) - 1, pow, val;
|
||||
++ int ret;
|
||||
+
|
||||
+ status_old = read_sr(nor);
|
||||
+
|
||||
+@@ -499,7 +500,10 @@ static int stm_lock(struct spi_nor *nor,
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ write_enable(nor);
|
||||
+- return write_sr(nor, status_new);
|
||||
++ ret = write_sr(nor, status_new);
|
||||
++ if (ret)
|
||||
++ return ret;
|
||||
++ return spi_nor_wait_till_ready(nor);
|
||||
+ }
|
||||
+
|
||||
+ /*
|
||||
+@@ -513,6 +517,7 @@ static int stm_unlock(struct spi_nor *no
|
||||
+ uint8_t status_old, status_new;
|
||||
+ u8 mask = SR_BP2 | SR_BP1 | SR_BP0;
|
||||
+ u8 shift = ffs(mask) - 1, pow, val;
|
||||
++ int ret;
|
||||
+
|
||||
+ status_old = read_sr(nor);
|
||||
+
|
||||
+@@ -547,7 +552,10 @@ static int stm_unlock(struct spi_nor *no
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ write_enable(nor);
|
||||
+- return write_sr(nor, status_new);
|
||||
++ ret = write_sr(nor, status_new);
|
||||
++ if (ret)
|
||||
++ return ret;
|
||||
++ return spi_nor_wait_till_ready(nor);
|
||||
+ }
|
||||
+
|
||||
+ /*
|
||||
diff --git a/target/linux/generic/patches-4.4/049-0002-mtd-spi-nor-wait-for-SR_WIP-to-clear-on-initial-unlo.patch b/target/linux/generic/patches-4.4/049-0002-mtd-spi-nor-wait-for-SR_WIP-to-clear-on-initial-unlo.patch
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..0541c95594ec14f62b5db787f4d52d5a42777cdc
|
||||
--- /dev/null
|
||||
+++ b/target/linux/generic/patches-4.4/049-0002-mtd-spi-nor-wait-for-SR_WIP-to-clear-on-initial-unlo.patch
|
||||
@@ -0,0 +1,33 @@
|
||||
+From edf891ef9ab773363f8e58022a26d7d31604aed6 Mon Sep 17 00:00:00 2001
|
||||
+Message-Id: <edf891ef9ab773363f8e58022a26d7d31604aed6.1462572703.git.mschiffer@universe-factory.net>
|
||||
+From: Brian Norris <computersforpeace@gmail.com>
|
||||
+Date: Fri, 29 Jan 2016 11:25:30 -0800
|
||||
+Subject: [PATCH] mtd: spi-nor: wait for SR_WIP to clear on initial unlock
|
||||
+
|
||||
+Fixup a piece leftover by commit 32321e950d8a ("mtd: spi-nor: wait until
|
||||
+lock/unlock operations are ready"). That commit made us wait for the WIP
|
||||
+bit to settle after lock/unlock operations, but it missed the open-coded
|
||||
+"unlock" that happens at probe() time.
|
||||
+
|
||||
+We should probably have this code utilize the unlock() routines in the
|
||||
+future, to avoid duplication, but unfortunately, flash which need to be
|
||||
+unlocked don't all have a proper ->flash_unlock() callback.
|
||||
+
|
||||
+Signed-off-by: Brian Norris <computersforpeace@gmail.com>
|
||||
+Cc: Stas Sergeev <stsp@users.sourceforge.net>
|
||||
+Reviewed-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
|
||||
+Tested-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
|
||||
+---
|
||||
+ drivers/mtd/spi-nor/spi-nor.c | 1 +
|
||||
+ 1 file changed, 1 insertion(+)
|
||||
+
|
||||
+--- a/drivers/mtd/spi-nor/spi-nor.c
|
||||
++++ b/drivers/mtd/spi-nor/spi-nor.c
|
||||
+@@ -1169,6 +1169,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
+ info->flags & SPI_NOR_HAS_LOCK) {
|
||||
+ write_enable(nor);
|
||||
+ write_sr(nor, 0);
|
||||
++ spi_nor_wait_till_ready(nor);
|
||||
+ }
|
||||
+
|
||||
+ if (!mtd->name)
|
||||
diff --git a/target/linux/generic/patches-4.4/466-revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch b/target/linux/generic/patches-4.4/466-revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..7c6530a5e0e8bc144e1d4497428e3c3691c2ef22
|
||||
--- /dev/null
|
||||
+++ b/target/linux/generic/patches-4.4/466-revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
|
||||
@@ -0,0 +1,18 @@
|
||||
+--- a/drivers/mtd/spi-nor/spi-nor.c
|
||||
++++ b/drivers/mtd/spi-nor/spi-nor.c
|
||||
+@@ -1161,6 +1161,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
+ JEDEC_MFR(info) == SNOR_MFR_INTEL ||
|
||||
+ JEDEC_MFR(info) == SNOR_MFR_MACRONIX ||
|
||||
+ JEDEC_MFR(info) == SNOR_MFR_SST ||
|
||||
++ JEDEC_MFR(info) == SNOR_MFR_WINBOND ||
|
||||
+ info->flags & SPI_NOR_HAS_LOCK) {
|
||||
+ write_enable(nor);
|
||||
+ write_sr(nor, 0);
|
||||
+@@ -1178,6 +1179,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
+
|
||||
+ /* NOR protection support for STmicro/Micron chips and similar */
|
||||
+ if (JEDEC_MFR(info) == SNOR_MFR_MICRON ||
|
||||
++ JEDEC_MFR(info) == SNOR_MFR_WINBOND ||
|
||||
+ info->flags & SPI_NOR_HAS_LOCK) {
|
||||
+ nor->flash_lock = stm_lock;
|
||||
+ nor->flash_unlock = stm_unlock;
|
||||
@ -0,0 +1,22 @@
|
||||
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
Date: Mon, 3 Jul 2017 01:40:32 +0200
|
||||
Subject: busybox: compile with debug information
|
||||
|
||||
The added debug information is stripped of during packaging, so it does not
|
||||
increase the package size. It does however slightly change offsets in the
|
||||
code, preventing the weird ash segfaults we've been seeing. Also, if the
|
||||
issue returns, we'll have debug information matching the coredumps.
|
||||
|
||||
diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile
|
||||
index 40bddd6b58195828951d1e48c12848f4fbfc1430..bba1a40568d4bd0543e4768439a249c89779f29a 100644
|
||||
--- a/package/utils/busybox/Makefile
|
||||
+++ b/package/utils/busybox/Makefile
|
||||
@@ -91,6 +91,8 @@ ifdef CONFIG_BUSYBOX_DEFAULT_NSLOOKUP_LEDE
|
||||
endif
|
||||
endif
|
||||
|
||||
+TARGET_CFLAGS += -g
|
||||
+
|
||||
define Build/Compile
|
||||
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
CC="$(TARGET_CC)" \
|
||||
@ -18,6 +18,10 @@ alias() {
|
||||
:
|
||||
}
|
||||
|
||||
manifest_alias() {
|
||||
:
|
||||
}
|
||||
|
||||
packages() {
|
||||
:
|
||||
}
|
||||
|
||||
@ -9,6 +9,7 @@ default_sysupgrade_ext='.bin'
|
||||
|
||||
output=
|
||||
aliases=
|
||||
manifest_aliases=
|
||||
|
||||
sysupgrade_ext=
|
||||
|
||||
@ -33,6 +34,10 @@ generate() {
|
||||
for alias in $aliases; do
|
||||
generate_line "$alias" "gluon-${SITE_CODE}-${GLUON_RELEASE}-${alias}-sysupgrade${sysupgrade_ext}"
|
||||
done
|
||||
|
||||
for alias in $manifest_aliases; do
|
||||
generate_line "$alias" "gluon-${SITE_CODE}-${GLUON_RELEASE}-${output}-sysupgrade${sysupgrade_ext}"
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
@ -44,6 +49,7 @@ device() {
|
||||
|
||||
output="$1"
|
||||
aliases=
|
||||
manifest_aliases=
|
||||
|
||||
sysupgrade_ext="$default_sysupgrade_ext"
|
||||
}
|
||||
@ -53,6 +59,7 @@ sysupgrade_image() {
|
||||
|
||||
output="$1"
|
||||
aliases=
|
||||
manifest_aliases=
|
||||
|
||||
if [ "$3" ]; then
|
||||
sysupgrade_ext="$3"
|
||||
@ -65,6 +72,10 @@ alias() {
|
||||
aliases="$aliases $1"
|
||||
}
|
||||
|
||||
manifest_alias() {
|
||||
manifest_aliases="$manifest_aliases $1"
|
||||
}
|
||||
|
||||
sysupgrade() {
|
||||
if [ "$2" ]; then
|
||||
sysupgrade_ext="$2"
|
||||
|
||||
@ -6,6 +6,8 @@ config 'CONFIG_BUSYBOX_CUSTOM=y'
|
||||
config 'CONFIG_BUSYBOX_CONFIG_SHA256SUM=y'
|
||||
config '# CONFIG_BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set'
|
||||
|
||||
config '# CONFIG_KMOD_BATMAN_ADV_MCAST is not set'
|
||||
|
||||
config 'CONFIG_PACKAGE_ATH_DEBUG=y'
|
||||
|
||||
config 'CONFIG_TARGET_MULTI_PROFILE=y'
|
||||
|
||||
@ -5,3 +5,5 @@ factory
|
||||
|
||||
device vocore-16M vocore-16M
|
||||
factory
|
||||
|
||||
device a5-v11 a5-v11
|
||||
|
||||
@ -7,3 +7,5 @@ factory_image x86-generic combined-ext4 .img.gz
|
||||
factory_image x86-generic combined-ext4 .vdi
|
||||
factory_image x86-generic combined-ext4 .vmdk
|
||||
sysupgrade_image x86-generic combined-ext4 .img.gz
|
||||
manifest_alias x86-kvm
|
||||
manifest_alias x86-xen_domu
|
||||
|
||||
Loading…
Reference in New Issue
Block a user