From a1071bc5d4116c52f961cbbf3e14611b5c323fb4 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 13 Aug 2015 20:27:07 +0200
Subject: [PATCH] Update modules
---
modules | 8 ++++----
.../0006-base-files-disable-reset-button-handling.patch | 6 ++++--
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/modules b/modules
index e20e49b69..0539a1609 100644
--- a/modules
+++ b/modules
@@ -1,18 +1,18 @@
GLUON_FEEDS='openwrt gluon routing luci'
OPENWRT_REPO=git://git.openwrt.org/15.05/openwrt.git
-OPENWRT_COMMIT=48e7befbddb933d6cb046ec074470bbccdb060da
+OPENWRT_COMMIT=b62dde9c1c7694b420b3d39823b3553032305409
PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git
-PACKAGES_OPENWRT_COMMIT=1ee31bdfd26c53e41199c3d28cadca731d3bd372
+PACKAGES_OPENWRT_COMMIT=74a1d01651c035b28509babed6a11f34ef2c6ee5
PACKAGES_OPENWRT_BRANCH=for-15.05
PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git
PACKAGES_GLUON_COMMIT=881036e1f2818d2f0f0a8a72bfdb9c59e67b0e48
PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git
-PACKAGES_ROUTING_COMMIT=15b6598e575a852b1dd94aae6d323ba4683d50fe
+PACKAGES_ROUTING_COMMIT=de2eacac7faf3aeac7b5be84a9ff7712faffeb29
PACKAGES_LUCI_REPO=git://github.com/openwrt/luci.git
-PACKAGES_LUCI_COMMIT=3a7d738e2776e2ddaf6c127dbd9e2b90a77181d8
+PACKAGES_LUCI_COMMIT=c595f3095bd53e458984e410e24bf4d81a976aea
PACKAGES_LUCI_BRANCH=for-15.05
diff --git a/patches/openwrt/0006-base-files-disable-reset-button-handling.patch b/patches/openwrt/0006-base-files-disable-reset-button-handling.patch
index 4a601eda4..a889df962 100644
--- a/patches/openwrt/0006-base-files-disable-reset-button-handling.patch
+++ b/patches/openwrt/0006-base-files-disable-reset-button-handling.patch
@@ -6,10 +6,10 @@ This conflicts with our reset button usage.
diff --git a/package/base-files/files/etc/rc.button/reset b/package/base-files/files/etc/rc.button/reset
deleted file mode 100755
-index 229b503..0000000
+index 3e24146..0000000
--- a/package/base-files/files/etc/rc.button/reset
+++ /dev/null
-@@ -1,18 +0,0 @@
+@@ -1,20 +0,0 @@
-#!/bin/sh
-
-[ "${ACTION}" = "released" ] || exit 0
@@ -28,3 +28,5 @@ index 229b503..0000000
- echo "FACTORY RESET" > /dev/console
- jffs2reset -y && reboot &
-fi
+-
+-return 0
--
GitLab