[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-617-gd0ba2a1
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-617-gd0ba2a1
|
From: Sébastien S. <ss...@us...> - 2015-02-20 15:31:36
|
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 d0ba2a1bca30510947a50b1ed4b2c7f7b846eb7c (commit)
via faf91ec6ca32c82f818f772d05c1692dd1b28e71 (commit)
from b8a4621a225d44cbc94708c0c5e8a1b8be6f535b (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 d0ba2a1bca30510947a50b1ed4b2c7f7b846eb7c
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Feb 20 16:36:32 2015 +0100
[BUILDROOT] 2015.02: fix patch 221
commit faf91ec6ca32c82f818f772d05c1692dd1b28e71
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Feb 20 15:53:43 2015 +0100
[BUILDROOT] add lib and usr/lib dirs to rootfs skeleton.
Without these two dirs apf6 toolchain fails to build on BR 2015.02
-----------------------------------------------------------------------
Summary of changes:
.../{root/.bash_history => lib/.empty} | 0
.../{root/.bash_history => usr/lib/.empty} | 0
.../221-v2-3-3-imx-usb-loader-new-package.patch | 54 ++++++++++----------
3 files changed, 27 insertions(+), 27 deletions(-)
copy buildroot/target/device/armadeus/rootfs/target_skeleton/{root/.bash_history => lib/.empty} (100%)
copy buildroot/target/device/armadeus/rootfs/target_skeleton/{root/.bash_history => usr/lib/.empty} (100%)
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/root/.bash_history b/buildroot/target/device/armadeus/rootfs/target_skeleton/lib/.empty
similarity index 100%
copy from buildroot/target/device/armadeus/rootfs/target_skeleton/root/.bash_history
copy to buildroot/target/device/armadeus/rootfs/target_skeleton/lib/.empty
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/root/.bash_history b/buildroot/target/device/armadeus/rootfs/target_skeleton/usr/lib/.empty
similarity index 100%
copy from buildroot/target/device/armadeus/rootfs/target_skeleton/root/.bash_history
copy to buildroot/target/device/armadeus/rootfs/target_skeleton/usr/lib/.empty
diff --git a/patches/buildroot/2015.02/221-v2-3-3-imx-usb-loader-new-package.patch b/patches/buildroot/2015.02/221-v2-3-3-imx-usb-loader-new-package.patch
index 9bd56f4..b377d03 100644
--- a/patches/buildroot/2015.02/221-v2-3-3-imx-usb-loader-new-package.patch
+++ b/patches/buildroot/2015.02/221-v2-3-3-imx-usb-loader-new-package.patch
@@ -23,14 +23,14 @@ Index: buildroot/package/Config.in.host
===================================================================
--- buildroot.orig/package/Config.in.host
+++ buildroot/package/Config.in.host
-@@ -9,6 +9,7 @@ menu "Host utilities"
- source "package/genext2fs/Config.in.host"
- source "package/genimage/Config.in.host"
- source "package/genpart/Config.in.host"
+@@ -10,6 +10,7 @@ menu "Host utilities"
+ source "package/genext2fs/Config.in.host"
+ source "package/genimage/Config.in.host"
+ source "package/genpart/Config.in.host"
+ source "package/imx-usb-loader/Config.in.host"
- source "package/lpc3250loader/Config.in.host"
- source "package/mtd/Config.in.host"
- source "package/mtools/Config.in.host"
+ source "package/lpc3250loader/Config.in.host"
+ source "package/mke2img/Config.in.host"
+ source "package/mtd/Config.in.host"
Index: buildroot/package/imx-usb-loader/Config.in.host
===================================================================
--- /dev/null
@@ -132,14 +132,14 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -344,6 +344,7 @@ endif
- source "package/hwdata/Config.in"
- source "package/i2c-tools/Config.in"
- source "package/imx-test/Config.in"
+@@ -347,6 +347,7 @@ endif
+ source "package/hwdata/Config.in"
+ source "package/i2c-tools/Config.in"
+ source "package/imx-test/Config.in"
+ source "package/imx-usb-loader/Config.in"
- source "package/input-event-daemon/Config.in"
- source "package/input-tools/Config.in"
- source "package/intel-microcode/Config.in"
+ source "package/input-event-daemon/Config.in"
+ source "package/input-tools/Config.in"
+ source "package/intel-microcode/Config.in"
Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.patch
===================================================================
--- /dev/null
@@ -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
|