[PATCH 09/11] fff-network: move default-bsp files to package
mayosemmel
mayosemmel at googlemail.com
Do Jun 9 14:00:31 CEST 2016
Schaut gut aus
Reviewed-by: Jan Kraus <mayosemmel at gmail.com>
Am Mittwoch, den 08.06.2016, 18:29 +0200 schrieb Tim Niemeyer:
> - mv /etc/network.* files to package
> - mv /etc/config/network to package
> - also removes the bsp specific root_file_system
>
> Signed-off-by: Tim Niemeyer <tim at tn-x.org>
> ---
>
> buildscript | 1 -
> src/packages/fff/fff-network/Makefile | 5 +++--
> .../etc => src/packages/fff/fff-network/ar71xx}/network.cpe210 | 0
> .../etc => src/packages/fff/fff-network/ar71xx}/network.gl-ar150 | 0
> .../etc => src/packages/fff/fff-network/ar71xx}/network.mode | 0
> .../etc => src/packages/fff/fff-network/ar71xx}/network.tl-mr3020-v1 | 0
> .../packages/fff/fff-network/ar71xx}/network.tl-wa850re-v1 | 0
> .../packages/fff/fff-network/ar71xx}/network.tl-wa860re-v1 | 0
> .../packages/fff/fff-network/ar71xx}/network.tl-wdr3500-v1 | 0
> .../packages/fff/fff-network/ar71xx}/network.tl-wdr3600-v1 | 0
> .../packages/fff/fff-network/ar71xx}/network.tl-wdr4300-v1 | 0
> .../packages/fff/fff-network/ar71xx}/network.tl-wdr4310-v1 | 0
> .../packages/fff/fff-network/ar71xx}/network.tl-wr1043nd-v1 | 0
> .../packages/fff/fff-network/ar71xx}/network.tl-wr1043nd-v2 | 0
> .../packages/fff/fff-network/ar71xx}/network.tl-wr1043nd-v3 | 0
> .../etc => src/packages/fff/fff-network/ar71xx}/network.tl-wr740n-v4 | 0
> .../packages/fff/fff-network/ar71xx}/network.tl-wr741nd-v2 | 0
> .../packages/fff/fff-network/ar71xx}/network.tl-wr741nd-v4 | 0
> .../packages/fff/fff-network/ar71xx}/network.tl-wr841n-v10 | 0
> .../packages/fff/fff-network/ar71xx}/network.tl-wr841n-v11 | 0
> .../etc => src/packages/fff/fff-network/ar71xx}/network.tl-wr841n-v8 | 0
> .../etc => src/packages/fff/fff-network/ar71xx}/network.tl-wr841n-v9 | 0
> .../packages/fff/fff-network/ar71xx}/network.tl-wr841nd-v7 | 0
> .../etc => src/packages/fff/fff-network/ar71xx}/network.tl-wr842n-v2 | 0
> .../packages/fff/fff-network/ar71xx}/network.ubnt-bullet-m | 0
> .../packages/fff/fff-network/ar71xx}/network.ubnt-loco-m-xw | 0
> .../etc => src/packages/fff/fff-network/ar71xx}/network.ubnt-nano-m | 0
> .../packages/fff/fff-network/files}/etc/config/network | 0
> .../packages/fff/fff-network/mpc85xx}/network.tl-wdr4900-v1 | 0
> 29 files changed, 3 insertions(+), 3 deletions(-)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.cpe210 (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.gl-ar150 (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.mode (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.tl-mr3020-v1 (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.tl-wa850re-v1 (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.tl-wa860re-v1 (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.tl-wdr3500-v1 (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.tl-wdr3600-v1 (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.tl-wdr4300-v1 (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.tl-wdr4310-v1 (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.tl-wr1043nd-v1 (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.tl-wr1043nd-v2 (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.tl-wr1043nd-v3 (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.tl-wr740n-v4 (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.tl-wr741nd-v2 (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.tl-wr741nd-v4 (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.tl-wr841n-v10 (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.tl-wr841n-v11 (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.tl-wr841n-v8 (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.tl-wr841n-v9 (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.tl-wr841nd-v7 (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.tl-wr842n-v2 (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.ubnt-bullet-m (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.ubnt-loco-m-xw (100%)
> rename {bsp/ar71xx/root_file_system/etc => src/packages/fff/fff-network/ar71xx}/network.ubnt-nano-m (100%)
> rename {bsp/default/root_file_system => src/packages/fff/fff-network/files}/etc/config/network (100%)
> rename {bsp/wdr4900/root_file_system/etc => src/packages/fff/fff-network/mpc85xx}/network.tl-wdr4900-v1 (100%)
>
> diff --git a/buildscript b/buildscript
> index 5662726..800e6c2 100755
> --- a/buildscript
> +++ b/buildscript
> @@ -174,7 +174,6 @@ prebuild() {
> mkdir "$target"/files
>
> cp -r ./bsp/default/root_file_system/* "$target"/files/
> - cp -r ./bsp/"$machine"/root_file_system/* "$target"/files/
> cp ./bsp/"$machine"/.config "$target"/.config
>
> while IFS= read -r -d '' template
> diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile
> index e3dc981..37e5ea3 100644
> --- a/src/packages/fff/fff-network/Makefile
> +++ b/src/packages/fff/fff-network/Makefile
> @@ -1,8 +1,8 @@
> include $(TOPDIR)/rules.mk
>
> PKG_NAME:=fff-network
> -PKG_VERSION:=0.0.1
> -PKG_RELEASE:=2
> +PKG_VERSION:=0.0.2
> +PKG_RELEASE:=1
>
> PKG_BUILD_DIR:=$(BUILD_DIR)/fff-network
>
> @@ -34,6 +34,7 @@ endef
>
> define Package/fff-network/install
> $(CP) ./files/* $(1)/
> + test -d ./$(BOARD) && $(CP) ./$(BOARD)/* $(1)/etc/
> endef
>
> $(eval $(call BuildPackage,fff-network))
> diff --git a/bsp/ar71xx/root_file_system/etc/network.cpe210 b/src/packages/fff/fff-network/ar71xx/network.cpe210
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.cpe210
> rename to src/packages/fff/fff-network/ar71xx/network.cpe210
> diff --git a/bsp/ar71xx/root_file_system/etc/network.gl-ar150 b/src/packages/fff/fff-network/ar71xx/network.gl-ar150
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.gl-ar150
> rename to src/packages/fff/fff-network/ar71xx/network.gl-ar150
> diff --git a/bsp/ar71xx/root_file_system/etc/network.mode b/src/packages/fff/fff-network/ar71xx/network.mode
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.mode
> rename to src/packages/fff/fff-network/ar71xx/network.mode
> diff --git a/bsp/ar71xx/root_file_system/etc/network.tl-mr3020-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-mr3020-v1
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.tl-mr3020-v1
> rename to src/packages/fff/fff-network/ar71xx/network.tl-mr3020-v1
> diff --git a/bsp/ar71xx/root_file_system/etc/network.tl-wa850re-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wa850re-v1
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.tl-wa850re-v1
> rename to src/packages/fff/fff-network/ar71xx/network.tl-wa850re-v1
> diff --git a/bsp/ar71xx/root_file_system/etc/network.tl-wa860re-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wa860re-v1
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.tl-wa860re-v1
> rename to src/packages/fff/fff-network/ar71xx/network.tl-wa860re-v1
> diff --git a/bsp/ar71xx/root_file_system/etc/network.tl-wdr3500-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wdr3500-v1
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.tl-wdr3500-v1
> rename to src/packages/fff/fff-network/ar71xx/network.tl-wdr3500-v1
> diff --git a/bsp/ar71xx/root_file_system/etc/network.tl-wdr3600-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.tl-wdr3600-v1
> rename to src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1
> diff --git a/bsp/ar71xx/root_file_system/etc/network.tl-wdr4300-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.tl-wdr4300-v1
> rename to src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1
> diff --git a/bsp/ar71xx/root_file_system/etc/network.tl-wdr4310-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.tl-wdr4310-v1
> rename to src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1
> diff --git a/bsp/ar71xx/root_file_system/etc/network.tl-wr1043nd-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v1
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.tl-wr1043nd-v1
> rename to src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v1
> diff --git a/bsp/ar71xx/root_file_system/etc/network.tl-wr1043nd-v2 b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v2
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.tl-wr1043nd-v2
> rename to src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v2
> diff --git a/bsp/ar71xx/root_file_system/etc/network.tl-wr1043nd-v3 b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v3
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.tl-wr1043nd-v3
> rename to src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v3
> diff --git a/bsp/ar71xx/root_file_system/etc/network.tl-wr740n-v4 b/src/packages/fff/fff-network/ar71xx/network.tl-wr740n-v4
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.tl-wr740n-v4
> rename to src/packages/fff/fff-network/ar71xx/network.tl-wr740n-v4
> diff --git a/bsp/ar71xx/root_file_system/etc/network.tl-wr741nd-v2 b/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v2
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.tl-wr741nd-v2
> rename to src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v2
> diff --git a/bsp/ar71xx/root_file_system/etc/network.tl-wr741nd-v4 b/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v4
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.tl-wr741nd-v4
> rename to src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v4
> diff --git a/bsp/ar71xx/root_file_system/etc/network.tl-wr841n-v10 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v10
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.tl-wr841n-v10
> rename to src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v10
> diff --git a/bsp/ar71xx/root_file_system/etc/network.tl-wr841n-v11 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v11
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.tl-wr841n-v11
> rename to src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v11
> diff --git a/bsp/ar71xx/root_file_system/etc/network.tl-wr841n-v8 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v8
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.tl-wr841n-v8
> rename to src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v8
> diff --git a/bsp/ar71xx/root_file_system/etc/network.tl-wr841n-v9 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v9
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.tl-wr841n-v9
> rename to src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v9
> diff --git a/bsp/ar71xx/root_file_system/etc/network.tl-wr841nd-v7 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841nd-v7
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.tl-wr841nd-v7
> rename to src/packages/fff/fff-network/ar71xx/network.tl-wr841nd-v7
> diff --git a/bsp/ar71xx/root_file_system/etc/network.tl-wr842n-v2 b/src/packages/fff/fff-network/ar71xx/network.tl-wr842n-v2
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.tl-wr842n-v2
> rename to src/packages/fff/fff-network/ar71xx/network.tl-wr842n-v2
> diff --git a/bsp/ar71xx/root_file_system/etc/network.ubnt-bullet-m b/src/packages/fff/fff-network/ar71xx/network.ubnt-bullet-m
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.ubnt-bullet-m
> rename to src/packages/fff/fff-network/ar71xx/network.ubnt-bullet-m
> diff --git a/bsp/ar71xx/root_file_system/etc/network.ubnt-loco-m-xw b/src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m-xw
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.ubnt-loco-m-xw
> rename to src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m-xw
> diff --git a/bsp/ar71xx/root_file_system/etc/network.ubnt-nano-m b/src/packages/fff/fff-network/ar71xx/network.ubnt-nano-m
> similarity index 100%
> rename from bsp/ar71xx/root_file_system/etc/network.ubnt-nano-m
> rename to src/packages/fff/fff-network/ar71xx/network.ubnt-nano-m
> diff --git a/bsp/default/root_file_system/etc/config/network b/src/packages/fff/fff-network/files/etc/config/network
> similarity index 100%
> rename from bsp/default/root_file_system/etc/config/network
> rename to src/packages/fff/fff-network/files/etc/config/network
> diff --git a/bsp/wdr4900/root_file_system/etc/network.tl-wdr4900-v1 b/src/packages/fff/fff-network/mpc85xx/network.tl-wdr4900-v1
> similarity index 100%
> rename from bsp/wdr4900/root_file_system/etc/network.tl-wdr4900-v1
> rename to src/packages/fff/fff-network/mpc85xx/network.tl-wdr4900-v1
> --
> 2.1.4
>
-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname : signature.asc
Dateityp : application/pgp-signature
Dateigröße : 473 bytes
Beschreibung: This is a digitally signed message part
URL : <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20160609/8f20a6b2/attachment-0001.sig>
Mehr Informationen über die Mailingliste franken-dev