[2/4] buildscript: set or load bsp/community in function

Submitted by Tim Niemeyer on May 14, 2016, 2:36 p.m.

Details

Message ID 1463236588-29393-2-git-send-email-tim@tn-x.org
State Accepted, archived
Commit be951267b9a7401af73db2602bf7232513c8b089
Headers show

Commit Message

Tim Niemeyer May 14, 2016, 2:36 p.m. 
Signed-off-by: Tim Niemeyer <tim@tn-x.org>
---

 buildscript | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

Patch hide | download patch | download mbox 

diff --git a/buildscript b/buildscript
index d6e4d51..9b562e7 100755
--- a/buildscript
+++ b/buildscript
@@ -314,6 +314,31 @@  clean() {
     done
 }
 
+loadBSP()
+{
+    echo "Working with $(/bin/ls -l selected_bsp | awk '{ print $11 }')"
+    . selected_bsp
+}
+
+loadCommunity()
+{
+    echo "Working with $(/bin/ls -l selected_community | awk '{ print $11 }')"
+    tpl_translate=$(awk -F= 'BEGIN{printf("sed")} /^.+$/{gsub("/", "\\/", $0); printf(" -es/\\${%s}/%s/g",$1,$2)}' selected_community)
+}
+
+setCommunity() {
+    /bin/rm -rf selected_community
+    /bin/ln -s "$1" selected_community
+    loadCommunity
+}
+
+setBSP()
+{
+    /bin/rm -rf selected_bsp
+    /bin/ln -s "$1" selected_bsp
+    loadBSP
+}
+
 buildall() {
     for bsp in $(/bin/ls bsp/*.bsp); do
         ./buildscript selectbsp "$bsp"
@@ -333,10 +358,8 @@  if [ "$1" != "selectbsp" -a "$1" != "selectcommunity" ]; then
         echo "$0 selectcommunity"
         exit
     fi
-    echo "Working with $(/bin/ls -l selected_bsp | awk '{ print $11 }') and" \
-            "$(/bin/ls -l selected_community | awk '{ print $11 }')"
-    . selected_bsp
-    tpl_translate=$(awk -F= 'BEGIN{printf("sed")} /^.+$/{gsub("/", "\\/", $0); printf(" -es/\\${%s}/%s/g",$1,$2)}' selected_community)
+    loadBSP
+    loadCommunity
     echo
 fi
 
@@ -353,8 +376,7 @@  case "$1" in
             if [ ! -f "$2" ]; then
                 echo "Could not find $2"
             else
-                /bin/rm -rf selected_bsp
-                /bin/ln -s "$2" selected_bsp
+                setBSP "$2"
             fi
         fi
         ;;
@@ -370,8 +392,7 @@  case "$1" in
             if [ ! -f "$2" ]; then
                 echo "Could not find $2"
             else
-                /bin/rm -rf selected_community
-                /bin/ln -s "$2" selected_community
+                setCommunity "$2"
             fi
         fi
         ;;

Comments

Jan Kraus May 14, 2016, 4:05 p.m. 
Hi Tim,

mir ist nicht ganz klar wieso wir diesen Patch brauchen/wollen?

Grüße Jan

Am Samstag, den 14.05.2016, 16:36 +0200 schrieb Tim Niemeyer:
> Signed-off-by: Tim Niemeyer <tim@tn-x.org>
> ---
> 
>  buildscript | 37 +++++++++++++++++++++++++++++--------
>  1 file changed, 29 insertions(+), 8 deletions(-)
> 
> diff --git a/buildscript b/buildscript
> index d6e4d51..9b562e7 100755
> --- a/buildscript
> +++ b/buildscript
> @@ -314,6 +314,31 @@ clean() {
>      done
>  }
>  
> +loadBSP()
> +{
> +    echo "Working with $(/bin/ls -l selected_bsp | awk '{ print $11 }')"
> +    . selected_bsp
> +}
> +
> +loadCommunity()
> +{
> +    echo "Working with $(/bin/ls -l selected_community | awk '{ print $11 }')"
> +    tpl_translate=$(awk -F= 'BEGIN{printf("sed")} /^.+$/{gsub("/", "\\/", $0); printf(" -es/\\${%s}/%s/g",$1,$2)}' selected_community)
> +}
> +
> +setCommunity() {
> +    /bin/rm -rf selected_community
> +    /bin/ln -s "$1" selected_community
> +    loadCommunity
> +}
> +
> +setBSP()
> +{
> +    /bin/rm -rf selected_bsp
> +    /bin/ln -s "$1" selected_bsp
> +    loadBSP
> +}
> +
>  buildall() {
>      for bsp in $(/bin/ls bsp/*.bsp); do
>          ./buildscript selectbsp "$bsp"
> @@ -333,10 +358,8 @@ if [ "$1" != "selectbsp" -a "$1" != "selectcommunity" ]; then
>          echo "$0 selectcommunity"
>          exit
>      fi
> -    echo "Working with $(/bin/ls -l selected_bsp | awk '{ print $11 }') and" \
> -            "$(/bin/ls -l selected_community | awk '{ print $11 }')"
> -    . selected_bsp
> -    tpl_translate=$(awk -F= 'BEGIN{printf("sed")} /^.+$/{gsub("/", "\\/", $0); printf(" -es/\\${%s}/%s/g",$1,$2)}' selected_community)
> +    loadBSP
> +    loadCommunity
>      echo
>  fi
>  
> @@ -353,8 +376,7 @@ case "$1" in
>              if [ ! -f "$2" ]; then
>                  echo "Could not find $2"
>              else
> -                /bin/rm -rf selected_bsp
> -                /bin/ln -s "$2" selected_bsp
> +                setBSP "$2"
>              fi
>          fi
>          ;;
> @@ -370,8 +392,7 @@ case "$1" in
>              if [ ! -f "$2" ]; then
>                  echo "Could not find $2"
>              else
> -                /bin/rm -rf selected_community
> -                /bin/ln -s "$2" selected_community
> +                setCommunity "$2"
>              fi
>          fi
>          ;;
> -- 
> 2.1.4
>
Tim Niemeyer May 14, 2016, 4:07 p.m. 
Moin Jan

Am Samstag, den 14.05.2016, 18:05 +0200 schrieb mayosemmel:
> Hi Tim,
> 
> mir ist nicht ganz klar wieso wir diesen Patch brauchen/wollen?
Das ist nötig, damit das buildall das neue bsp "laden" kann und nicht
erst das buildscript komplett aufrufen muss. Das wiederum ist nötig,
damit die Version richtig gesetzt wird.

Tim

> 
> Grüße Jan
> 
> Am Samstag, den 14.05.2016, 16:36 +0200 schrieb Tim Niemeyer:
> > Signed-off-by: Tim Niemeyer <tim@tn-x.org>
> > ---
> > 
> >  buildscript | 37 +++++++++++++++++++++++++++++--------
> >  1 file changed, 29 insertions(+), 8 deletions(-)
> > 
> > diff --git a/buildscript b/buildscript
> > index d6e4d51..9b562e7 100755
> > --- a/buildscript
> > +++ b/buildscript
> > @@ -314,6 +314,31 @@ clean() {
> >      done
> >  }
> >  
> > +loadBSP()
> > +{
> > +    echo "Working with $(/bin/ls -l selected_bsp | awk '{ print $11 }')"
> > +    . selected_bsp
> > +}
> > +
> > +loadCommunity()
> > +{
> > +    echo "Working with $(/bin/ls -l selected_community | awk '{ print $11 }')"
> > +    tpl_translate=$(awk -F= 'BEGIN{printf("sed")} /^.+$/{gsub("/", "\\/", $0); printf(" -es/\\${%s}/%s/g",$1,$2)}' selected_community)
> > +}
> > +
> > +setCommunity() {
> > +    /bin/rm -rf selected_community
> > +    /bin/ln -s "$1" selected_community
> > +    loadCommunity
> > +}
> > +
> > +setBSP()
> > +{
> > +    /bin/rm -rf selected_bsp
> > +    /bin/ln -s "$1" selected_bsp
> > +    loadBSP
> > +}
> > +
> >  buildall() {
> >      for bsp in $(/bin/ls bsp/*.bsp); do
> >          ./buildscript selectbsp "$bsp"
> > @@ -333,10 +358,8 @@ if [ "$1" != "selectbsp" -a "$1" != "selectcommunity" ]; then
> >          echo "$0 selectcommunity"
> >          exit
> >      fi
> > -    echo "Working with $(/bin/ls -l selected_bsp | awk '{ print $11 }') and" \
> > -            "$(/bin/ls -l selected_community | awk '{ print $11 }')"
> > -    . selected_bsp
> > -    tpl_translate=$(awk -F= 'BEGIN{printf("sed")} /^.+$/{gsub("/", "\\/", $0); printf(" -es/\\${%s}/%s/g",$1,$2)}' selected_community)
> > +    loadBSP
> > +    loadCommunity
> >      echo
> >  fi
> >  
> > @@ -353,8 +376,7 @@ case "$1" in
> >              if [ ! -f "$2" ]; then
> >                  echo "Could not find $2"
> >              else
> > -                /bin/rm -rf selected_bsp
> > -                /bin/ln -s "$2" selected_bsp
> > +                setBSP "$2"
> >              fi
> >          fi
> >          ;;
> > @@ -370,8 +392,7 @@ case "$1" in
> >              if [ ! -f "$2" ]; then
> >                  echo "Could not find $2"
> >              else
> > -                /bin/rm -rf selected_community
> > -                /bin/ln -s "$2" selected_community
> > +                setCommunity "$2"
> >              fi
> >          fi
> >          ;;
> > -- 
> > 2.1.4
> > 
>
Jan Kraus May 14, 2016, 4:10 p.m. 
Auch im Kontext mit der anderen Antwort:
Reviewed-by: Jan Kraus <mayosemmel@gmail.com>

Am Samstag, den 14.05.2016, 18:07 +0200 schrieb Tim Niemeyer:
> Moin Jan
> 
> Am Samstag, den 14.05.2016, 18:05 +0200 schrieb mayosemmel:
> > Hi Tim,
> > 
> > mir ist nicht ganz klar wieso wir diesen Patch brauchen/wollen?
> Das ist nötig, damit das buildall das neue bsp "laden" kann und nicht
> erst das buildscript komplett aufrufen muss. Das wiederum ist nötig,
> damit die Version richtig gesetzt wird.
> 
> Tim
> 
> > 
> > Grüße Jan
> > 
> > Am Samstag, den 14.05.2016, 16:36 +0200 schrieb Tim Niemeyer:
> > > Signed-off-by: Tim Niemeyer <tim@tn-x.org>
> > > ---
> > > 
> > >  buildscript | 37 +++++++++++++++++++++++++++++--------
> > >  1 file changed, 29 insertions(+), 8 deletions(-)
> > > 
> > > diff --git a/buildscript b/buildscript
> > > index d6e4d51..9b562e7 100755
> > > --- a/buildscript
> > > +++ b/buildscript
> > > @@ -314,6 +314,31 @@ clean() {
> > >      done
> > >  }
> > >  
> > > +loadBSP()
> > > +{
> > > +    echo "Working with $(/bin/ls -l selected_bsp | awk '{ print $11 }')"
> > > +    . selected_bsp
> > > +}
> > > +
> > > +loadCommunity()
> > > +{
> > > +    echo "Working with $(/bin/ls -l selected_community | awk '{ print $11 }')"
> > > +    tpl_translate=$(awk -F= 'BEGIN{printf("sed")} /^.+$/{gsub("/", "\\/", $0); printf(" -es/\\${%s}/%s/g",$1,$2)}' selected_community)
> > > +}
> > > +
> > > +setCommunity() {
> > > +    /bin/rm -rf selected_community
> > > +    /bin/ln -s "$1" selected_community
> > > +    loadCommunity
> > > +}
> > > +
> > > +setBSP()
> > > +{
> > > +    /bin/rm -rf selected_bsp
> > > +    /bin/ln -s "$1" selected_bsp
> > > +    loadBSP
> > > +}
> > > +
> > >  buildall() {
> > >      for bsp in $(/bin/ls bsp/*.bsp); do
> > >          ./buildscript selectbsp "$bsp"
> > > @@ -333,10 +358,8 @@ if [ "$1" != "selectbsp" -a "$1" != "selectcommunity" ]; then
> > >          echo "$0 selectcommunity"
> > >          exit
> > >      fi
> > > -    echo "Working with $(/bin/ls -l selected_bsp | awk '{ print $11 }') and" \
> > > -            "$(/bin/ls -l selected_community | awk '{ print $11 }')"
> > > -    . selected_bsp
> > > -    tpl_translate=$(awk -F= 'BEGIN{printf("sed")} /^.+$/{gsub("/", "\\/", $0); printf(" -es/\\${%s}/%s/g",$1,$2)}' selected_community)
> > > +    loadBSP
> > > +    loadCommunity
> > >      echo
> > >  fi
> > >  
> > > @@ -353,8 +376,7 @@ case "$1" in
> > >              if [ ! -f "$2" ]; then
> > >                  echo "Could not find $2"
> > >              else
> > > -                /bin/rm -rf selected_bsp
> > > -                /bin/ln -s "$2" selected_bsp
> > > +                setBSP "$2"
> > >              fi
> > >          fi
> > >          ;;
> > > @@ -370,8 +392,7 @@ case "$1" in
> > >              if [ ! -f "$2" ]; then
> > >                  echo "Could not find $2"
> > >              else
> > > -                /bin/rm -rf selected_community
> > > -                /bin/ln -s "$2" selected_community
> > > +                setCommunity "$2"
> > >              fi
> > >          fi
> > >          ;;
> > > -- 
> > > 2.1.4
> > > 
> > 
>