From 1e87d81b7422bf0e62ce50bc1549ff44c2e89fde Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sat, 2 Jun 2018 23:39:27 +0300 Subject: [PATCH 1/7] fwupdate: add option to show URLs when listing versions --- board/common/overlay/sbin/fwupdate | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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) From ce93017e44e69559cfdc682cdf3c3934ca256dbf Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sat, 23 Jun 2018 23:21:13 +0300 Subject: [PATCH 2/7] list-versions-bitbucket: versions not starting with a digit are considered prereleases --- .../overlay/usr/libexec/list-versions-bitbucket | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/board/common/overlay/usr/libexec/list-versions-bitbucket b/board/common/overlay/usr/libexec/list-versions-bitbucket index 044ea42791..7f376d4425 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]} From b875763a6ab0bbf0066856e41869b130249329f2 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sun, 24 Jun 2018 23:48:33 +0300 Subject: [PATCH 3/7] add lan951x-led-ctl package --- package/Config.in | 1 + .../0001-fix-cross-compile.patch | 23 +++++++++++++++++++ package/lan951x-led-ctl/Config.in | 3 +++ package/lan951x-led-ctl/lan951x-led-ctl.mk | 12 ++++++++++ 4 files changed, 39 insertions(+) create mode 100644 package/lan951x-led-ctl/0001-fix-cross-compile.patch create mode 100644 package/lan951x-led-ctl/Config.in create mode 100644 package/lan951x-led-ctl/lan951x-led-ctl.mk diff --git a/package/Config.in b/package/Config.in index e3106412cd..fbf67e61d2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -436,6 +436,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..dba3108f11 --- /dev/null +++ b/package/lan951x-led-ctl/lan951x-led-ctl.mk @@ -0,0 +1,12 @@ +LAN951X_LED_CTL_VERSION = 0291b91702f5742fa56aa5e0942c28261777de7c +LAN951X_LED_CTL_SITE = $(call github,dumpsite,lan951x-led-ctl,$(LAN951X_LED_CTL_VERSION)) + +define LAN951X_LED_CTL_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) CFLAGS="$(TARGET_CLFAGS) -Iinclude" +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)) From bd02abf38d536094ba4a8f43b3dded7197af45a1 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sun, 24 Jun 2018 23:51:53 +0300 Subject: [PATCH 4/7] raspberrypi (all): enable lan951x-led-ctl package --- configs/raspberrypi2_defconfig | 1 + configs/raspberrypi3_defconfig | 1 + configs/raspberrypi_defconfig | 1 + 3 files changed, 3 insertions(+) diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index 57856200f4..00d4a4a388 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -44,6 +44,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_CA_CERTIFICATES=y diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index 4dcc16d50d..7e9cc01bb2 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -44,6 +44,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_CA_CERTIFICATES=y diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index 3f11a9dbc0..1ed5ef71a7 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -51,6 +51,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 From e2cda6d65ed561c3c257b225236ef454ba6f7f95 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Tue, 10 Jul 2018 16:33:29 +0300 Subject: [PATCH 5/7] list-versions-bitbucket: accept more version formats --- board/common/overlay/usr/libexec/list-versions-bitbucket | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/common/overlay/usr/libexec/list-versions-bitbucket b/board/common/overlay/usr/libexec/list-versions-bitbucket index 7f376d4425..e80b521d3a 100755 --- a/board/common/overlay/usr/libexec/list-versions-bitbucket +++ b/board/common/overlay/usr/libexec/list-versions-bitbucket @@ -7,8 +7,8 @@ fi function check_prerelease() { read line - if [[ "$line" =~ ^[0-9] ]]; then - echo "$line" + if [[ "$line" =~ ^[0-9._]+\| ]]; then + echo "$line" else echo "$line" | sed 's/|false|/|true|/' fi From b5917f86a174d20458caa062540e6fa8c6ac0462 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Wed, 11 Jul 2018 18:03:50 +0300 Subject: [PATCH 6/7] lan951x-led-ctl: add libusb dependency --- package/lan951x-led-ctl/lan951x-led-ctl.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/lan951x-led-ctl/lan951x-led-ctl.mk b/package/lan951x-led-ctl/lan951x-led-ctl.mk index dba3108f11..dcaaefd981 100644 --- a/package/lan951x-led-ctl/lan951x-led-ctl.mk +++ b/package/lan951x-led-ctl/lan951x-led-ctl.mk @@ -1,5 +1,6 @@ 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" From 4bb200c13bb83339d1d1972fd6a23e79c678aae4 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Wed, 11 Jul 2018 22:33:24 +0300 Subject: [PATCH 7/7] lan951x-led-ctl: fix compiling error --- package/lan951x-led-ctl/lan951x-led-ctl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lan951x-led-ctl/lan951x-led-ctl.mk b/package/lan951x-led-ctl/lan951x-led-ctl.mk index dcaaefd981..a30e3b0cb8 100644 --- a/package/lan951x-led-ctl/lan951x-led-ctl.mk +++ b/package/lan951x-led-ctl/lan951x-led-ctl.mk @@ -3,7 +3,7 @@ LAN951X_LED_CTL_SITE = $(call github,dumpsite,lan951x-led-ctl,$(LAN951X_LED_CTL_ LAN951X_LED_CTL_DEPENDENCIES = libusb define LAN951X_LED_CTL_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) CFLAGS="$(TARGET_CLFAGS) -Iinclude" + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) CFLAGS="$(TARGET_CLFAGS) -Iinclude -std=c99" endef define LAN951X_LED_CTL_INSTALL_TARGET_CMDS