From 90efbb355b824998b93853d7b5a9d261b7533a9d Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Thu, 7 Mar 2019 19:53:22 +0100 Subject: [PATCH] fixup: LIME_RELEASE for upgrades Testing and master are two different branches and LibreMesh renames it's VERSION based on this branch. Therefore both testing/unstable would always request a "master" version from the server. Now it's separated. --- asu/utils/distributions/lime/distro_config.yml | 2 +- asu/utils/distributions/lime/{unstable.yml => master.yml} | 3 ++- asu/utils/distributions/lime/testing.yml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) rename asu/utils/distributions/lime/{unstable.yml => master.yml} (90%) diff --git a/asu/utils/distributions/lime/distro_config.yml b/asu/utils/distributions/lime/distro_config.yml index 021701a8..417cb710 100644 --- a/asu/utils/distributions/lime/distro_config.yml +++ b/asu/utils/distributions/lime/distro_config.yml @@ -11,7 +11,7 @@ latest: "testing" versions: - "testing" - - "unstable" + - "master" - "aparcar" active_targets: diff --git a/asu/utils/distributions/lime/unstable.yml b/asu/utils/distributions/lime/master.yml similarity index 90% rename from asu/utils/distributions/lime/unstable.yml rename to asu/utils/distributions/lime/master.yml index ac1d921e..2ab3308a 100644 --- a/asu/utils/distributions/lime/unstable.yml +++ b/asu/utils/distributions/lime/master.yml @@ -1,8 +1,9 @@ parent_distro: openwrt parent_version: snapshots snapshots: True +version_alias: unstable development version_description: > - LibreMesh development branch on OpenWrt development branch + LibreMesh master branch on OpenWrt development branch repos: | src/gz openwrt_core http://downloads.openwrt.org/snapshots/targets/{{ target }}/packages src/gz openwrt_base http://downloads.openwrt.org/snapshots/packages/{{ pkg_arch }}/base diff --git a/asu/utils/distributions/lime/testing.yml b/asu/utils/distributions/lime/testing.yml index 41458824..a468ecd3 100644 --- a/asu/utils/distributions/lime/testing.yml +++ b/asu/utils/distributions/lime/testing.yml @@ -16,6 +16,6 @@ repos: | src/gz openwrt_packages http://downloads.openwrt.org/releases/{{ ib_version }}/packages/{{ pkg_arch }}/packages src/gz openwrt_telephony http://downloads.openwrt.org/releases/{{ ib_version }}/packages/{{ pkg_arch }}/telephony src imagebuilder file:packages - src/gz libremesh http://chef.libremesh.org/snapshots/packages/ + src/gz libremesh https://snapshots.libremesh.org/branches/testing/ src/gz lm_profiles http://chef.libremesh.org/network-profiles/ src/gz libremap http://repo.libremesh.org/releases/17.06/packages/{{ pkg_arch }}/libremap