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

Adrian Schmutzler mail at adrianschmutzler.de
Mo Sep 18 10:01:03 CEST 2017


Tested-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>

> -----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



Mehr Informationen über die Mailingliste franken-dev