John Crispin [Tue, 14 Oct 2014 12:21:41 +0000 (12:21 +0000)]
ar71xx: fix seama factory type image generation.
Currently JFFS2 end-of-filesystem marker 0xdeadc0de is included the
computation of image's MD5 checksum as part of the seama header. But
OpenWrt will erase blocks including and after the marker thus
invalidating the checksum after the first boot.
John Crispin [Tue, 14 Oct 2014 12:21:36 +0000 (12:21 +0000)]
ar71xx: qihoo-c301: reset imageNtrynum after each successful boot.
Qihoo C301 has 2 flash chips of which one is used as primary and the
other is used as backup. OEM U-Boot will try to boot an activeregion N
with imageNstatus=0 and imageNtrynum <= imagemaxtry. If such a region
is found, bootloader will try to increment imageNtrynum and boot it.
This patch tries to reset imageNtrynum after each successful boot (if
the boot process reaches the execution of /etc/init.d/done).
John Crispin [Tue, 14 Oct 2014 12:21:11 +0000 (12:21 +0000)]
scripts: fix wrong usage of '==' operator
[base-files] shell-scripting: fix wrong usage of '==' operator
normally the '==' is used for invoking a regex parser and is a bashism.
all of the fixes just want to compare a string. the used busybox-ash
will silently "ignore" this mistake, but make it portable/clean at least.
this patch does not change the behavior/logic of the scripts.
John Crispin [Tue, 14 Oct 2014 10:33:07 +0000 (10:33 +0000)]
ar71xx: Fix LED definitions for the DRAGINO2 board
This patch fixes LED definitions for the DRAGINO2 board.
1. It renames the Router/USB led to System, as it is now marked "SYS" on the board.
2. It gives control of the LAN and WAN leds and some other GPIOs to Linux.
3. It fixes the active_low property for the LAN and WAN leds.
4. It sets up WLAN, LAN and WAN leds in the UCI defaults.
5. It allows usage of the System led by the diag.sh script, so it will be used to indicate boot and failsafe status.
John Crispin [Mon, 13 Oct 2014 19:41:27 +0000 (19:41 +0000)]
scripts/feeds: handle missing/broken feeds better
pts/feeds update -a" can fail rather silently for feeds using git, as
the script does not pause when updating a feed fails. Instead it prints the
error message and calmly continues to the next feed. It is very easy to
overlook update errors with the feeds updated first, as their text scrolls
rapidly away from the screen.
This behaviour has not been a big problem with svn feeds, as svn update stops
with a conflict message and interactively forces the user to resolve or
postpone the conflict. In any case the svn error is noticed by the user.
Majority of the feeds use now git, so this silent failure can affect users
doing private builds in an increasing amount.
Below is an example of update failing and script continuing:
perus@v1404:/Openwrt/barrier$ ./scripts/feeds update -a
Updating feed 'packages' from
'https://github.com/openwrt/packages.git;for-14.07' ...
remote: Counting objects: 17, done.
remote: Compressing objects: 100% (15/15), done.
remote: Total 17 (delta 10), reused 8 (delta 1)
Unpacking objects: 100% (17/17), done.
From https://github.com/openwrt/packages 62031da..dc26009 for-14.07 -> origin/for-14.07
Updating 62031da..dc26009
error: Your local changes to the following files would be overwritten by merge:
utils/collectd/Makefile
Please, commit your changes or stash them before you can merge.
Aborting
failed.
Updating feed 'luci' from 'http://git.openwrt.org/project/luci.git;luci-0.12' ...
Already up-to-date.
Create index file './feeds/luci.index'
Updating feed 'routing' from
'https://github.com/openwrt-routing/packages.git;for-14.07' ...
...
The script prints "failed.", but does not break the updating process. The
"update_feed" function returns an error code 1, but that value is not checked
in the "update" function, which continues to the next feed.
Return 1 as error:
https://dev.openwrt.org/browser/trunk/scripts/feeds#L547
Call to update_feed without any error monitoring:
https://dev.openwrt.org/browser/trunk/scripts/feeds#L585
The included patch makes the feeds script to stop updating after failing to
update a feed.
The script continues to the refresh_config step despite a possible failure in
updating, so the stopping action just prevents the other feeds from updating
and makes the error more clearly visible.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
SVN-Revision: 42891
Steven Barth [Sun, 12 Oct 2014 12:27:21 +0000 (12:27 +0000)]
netifd: Make mtu configurable of dynamic 6rd tunnel interface
Patch allows to configure the mtu of the dynamic 6rd tunnel interface when created by dhcp script.
In some setups it's desirable to have config control over the 6rd tunnel mtu to maximize the traffic throughput
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
SVN-Revision: 42871
Steven Barth [Thu, 9 Oct 2014 07:35:28 +0000 (07:35 +0000)]
ppp: remove ugly ipv6-workaround
This is not needed after all:
Omitting option ipv6 or setting it to 'auto' will
fire up a dhcpv6 subprotocol (this was added).
Setting ipv6 to 1 will only cause the IPv6 link to
be brought up and an accompanying dhcpv6 or static
interface with ifname @wan can be used to configure addresses.
Signed-off-by: Steven Barth <steven@midlink.org>
SVN-Revision: 42859
Steven Barth [Thu, 9 Oct 2014 07:16:35 +0000 (07:16 +0000)]
dropbear: ensure the interface has an ip-address
Use network_get_ipaddrs_all to get all ip-addresses of an interface. If the
function fails, the interface does not exists or has not any suiteable ip
addresses assigned.
Use the returned ip-address(es) to construct the dropbear listen address.
Felix Fietkau [Tue, 7 Oct 2014 10:37:48 +0000 (10:37 +0000)]
cns3xxx: fix shared PCI interrupt mapping
This patch originally failed to combine INTA/B/C/D onto a single ARM CPU
interrupt. Instead, it mapped INTA/B/C and excluded D. This patch
corrects the issue by mapping all four interrupts to the single ARM CPU
interrupt. The original intent of the patch still holds as the newer PCB
take advantage of isolated interrupts. This fix only applies to older
PCB's that do not route INTA/B/C/D to unique external ARM CPU
interrupts.
Rafał Miłecki [Mon, 6 Oct 2014 14:02:06 +0000 (14:02 +0000)]
kernel: enable CONFIG_MTD_SPLIT_SQUASHFS_ROOT
This enables dedicated "rootfs" splitter by default. We still keep
CONFIG_MTD_SPLIT_SQUASHFS_ROOT, so the old (built-in) splitter will be
used as a fallback in case of problems.
Once we decide the dedicated partitioner works stable, we should remove
the old one completely.
John Crispin [Mon, 6 Oct 2014 04:53:20 +0000 (04:53 +0000)]
ar71xx: simplify TP-LINK model detection
All TP-LINK machine names begin with "TP-LINK", so there's no need to check for
more specific model names. This also allows adding new models like the Archer
series more easily.
John Crispin [Mon, 6 Oct 2014 04:53:14 +0000 (04:53 +0000)]
Fix build when TAR_OPTIONS env variable is set
The build system sets a make variable TAR_OPTIONS to the unpacking
command, i.e. "-xf -". Now if an environment variable with the same
name is set, the make variable is automatically exported to the
environment. The make variable is added to the tar command in the
makefile, and tar adds the environment variable. This results in a
command like "tar -c /some/dir -xf - -xf -" which of course doesn't
work. It is also difficult to spot as the second "-xf -" is not
visible on the command line.
I suggest this is fixed by unexporting TAR_OPTIONS as I see no use
of the evironment variable, and it is changed from the original
value anyway.
Signed-off-by: Jan Kardell <jan.kardell@telliq.com>
SVN-Revision: 42794