commit 8d8e38b1145524ece55cbc49f088c41d98f8e094
author Simon Glass <sjg@chromium.org> Thu Mar 02 15:03:35 2017 -0700
committer chrome-bot <chrome-bot@chromium.org> Sat Apr 01 15:39:27 2017 -0700
tree 0e60ec22d51b22cd1cc6d08fdf12e58650832969
parent f07e49ec1f6e9c73eb6f51c66bd068056b5a6e8f

cros_set_lsb_release: Show unified build information

With unified builds we want to record the supported models. Adjust the
script to support setting two variables: one to indicate whether this is
a unified build and one to list the models supported.

BUG=chromium:698012
TEST=Manual:
~/cosarm/chromite/bin/cros_set_lsb_release  --board reef --sysroot ~/cosarm/chroot/build/reef --version 123
~/cosarm/chromite/bin/cros_set_lsb_release --models reef:pyro:snappy --board reef --sysroot ~/cosarm/chroot/build/reef --version 123
cat ~/cosarm/chroot/build/reef/etc/lsb-release

Signed-off-by: Simon Glass <sjg@chromium.org>

Change-Id: Iea758f93932d42fe0bb72235dccb3880ba2a3307
Reviewed-on: https://chromium-review.googlesource.com/448846
Commit-Ready: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

scripts/cros_set_lsb_release.py

diff --git a/scripts/cros_set_lsb_release.py b/scripts/cros_set_lsb_release.py
index 637c1f2..915befe 100644
--- a/scripts/cros_set_lsb_release.py
+++ b/scripts/cros_set_lsb_release.py
@@ -38,6 +38,8 @@
 LSB_KEY_BUILD_TYPE = 'CHROMEOS_RELEASE_BUILD_TYPE'
 LSB_KEY_DESCRIPTION = 'CHROMEOS_RELEASE_DESCRIPTION'
 LSB_KEY_BOARD = 'CHROMEOS_RELEASE_BOARD'
+LSB_KEY_MODELS = 'CHROMEOS_RELEASE_MODELS'
+LSB_KEY_UNIBUILD = 'CHROMEOS_RELEASE_UNIBUILD'
 LSB_KEY_BRANCH_NUMBER = 'CHROMEOS_RELEASE_BRANCH_NUMBER'
 LSB_KEY_BUILD_NUMBER = 'CHROMEOS_RELEASE_BUILD_NUMBER'
 LSB_KEY_CHROME_MILESTONE = 'CHROMEOS_RELEASE_CHROME_MILESTONE'
@@ -59,6 +61,8 @@
   parser.add_argument('--app_id', default=None,
                       help='The APP_ID to install.')
   parser.add_argument('--board', help='The board name.', required=True)
+  parser.add_argument('--models',
+                      help='Models supported by this board, space-separated')
   parser.add_argument('--sysroot', required=True, type='path',
                       help='The sysroot to install the lsb-release file into.')
   parser.add_argument('--version_string', required=True,
@@ -146,6 +150,9 @@
         LSB_KEY_BUILDER_PATH: opts.builder_path,
     })
 
+  board_and_models = opts.board
+  if opts.models:
+    board_and_models += '-unibuild (%s)' % opts.models
   if opts.official:
     # Official builds (i.e. buildbot).
     track = 'dev-channel'
@@ -158,7 +165,7 @@
                               (opts.version_string,
                                build_type,
                                track,
-                               opts.board)),
+                               board_and_models)),
         LSB_KEY_AUSERVER: 'https://tools.google.com/service/update2',
         LSB_KEY_DEVSERVER: '',
     })
@@ -170,7 +177,7 @@
         LSB_KEY_BUILD_TYPE: build_type,
         LSB_KEY_DESCRIPTION: '%s (%s) %s' % (opts.version_string,
                                              build_type,
-                                             opts.board),
+                                             board_and_models),
     })
   else:
     # Developer manual builds.
@@ -181,7 +188,7 @@
         LSB_KEY_DESCRIPTION: '%s (%s) %s %s' % (opts.version_string,
                                                 build_type,
                                                 opts.track,
-                                                opts.board),
+                                                board_and_models),
     })
 
   fields.update({
@@ -193,5 +200,8 @@
       LSB_KEY_VERSION: opts.version_string,
       LSB_KEY_GOOGLE_RELEASE: opts.version_string,
   })
+  if opts.models:
+    fields[LSB_KEY_UNIBUILD] = '1'
+    fields[LSB_KEY_MODELS] = opts.models
 
   image_lib.WriteLsbRelease(opts.sysroot, fields)