[openwrt/openwrt] restool: update to LSDK-20.12
LEDE Commits
lede-commits at lists.infradead.org
Wed Sep 22 00:39:37 PDT 2021
aparcar pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/96c7164acd80d07655c2d8dbb3dc4ce556a65e46
commit 96c7164acd80d07655c2d8dbb3dc4ce556a65e46
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Sun Sep 19 19:43:41 2021 -0700
restool: update to LSDK-20.12
Fixes compilation with both GCC 10 and 11.
Switched to AUTORELEASE for simplicity.
Removed PKG_VERSION as it's derived from PKG_SOURCE_VERSION.
Removed all patches as they are upstream backports.
Signed-off-by: Rosen Penev <rosenp at gmail.com>
---
package/network/utils/layerscape/restool/Makefile | 5 +-
...0001-restool-fix-get_device_file-function.patch | 102 --------
.../patches/0002-restool-yocto-build-issue.patch | 264 ---------------------
3 files changed, 2 insertions(+), 369 deletions(-)
diff --git a/package/network/utils/layerscape/restool/Makefile b/package/network/utils/layerscape/restool/Makefile
index 96ee7ef1cc..b48c033464 100644
--- a/package/network/utils/layerscape/restool/Makefile
+++ b/package/network/utils/layerscape/restool/Makefile
@@ -8,12 +8,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=restool
-PKG_VERSION:=LSDK-20.04
-PKG_RELEASE:=3
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/restool
-PKG_SOURCE_VERSION:=f0cec094e4c6d1c975b377203a3bf994ba9325a9
+PKG_SOURCE_VERSION:=LSDK-20.12
PKG_MIRROR_HASH:=1863acfaef319e6b277671fead51df0a31bdddb59022080d86b7d81da0bc8490
PKG_FLAGS:=nonshared
diff --git a/package/network/utils/layerscape/restool/patches/0001-restool-fix-get_device_file-function.patch b/package/network/utils/layerscape/restool/patches/0001-restool-fix-get_device_file-function.patch
deleted file mode 100644
index 65d381cbc5..0000000000
--- a/package/network/utils/layerscape/restool/patches/0001-restool-fix-get_device_file-function.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 37f0f1550e7822584b858edde416a694fb902236 Mon Sep 17 00:00:00 2001
-From: Ioana Ciornei <ioana.ciornei at nxp.com>
-Date: Tue, 31 Jul 2018 13:33:20 +0300
-Subject: [PATCH] restool: fix get_device_file() function
-
-This patch fixes multiple problems encountered in the
-get_device_file() function:
- - The deprecated atoi() function is replaced by strtoul
- - An invalid memory access was being performed by using
- memory from dir->d_name even after closedir(). This is
- fixed by a strdup() on the device filename.
- - Also, error prints now print any relevant error code.
-
-Signed-off-by: Ioana Ciornei <ioana.ciornei at nxp.com>
----
- restool.c | 44 ++++++++++++++++++++++++++++----------------
- 1 file changed, 28 insertions(+), 16 deletions(-)
-
---- a/restool.c
-+++ b/restool.c
-@@ -1193,8 +1193,13 @@ out:
-
- static int get_device_file(void)
- {
-+ int num_dev_files = 0;
-+ struct dirent *dir;
- int error = 0;
-+ char *device;
- int num_char;
-+ long val;
-+ DIR *d;
-
- memset(restool.device_file, '\0', DEV_FILE_SIZE);
-
-@@ -1222,10 +1227,6 @@ static int get_device_file(void)
- goto out;
- }
- } else {
-- DIR *d;
-- struct dirent *dir;
-- int num_dev_files = 0;
-- char *dprc_index;
-
- d = opendir("/dev");
- if (!d) {
-@@ -1235,26 +1236,34 @@ static int get_device_file(void)
- }
- while ((dir = readdir(d)) != NULL) {
- if (strncmp(dir->d_name, "dprc.", 5) == 0) {
-- dprc_index = &dir->d_name[5];
-- num_dev_files += 1;
-+ if (num_dev_files == 0)
-+ device = strdup(dir->d_name);
-+ num_dev_files++;
- }
- }
- closedir(d);
-
- if (num_dev_files == 1) {
-- int temp_len = strlen(dprc_index);
-+ errno = 0;
-+ val = strtoul(&device[5], NULL, 0);
-+ if ((errno == ERANGE && val == LONG_MAX) ||
-+ ( errno != 0 && val == 0 )) {
-+ ERROR_PRINTF("error: device file malformed\n");
-+ error = -1;
-+ goto out_free_device;;
-+ }
-+ restool.root_dprc_id = val;
-
-- temp_len += 10;
-- num_char = sprintf(restool.device_file, "/dev/dprc.%s",
-- dprc_index);
-- if (num_char != temp_len) {
-- ERROR_PRINTF("sprintf error\n");
-+ num_char = snprintf(restool.device_file, DEV_FILE_SIZE,
-+ "/dev/dprc.%d", restool.root_dprc_id);
-+ if (num_char < 0 || num_char >= DEV_FILE_SIZE) {
-+ ERROR_PRINTF("error: device file malformed\n");
- error = -1;
-- goto out;
-+ goto out_free_device;
- }
-- restool.root_dprc_id = atoi(dprc_index);
-- if (access(restool.device_file, F_OK) != 0)
-- printf("no such dev file\n");
-+ error = access(restool.device_file, F_OK);
-+ if (error != 0)
-+ ERROR_PRINTF("error: access(%s) = %d\n", restool.device_file, error);
- } else {
- error = -1;
- if (num_dev_files == 0)
-@@ -1263,6 +1272,9 @@ static int get_device_file(void)
- ERROR_PRINTF("error: multiple root containers\n");
- }
- }
-+
-+out_free_device:
-+ free(device);
- out:
- return error;
- }
diff --git a/package/network/utils/layerscape/restool/patches/0002-restool-yocto-build-issue.patch b/package/network/utils/layerscape/restool/patches/0002-restool-yocto-build-issue.patch
deleted file mode 100644
index d38db52dae..0000000000
--- a/package/network/utils/layerscape/restool/patches/0002-restool-yocto-build-issue.patch
+++ /dev/null
@@ -1,264 +0,0 @@
-From 802764f8ed76f927dff494558332b0b77de7ac65 Mon Sep 17 00:00:00 2001
-From: Ionut-robert Aron <ionut-robert.aron at nxp.com>
-Date: Fri, 16 Oct 2020 11:01:24 +0300
-Subject: [PATCH] restool: yocto build issue
-
-Prefix 'enum mc_cmd_status mc_status' with 'static' so restool can
-compile.
-
-Signed-off-by: Ionut-robert Aron <ionut-robert.aron at nxp.com>
----
- dpaiop_commands.c | 2 +-
- dpbp_commands.c | 2 +-
- dpci_commands.c | 2 +-
- dpcon_commands.c | 2 +-
- dpdbg_commands.c | 2 +-
- dpdcei_commands.c | 2 +-
- dpdmai_commands.c | 2 +-
- dpdmux_commands.c | 2 +-
- dpio_commands.c | 2 +-
- dpmac_commands.c | 2 +-
- dpmcp_commands.c | 2 +-
- dpni_commands.c | 2 +-
- dprc_commands.c | 2 +-
- dprc_commands_generate_dpl.c | 4 ++--
- dprtc_commands.c | 2 +-
- dpseci_commands.c | 2 +-
- dpsw_commands.c | 2 +-
- restool.c | 8 ++++----
- 18 files changed, 22 insertions(+), 22 deletions(-)
-
---- a/dpaiop_commands.c
-+++ b/dpaiop_commands.c
-@@ -44,7 +44,7 @@
- #include "mc_v9/fsl_dpaiop.h"
- #include "mc_v10/fsl_dpaiop.h"
-
--enum mc_cmd_status mc_status;
-+static enum mc_cmd_status mc_status;
-
- /**
- * dpaiop info command options
---- a/dpbp_commands.c
-+++ b/dpbp_commands.c
-@@ -43,7 +43,7 @@
- #include "mc_v9/fsl_dpbp.h"
- #include "mc_v10/fsl_dpbp.h"
-
--enum mc_cmd_status mc_status;
-+static enum mc_cmd_status mc_status;
-
- /**
- * dpbp info command options
---- a/dpci_commands.c
-+++ b/dpci_commands.c
-@@ -44,7 +44,7 @@
- #include "mc_v9/fsl_dpci.h"
- #include "mc_v10/fsl_dpci.h"
-
--enum mc_cmd_status mc_status;
-+static enum mc_cmd_status mc_status;
-
- /**
- * dpci info command options
---- a/dpcon_commands.c
-+++ b/dpcon_commands.c
-@@ -44,7 +44,7 @@
- #include "mc_v9/fsl_dpcon.h"
- #include "mc_v10/fsl_dpcon.h"
-
--enum mc_cmd_status mc_status;
-+static enum mc_cmd_status mc_status;
-
- /**
- * dpcon info command options
---- a/dpdbg_commands.c
-+++ b/dpdbg_commands.c
-@@ -41,7 +41,7 @@
- #include "utils.h"
- #include "mc_v10/fsl_dpdbg.h"
-
--enum mc_cmd_status mc_status;
-+static enum mc_cmd_status mc_status;
-
- enum dpdbg_info_options {
- INFO_OPT_HELP = 0,
---- a/dpdcei_commands.c
-+++ b/dpdcei_commands.c
-@@ -43,7 +43,7 @@
- #include "mc_v9/fsl_dpdcei.h"
- #include "mc_v10/fsl_dpdcei.h"
-
--enum mc_cmd_status mc_status;
-+static enum mc_cmd_status mc_status;
-
- /**
- * dpdcei info command options
---- a/dpdmai_commands.c
-+++ b/dpdmai_commands.c
-@@ -42,7 +42,7 @@
- #include "mc_v9/fsl_dpdmai.h"
- #include "mc_v10/fsl_dpdmai.h"
-
--enum mc_cmd_status mc_status;
-+static enum mc_cmd_status mc_status;
-
- /**
- * dpdmai info command options
---- a/dpdmux_commands.c
-+++ b/dpdmux_commands.c
-@@ -47,7 +47,7 @@
- DPDMUX_OPT_BRIDGE_EN | \
- DPDMUX_OPT_CLS_MASK_SUPPORT)
-
--enum mc_cmd_status mc_status;
-+static enum mc_cmd_status mc_status;
-
- /**
- * dpdmux info command options
---- a/dpio_commands.c
-+++ b/dpio_commands.c
-@@ -43,7 +43,7 @@
- #include "mc_v9/fsl_dpio.h"
- #include "mc_v10/fsl_dpio.h"
-
--enum mc_cmd_status mc_status;
-+static enum mc_cmd_status mc_status;
-
- /**
- * dpio info command options
---- a/dpmac_commands.c
-+++ b/dpmac_commands.c
-@@ -43,7 +43,7 @@
- #include "mc_v9/fsl_dpmac.h"
- #include "mc_v10/fsl_dpmac.h"
-
--enum mc_cmd_status mc_status;
-+static enum mc_cmd_status mc_status;
-
- /**
- * dpmac info command options
---- a/dpmcp_commands.c
-+++ b/dpmcp_commands.c
-@@ -43,7 +43,7 @@
- #include "mc_v9/fsl_dpmcp.h"
- #include "mc_v10/fsl_dpmcp.h"
-
--enum mc_cmd_status mc_status;
-+static enum mc_cmd_status mc_status;
-
- /**
- * dpmcp info command options
---- a/dpni_commands.c
-+++ b/dpni_commands.c
-@@ -71,7 +71,7 @@
- DPNI_OPT_SINGLE_SENDER | \
- DPNI_OPT_CUSTOM_CG)
-
--enum mc_cmd_status mc_status;
-+static enum mc_cmd_status mc_status;
-
- /**
- * max_dist: Maximum distribution size for Rx traffic class;
---- a/dprc_commands.c
-+++ b/dprc_commands.c
-@@ -52,7 +52,7 @@
- DPRC_CFG_OPT_IRQ_CFG_ALLOWED | \
- DPRC_CFG_OPT_PL_ALLOWED)
-
--enum mc_cmd_status mc_status;
-+static enum mc_cmd_status mc_status;
-
- /**
- * dprc sync command options
---- a/dprc_commands_generate_dpl.c
-+++ b/dprc_commands_generate_dpl.c
-@@ -189,7 +189,7 @@ static struct container_list *container_
- static struct obj_list *obj_head;
- static struct conn_list *conn_head;
-
--enum mc_cmd_status mc_status;
-+static enum mc_cmd_status mc_status;
-
- /**
- * compare_insert_obj - compare the newly added object node with existing ones,
-@@ -273,7 +273,7 @@ static int find_all_obj_desc(uint32_t dp
-
- int num_child_devices;
- int error = 0;
-- enum mc_cmd_status mc_status;
-+ static enum mc_cmd_status mc_status;
- struct container_list *prev_cont;
- struct container_list *curr_cont;
- struct dprc_attributes dprc_attr;
---- a/dprtc_commands.c
-+++ b/dprtc_commands.c
-@@ -42,7 +42,7 @@
- #include "mc_v9/fsl_dprtc.h"
- #include "mc_v10/fsl_dprtc.h"
-
--enum mc_cmd_status mc_status;
-+static enum mc_cmd_status mc_status;
-
- /**
- * dprtc info command options
---- a/dpseci_commands.c
-+++ b/dpseci_commands.c
-@@ -43,7 +43,7 @@
- #include "mc_v9/fsl_dpseci.h"
- #include "mc_v10/fsl_dpseci.h"
-
--enum mc_cmd_status mc_status;
-+static enum mc_cmd_status mc_status;
-
- /**
- * dpseci info command options
---- a/dpsw_commands.c
-+++ b/dpsw_commands.c
-@@ -50,7 +50,7 @@
- DPSW_OPT_FLOODING_METERING_DIS | \
- DPSW_OPT_METERING_EN)
-
--enum mc_cmd_status mc_status;
-+static enum mc_cmd_status mc_status;
-
- /**
- * dpsw info command options
---- a/restool.c
-+++ b/restool.c
-@@ -360,7 +360,7 @@ int find_target_obj_desc(uint32_t dprc_i
- {
- int num_child_devices;
- int error = 0;
-- enum mc_cmd_status mc_status;
-+ static enum mc_cmd_status mc_status;
-
- assert(nesting_level <= MAX_DPRC_NESTING);
-
-@@ -492,7 +492,7 @@ int print_obj_verbose(struct dprc_obj_de
- uint16_t obj_handle;
- uint32_t irq_mask;
- uint32_t irq_status;
-- enum mc_cmd_status mc_status;
-+ static enum mc_cmd_status mc_status;
- int error = 0;
-
- if (strcmp(target_obj_desc->type, "dprc") == 0 &&
-@@ -816,7 +816,7 @@ int parse_object_name(const char *obj_na
- int open_dprc(uint32_t dprc_id, uint16_t *dprc_handle)
- {
- int error;
-- enum mc_cmd_status mc_status;
-+ static enum mc_cmd_status mc_status;
-
- error = dprc_open(&restool.mc_io, 0,
- dprc_id,
-@@ -1325,7 +1325,7 @@ int main(int argc, char *argv[])
- const char *cmd_name;
- bool mc_io_initialized = false;
- bool root_dprc_opened = false;
-- enum mc_cmd_status mc_status;
-+ static enum mc_cmd_status mc_status;
- bool talk_to_mc = true;
-
- #ifdef DEBUG
More information about the lede-commits
mailing list