From 195ea9ab4da97ce91b5890880b0e3f11a823486b Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Thu, 6 Nov 2014 15:55:46 -0800 Subject: [PATCH] backports: move version file generation to run earlier The version file contains: * BACKPORTS_VERSION * BACKPORTED_KERNEL_VERSION * BACKPORTED_KERNEL_NAME This file is used by the Makefile to export variable definitions used to identify the backport. For kernel integration we'll be using a generated Kconfig file instead and since these are needed when processing kconfig logic this will need to be defined earlier. Just move the generation of the version file for packaging up early to match where we will generate the Kconfig with the backports versioning identification. This change has no real functional change other than the move of some code running earlier. Signed-off-by: Luis R. Rodriguez --- gentree.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gentree.py b/gentree.py index 71e52e44c6b6..afa49673fb69 100755 --- a/gentree.py +++ b/gentree.py @@ -843,6 +843,24 @@ def process(kerneldir, copy_list_file, git_revision=None, git_debug_snapshot(args, 'Add driver sources') disable_list = add_automatic_backports(args) + if git_tracked_version: + backports_version = "(see git)" + kernel_version = "(see git)" + else: + backports_version = git.describe(tree=source_dir, extra_args=['--long']) + kernel_version = git.describe(rev=args.git_revision or 'HEAD', + tree=args.kerneldir, + extra_args=['--long']) + + if not bpid.integrate: + f = open(os.path.join(bpid.target_dir, 'versions'), 'w') + f.write('BACKPORTS_VERSION="%s"\n' % backports_version) + f.write('BACKPORTED_KERNEL_VERSION="%s"\n' % kernel_version) + f.write('BACKPORTED_KERNEL_NAME="%s"\n' % args.base_name) + if git_tracked_version: + f.write('BACKPORTS_GIT_TRACKED="backport tracker ID: $(shell git rev-parse HEAD 2>/dev/null || echo \'not built in git tree\')"\n') + f.close() + git_debug_snapshot(args, "add versions files") if disable_list: # No need to verify_sources() as compat's Kconfig has no 'source' call @@ -872,24 +890,6 @@ def process(kerneldir, copy_list_file, git_revision=None, configtree.modify_selects() git_debug_snapshot(args, "convert select to depends on") - # write the versioning file - if git_tracked_version: - backports_version = "(see git)" - kernel_version = "(see git)" - else: - backports_version = git.describe(tree=source_dir, extra_args=['--long']) - kernel_version = git.describe(rev=args.git_revision or 'HEAD', - tree=args.kerneldir, - extra_args=['--long']) - f = open(os.path.join(bpid.target_dir, 'versions'), 'w') - f.write('BACKPORTS_VERSION="%s"\n' % backports_version) - f.write('BACKPORTED_KERNEL_VERSION="%s"\n' % kernel_version) - f.write('BACKPORTED_KERNEL_NAME="%s"\n' % args.base_name) - if git_tracked_version: - f.write('BACKPORTS_GIT_TRACKED="backport tracker ID: $(shell git rev-parse HEAD 2>/dev/null || echo \'not built in git tree\')"\n') - f.close() - git_debug_snapshot(args, "add versions files") - symbols = configtree.symbols() # write local symbol list -- needed during packaging build -- 2.30.2