[PATCH 06/11] fff-sysupgrade: move sysupgrade.sh to package

[mayosemmel]

Hi Tim,

Am Mittwoch, den 08.06.2016, 18:29 +0200 schrieb Tim Niemeyer:
> Signed-off-by: Tim Niemeyer <tim at tn-x.org>
> ---
> 
>  .../root_file_system/etc/config/firmware.tpl       |  4 ---
>  src/packages/fff/fff-sysupgrade/Makefile           | 40 ++++++++++++++++++++++
>  .../fff/fff-sysupgrade/files}/etc/sysupgrade.conf  |  0
>  .../fff/fff-sysupgrade/files}/etc/sysupgrade.sh    | 10 +++---
>  src/packages/fff/fff/Makefile                      |  5 +--
>  5 files changed, 49 insertions(+), 10 deletions(-)
>  delete mode 100644 bsp/default/root_file_system/etc/config/firmware.tpl
>  create mode 100644 src/packages/fff/fff-sysupgrade/Makefile
>  rename {bsp/default/root_file_system => src/packages/fff/fff-sysupgrade/files}/etc/sysupgrade.conf (100%)
>  rename {bsp/default/root_file_system => src/packages/fff/fff-sysupgrade/files}/etc/sysupgrade.sh (90%)
> 
> diff --git a/bsp/default/root_file_system/etc/config/firmware.tpl b/bsp/default/root_file_system/etc/config/firmware.tpl
> deleted file mode 100644
> index 1c2e7d6..0000000
> --- a/bsp/default/root_file_system/etc/config/firmware.tpl
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -config upgrade 'upgrade'
> -	option path '${UPGRADE_PATH}'
> -	option auto 0
> -	option remote 1
> \ No newline at end of file
> diff --git a/src/packages/fff/fff-sysupgrade/Makefile b/src/packages/fff/fff-sysupgrade/Makefile
> new file mode 100644
> index 0000000..ded9852
> --- /dev/null
> +++ b/src/packages/fff/fff-sysupgrade/Makefile
> @@ -0,0 +1,40 @@
> +include $(TOPDIR)/rules.mk
> +
> +PKG_NAME:=fff-sysupgrade
> +PKG_VERSION:=0.0.1
> +PKG_RELEASE:=1
> +
> +PKG_BUILD_DIR:=$(BUILD_DIR)/fff-sysupgrade
> +
> +include $(INCLUDE_DIR)/package.mk
> +
> +define Package/fff-sysupgrade
> +    SECTION:=base
> +    CATEGORY:=Freifunk
> +    TITLE:=Freifunk-Franken sysupgrade
> +    URL:=http://www.freifunk-franken.de
> +    DEPENDS:=+fff-boardname
> +endef
> +
> +define Package/fff-sysupgrade/description
> +    This is the Freifunk Franken Firmware sysupgrade package.
> +    This packages provides an semi automated sysupgrade script.
> +endef
> +
> +define Build/Prepare
> +    echo "all: " > $(PKG_BUILD_DIR)/Makefile
> +endef
> +
> +define Build/Configure
> +    # nothing
> +endef
> +
> +define Build/Compile
> +    # nothing
> +endef
> +
> +define Package/fff-sysupgrade/install
> +    $(CP) ./files/* $(1)/
> +endef
> +
> +$(eval $(call BuildPackage,fff-sysupgrade))
> diff --git a/bsp/default/root_file_system/etc/sysupgrade.conf b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.conf
> similarity index 100%
> rename from bsp/default/root_file_system/etc/sysupgrade.conf
> rename to src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.conf
> diff --git a/bsp/default/root_file_system/etc/sysupgrade.sh b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> similarity index 90%
> rename from bsp/default/root_file_system/etc/sysupgrade.sh
> rename to src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> index 8803818..f53bc5d 100755
> --- a/bsp/default/root_file_system/etc/sysupgrade.sh
> +++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> @@ -3,6 +3,8 @@ cd /tmp/
>  
>  . /etc/firmware_release
>  
> +. /etc/community.cfg
> +
>  BOARD=$(uci get board.model.name)
>  
>  #decide SOC
> @@ -20,7 +22,7 @@ case $BOARD in
>          BOARD="cpe210-220-510-520" ;;
>  esac
>  
> -wget $(uci get firmware.upgrade.path)/release.nfo
> +wget "${UPGRADE_PATH}/release.nfo"
>  if [ ! -f release.nfo ]; then
>    echo -ne "Latest release information not found. Please try to update manually.\n\n"
>    exit 1
> @@ -51,14 +53,14 @@ fi
>  
>  FILE="${FIRMWARE_COMMUNITY}-${VERSION}-${SOC}-generic-${BOARD}-squashfs-sysupgrade.bin"
>  echo -ne "Downloading $FILE\n\n"
> -wget $(uci get firmware.upgrade.path)/${FILE}
> -wget $(uci get firmware.upgrade.path)/${FILE}.sha256
> +wget "${UPGRADE_PATH}/${FILE}"
> +wget "${UPGRADE_PATH}/${FILE}.sha256"
>  
>  echo -ne "\ndone. Comparing sha256 sums: "
>  sha256sum -c ${FILE}.sha256
>  ret=$?
>  echo
> -if [ $ret -ne 0 ]; then
> + [ $ret -ne 0 ]; then
Ich bin nicht sicher ob das ohne "if" funktioniert. Selbst wenn, ist es
mit leserlicher.
Wenn das wieder da ist, kannst du ein Reviewed-by von mir dranhängen.

Grüße Jan
>    echo -ne "sha256 sums do not match. Try restarting this script to redownload the firmware.\n\n"
>    rm -f ${FILE}*
>    exit 1
> diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile
> index 366e828..2a5e6ed 100644
> --- a/src/packages/fff/fff/Makefile
> +++ b/src/packages/fff/fff/Makefile
> @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
>  
>  PKG_NAME:=fff
>  PKG_VERSION:=0.0.2
> -PKG_RELEASE:=2
> +PKG_RELEASE:=3
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/fff
>  
> @@ -23,7 +23,8 @@ define Package/fff-base
>               +fff-firewall \
>               +fff-support \
>               +fff-network \
> -             +fff-wireless
> +             +fff-wireless \
> +             +fff-sysupgrade
>  endef
>  
>  define Package/fff-base/description
> -- 
> 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/f6134b49/attachment-0001.sig>