From 9582183458570a93ddb4553cd1141ed8b7b7602b Mon Sep 17 00:00:00 2001 From: Jens Maus Date: Thu, 2 Sep 2021 09:54:38 +0200 Subject: [PATCH] Update eq3_char_loop and rpi-rf-mod package to latest (#1517) Update eq3_char_loop and rpi-rf-mod package to latest versions. Add proper hash files accordingly. --- .../package/eq3_char_loop/eq3_char_loop.hash | 3 +++ .../package/eq3_char_loop/eq3_char_loop.mk | 2 +- buildroot-external/package/rpi-rf-mod/rpi-rf-mod.hash | 3 +++ buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk | 11 +++++++++-- 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 buildroot-external/package/eq3_char_loop/eq3_char_loop.hash create mode 100644 buildroot-external/package/rpi-rf-mod/rpi-rf-mod.hash diff --git a/buildroot-external/package/eq3_char_loop/eq3_char_loop.hash b/buildroot-external/package/eq3_char_loop/eq3_char_loop.hash new file mode 100644 index 000000000..d0aa7a1e1 --- /dev/null +++ b/buildroot-external/package/eq3_char_loop/eq3_char_loop.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 2cc35060f1667a71184fd191e72bd96793f0a9709f14262adb7279ace38ba960 eq3_char_loop-e60183fc5b8375d9eea185c716f716c07657fa00.tar.gz +sha256 e600b8a501a17600d01bd7a4646508f94f3cd3b9df03661babd9f1801e579b36 LicenseDE.txt diff --git a/buildroot-external/package/eq3_char_loop/eq3_char_loop.mk b/buildroot-external/package/eq3_char_loop/eq3_char_loop.mk index 9aca0095e..b413dab97 100644 --- a/buildroot-external/package/eq3_char_loop/eq3_char_loop.mk +++ b/buildroot-external/package/eq3_char_loop/eq3_char_loop.mk @@ -8,7 +8,7 @@ # ############################################################# -EQ3_CHAR_LOOP_VERSION = 8cb51174c2bc8c4b33df50a96b82c90e8092f79c +EQ3_CHAR_LOOP_VERSION = e60183fc5b8375d9eea185c716f716c07657fa00 EQ3_CHAR_LOOP_SITE = $(call github,eq-3,occu,$(EQ3_CHAR_LOOP_VERSION)) EQ3_CHAR_LOOP_LICENSE = GPL2 #EQ3_CHAR_LOOP_LICENSE_FILES = LICENSE diff --git a/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.hash b/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.hash new file mode 100644 index 000000000..09f3bf962 --- /dev/null +++ b/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 115e5c0e0174f21005e6e1d8a616dd86ad5ad61df5929b06e6f7b7b20a8c9e48 rpi-rf-mod-7f5d50c8ac72e114a6b11a4ae0e92e316260fb0d.tar.gz +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk b/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk index 1abfe178d..8121e3338 100644 --- a/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk +++ b/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk @@ -11,15 +11,16 @@ # ############################################################# -RPI_RF_MOD_VERSION = 3b0311063973669d0b5310a3d3e4b6280ac4f438 +RPI_RF_MOD_VERSION = 7f5d50c8ac72e114a6b11a4ae0e92e316260fb0d RPI_RF_MOD_SITE = $(call github,jens-maus,RaspberryMatic,$(RPI_RF_MOD_VERSION)) RPI_RF_MOD_LICENSE = Apache-2.0 RPI_RF_MOD_DEPENDENCIES = host-dtc -#RPI_RF_MOD_LICENSE_FILES = LICENSE +RPI_RF_MOD_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_RPI_RF_MOD_DTS_RPI),y) # RaspberryPi DTS file RPI_RF_MOD_DTS_FILE = rpi-rf-mod + RPI_RF_MOD_DTS_FILE_ALT = rpi-rf-mod-rpi1 else ifeq ($(BR2_PACKAGE_RPI_RF_MOD_DTS_TINKER),y) # ASUS Tinkerboard DTS file RPI_RF_MOD_DTS_FILE = rpi-rf-mod-tinker @@ -38,12 +39,18 @@ define RPI_RF_MOD_BUILD_CMDS if [[ -n "$(RPI_RF_MOD_DTS_FILE)" ]]; then \ $(HOST_DIR)/bin/dtc -@ -I dts -O dtb -W no-unit_address_vs_reg -o $(@D)/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod.dtbo $(@D)/buildroot-external/package/rpi-rf-mod/dts/$(RPI_RF_MOD_DTS_FILE).dts; \ fi + if [[ -n "$(RPI_RF_MOD_DTS_FILE_ALT)" ]]; then \ + $(HOST_DIR)/bin/dtc -@ -I dts -O dtb -W no-unit_address_vs_reg -o $(@D)/buildroot-external/package/rpi-rf-mod/dts/$(RPI_RF_MOD_DTS_FILE_ALT).dtbo $(@D)/buildroot-external/package/rpi-rf-mod/dts/$(RPI_RF_MOD_DTS_FILE_ALT).dts; \ + fi endef define RPI_RF_MOD_INSTALL_TARGET_CMDS if [[ -n "$(RPI_RF_MOD_DTS_FILE)" ]]; then \ $(INSTALL) -D -m 0644 $(@D)/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod.dtbo $(BINARIES_DIR)/; \ fi + if [[ -n "$(RPI_RF_MOD_DTS_FILE_ALT)" ]]; then \ + $(INSTALL) -D -m 0644 $(@D)/buildroot-external/package/rpi-rf-mod/dts/$(RPI_RF_MOD_DTS_FILE_ALT).dtbo $(BINARIES_DIR)/; \ + fi endef $(eval $(generic-package))