Petter Mabäcker 3f9658a482
kernel-yocto: fix machine_srcrev check in do_patch ...
do_patch is currently doing checks with machine_srcrev without initiate
it which leads to below (additional debug added):
DEBUG: Executing shell function do_patch
.
.
.
+ [ 0 -ne 0 ]
+ [ != AUTOINC ]
+ git rev-parse --verify ~0
fatal: Needed a single revision
+ git merge-base HEAD
usage: git merge-base [-a|--all] <commit> <commit>...
or: git merge-base [-a|--all] --octopus <commit>...
or: git merge-base --independent <commit>...
or: git merge-base --is-ancestor <commit> <commit>
or: git merge-base --fork-point <ref> [<commit>]
-a, --all output all common ancestors
--octopus find ancestors for a single n-way merge
--independent list revs not reachable from others
--is-ancestor is the first one ancestor of the other?
--fork-point find where <commit> forked from reflog of <ref>
+ [ = ]
+ set +x
DEBUG: Shell function do_patch finished
Only reason it works today is because 'rev-parse/merge-base' with empty machine_srcrev
will result in "false positive". Solve this by adding a similar non-empty check and
use SRCREV as fallback as in 'do_kernel_metadata'
(From OE-Core rev: 5f7403151fc8bfd5b1d77f6626717c8b84d33d93)
Signed-off-by: Petter Mabäcker <petter@technux.se >
Signed-off-by: Ross Burton <ross.burton@intel.com >
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org >
2015-07-16 15:09:19 +01:00
2015-06-23 11:57:25 +01:00
2015-07-12 22:55:41 +01:00
2010-04-27 17:11:28 +01:00
2014-02-28 14:01:16 +00:00
2015-06-23 11:57:25 +01:00
2015-07-16 15:09:18 +01:00
2012-09-10 13:01:46 +01:00
2015-02-08 08:00:25 +00:00
2014-05-08 13:00:33 +01:00
2013-08-13 23:06:03 +01:00
2015-02-17 13:43:38 +00:00
2015-06-11 23:59:13 +01:00
2015-07-02 23:08:39 +01:00
2013-06-14 12:55:47 +01:00
2015-07-16 15:09:16 +01:00
2015-05-24 07:19:18 +01:00
2015-05-07 13:40:36 +01:00
2013-09-01 15:51:42 +01:00
2015-06-23 11:57:25 +01:00
2013-10-26 15:59:13 +01:00
2015-07-02 23:08:40 +01:00
2014-11-09 10:21:23 +00:00
2014-12-03 12:23:59 +00:00
2014-03-25 09:55:35 +00:00
2015-06-23 11:46:57 +01:00
2015-02-08 08:00:25 +00:00
2015-07-01 15:39:58 +01:00
2014-02-17 15:28:58 +00:00
2014-08-28 15:12:43 +01:00
2015-01-16 23:08:19 +00:00
2015-07-02 22:56:38 +01:00
2014-08-16 08:22:45 +01:00
2015-06-23 11:57:25 +01:00
2013-12-18 17:08:05 +00:00
2015-03-16 17:41:55 +00:00
2015-05-09 22:26:45 +01:00
2015-07-07 13:33:25 +01:00
2015-05-07 13:40:33 +01:00
2015-05-07 13:40:33 +01:00
2014-06-29 09:04:21 +01:00
2014-02-02 22:37:38 +00:00
2015-06-23 11:47:39 +01:00
2014-02-02 22:37:38 +00:00
2014-02-02 22:37:39 +00:00
2015-06-23 11:46:56 +01:00
2015-06-18 09:14:06 +01:00
2013-11-06 11:02:26 +00:00
2015-04-21 07:20:25 +01:00
2015-06-23 11:57:25 +01:00
2013-08-23 16:20:11 +01:00
2013-10-29 10:41:37 +00:00
2014-09-29 12:12:43 +01:00
2015-07-08 00:01:19 +01:00
2012-09-05 22:25:23 +01:00
2014-06-25 13:51:48 +01:00
2015-06-23 11:57:25 +01:00
2015-06-23 11:57:25 +01:00
2014-06-24 19:54:12 +01:00
2013-09-22 12:19:43 +01:00
2015-06-23 11:57:25 +01:00
2015-07-08 00:01:21 +01:00
2015-07-08 00:01:23 +01:00
2014-11-09 10:21:22 +00:00
2015-06-23 11:47:22 +01:00
2014-10-30 13:01:21 +00:00
2014-04-01 23:37:01 +01:00
2014-09-01 18:03:04 +01:00
2015-06-11 23:59:13 +01:00
2015-06-23 11:57:25 +01:00
2015-07-16 15:09:18 +01:00
2015-05-05 22:15:17 +01:00
2015-05-26 10:57:52 +01:00
2014-05-08 13:00:33 +01:00
2015-03-25 12:39:42 +00:00
2015-05-26 10:57:51 +01:00
2015-05-26 10:57:52 +01:00
2015-07-16 15:09:19 +01:00
2015-05-26 10:57:51 +01:00
2015-03-16 17:41:56 +00:00
2013-01-07 11:09:42 +00:00
2014-08-23 23:01:57 +01:00
2015-06-23 11:57:25 +01:00
2015-06-23 11:57:25 +01:00
2014-12-21 12:37:53 +00:00
2015-07-12 22:55:45 +01:00
2014-07-03 17:41:16 +01:00
2014-12-03 12:23:59 +00:00
2013-06-14 12:55:47 +01:00
2014-01-06 11:13:56 +00:00
2015-05-05 22:15:17 +01:00
2015-05-14 11:43:56 +01:00
2015-05-14 11:43:56 +01:00
2015-07-08 00:01:20 +01:00
2014-06-01 14:29:29 +01:00
2015-06-11 23:59:16 +01:00
2015-05-26 10:57:51 +01:00
2015-03-16 17:41:53 +00:00
2015-06-23 11:57:25 +01:00
2015-05-05 22:15:17 +01:00
2015-06-23 11:57:25 +01:00
2015-06-23 11:57:25 +01:00
2015-06-23 11:57:25 +01:00
2015-06-23 11:57:25 +01:00
2015-06-23 11:57:25 +01:00
2015-06-16 14:21:29 +01:00
2014-09-10 15:38:57 +01:00
2013-09-14 08:21:00 +01:00
2014-06-29 09:04:22 +01:00
2012-07-26 14:56:20 +01:00
2015-03-16 17:41:56 +00:00
2012-10-18 12:13:12 +01:00
2015-07-12 22:55:41 +01:00
2015-06-23 11:57:25 +01:00
2012-09-02 05:52:06 -07:00
2013-06-20 13:10:46 +01:00
2013-06-14 12:55:47 +01:00
2014-11-09 10:21:19 +00:00
2014-07-25 15:33:59 +01:00
2015-04-27 15:34:59 +01:00
2015-05-07 13:40:33 +01:00
2014-02-02 22:37:39 +00:00
2014-12-25 08:18:13 +00:00
2014-12-05 18:01:08 +00:00
2013-06-13 17:38:11 +01:00
2015-02-14 08:40:57 +00:00
2014-12-05 18:01:05 +00:00
2015-01-29 15:36:51 +00:00
2014-04-23 11:43:27 +01:00
2012-08-02 15:28:39 +01:00
2015-07-09 18:00:17 +01:00
2015-05-15 17:44:59 +01:00
2014-08-15 18:21:46 +01:00
2015-02-03 14:53:56 +00:00
2014-08-15 18:21:46 +01:00
2015-04-24 11:06:55 +01:00
2015-07-16 15:09:16 +01:00
2014-01-28 00:52:36 +00:00
2012-02-21 17:00:46 +00:00
2015-06-08 17:34:04 +01:00
2014-02-02 22:37:39 +00:00
2014-05-08 13:00:33 +01:00
2014-11-12 15:38:33 +00:00
2015-05-05 22:15:17 +01:00
2014-11-20 14:08:14 +00:00
2015-07-12 22:55:46 +01:00
2015-06-23 16:07:23 +01:00
2014-08-02 09:26:14 +01:00
2015-05-14 11:44:00 +01:00
2014-01-10 15:16:52 +00:00
2014-03-05 15:50:20 +00:00
2015-07-09 18:00:21 +01:00
2014-06-13 12:31:38 +01:00
2012-08-21 12:15:30 +01:00
2015-03-31 22:23:12 +01:00
2015-06-26 09:28:53 +01:00
2013-06-14 12:55:47 +01:00
2015-02-08 08:00:24 +00:00
2014-09-23 20:31:18 +01:00
2015-06-23 11:57:25 +01:00
2015-06-23 11:57:25 +01:00
2015-04-08 10:53:18 +01:00
2014-09-03 16:00:28 +01:00
2015-06-23 11:57:25 +01:00
2015-06-23 11:57:25 +01:00
2015-02-17 22:35:02 +00:00
2015-02-15 21:58:27 +00:00
2013-09-06 23:03:22 +01:00
3f9658a482