[RFC 1/3] Update Batman to compat15

Christian Dresel fff at chrisi01.de
So Aug 20 21:21:21 CEST 2017


Hi

Danke euch :) Gleich mal eine neue Git-Übung gehabt ;) So ein
interactive rebase ist schon seltsam aber ich glaub ich habs hinbekommen
:) v2 ist eben raus :)

mfg

Christian

On 20.08.2017 19:50, Christoph süpke wrote:
> nein, auch bei mir stimmt da was nicht.
> 
> Am Sonntag, 20. August 2017 schrieb robert :
> 
>     Hi,
> 
>     da ist irgend was kaputt gegangen. s.unten
> 
> 
>     Am 20.08.2017 um 10:29 schrieb Christian Dresel:
>     > Signed-off-by: Christian Dresel <fff at chrisi01.de <javascript:;>>
>     > Signed-off-by: Jan Kraus <mayosemmel at gmail.com <javascript:;>>
>     >
>     > ---
>     >  buildscript                                        |  4 +-
>     >  src/packages/fff/fff-batman-adv-legacy/Makefile    | 44
>     ----------------------
>     >  .../files/etc/uci-defaults/93-fff-batman-adv       | 22 -----------
>     >  .../files/usr/lib/micron.d/fff-batman-adv-legacy   |  1 -
>     >  src/packages/fff/fff-batman-adv/Makefile           | 43
>     +++++++++++++++++++++
>     >  .../files/etc/uci-defaults/93-fff-batman-adv       | 22 +++++++++++
>     >  .../files/usr/lib/micron.d/fff-batman-adv          |  1 +
>     >  7 files changed, 68 insertions(+), 69 deletions(-)
>     >  delete mode 100644 src/packages/fff/fff-batman-adv-legacy/Makefile
>     >  delete mode 100644
>     src/packages/fff/fff-batman-adv-legacy/files/etc/uci-defaults/93-fff-batman-adv
>     >  delete mode 100644
>     src/packages/fff/fff-batman-adv-legacy/files/usr/lib/micron.d/fff-batman-adv-legacy
>     >  create mode 100644 src/packages/fff/fff-batman-adv/Makefile
>     >  create mode 100644
>     src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-batman-adv
>     >  create mode 100644
>     src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-batman-adv
>     >
>     > diff --git a/buildscript b/buildscript
>     > index f6d6297..dd775e3 100755
>     > --- a/buildscript
>     > +++ b/buildscript
>     > @@ -31,13 +31,13 @@ OPENWRT_PKGS="gpioctl-sysfs libugpio fastd haserl"
>     >  GLUON=(gluon
>     >              https://github.com/freifunk-gluon/packages.git
>     <https://github.com/freifunk-gluon/packages.git>
>     >              a18c69094c534bb7359d9c95c7b88ac047712574)
>     > -GLUON_PKGS="kmod-batman-adv-legacy micrond simple-tc uradvd"
>     > +GLUON_PKGS="micrond simple-tc uradvd"
>     >
>     >  #official openwrt routing packages
>     >  ROUTING=(routing
>     >           https://github.com/openwrt-routing/packages.git
>     <https://github.com/openwrt-routing/packages.git>
>     >           dd36dd47bbd75defcb3c517cafe7a19ee425f0af) # lede-17.01
>     > -ROUTING_PKGS="alfred"
>     > +ROUTING_PKGS="kmod-batman-adv batctl alfred"
>     >
>     >  FFF=(fff)
>     >  FFF_PKGS="-a"
>     > diff --git a/src/packages/fff/fff-batman-adv-legacy/Makefile
>     b/src/packages/fff/fff-batman-adv-legacy/Makefile
>     > deleted file mode 100644
>     > index 48b9e50..0000000
>     > --- a/src/packages/fff/fff-batman-adv-legacy/Makefile
>     > +++ /dev/null
>     > @@ -1,44 +0,0 @@
>     > -include $(TOPDIR)/rules.mk <http://rules.mk>
>     > -
>     > -PKG_NAME:=fff-batman-adv-legacy
>     > -PKG_VERSION:=1
>     > -PKG_RELEASE:=1
>     > -
>     > -PKG_BUILD_DIR:=$(BUILD_DIR)/fff-batman-adv-legacy
>     > -
>     > -include $(INCLUDE_DIR)/package.mk <http://package.mk>
>     > -
>     > -define Package/fff-batman-adv-legacy
>     > -    SECTION:=base
>     > -    CATEGORY:=Freifunk
>     > -    TITLE:=Freifunk-Franken batman-adv-legacy
>     > -    URL:=http://www.freifunk-franken.de
>     <http://www.freifunk-franken.de>
>     > -    DEPENDS:=+ at PACKAGE_kmod-batman-adv-legacy \
>     > -             + at KMOD_BATMAN_ADV_LEGACY_BLA \
>     > -             + at KMOD_BATMAN_ADV_LEGACY_DAT \
>     > -             + at KMOD_BATMAN_ADV_LEGACY_NC \
>     > -             + at KMOD_BATMAN_ADV_LEGACY_BATCTL
>     > -endef
>     > -
>     > -define Package/fff-batman-adv-legacy/description
>     > -    This is the batman-adv-legacy for the Freifunk Franken Firmware
>     > -    It is used to configure batman-adv-legacy.
>     > -endef
>     > -
>     > -define Build/Prepare
>     > -     echo "all: " > $(PKG_BUILD_DIR)/Makefile
>     > -endef
>     > -
>     > -define Build/Configure
>     > -     # nothing
>     > -endef
>     > -
>     > -define Build/Compile
>     > -     # nothing
>     > -endef
>     > -
>     > -define Package/fff-batman-adv-legacy/install
>     > -     $(CP) ./files/* $(1)/
>     > -endef
>     > -
>     > -$(eval $(call BuildPackage,fff-batman-adv-legacy))
>     > diff --git
>     a/src/packages/fff/fff-batman-adv-legacy/files/etc/uci-defaults/93-fff-batman-adv
>     b/src/packages/fff/fff-batman-adv-legacy/files/etc/uci-defaults/93-fff-batman-adv
>     > deleted file mode 100644
>     > index 9bc3928..0000000
>     > ---
>     a/src/packages/fff/fff-batman-adv-legacy/files/etc/uci-defaults/93-fff-batman-adv
>     > +++ /dev/null
>     > @@ -1,22 +0,0 @@
>     > -#!/bin/sh
>     > -
>     > -uci batch <<EOF
>     > -  delete batman-adv.bat0
>     > -  set batman-adv.bat0=mesh
>     > -  set batman-adv.bat0.gw_mode='client'
>     > -  set batman-adv.bat0.gw_sel_class='1'
>     > -  set batman-adv.bat0.bridge_loop_avoidance='0'
>     > -  set batman-adv.bat0.network_coding='0'
>     > -  set batman-adv.bat0.aggregated_ogms='1'
>     > -  set batman-adv.bat0.ap_isolation='0'
>     > -  set batman-adv.bat0.bonding='0'
>     > -  set batman-adv.bat0.fragmentation='1'
>     > -  set batman-adv.bat0.orig_interval='1000'
>     > -  set batman-adv.bat0.vis_mode='0'
>     > -  set batman-adv.bat0.distributed_arp_table='1'
>     > -  set batman-adv.bat0.hop_penalty='30'
>     > -EOF
>     > -
>     > -uci commit
>     > -
>     > -exit 0
>     > diff --git
>     a/src/packages/fff/fff-batman-adv-legacy/files/usr/lib/micron.d/fff-batman-adv-legacy
>     b/src/packages/fff/fff-batman-adv-legacy/files/usr/lib/micron.d/fff-batman-adv-legacy
>     > deleted file mode 100644
>     > index 21c857b..0000000
>     > ---
>     a/src/packages/fff/fff-batman-adv-legacy/files/usr/lib/micron.d/fff-batman-adv-legacy
>     > +++ /dev/null
>     > @@ -1 +0,0 @@
>     > -*/1 * * * * /usr/sbin/batctl gw off; sleep 1; /usr/sbin/batctl gw
>     client
>     > diff --git a/src/packages/fff/fff-batman-adv/Makefile
>     b/src/packages/fff/fff-batman-adv/Makefile
>     > new file mode 100644
>     > index 0000000..405c255
>     > --- /dev/null
>     > +++ b/src/packages/fff/fff-batman-adv/Makefile
>     > @@ -0,0 +1,43 @@
>     > +include $(TOPDIR)/rules.mk <http://rules.mk>
>     > +
>     > +PKG_NAME:=3Dfff-batman-adv
>     > +PKG_VERSION:=3D1
>     > +PKG_RELEASE:=3D1
>     Hier und weiter ist ueberall ein "3D" rein gerutscht. Ist das nur bei
>     mir so?
>     Robert
>     > +
>     > +PKG_BUILD_DIR:=3D$(BUILD_DIR)/fff-batman-adv
>     > +
>     > +include $(INCLUDE_DIR)/package.mk <http://package.mk>
>     > +
>     > +define Package/fff-batman-adv
>     > +    SECTION:=3Dbase
>     > +    CATEGORY:=3DFreifunk
>     > +    TITLE:=3DFreifunk-Franken batman-adv
>     > +    URL:=3Dhttp://www.freifunk-franken.de
>     <http://www.freifunk-franken.de>
>     > +    DEPENDS:=3D+kmod-batman-adv \
>     > +             + at KMOD_BATMAN_ADV_BATMAN_V \
>     > +             + at KMOD_BATMAN_ADV_NC \
>     > +             +batctl
>     > +endef
>     > +
>     > +define Package/fff-batman-adv/description
>     > +    This is the batman-adv for the Freifunk Franken Firmware
>     > +    It is used to configure batman-adv.
>     > +endef
>     > +
>     > +define Build/Prepare
>     > +     echo "all: " > $(PKG_BUILD_DIR)/Makefile
>     > +endef
>     > +
>     > +define Build/Configure
>     > +     # nothing
>     > +endef
>     > +
>     > +define Build/Compile
>     > +     # nothing
>     > +endef
>     > +
>     > +define Package/fff-batman-adv/install
>     > +     $(CP) ./files/* $(1)/
>     > +endef
>     > +
>     > +$(eval $(call BuildPackage,fff-batman-adv))
>     > diff --git
>     a/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-batman-adv
>     b/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-batman-adv
>     > new file mode 100644
>     > index 0000000..a3f55c3
>     > --- /dev/null
>     > +++
>     b/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-batman-adv
>     > @@ -0,0 +1,22 @@
>     > +#!/bin/sh
>     > +
>     > +uci batch <<EOF
>     > +  delete batman-adv.bat0
>     > +  set batman-adv.bat0=3Dmesh
>     > +  set batman-adv.bat0.gw_mode=3D'client'
>     > +  set batman-adv.bat0.gw_sel_class=3D'1'
>     > +  set batman-adv.bat0.bridge_loop_avoidance=3D'0'
>     > +  set batman-adv.bat0.network_coding=3D'0'
>     > +  set batman-adv.bat0.aggregated_ogms=3D'1'
>     > +  set batman-adv.bat0.ap_isolation=3D'0'
>     > +  set batman-adv.bat0.bonding=3D'0'
>     > +  set batman-adv.bat0.fragmentation=3D'1'
>     > +  set batman-adv.bat0.orig_interval=3D'1000'
>     > +  set batman-adv.bat0.vis_mode=3D'0'
>     > +  set batman-adv.bat0.distributed_arp_table=3D'1'
>     > +  set batman-adv.bat0.hop_penalty=3D'30'
>     > +EOF
>     > +
>     > +uci commit
>     > +
>     > +exit 0
>     > diff --git
>     a/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-batman-adv
>     b/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-batman-adv
>     > new file mode 100644
>     > index 0000000..21c857b
>     > --- /dev/null
>     > +++
>     b/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-batman-adv
>     > @@ -0,0 +1 @@
>     > +*/1 * * * * /usr/sbin/batctl gw off; sleep 1; /usr/sbin/batctl gw
>     client
> 
>     --
>     franken-dev mailing list
>     franken-dev at freifunk.net <javascript:;>
>     http://lists.freifunk.net/mailman/listinfo/franken-dev-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  : 819 bytes
Beschreibung: OpenPGP digital signature
URL         : <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20170820/49f91275/attachment.sig>


Mehr Informationen über die Mailingliste franken-dev