Skip to content

Commit

Permalink
OpenWRT: Update OpenWrt, packages and routing to openwrt-18.06
Browse files Browse the repository at this point in the history
Refresh patches.

Bumps batman-adv to 2018.1

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Tim Niemeyer <tim@tn-x.org>
[fabian@blaese.de: Use 18.06.1 for OpenWRT and packages]
Signed-off-by: Fabian Bläse <fabian@blaese.de>
  • Loading branch information
adschm authored and fblaese committed Sep 29, 2018
1 parent cf578a1 commit b6fcb2d
Show file tree
Hide file tree
Showing 15 changed files with 22 additions and 2,151 deletions.
12 changes: 6 additions & 6 deletions build_patches/openwrt/0001-sysupgrade-no-config-save.patch
@@ -1,25 +1,25 @@
From 1115262b144c9fbdb9101a29681cf3d0f332f167 Mon Sep 17 00:00:00 2001
From 758b72379e994960ee1dcb0bf4f6db37140f59f0 Mon Sep 17 00:00:00 2001
From: Tim Niemeyer <tim@tn-x.org>
Date: Sat, 8 Jul 2017 10:46:59 +0200
Subject: [PATCH 1/7] sysupgrade no config save
Subject: [PATCH 1/4] sysupgrade no config save

---
package/base-files/files/sbin/sysupgrade | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index c095ca8..4a97d36 100755
index bf5428a..e7d6f90 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -104,7 +104,7 @@ EOF
@@ -118,7 +118,7 @@ list_changed_conffiles() {
add_uci_conffiles() {
local file="$1"
( find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' \
- /etc/sysupgrade.conf /lib/upgrade/keep.d/* 2>/dev/null) \
+ /etc/sysupgrade.conf 2>/dev/null) \
-type f -o -type l 2>/dev/null;
opkg list-changed-conffiles ) | sort -u > "$file"
list_changed_conffiles ) | sort -u > "$file"
return 0
--
2.1.4
2.7.4

6 changes: 3 additions & 3 deletions build_patches/openwrt/0002-set-root-password.patch
@@ -1,7 +1,7 @@
From 5d70b1bbf367a69b876c49c22928e5897b1e8efd Mon Sep 17 00:00:00 2001
From b8eda046b9b2bbb5cf1feba5a0df67435aef240a Mon Sep 17 00:00:00 2001
From: Tim Niemeyer <tim@tn-x.org>
Date: Sat, 8 Jul 2017 10:47:28 +0200
Subject: [PATCH 2/7] set root password
Subject: [PATCH 2/4] set root password

---
package/base-files/files/etc/shadow | 2 +-
Expand All @@ -18,5 +18,5 @@ index 4b4154f..b8d180a 100644
ftp:*:0:0:99999:7:::
network:*:0:0:99999:7:::
--
2.1.4
2.7.4

6 changes: 3 additions & 3 deletions build_patches/openwrt/0003-ntpd-host-as-string.patch
@@ -1,7 +1,7 @@
From 90e6f265608037301cd0b865b172a642dd2a254a Mon Sep 17 00:00:00 2001
From 5957781393de24387301ffb1d49ee115bb713928 Mon Sep 17 00:00:00 2001
From: Tim Niemeyer <tim@tn-x.org>
Date: Sat, 8 Jul 2017 10:47:56 +0200
Subject: [PATCH 3/7] ntpd host as string
Subject: [PATCH 3/4] ntpd host as string

---
package/utils/busybox/files/sysntpd | 2 +-
Expand All @@ -21,5 +21,5 @@ index e693e40..12383a4 100755

start_service() {
--
2.1.4
2.7.4

@@ -1,18 +1,18 @@
From f4724465e4cdbfecdd934893f6fc0c81f7038e1b Mon Sep 17 00:00:00 2001
From 3280eb51202a8b6b4af55165b1b795fbd3c7318c Mon Sep 17 00:00:00 2001
From: Tim Niemeyer <tim@tn-x.org>
Date: Sat, 8 Jul 2017 10:48:53 +0200
Subject: [PATCH 4/7] ar71xx-4.4-l2tp-stats
Subject: [PATCH 4/4] ar71xx-4.9-l2tp-stats

---
...-stats-counter-overflow-on-32-bit-systems.patch | 38 ++++++++++++++++++++++
1 file changed, 38 insertions(+)
create mode 100644 target/linux/ar71xx/patches-4.4/fix-l2tp-stats-counter-overflow-on-32-bit-systems.patch
create mode 100644 target/linux/ar71xx/patches-4.9/fix-l2tp-stats-counter-overflow-on-32-bit-systems.patch

diff --git a/target/linux/ar71xx/patches-4.4/fix-l2tp-stats-counter-overflow-on-32-bit-systems.patch b/target/linux/ar71xx/patches-4.4/fix-l2tp-stats-counter-overflow-on-32-bit-systems.patch
diff --git a/target/linux/ar71xx/patches-4.9/fix-l2tp-stats-counter-overflow-on-32-bit-systems.patch b/target/linux/ar71xx/patches-4.9/fix-l2tp-stats-counter-overflow-on-32-bit-systems.patch
new file mode 100644
index 0000000..4348aea
--- /dev/null
+++ b/target/linux/ar71xx/patches-4.4/fix-l2tp-stats-counter-overflow-on-32-bit-systems.patch
+++ b/target/linux/ar71xx/patches-4.9/fix-l2tp-stats-counter-overflow-on-32-bit-systems.patch
@@ -0,0 +1,38 @@
+From 19b1c8733b99f13005f2d8918bce588f0b2556f8 Mon Sep 17 00:00:00 2001
+From: Dominik Heidler <dominik@heidler.eu>
Expand Down Expand Up @@ -53,5 +53,5 @@ index 0000000..4348aea
+2.7.2
+
--
2.1.4
2.7.4

This file was deleted.

0 comments on commit b6fcb2d

Please sign in to comment.