Skip to content

Commit

Permalink
refactor: Buildroot 2021.02 build fixes
Browse files Browse the repository at this point in the history
- new package generation hash algorithm
- changed Buildroot U-Boot configuration keys
- WiringPi fix for GCC 10
  • Loading branch information
zehnm committed Apr 7, 2021
1 parent ad2c6ed commit c5b4d7e
Show file tree
Hide file tree
Showing 34 changed files with 84 additions and 148 deletions.
5 changes: 3 additions & 2 deletions buildroot-external/configs/remote_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ BR2_PACKAGE_SWUPDATE_INSTALL_CLIENT_TOOLS=y
BR2_PACKAGE_SWUPDATE_INSTALL_HAWKBIT_TOOLS=y
# BR2_PACKAGE_SYSTEMD_HWDB is not set
# BR2_PACKAGE_SYSTEMD_MYHOSTNAME is not set
BR2_PACKAGE_UTIL_LINUX_BINARIES=y
BR2_PACKAGE_UTIL_LINUX_KILL=y
BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_SQUASHFS=y
Expand All @@ -133,14 +134,14 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_0_w"
BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_YIOS_PATH)/board/remote/uboot.config"
BR2_TARGET_UBOOT_BOOT_SCRIPT=y
BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_YIOS_PATH)/board/remote/uboot-boot.ush"
BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_GENEXT2FS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_MTOOLS=y
BR2_PACKAGE_HOST_SQUASHFS=y
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_YIOS_PATH)/board/remote/uboot-boot.ush"
BR2_PACKAGE_HOST_ZIP=y
BR2_PACKAGE_YIO_REMOTE=y
BR2_PACKAGE_YIO_INTEGRATION_OPENHAB=y
Expand Down
5 changes: 3 additions & 2 deletions buildroot-external/configs/rpi0w_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ BR2_PACKAGE_SWUPDATE_INSTALL_CLIENT_TOOLS=y
BR2_PACKAGE_SWUPDATE_INSTALL_HAWKBIT_TOOLS=y
# BR2_PACKAGE_SYSTEMD_HWDB is not set
# BR2_PACKAGE_SYSTEMD_MYHOSTNAME is not set
BR2_PACKAGE_UTIL_LINUX_BINARIES=y
BR2_PACKAGE_UTIL_LINUX_KILL=y
BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_SQUASHFS=y
Expand All @@ -128,14 +129,14 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_0_w"
BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_YIOS_PATH)/board/raspberrypi/uboot.config"
BR2_TARGET_UBOOT_BOOT_SCRIPT=y
BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_YIOS_PATH)/board/raspberrypi/uboot-boot.ush"
BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_GENEXT2FS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_MTOOLS=y
BR2_PACKAGE_HOST_SQUASHFS=y
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_YIOS_PATH)/board/raspberrypi/uboot-boot.ush"
BR2_PACKAGE_HOST_ZIP=y
BR2_PACKAGE_YIO_REMOTE=y
BR2_PACKAGE_YIO_INTEGRATION_OPENHAB=y
Expand Down
5 changes: 3 additions & 2 deletions buildroot-external/configs/rpi3_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ BR2_PACKAGE_SWUPDATE_INSTALL_CLIENT_TOOLS=y
BR2_PACKAGE_SWUPDATE_INSTALL_HAWKBIT_TOOLS=y
# BR2_PACKAGE_SYSTEMD_HWDB is not set
# BR2_PACKAGE_SYSTEMD_MYHOSTNAME is not set
BR2_PACKAGE_UTIL_LINUX_BINARIES=y
BR2_PACKAGE_UTIL_LINUX_KILL=y
BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_SQUASHFS=y
Expand All @@ -129,14 +130,14 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3_32b"
BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_YIOS_PATH)/board/raspberrypi/uboot.config"
BR2_TARGET_UBOOT_BOOT_SCRIPT=y
BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_YIOS_PATH)/board/raspberrypi/uboot-boot.ush"
BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_GENEXT2FS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_MTOOLS=y
BR2_PACKAGE_HOST_SQUASHFS=y
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_YIOS_PATH)/board/raspberrypi/uboot-boot.ush"
BR2_PACKAGE_HOST_ZIP=y
BR2_PACKAGE_YIO_REMOTE=y
BR2_PACKAGE_YIO_INTEGRATION_OPENHAB=y
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
none xxx yio-integration-bangolufsen-v0.2.5.tar.gz
none xxx yio-integration-bangolufsen-v0.2.5-br1.tar.gz
sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSE

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
none xxx yio-integration-dock-v0.6.4.tar.gz
none xxx yio-integration-dock-v0.6.4-br1.tar.gz
sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSE

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
none xxx yio-integration-homeassistant-v0.5.7.tar.gz
none xxx yio-integration-homeassistant-v0.5.7-br1.tar.gz
sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSE

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
none xxx yio-integration-homey-v0.5.4.tar.gz
none xxx yio-integration-homey-v0.5.4-br1.tar.gz
sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSE

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
none xxx yio-integration-openhab-v0.5.4.tar.gz
none xxx yio-integration-openhab-v0.5.4-br1.tar.gz
sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSE

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
none xxx yio-integration-openweather-v0.5.4.tar.gz
none xxx yio-integration-openweather-v0.5.4-br1.tar.gz
sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSE

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
none xxx yio-integration-roon-v0.4.4.tar.gz
none xxx yio-integration-roon-v0.4.4-br1.tar.gz
sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSE

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
none xxx yio-integration-spotify-v0.5.4.tar.gz
none xxx yio-integration-spotify-v0.5.4-br1.tar.gz
sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSE

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
none xxx yio-remote-software-v0.7.0.tar.gz
none xxx yio-remote-software-v0.7.0-br1.tar.gz
sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSE
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
none xxx yio-web-configurator-v0.2.1.tar.gz
none xxx yio-web-configurator-v0.2.1-br1.tar.gz
sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
From c69c7d60058e04f1e170723c2a9562ea095d1c79 Mon Sep 17 00:00:00 2001
From: akvavit01 <[email protected]>
Date: Fri, 5 Jun 2020 18:00:20 +0700
Subject: [PATCH 1/2] Fix for multiple definition of comDat

