[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-516-g73f1aed
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-516-g73f1aed
|
From: Sébastien S. <ss...@us...> - 2014-12-16 09:22:11
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 73f1aed88f2493a1b0385364afa81fc5c2578cb0 (commit)
from b1982bfa150181c6a2a5e5a7f81f9ee39fd3ec21 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 73f1aed88f2493a1b0385364afa81fc5c2578cb0
Author: Sébastien Szymanski <ss...@us...>
Date: Tue Dec 16 10:25:26 2014 +0100
[BUILDROOT] 201{3,4}.11: fix imx-usb-loader build
-----------------------------------------------------------------------
Summary of changes:
.../221-v2-3-3-imx-usb-loader-new-package.patch | 26 ++++++++++----------
.../221-v2-3-3-imx-usb-loader-new-package.patch | 26 ++++++++++----------
2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/patches/buildroot/2013.11/221-v2-3-3-imx-usb-loader-new-package.patch b/patches/buildroot/2013.11/221-v2-3-3-imx-usb-loader-new-package.patch
index ae63fef..f25017f 100644
--- a/patches/buildroot/2013.11/221-v2-3-3-imx-usb-loader-new-package.patch
+++ b/patches/buildroot/2013.11/221-v2-3-3-imx-usb-loader-new-package.patch
@@ -150,32 +150,32 @@ Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.pat
+@@ -416,9 +415,9 @@ int main(int argc, char * const argv[])
+ char const *base_path = get_base_path(argv[0]);
+ char const *conf_path = "/etc/imx-loader.d/";
-+
++
+- err = parse_opts(argc, argv, &conf_path, &verify, &cmd_head);
+- if (err < 0)
+- return -1;
++ ret = parse_opts(argc, argv, &conf_path, &verify, &cmd_head);
++ if (ret < 0)
++ return ret;
-+
++
+ // Get list of machines...
+ conf = conf_file_name("imx_usb.conf", base_path, conf_path);
+@@ -429,20 +428,20 @@ int main(int argc, char * const argv[])
+ if (!list)
+ return -1;
-+
++
+- r = libusb_init(NULL);
+- if (r < 0)
++ ret = libusb_init(NULL);
++ if (ret != 0)
+ goto out;
-+
++
+- cnt = libusb_get_device_list(NULL, &devs);
+- if (cnt < 0)
++ ret = libusb_get_device_list(NULL, &devs);
++ if (ret < 0)
+ goto out;
-+
++
+ // print_devs(devs);
+ dev = find_imx_dev(devs, &mach, list);
+ if (dev) {
@@ -187,9 +187,9 @@ Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.pat
++ printf("%s:Could not open device vid=0x%x pid=0x%x err=%d\n", __func__, mach->vid, mach->pid, ret);
+ }
+ libusb_free_device_list(devs, 1);
-+
++
+@@ -451,12 +450,16 @@ int main(int argc, char * const argv[])
-+
++
+ // Get machine specific configuration file..
+ conf = conf_file_name(mach->file_name, base_path, conf_path);
+- if (conf == NULL)
@@ -197,20 +197,20 @@ Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.pat
++ ret = -1;
+ goto out;
++ }
-+
++
+ p_id = parse_conf(conf);
+- if (!p_id)
++ if (!p_id) {
++ ret = -1;
+ goto out;
++ }
-+
++
+ if (p_id->mode == MODE_HID)
+ p_id->transfer = &transfer_hid;
+@@ -473,14 +476,14 @@ int main(int argc, char * const argv[])
+ if (libusb_kernel_driver_active(h, 0))
+ libusb_detach_kernel_driver(h, 0);
-+
++
+- err = libusb_claim_interface(h, 0);
+- if (err) {
++ ret = libusb_claim_interface(h, 0);
@@ -227,13 +227,13 @@ Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.pat
+ goto out;
+ }
+@@ -493,6 +496,7 @@ int main(int argc, char * const argv[])
-+
++
+ if (curr == NULL) {
-+ printf("no job found\n");
++ printf("no job found\n");
++ ret = -1;
+ goto out;
+ }
-+
++
+@@ -501,17 +505,17 @@ int main(int argc, char * const argv[])
+ perform_mem_work(p_id, curr->mem);
+ // printf("jump_mode %x\n", curr->jump_mode);
diff --git a/patches/buildroot/2014.11/221-v2-3-3-imx-usb-loader-new-package.patch b/patches/buildroot/2014.11/221-v2-3-3-imx-usb-loader-new-package.patch
index 3c4f3a7..98f4e77 100644
--- a/patches/buildroot/2014.11/221-v2-3-3-imx-usb-loader-new-package.patch
+++ b/patches/buildroot/2014.11/221-v2-3-3-imx-usb-loader-new-package.patch
@@ -162,32 +162,32 @@ Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.pat
+@@ -416,9 +415,9 @@ int main(int argc, char * const argv[])
+ char const *base_path = get_base_path(argv[0]);
+ char const *conf_path = "/etc/imx-loader.d/";
-+
++
+- err = parse_opts(argc, argv, &conf_path, &verify, &cmd_head);
+- if (err < 0)
+- return -1;
++ ret = parse_opts(argc, argv, &conf_path, &verify, &cmd_head);
++ if (ret < 0)
++ return ret;
-+
++
+ // Get list of machines...
+ conf = conf_file_name("imx_usb.conf", base_path, conf_path);
+@@ -429,20 +428,20 @@ int main(int argc, char * const argv[])
+ if (!list)
+ return -1;
-+
++
+- r = libusb_init(NULL);
+- if (r < 0)
++ ret = libusb_init(NULL);
++ if (ret != 0)
+ goto out;
-+
++
+- cnt = libusb_get_device_list(NULL, &devs);
+- if (cnt < 0)
++ ret = libusb_get_device_list(NULL, &devs);
++ if (ret < 0)
+ goto out;
-+
++
+ // print_devs(devs);
+ dev = find_imx_dev(devs, &mach, list);
+ if (dev) {
@@ -199,9 +199,9 @@ Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.pat
++ printf("%s:Could not open device vid=0x%x pid=0x%x err=%d\n", __func__, mach->vid, mach->pid, ret);
+ }
+ libusb_free_device_list(devs, 1);
-+
++
+@@ -451,12 +450,16 @@ int main(int argc, char * const argv[])
-+
++
+ // Get machine specific configuration file..
+ conf = conf_file_name(mach->file_name, base_path, conf_path);
+- if (conf == NULL)
@@ -209,20 +209,20 @@ Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.pat
++ ret = -1;
+ goto out;
++ }
-+
++
+ p_id = parse_conf(conf);
+- if (!p_id)
++ if (!p_id) {
++ ret = -1;
+ goto out;
++ }
-+
++
+ if (p_id->mode == MODE_HID)
+ p_id->transfer = &transfer_hid;
+@@ -473,14 +476,14 @@ int main(int argc, char * const argv[])
+ if (libusb_kernel_driver_active(h, 0))
+ libusb_detach_kernel_driver(h, 0);
-+
++
+- err = libusb_claim_interface(h, 0);
+- if (err) {
++ ret = libusb_claim_interface(h, 0);
@@ -239,13 +239,13 @@ Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.pat
+ goto out;
+ }
+@@ -493,6 +496,7 @@ int main(int argc, char * const argv[])
-+
++
+ if (curr == NULL) {
-+ printf("no job found\n");
++ printf("no job found\n");
++ ret = -1;
+ goto out;
+ }
-+
++
+@@ -501,17 +505,17 @@ int main(int argc, char * const argv[])
+ perform_mem_work(p_id, curr->mem);
+ // printf("jump_mode %x\n", curr->jump_mode);
hooks/post-receive
--
armadeus
|