[RFC PATCH 1/9] buildscript: Update OpenWRT to 15.05

[Steffen Pankratz]

On Sun, 25 Oct 2015 16:26:20 +0100
Tim Niemeyer <tim.niemeyer at mastersword.de> wrote:

Der Patch zieht auch die OpenWrt Version hoch!
Ist das so gewollt?

Bei dem OpenWrt Packages Feed gab es inzwischen Aktualisierungen,
siehe https://github.com/openwrt/packages/commits/for-15.05
Aber das war zu erwarten :)


> - Updates openwrt package feed
> - Removes openwrt old_package feed
> 
> Signed-off-by: Tim Niemeyer <tim.niemeyer at mastersword.de>
> ---
> 
>  build_patches/sysupgrade_no_config_save.patch |  2 +-
>  buildscript                                   | 12 ++++--------
>  2 files changed, 5 insertions(+), 9 deletions(-)
> 
> diff --git a/build_patches/sysupgrade_no_config_save.patch b/build_patches/sysupgrade_no_config_save.patch
> index b40f1a8..55b3d74 100644
> --- a/build_patches/sysupgrade_no_config_save.patch
> +++ b/build_patches/sysupgrade_no_config_save.patch
> @@ -8,6 +8,6 @@ Index: package/base-files/files/sbin/sysupgrade
>   	( 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 2>/dev/null;
> + 		-type f -o -type l 2>/dev/null;
>   	  opkg list-changed-conffiles ) | sort -u > "$file"
>   	return 0
> diff --git a/buildscript b/buildscript
> index 4c31e20..8c70017 100755
> --- a/buildscript
> +++ b/buildscript
> @@ -2,9 +2,9 @@
>  
>  builddir=./build
>  
> -OPENWRTREV="f816c4907951b49f8c42e2ad58c2ca5672a807d1"
> -OPENWRTURL="git://git.openwrt.org/14.07/openwrt.git"
> -PACKAGEREV="de5e37ac5be3d44c335faa9652bf4ce15784f4ad"
> +OPENWRTREV="dc3c0b7c35c53d6a81f6ac5aeb95c64dc1f9f80c"
> +OPENWRTURL="git://git.openwrt.org/15.05/openwrt.git"
> +PACKAGEREV="ffd3b199e11ec335ce4f6ddd4a1a3aaff370318d"
>  PACKAGEURL="https://github.com/openwrt/packages.git"
>  
>  ## Feed definition [0]: name aka directory, [1]: url, [2]: revision, [3..n]: patches
> @@ -15,10 +15,6 @@ OPENWRT=(openwrt
>           $PACKAGEREV)
>  OPENWRT_PKGS="bridge gpioctl-sysfs libugpio mii-tool kmod-gpiotoggling"
>  
> -OPENWRT_OLDPACKAGES=(openwrt_oldpackages
> -                     http://git.openwrt.org/14.07/packages.git
> -                     ee10403aab0b9b23096532662471e8052377444c)
> -
>  ## Be careful: FFF uses COMPAT_VERSION 14 at the moment.
>  ## See http://www.open-mesh.org/projects/batman-adv/wiki/Compatversion
>  BATMAN_ADV=(batman_adv
> @@ -38,7 +34,7 @@ FASTD=(fastd
>         v17)
>  FASTD_PKGS="fastd"
>  
> -FEEDS=(OPENWRT OPENWRT_OLDPACKAGES ROUTING FASTD BATMAN_ADV)
> +FEEDS=(OPENWRT ROUTING FASTD BATMAN_ADV)
>  
>  checkout_git(){
>      local DIRECTORY=$1
> -- 
> 2.1.4
> 
> -- 
> franken-dev mailing list
> franken-dev at freifunk.net
> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net


-- 
Hermes powered by Manjaro Linux (Linux 4.2.5)

Best regards, Steffen Pankratz.
-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : nicht verfügbar
Dateityp    : application/pgp-signature
Dateigröße  : 181 bytes
Beschreibung: OpenPGP digital signature
URL         : <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20151104/8f28ccdf/attachment-0001.sig>