On Thu, Jun 15, 2017 at 1:46 PM, Kevin Darbyshire-Bryant <ke...@darbyshire-bryant.me.uk> wrote: > The classic single '&' when double '&&' conditional was meant. > > Signed-off-by: Kevin Darbyshire-Bryant <ke...@darbyshire-bryant.me.uk> > --- > > v2 - bump pkg release number - always forget that! > > package/network/services/dropbear/Makefile | 2 +- > package/network/services/dropbear/files/dropbear.init | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/network/services/dropbear/Makefile > b/package/network/services/dropbear/Makefile > index 6f2e4f6..87ffc5d 100644 > --- a/package/network/services/dropbear/Makefile > +++ b/package/network/services/dropbear/Makefile > @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk > > PKG_NAME:=dropbear > PKG_VERSION:=2017.75 > -PKG_RELEASE:=2 > +PKG_RELEASE:=3 > > PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 > PKG_SOURCE_URL:= \ > diff --git a/package/network/services/dropbear/files/dropbear.init > b/package/network/services/dropbear/files/dropbear.init > index 3fd2c57..2d23ebd 100755 > --- a/package/network/services/dropbear/files/dropbear.init > +++ b/package/network/services/dropbear/files/dropbear.init > @@ -134,7 +134,7 @@ service_triggers() > config_load "${NAME}" > config_foreach load_interfaces dropbear > > - [ -n "${interfaces}" ] & { > + [ -n "${interfaces}" ] && { > for n in $interfaces ; do > procd_add_interface_trigger "interface.*" $n > /etc/init.d/dropbear reload > done > -- > 2.7.4 > > > _______________________________________________ > Lede-dev mailing list > Lede-dev@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/lede-dev The patch fails to apply properly :
Applying: dropbear: fix service trigger syntax error fatal: sha1 information is lacking or useless (package/network/services/dropbear/Makefile). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Can you rebase it on master ? Thx, Hans _______________________________________________ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev