[RFC,1/8] renamed package feed "batman_adv" to the correct name "gluon"

Submitted by Jan Kraus on May 3, 2016, 9:20 p.m.

Details

Message ID 1462310457-9633-2-git-send-email-mayosemmel@gmail.com
State Accepted, archived
Commit ba3c645a521b7c144fd73d280bb36446457171e0
Headers show

Commit Message

Jan Kraus May 3, 2016, 9:20 p.m. 
This will prevent double work because of missunderstandings.

Signed-off-by: Jan Kraus <mayosemmel@gmail.com>
---
 .gitignore  | 2 +-
 buildscript | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox 

diff --git a/.gitignore b/.gitignore
index 85a174d..16b6819 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@ 
 /src/openwrt
 /src/packages/fastd
 /src/packages/openwrt
-/src/packages/batman_adv
+/src/packages/gluon
 /src/packages/routing
 /.project
 /*.patch
diff --git a/buildscript b/buildscript
index 7e16687..dd51582 100755
--- a/buildscript
+++ b/buildscript
@@ -28,10 +28,10 @@  OPENWRT_PKGS="gpioctl-sysfs libugpio fastd haserl"
 
 ## 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
+GLUON=(gluon
             https://github.com/freifunk-gluon/packages.git
             bdb56bba02168a7fdd7c8bbf380ae59a4febac7c)
-BATMAN_ADV_PKGS="kmod-batman-adv-legacy micrond simple-tc uradvd"
+GLUON_PKGS="kmod-batman-adv-legacy micrond simple-tc uradvd"
 
 #official openwrt routing packages
 ROUTING=(routing
@@ -42,7 +42,7 @@  ROUTING_PKGS="alfred"
 FFF=(fff)
 FFF_PKGS="-a"
 
-FEEDS=(OPENWRT ROUTING BATMAN_ADV FFF)
+FEEDS=(OPENWRT ROUTING GLUON FFF)
 
 checkout_git(){
     local DIRECTORY=$1

Comments

Tim Niemeyer May 7, 2016, 2:29 p.m. 
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Hi

Am 3. Mai 2016 23:20:50 MESZ, schrieb Jan Kraus <mayosemmel@googlemail.com>:
>This will prevent double work because of missunderstandings.
>
>Signed-off-by: Jan Kraus <mayosemmel@gmail.com>

Reviewed-by: Tim Niemeyer <tim@tn-x.org>

Bitte erst nach dem FeatureFreeze applien.

Tim

>---
> .gitignore  | 2 +-
> buildscript | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/.gitignore b/.gitignore
>index 85a174d..16b6819 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -6,7 +6,7 @@
> /src/openwrt
> /src/packages/fastd
> /src/packages/openwrt
>-/src/packages/batman_adv
>+/src/packages/gluon
> /src/packages/routing
> /.project
> /*.patch
>diff --git a/buildscript b/buildscript
>index 7e16687..dd51582 100755
>--- a/buildscript
>+++ b/buildscript
>@@ -28,10 +28,10 @@ OPENWRT_PKGS="gpioctl-sysfs libugpio fastd haserl"
>
> ## 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
>+GLUON=(gluon
>             https://github.com/freifunk-gluon/packages.git
>             bdb56bba02168a7fdd7c8bbf380ae59a4febac7c)
>-BATMAN_ADV_PKGS="kmod-batman-adv-legacy micrond simple-tc uradvd"
>+GLUON_PKGS="kmod-batman-adv-legacy micrond simple-tc uradvd"
>
> #official openwrt routing packages
> ROUTING=(routing
>@@ -42,7 +42,7 @@ ROUTING_PKGS="alfred"
> FFF=(fff)
> FFF_PKGS="-a"
>
>-FEEDS=(OPENWRT ROUTING BATMAN_ADV FFF)
>+FEEDS=(OPENWRT ROUTING GLUON FFF)
>
> checkout_git(){
>     local DIRECTORY=$1
-----BEGIN PGP SIGNATURE-----

iQE5BAEBCgAjHBxUaW0gTmllbWV5ZXIgPHRpbUB0bi14Lm9yZz4FAlct+6UACgkQ
ELiw0DPkKM/PgwgArI+RmJC63manIbU+wcfCDBRtHEyaiGeLxQPvf5P7FufGRNeC
jF+le1Fb/2cZa3NFMQGpq+VQFgzwL3FD2vKkx8MhF3m0UP5Zsm44s9DkTmHBzg/o
L+da5OVzzPlnczhC/RxdCZ3B6lbn+gnNB30ZgtX6O9HVjw2WTYgKo8LvYYWL9Gu2
3Uvk4ZkPlSIQaZrVXKCTB5vjgTZYkzxWUeRIZq9+LbrMRCq0YaMFe4WW2dH/qrne
lkgqomKBrHpsHjQwFvHB6Z5+6AkZqm86STcUjZECng7qh2Bv5PId5fjbzIUeIdAe
UY8YuT7zRfelEdnukFxZFMB0+OsV5elzLEMi6A==
=Oy8+
-----END PGP SIGNATURE-----
Tim Niemeyer May 15, 2016, 2:51 p.m. 
Am Samstag, den 07.05.2016, 16:29 +0200 schrieb Tim Niemeyer:
> Hi
> 
> Am 3. Mai 2016 23:20:50 MESZ, schrieb Jan Kraus <mayosemmel@googlemail.com>:
> >This will prevent double work because of missunderstandings.
> >
> >Signed-off-by: Jan Kraus <mayosemmel@gmail.com>
> 
> Reviewed-by: Tim Niemeyer <tim@tn-x.org>
> 
> Bitte erst nach dem FeatureFreeze applien.
Und applied.

Danke

Tim

> Tim
> 
> >---
> > .gitignore  | 2 +-
> > buildscript | 6 +++---
> > 2 files changed, 4 insertions(+), 4 deletions(-)
> >
> >diff --git a/.gitignore b/.gitignore
> >index 85a174d..16b6819 100644
> >--- a/.gitignore
> >+++ b/.gitignore
> >@@ -6,7 +6,7 @@
> > /src/openwrt
> > /src/packages/fastd
> > /src/packages/openwrt
> >-/src/packages/batman_adv
> >+/src/packages/gluon
> > /src/packages/routing
> > /.project
> > /*.patch
> >diff --git a/buildscript b/buildscript
> >index 7e16687..dd51582 100755
> >--- a/buildscript
> >+++ b/buildscript
> >@@ -28,10 +28,10 @@ OPENWRT_PKGS="gpioctl-sysfs libugpio fastd haserl"
> >
> > ## 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
> >+GLUON=(gluon
> >             https://github.com/freifunk-gluon/packages.git
> >             bdb56bba02168a7fdd7c8bbf380ae59a4febac7c)
> >-BATMAN_ADV_PKGS="kmod-batman-adv-legacy micrond simple-tc uradvd"
> >+GLUON_PKGS="kmod-batman-adv-legacy micrond simple-tc uradvd"
> >
> > #official openwrt routing packages
> > ROUTING=(routing
> >@@ -42,7 +42,7 @@ ROUTING_PKGS="alfred"
> > FFF=(fff)
> > FFF_PKGS="-a"
> >
> >-FEEDS=(OPENWRT ROUTING BATMAN_ADV FFF)
> >+FEEDS=(OPENWRT ROUTING GLUON FFF)
> >
> > checkout_git(){
> >     local DIRECTORY=$1