2
1
Эх сурвалжийг харах

package/open-plc-utils: bump to version 1ba7d5a042e4e8ff6858b08e113eec5dc4e89cf2

Other changes:
 - Remove 0002-plc-plc.h-fix-build-with-gcc-10.patch as
   related MR https://github.com/qca/open-plc-utils/pull/141
   has been merged.

Notable changes since last version:

 - Drop privileges after opening the channel file descriptor
 - Remove all checks for root permissions
 - Add chip identification for QCA7006AQ

Signed-off-by: Kai Stuhlemmer (ebee Engineering) <kai.stuhlemmer@ebee.de>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
Kai Stuhlemmer (ebee Engineering) 2 жил өмнө
parent
commit
39fef04541

+ 0 - 1
.checkpackageignore

@@ -1115,7 +1115,6 @@ package/olsr/S50olsr Indent Shellcheck Variables
 package/omxplayer/0001-Update-Makefile-to-be-compatible-with-buildroot.patch Upstream
 package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch Upstream
 package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch Upstream
-package/open-plc-utils/0002-plc-plc.h-fix-build-with-gcc-10.patch Upstream
 package/open2300/0001-fix-makefile.patch Upstream
 package/openjdk/17.0.7+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch Upstream
 package/openldap/0001-fix_cross_strip.patch Upstream

+ 0 - 37
package/open-plc-utils/0002-plc-plc.h-fix-build-with-gcc-10.patch

@@ -1,37 +0,0 @@
-From 27222be0b8db59cae30a5fcca93255daea147bb6 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Wed, 23 Sep 2020 19:05:23 +0200
-Subject: [PATCH] plc/plc.h: fix build with gcc 10
-
-Drop plcproperty from plc/plc.h to avoid the following build failure
-with gcc 10 (which defaults to -fno-common):
-
-/home/buildroot/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: rules.o:(.bss+0x0): multiple definition of `plcproperty'; pibruin.o:(.bss+0x0): first defined here
-
-Fixes:
- - http://autobuild.buildroot.org/results/6b3064b64dea3d4aaf219f787429c25918101483
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/qca/open-plc-utils/pull/141]
----
- plc/plc.h | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/plc/plc.h b/plc/plc.h
-index 1fa32b53..208cf91a 100644
---- a/plc/plc.h
-+++ b/plc/plc.h
-@@ -496,9 +496,7 @@ struct __packed plcproperty
- 	uint8_t DATA_FORMAT;
- 	uint32_t DATA_LENGTH;
- 	uint8_t DATA_BUFFER [128];
--}
--
--plcproperty;
-+};
- 
- #ifndef __GNUC__
- #pragma pack (pop)
--- 
-2.28.0
-

+ 1 - 1
package/open-plc-utils/open-plc-utils.hash

@@ -1,3 +1,3 @@
 # Locally computed
-sha256  b0156567a71c608cc1a0b18bbb1c5a97dd0ad9180097435f7e99119712bb299b  open-plc-utils-32408520fcebe785983a68e39ec83830a3005779.tar.gz
+sha256  4b1b55896939f178321ffe1ec2dc6937ea688d577b3671a5f0edb5c3326dfa3d  open-plc-utils-1ba7d5a042e4e8ff6858b08e113eec5dc4e89cf2.tar.gz
 sha256  3137c632bbcec5e88b72dc13f4fe06ee184eea364fec8f7494bdfa57672ef921  LICENSE

+ 1 - 1
package/open-plc-utils/open-plc-utils.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPEN_PLC_UTILS_VERSION = 32408520fcebe785983a68e39ec83830a3005779
+OPEN_PLC_UTILS_VERSION = 1ba7d5a042e4e8ff6858b08e113eec5dc4e89cf2
 OPEN_PLC_UTILS_SITE = $(call github,qca,open-plc-utils,$(OPEN_PLC_UTILS_VERSION))
 OPEN_PLC_UTILS_LICENSE = BSD-3-Clause
 OPEN_PLC_UTILS_LICENSE_FILES = LICENSE