diff --git a/board/common/overlay/sbin/fwupdate b/board/common/overlay/sbin/fwupdate index 9514b9a93e..a0537c85b6 100755 --- a/board/common/overlay/sbin/fwupdate +++ b/board/common/overlay/sbin/fwupdate @@ -4,7 +4,7 @@ #### usage #### function exit_usage() { - echo "Usage: fwupdate versions (lists available versions)" + echo "Usage: fwupdate versions [-u] (lists available versions, optionally showing the URL)" echo " fwupdate current (shows the current version" echo " fwupdate download (downloads a firmware version)" echo " fwupdate extract (extracts the downloaded firmware archive)" @@ -394,7 +394,9 @@ function new_version() { case "$1" in versions) - show_versions + show_url="false" + test "$2" == "-u" && show_url="true" + show_versions $show_url ;; current) diff --git a/board/common/overlay/usr/libexec/list-versions-bitbucket b/board/common/overlay/usr/libexec/list-versions-bitbucket index 044ea42791..e80b521d3a 100755 --- a/board/common/overlay/usr/libexec/list-versions-bitbucket +++ b/board/common/overlay/usr/libexec/list-versions-bitbucket @@ -5,6 +5,15 @@ if [ -z "$1" ]; then exit -1 fi +function check_prerelease() { + read line + if [[ "$line" =~ ^[0-9._]+\| ]]; then + echo "$line" + else + echo "$line" | sed 's/|false|/|true|/' + fi +} + extensions=".img.gz .img.xz .img" opts="-s -S -f" test -n "$FW_USERNAME" && opts+=" --user $FW_USERNAME:$FW_PASSWORD" @@ -13,6 +22,6 @@ url="https://api.bitbucket.org/2.0/repositories/$1/downloads?pagelen=100&_=$(dat rtrimstr=$(for e in $extensions; do echo -n " | rtrimstr(\"$e\")"; done) jq_expr=".values[] | [{a: .name | split(\"-\"), url: .links.self.href}] | map((.a[2] $rtrimstr), \"false\", .a[1], .url) | join(\"|\")" -curl $opts $url | jq --raw-output "$jq_expr" +curl $opts $url | jq --raw-output "$jq_expr" | while read line; do echo "$line" | check_prerelease; done exit ${PIPESTATUS[0]} diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index 2a5033f112..03d8109607 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -52,6 +52,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_X=y +BR2_PACKAGE_LAN951X_LED_CTL=y BR2_PACKAGE_RPI_USERLAND=y BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_PYTHON_SSL=y diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index 32994b7f3c..e77564e96d 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -52,6 +52,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_X=y +BR2_PACKAGE_LAN951X_LED_CTL=y BR2_PACKAGE_RPI_USERLAND=y BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_PYTHON_SSL=y diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index 4d2489cc3d..1ffcdc7802 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -59,6 +59,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_X=y +BR2_PACKAGE_LAN951X_LED_CTL=y BR2_PACKAGE_RPI_ARMMEM=y BR2_PACKAGE_RPI_USERLAND=y BR2_PACKAGE_USB_MODESWITCH_DATA=y diff --git a/package/Config.in b/package/Config.in index a2401611f3..11b583496e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -437,6 +437,7 @@ endmenu source "package/irda-utils/Config.in" source "package/iucode-tool/Config.in" source "package/kbd/Config.in" + source "package/lan951x-led-ctl/Config.in" source "package/lcdproc/Config.in" source "package/libuio/Config.in" source "package/libump/Config.in" diff --git a/package/lan951x-led-ctl/0001-fix-cross-compile.patch b/package/lan951x-led-ctl/0001-fix-cross-compile.patch new file mode 100644 index 0000000000..8642dd120d --- /dev/null +++ b/package/lan951x-led-ctl/0001-fix-cross-compile.patch @@ -0,0 +1,23 @@ +diff -uNr lan951x-led-ctl-master/Makefile lan951x-led-ctl-fix/Makefile +--- lan951x-led-ctl-master/Makefile 2017-02-11 22:50:52.000000000 +0200 ++++ lan951x-led-ctl-fix/Makefile 2018-06-24 23:45:57.925879678 +0300 +@@ -1,12 +1,12 @@ +-ECHO = /bin/echo -e +-SHELL = /bin/sh +-RM = /bin/rm -f +-CC = gcc +-STRIP = strip ++ECHO ?= /bin/echo -e ++SHELL ?= /bin/sh ++RM ?= /bin/rm -f ++CC ?= gcc ++STRIP ?= strip + +-CFLAGS = -g -Os -std=c11 -I./include -Wall -Wstrict-prototypes -Wconversion ++CFLAGS ?= -g -Os -std=c11 -I./include -Wall -Wstrict-prototypes -Wconversion + CFLAGS += -Wmissing-prototypes -Wshadow -Wextra -Wunused +-LDFLAGS = -lusb-1.0 ++LDFLAGS += -lusb-1.0 + + PROGS = lan951x-led-ctl + diff --git a/package/lan951x-led-ctl/Config.in b/package/lan951x-led-ctl/Config.in new file mode 100644 index 0000000000..7c6cfc67ef --- /dev/null +++ b/package/lan951x-led-ctl/Config.in @@ -0,0 +1,3 @@ +config BR2_PACKAGE_LAN951X_LED_CTL + bool "lan951x-led-ctl" + diff --git a/package/lan951x-led-ctl/lan951x-led-ctl.mk b/package/lan951x-led-ctl/lan951x-led-ctl.mk new file mode 100644 index 0000000000..a30e3b0cb8 --- /dev/null +++ b/package/lan951x-led-ctl/lan951x-led-ctl.mk @@ -0,0 +1,13 @@ +LAN951X_LED_CTL_VERSION = 0291b91702f5742fa56aa5e0942c28261777de7c +LAN951X_LED_CTL_SITE = $(call github,dumpsite,lan951x-led-ctl,$(LAN951X_LED_CTL_VERSION)) +LAN951X_LED_CTL_DEPENDENCIES = libusb + +define LAN951X_LED_CTL_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) CFLAGS="$(TARGET_CLFAGS) -Iinclude -std=c99" +endef + +define LAN951X_LED_CTL_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/lan951x-led-ctl $(TARGET_DIR)/usr/bin/lan951x-led-ctl +endef + +$(eval $(generic-package))