---
wiringPiD/drcNetCmd.h | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/wiringPiD/drcNetCmd.h b/wiringPiD/drcNetCmd.h
index 23f7dc1..9754ad0 100644
--- a/wiringPiD/drcNetCmd.h
+++ b/wiringPiD/drcNetCmd.h
@@ -34,11 +34,19 @@
#define DRCN_DIGITAL_READ8 8
#define DRCN_ANALOG_READ 9

-
+// Multiple definition for comDat fix
+/*
struct drcNetComStruct
{
uint32_t pin ;
uint32_t cmd ;
uint32_t data ;
} comDat ;
+*/

+struct drcNetComStruct
+{
+ uint32_t pin ;
+ uint32_t cmd ;
+ uint32_t data ;
+};

From 7bace61ddba6be9a5ae1b75e1480c3f7f94606cc Mon Sep 17 00:00:00 2001
From: Mark Liffiton <[email protected]>
Date: Thu, 26 Nov 2020 12:52:22 -0600
Subject: [PATCH 2/2] Remove unneeded definition.

---
wiringPiD/drcNetCmd.h | 9 ---------
1 file changed, 9 deletions(-)

diff --git a/wiringPiD/drcNetCmd.h b/wiringPiD/drcNetCmd.h
index 9754ad0..c59e0b3 100644
--- a/wiringPiD/drcNetCmd.h
+++ b/wiringPiD/drcNetCmd.h
@@ -34,15 +34,6 @@
#define DRCN_DIGITAL_READ8 8
#define DRCN_ANALOG_READ 9

-// Multiple definition for comDat fix
-/*
-struct drcNetComStruct
-{
- uint32_t pin ;
- uint32_t cmd ;
- uint32_t data ;
-} comDat ;
-*/

struct drcNetComStruct
{
2 changes: 1 addition & 1 deletion buildroot-external/package/yio-wiringpi/yio-wiringpi.hash
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Locally calculated
sha256 2455fc97d2b60ed169675dccbaabf55e1958c3c2499b246c96edfc8b036e9073 wiringpi-2.46.tar.gz
sha256 ece3c25282de7b9d79bff913637018ca820400d6998e813d88b1918c9ec01da0 yio-wiringpi-final_official_2.50.tar.gz
sha256 1e27b58a573097a06f22c9c2b1ba51c01c1ece156c4673bb4a0a1339085fd71c yio-wiringpi-final_official_2.50-br1.tar.gz
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LESSER

This file was deleted.

0 comments on commit c5b4d7e

Please sign in to comment.