[PATCH v11 1/2] buildscript: simplify the use of patches for feeds

Tim Niemeyer tim at tn-x.org
Mo Sep 18 19:31:10 CEST 2017


Am Montag, den 18.09.2017, 10:01 +0200 schrieb Adrian Schmutzler:
> Tested-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
Danke. Hab das Set applied.

Tim

> 
> > -----Original Message-----
> > From: franken-dev [mailto:franken-dev-bounces at freifunk.net] On
> > Behalf
> > Of Tim Niemeyer
> > Sent: Sonntag, 17. September 2017 22:05
> > To: franken-dev at freifunk.net
> > Subject: [PATCH v11 1/2] buildscript: simplify the use of patches
> > for
> 
> feeds
> > 
> > Do this by applying the path within the patch function.
> > 
> > Signed-off-by: Tim Niemeyer <tim at tn-x.org>
> > ---
> > 
> > Changes in v11: None
> > 
> >  buildscript | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/buildscript b/buildscript
> > index 5559b37..4abeafa 100755
> > --- a/buildscript
> > +++ b/buildscript
> > @@ -103,7 +103,7 @@ get_source() {
> >              count=3
> >              while [ "x${FEED[count]}" != "x" ]
> >              do
> > -                local PATCH=${FEED[count]}
> > +                local
> 
> PATCH="../../../build_patches/${NAME}/${FEED[count]}"
> >                  if [ ! -z "$PATCH" ] ; then
> >                      echo "Patching $PATCH"
> >                      git -C "$NAME" am --whitespace=nowarn "$PATCH"
> > --
> > 2.11.0
> > 
> > --
> > franken-dev mailing list
> > franken-dev at freifunk.net
> > http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
> 
> 
-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : signature.asc
Dateityp    : application/pgp-signature
Dateigröße  : 488 bytes
Beschreibung: This is a digitally signed message part
URL         : <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20170918/5679f6b1/attachment.sig>


Mehr Informationen über die Mailingliste franken-dev