diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-11-18 21:41:59 +0100 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-11-18 12:45:55 -0800 |
| commit | 6be85de08b7fa532d8077914281a339ec717d741 (patch) | |
| tree | 9cc2162823690e048b9c0ab73d31a57bbd8ad1d6 /devel | |
| parent | ded96b268ba59530f82f6c475fa1be3b295b6cdd (diff) | |
backports: fix breakage from integration patchset
Various small things broken in the integration patchset, fix
them to actually make backports useful again.
For example, a driver using devcoredump wouldn't have worked
without these changes as it would depend on devcoredump, and
that wasn't backported due to the bugs, despite being in the
backport Kconfig file.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'devel')
| -rwxr-xr-x | devel/git-tracker.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/devel/git-tracker.py b/devel/git-tracker.py index 24194908..b17fbed4 100755 --- a/devel/git-tracker.py +++ b/devel/git-tracker.py @@ -59,8 +59,15 @@ def handle_commit(args, msg, branch, treename, kernelobjdir, tmpdir, wgitdir, ba 'GIT_COMMITTER_EMAIL': SCRIPT_GIT_EMAIL, }) try: - failure = gentree.process(kernelobjdir, wdir, open(args.copy_list, 'r'), - git_revision=kernel_rev, + bpid = gentree.Bp_Identity(integrate = False, + kconfig_prefix = 'CPTCFG_', + project_prefix = '', + project_dir = wdir, + target_dir = wdir, + target_dir_name = '', + kconfig_source_var = '$BACKPORT_DIR') + failure = gentree.process(kernelobjdir, open(args.copy_list, 'r'), + bpid=bpid, git_revision=kernel_rev, base_name=tree, logwrite=logwrite, git_tracked_version=True) |