nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update upstream modules

Browse Source 
This updates OpenWRT and rebases our patches.

Furthermore, the mac80211 module is removed as currently the Attitude Adjustment
main repo has a newer version (and some fixes that aren't in the backport repo).

Also, update odhcp6c from Barrier Breaker.
This commit is contained in:
Matthias Schiffer 2014-04-18 18:37:29 +02:00
parent 5a4767b78f
commit 02b4f0c51b
15 changed files with 114 additions and 21985 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules
View File

@ -1,16 +1,13 @@
GLUON_FEEDS='openwrt mac80211 gluon routing luci' GLUON_FEEDS='openwrt gluon routing luci'
OPENWRT_REPO=git://nbd.name/attitude_adjustment.git OPENWRT_REPO=git://git.openwrt.org/12.09/openwrt.git
OPENWRT_COMMIT=c00de5a631d0a60b8264e1f97049149cbd100cd8 OPENWRT_COMMIT=bccb82223911823bf4ab040997757708b002a75f
PACKAGES_OPENWRT_REPO=git://nbd.name/packages_12.09.git PACKAGES_OPENWRT_REPO=git://git.openwrt.org/12.09/packages.git
PACKAGES_OPENWRT_COMMIT=c67cd451ac28058a4992ba9eb2eb5551f6cd1adb PACKAGES_OPENWRT_COMMIT=381bbea65989b63e30f43ab87e51b042325bbff3
PACKAGES_MAC80211_REPO=git://nbd.name/aa-mac80211.git
PACKAGES_MAC80211_COMMIT=a92ce773680046eeb755f6b7c7af41fb6bdd7342
PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git
PACKAGES_GLUON_COMMIT=c7911677c381b325cc49d23ce03a14b4297b463d PACKAGES_GLUON_COMMIT=2ced9d31f75624a7b02067e167cb34d77c4f9eb8
PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git
PACKAGES_ROUTING_COMMIT=0e4201a983df967e88e6ce5451f5f5f99bab2370 PACKAGES_ROUTING_COMMIT=0e4201a983df967e88e6ce5451f5f5f99bab2370

129
patches/openwrt/0003-Update-odhcp6c-to-latest-git-master.patch → patches/openwrt/0003-Update-odhcp6c-from-Barrier-Breaker.patch
View File

@ -1,9 +1,9 @@
From: Matthias Schiffer <mschiffer@universe-factory.net> From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 11 Jan 2014 11:47:58 +0100 Date: Sat, 11 Jan 2014 11:47:58 +0100
Subject: Update odhcp6c to latest git master Subject: Update odhcp6c from Barrier Breaker
diff --git a/package/odhcp6c/Makefile b/package/odhcp6c/Makefile diff --git a/package/odhcp6c/Makefile b/package/odhcp6c/Makefile
index e37b72e..ed51b98 100644 index e767064..f18e7fa 100644
--- a/package/odhcp6c/Makefile --- a/package/odhcp6c/Makefile
+++ b/package/odhcp6c/Makefile +++ b/package/odhcp6c/Makefile
@@ -8,26 +8,37 @@ @@ -8,26 +8,37 @@
@ -11,15 +11,16 @@ index e37b72e..ed51b98 100644
PKG_NAME:=odhcp6c PKG_NAME:=odhcp6c
-PKG_VERSION:=2013-10-02 -PKG_VERSION:=2013-10-02
+PKG_VERSION:=2014-01-11 -PKG_RELEASE=$(PKG_SOURCE_VERSION)-1
PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_VERSION:=2014-04-09
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_URL:=git://github.com/sbyx/odhcp6c.git PKG_SOURCE_URL:=git://github.com/sbyx/odhcp6c.git
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=357ecc1f5163bc7f74c64f4bca387e8d44a2eac5 -PKG_SOURCE_VERSION:=357ecc1f5163bc7f74c64f4bca387e8d44a2eac5
+PKG_SOURCE_VERSION:=8152153cb9c5b09862bf0c8a0d1005fa8dfdf262 +PKG_SOURCE_VERSION:=6bbd2b0208fc17b6566595bfdfef2ff1d012d143
PKG_MAINTAINER:=Steven Barth <steven@midlink.org> PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -49,10 +50,10 @@ index e37b72e..ed51b98 100644
$(INSTALL_DIR) $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/usr/sbin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/odhcp6c $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/odhcp6c $(1)/usr/sbin/
diff --git a/package/odhcp6c/files/dhcpv6.script b/package/odhcp6c/files/dhcpv6.script diff --git a/package/odhcp6c/files/dhcpv6.script b/package/odhcp6c/files/dhcpv6.script
index 324a823..8bcf766 100755 index 324a823..d228014 100755
--- a/package/odhcp6c/files/dhcpv6.script --- a/package/odhcp6c/files/dhcpv6.script
+++ b/package/odhcp6c/files/dhcpv6.script +++ b/package/odhcp6c/files/dhcpv6.script
@@ -64,23 +64,28 @@ setup_interface () { @@ -64,23 +64,34 @@ setup_interface () {
entry="${entry#*,}" entry="${entry#*,}"
local metric="${entry%%,*}" local metric="${entry%%,*}"
@ -61,13 +62,17 @@ index 324a823..8bcf766 100755
+ proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" + proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid"
+ else + else
+ proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "::/128" + proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "::/128"
+ for prefix in $PREFIXES; do + for prefix in $PREFIXES $ADDRESSES; do
+ local paddr="${prefix%%,*}" + local paddr="${prefix%%,*}"
+ proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "$paddr" + proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "$paddr"
+ done + done
+ fi + fi
done done
+ proto_add_data
+ [ -n "$CER" ] && json_add_string cer "$CER"
+ proto_close_data
+
proto_send_update "$INTERFACE" proto_send_update "$INTERFACE"
if [ -n "$AFTR_IP " -a -n "$IFACE_DSLITE" ]; then if [ -n "$AFTR_IP " -a -n "$IFACE_DSLITE" ]; then
@ -88,25 +93,47 @@ index 324a823..8bcf766 100755
+ json_add_string proto "dslite" + json_add_string proto "dslite"
+ json_add_string peeraddr "$AFTR_IP" + json_add_string peeraddr "$AFTR_IP"
+ json_add_string tunlink "$INTERFACE" + json_add_string tunlink "$INTERFACE"
+ [ -n "$ZONE_DSLITE" ] && json_add_string zone "$ZONE_DSLITE"
+ [ -n "$IFACE_DSLITE_DELEGATE" ] && json_add_boolean delegate "$IFACE_DSLITE_DELEGATE"
+ json_close_object + json_close_object
+ ubus call network add_dynamic "$(json_dump)" + ubus call network add_dynamic "$(json_dump)"
fi fi
# TODO: $SNTP_IP $SIP_IP $SNTP_FQDN $SIP_DOMAIN # TODO: $SNTP_IP $SIP_IP $SNTP_FQDN $SIP_DOMAIN
diff --git a/package/odhcp6c/files/dhcpv6.sh b/package/odhcp6c/files/dhcpv6.sh diff --git a/package/odhcp6c/files/dhcpv6.sh b/package/odhcp6c/files/dhcpv6.sh
index bf6cd9a..0638d28 100755 index bf6cd9a..90a8371 100755
--- a/package/odhcp6c/files/dhcpv6.sh --- a/package/odhcp6c/files/dhcpv6.sh
+++ b/package/odhcp6c/files/dhcpv6.sh +++ b/package/odhcp6c/files/dhcpv6.sh
@@ -10,18 +10,20 @@ proto_dhcpv6_init_config() { @@ -5,23 +5,31 @@
proto_config_add_string "clientid" init_proto "$@"
proto_config_add_string "reqopts"
proto_config_add_string "noslaaconly" proto_dhcpv6_init_config() {
+ proto_config_add_string "forceprefix" - proto_config_add_string "reqaddress"
proto_config_add_string "norelease" - proto_config_add_string "reqprefix"
proto_config_add_string "ip6prefix" - proto_config_add_string "clientid"
proto_config_add_string "iface_dslite" - proto_config_add_string "reqopts"
proto_config_add_string "ifaceid" - proto_config_add_string "noslaaconly"
+ proto_config_add_string "sourcerouting" - proto_config_add_string "norelease"
- proto_config_add_string "ip6prefix"
- proto_config_add_string "iface_dslite"
- proto_config_add_string "ifaceid"
+ renew_handler=1
+
+ proto_config_add_string 'reqaddress:or("try","force","none")'
+ proto_config_add_string 'reqprefix:or("auto","no",range(0, 64))'
+ proto_config_add_string clientid
+ proto_config_add_string 'reqopts:list(uinteger)'
+ proto_config_add_string 'noslaaconly:bool'
+ proto_config_add_string 'forceprefix:bool'
+ proto_config_add_string 'norelease:bool'
+ proto_config_add_string 'ip6prefix:ip6addr'
+ proto_config_add_string iface_dslite
+ proto_config_add_string zone_dslite
+ proto_config_add_string 'ifaceid:ip6addr'
+ proto_config_add_string 'sourcerouting:bool'
+ proto_config_add_string "userclass"
+ proto_config_add_string "vendorclass"
+ proto_config_add_boolean delegate
} }
proto_dhcpv6_setup() { proto_dhcpv6_setup() {
@ -115,12 +142,12 @@ index bf6cd9a..0638d28 100755
- local reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix iface_dslite ifaceid - local reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix iface_dslite ifaceid
- json_get_vars reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix iface_dslite ifaceid - json_get_vars reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix iface_dslite ifaceid
+ local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite ifaceid sourcerouting + local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite ifaceid sourcerouting userclass vendorclass delegate zone_dslite
+ json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite ifaceid sourcerouting + json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite ifaceid sourcerouting userclass vendorclass delegate zone_dslite
# Configure # Configure
@@ -35,6 +37,8 @@ proto_dhcpv6_setup() { @@ -35,16 +43,25 @@ proto_dhcpv6_setup() {
[ "$noslaaconly" = "1" ] && append opts "-S" [ "$noslaaconly" = "1" ] && append opts "-S"
@ -129,11 +156,65 @@ index bf6cd9a..0638d28 100755
[ "$norelease" = "1" ] && append opts "-k" [ "$norelease" = "1" ] && append opts "-k"
[ -n "$ifaceid" ] && append opts "-i$ifaceid" [ -n "$ifaceid" ] && append opts "-i$ifaceid"
@@ -45,6 +49,7 @@ proto_dhcpv6_setup() {
+ [ -n "$vendorclass" ] && append opts "-V$vendorclass"
+
+ [ -n "$userclass" ] && append opts "-u$userclass"
+
for opt in $reqopts; do
append opts "-r$opt"
done
[ -n "$ip6prefix" ] && proto_export "USERPREFIX=$ip6prefix" [ -n "$ip6prefix" ] && proto_export "USERPREFIX=$ip6prefix"
[ -n "$iface_dslite" ] && proto_export "IFACE_DSLITE=$iface_dslite" [ -n "$iface_dslite" ] && proto_export "IFACE_DSLITE=$iface_dslite"
+ [ "$sourcerouting" = "1" ] && proto_export "SOURCE_ROUTING=1" + [ "$sourcerouting" != "0" ] && proto_export "SOURCE_ROUTING=1"
+ [ "$delegate" = "0" ] && proto_export "IFACE_DSLITE_DELEGATE=0"
+ [ -n "$zone_dslite" ] && proto_export "ZONE_DSLITE=$zone_dslite"
proto_export "INTERFACE=$config" proto_export "INTERFACE=$config"
proto_run_command "$config" odhcp6c \ proto_run_command "$config" odhcp6c \
@@ -52,6 +69,13 @@ proto_dhcpv6_setup() {
$opts $iface
}
+proto_dhcpv6_renew() {
+ local interface="$1"
+ # SIGUSR1 forces odhcp6c to renew its lease
+ local sigusr1="$(kill -l SIGUSR1)"
+ [ -n "$sigusr1" ] && proto_kill_command "$interface" $sigusr1
+}
+
proto_dhcpv6_teardown() {
local interface="$1"
proto_kill_command "$interface"
diff --git a/package/odhcp6c/patches/001-fix-integer-overflow-after-50-days.patch b/package/odhcp6c/patches/001-fix-integer-overflow-after-50-days.patch
deleted file mode 100644
index 292d023..0000000
--- a/package/odhcp6c/patches/001-fix-integer-overflow-after-50-days.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5b98f902f616bd9b96a2128587bc6995555a43c1 Mon Sep 17 00:00:00 2001
-From: Steven Barth <steven@midlink.org>
-Date: Fri, 7 Mar 2014 10:33:49 +0100
-Subject: [PATCH] fix integer overflow after 50 days (thx Hauke Mehrtens)
-
----
- src/odhcp6c.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/odhcp6c.c b/src/odhcp6c.c
-index 3c6b3b0..ba11ced 100644
---- a/src/odhcp6c.c
-+++ b/src/odhcp6c.c
-@@ -470,7 +470,7 @@ uint64_t odhcp6c_get_milli_time(void)
- {
- struct timespec t = {0, 0};
- syscall(SYS_clock_gettime, CLOCK_MONOTONIC, &t);
-- return t.tv_sec * 1000 + t.tv_nsec / 1000000;
-+ return ((uint64_t)t.tv_sec) * 1000 + ((uint64_t)t.tv_nsec) / 1000000;
- }
-
-
---
-1.7.10.4
-

21949
patches/openwrt/0006-Remove-hostapd-and-mac80211-packages.patch
View File

File diff suppressed because it is too large Load Diff

0
patches/openwrt/0007-netifd-update-to-latest-git-add-UCI-config-path-patch.patch → patches/openwrt/0006-netifd-update-to-latest-git-add-UCI-config-path-patch.patch
View File

0
patches/openwrt/0008-ar71xx-add-kernel-support-for-the-TL-WDR3500-board.patch → patches/openwrt/0007-ar71xx-add-kernel-support-for-the-TL-WDR3500-board.patch
View File

0
patches/openwrt/0009-ar71xx-add-user-space-support-for-TL-WDR3500-board.patch → patches/openwrt/0008-ar71xx-add-user-space-support-for-TL-WDR3500-board.patch
View File

0
patches/openwrt/0010-ar71xx-build-image-for-the-TL-WDR3500-board.patch → patches/openwrt/0009-ar71xx-build-image-for-the-TL-WDR3500-board.patch
View File

0
patches/openwrt/0011-ar71xx-add-default-switch-configuration-for-the-TL-WDR3500.patch → patches/openwrt/0010-ar71xx-add-default-switch-configuration-for-the-TL-WDR3500.patch
View File

0
patches/openwrt/0012-ar71xx-add-diag-support-for-the-TL-WDR3500.patch → patches/openwrt/0011-ar71xx-add-diag-support-for-the-TL-WDR3500.patch
View File

0
patches/openwrt/0013-ar71xx-remove-numeric-suffix-of-the-TL-WDR3500-USB-LED.patch → patches/openwrt/0012-ar71xx-remove-numeric-suffix-of-the-TL-WDR3500-USB-LED.patch
View File

0
patches/openwrt/0014-ar71xx-fix-USB-power-GPIO-on-the-TL-WDR3500.patch → patches/openwrt/0013-ar71xx-fix-USB-power-GPIO-on-the-TL-WDR3500.patch
View File

0
patches/openwrt/0015-ar71xx-add-default-LED-configuration-for-the-WL-WRD3500.patch → patches/openwrt/0014-ar71xx-add-default-LED-configuration-for-the-WL-WRD3500.patch
View File

0
patches/openwrt/0016-ar71xx-fix-ethernet-LEDs-on-the-TL-WDR3500.patch → patches/openwrt/0015-ar71xx-fix-ethernet-LEDs-on-the-TL-WDR3500.patch
View File

0
patches/openwrt/0017-ar71xx-add-GPIO-output-select-values-for-AR934x.patch → patches/openwrt/0016-ar71xx-add-GPIO-output-select-values-for-AR934x.patch
View File

6
patches/packages/mac80211/0001-mac80211-ath9k-add-support-for-QCA953x.patch → patches/openwrt/0017-mac80211-ath9k-add-support-for-QCA953x.patch
View File

@ -1,5 +1,5 @@
From: Matthias Schiffer <mschiffer@universe-factory.net> From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 29 Mar 2014 21:33:11 +0100 Date: Fri, 18 Apr 2014 18:30:05 +0200
Subject: mac80211: ath9k: add support for QCA953x Subject: mac80211: ath9k: add support for QCA953x
This adds the following patches by Sujith Manoharan from ath9k-devel: This adds the following patches by Sujith Manoharan from ath9k-devel:
@ -8,11 +8,11 @@ ath9k: Add QCA953x WMAC platform support
ath9k: Disable AR_INTR_SYNC_HOST1_FATAL for QCA953x ath9k: Disable AR_INTR_SYNC_HOST1_FATAL for QCA953x
ath9k: Fix temperature compensation ath9k: Fix temperature compensation
diff --git a/mac80211/patches/567-ath9k-qca953x-support.patch b/mac80211/patches/567-ath9k-qca953x-support.patch diff --git a/package/mac80211/patches/567-ath9k-qca953x-support.patch b/package/mac80211/patches/567-ath9k-qca953x-support.patch
new file mode 100644 new file mode 100644
index 0000000..e73083a index 0000000..e73083a
--- /dev/null --- /dev/null
+++ b/mac80211/patches/567-ath9k-qca953x-support.patch +++ b/package/mac80211/patches/567-ath9k-qca953x-support.patch
@@ -0,0 +1,124 @@ @@ -0,0 +1,124 @@
+--- a/drivers/net/wireless/ath/ath9k/ahb.c +--- a/drivers/net/wireless/ath/ath9k/ahb.c
++++ b/drivers/net/wireless/ath/ath9k/ahb.c ++++ b/drivers/net/wireless/ath/ath9k/ahb.c