From patchwork Sat Nov 16 00:31:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Bump openwrt, packages and routing to v18.06.5, rebase patches From: Fabian Blaese X-Patchwork-Id: 1212 Message-Id: <20191116003105.363365-1-fabian@blaese.de> To: franken-dev@freifunk.net Date: Sat, 16 Nov 2019 01:31:05 +0100 Signed-off-by: Fabian Bläse Reviewed-by: Christian Dresel --- buildscript | 6 +++--- .../routing/0001-Update-babeld-to-1.9.1.patch | 13 ++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/buildscript b/buildscript index 306b91f..00f1874 100755 --- a/buildscript +++ b/buildscript @@ -13,9 +13,9 @@ builddir=./build -OPENWRTREV="v18.06.4" +OPENWRTREV="v18.06.5" OPENWRTURL="https://git.openwrt.org/openwrt/openwrt.git" -PACKAGEREV="5779614d267732fc382c1684202543fdbd924b4c" # openwrt-18.06.4 +PACKAGEREV="340d5ce71ee60c1d699e7e0ead9422bed6f8519f" # openwrt-18.06.5 PACKAGEURL="https://git.openwrt.org/feed/packages.git" ## Feed definition [0]: name aka directory, [1]: url, [2]: revision, [3..n]: patches @@ -36,7 +36,7 @@ GLUON_PKGS="kmod-batman-adv-legacy micrond simple-tc uradvd" #official openwrt routing packages ROUTING=(routing https://git.openwrt.org/feed/routing.git - bb156bf355b54236a52279522fabbec1e8dd7043) # openwrt-18.06.4 + c52779c05a4cf838c736327d8b042ee59f782331) # openwrt-18.06.5 ROUTING_PKGS="kmod-batman-adv batctl alfred babeld" FFF=(fff) diff --git a/feed_patches/routing/0001-Update-babeld-to-1.9.1.patch b/feed_patches/routing/0001-Update-babeld-to-1.9.1.patch index 7d4807d..10e5ed4 100644 --- a/feed_patches/routing/0001-Update-babeld-to-1.9.1.patch +++ b/feed_patches/routing/0001-Update-babeld-to-1.9.1.patch @@ -1,4 +1,4 @@ -From a9b2106178cf8f249056e23525c9841029bdf3d8 Mon Sep 17 00:00:00 2001 +From b58e2b95ffc83f73779619ea63777c0970398d13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= Date: Sun, 8 Sep 2019 23:19:33 +0200 Subject: [PATCH] Update babeld to 1.9.1 @@ -8,25 +8,24 @@ Subject: [PATCH] Update babeld to 1.9.1 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/babeld/Makefile b/babeld/Makefile -index 5cf136d..3235847 100644 +index 972862c..d113d54 100644 --- a/babeld/Makefile +++ b/babeld/Makefile -@@ -8,13 +8,13 @@ +@@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=babeld --PKG_VERSION:=1.8.2 +-PKG_VERSION:=1.8.5 +PKG_VERSION:=1.9.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.irif.fr/~jch/software/files/ - PKG_MD5SUM:=eec395ade02524b3f351507a21742939 --PKG_HASH:=07edecb132386d5561a767482bc5200e04239b18e48c2f0f47ae1c78d60fe5dc +-PKG_HASH:=202d99c275604507c6ce133710522f1ddfb62cb671c26f1ac2d3ab44af3d5bc4 +PKG_HASH:=1e1b3c01dd929177bc8d027aff1494da75e1e567e1f60df3bb45a78d5f1ca0b4 PKG_LICENSE:=MIT include $(INCLUDE_DIR)/package.mk -- -2.23.0 +2.24.0