aboutsummaryrefslogtreecommitdiff
path: root/sync_workspace.py
diff options
context:
space:
mode:
authorAsh Wilding <ash.wilding@arm.com>2019-07-15 15:53:27 +0100
committersudipto paul <sudipto.paul@arm.com>2019-07-21 23:02:01 +0100
commit42e0d085aface0cc49487d243e5045f868f71a90 (patch)
tree3f8c8b6c9ab9658425872bb7b7943be0bb34e5e0 /sync_workspace.py
parenta45f38cccc73989afeef5a6dbd7498d20d3ec257 (diff)
sync: update for LT-19.06 release
Landing team platforms: - Update manifest URL to arm-reference-platforms-manifest.git - Update manifest tag to refs/tags/LT-19.06 - Update prebuilts on releases.linaro.org to 19.06 - Update prebuilts MD5 checksum file to MD5SUMS.txt (was MD5SUMS) Other: - Clean up script output when only one option is available in a menu - Add -D flag to enable log.debug() logging - Add dump of dict when dblu returns None with noneAllowed=False Change-Id: I63cabbfcbc0ac9cdf061689e560aea5444236a56 Signed-off-by: Ash Wilding <ash.wilding@arm.com>
Diffstat (limited to 'sync_workspace.py')
-rw-r--r--sync_workspace.py22
1 files changed, 8 insertions, 14 deletions
diff --git a/sync_workspace.py b/sync_workspace.py
index a9732ca..d8192b2 100644
--- a/sync_workspace.py
+++ b/sync_workspace.py
@@ -190,7 +190,7 @@ if HOST=="Windows":
###
ARMPLATDB = {
"arm": {
- "rel": "19.03", "pbrel": "19.01", "mrel": "19.01",
+ "rel": "19.06", "pbrel": "{rel}", "mrel": "ARMLT-{rel}",
"cms": "developer.arm.com",
},
@@ -280,7 +280,7 @@ ARMPLATDB = {
"name": "Platforms",
### Default keys inherited by all platforms and optionally overridden
- "murl": "https://git.linaro.org/landing-teams/working/arm/manifest",
+ "murl": "https://git.linaro.org/landing-teams/working/arm/arm-reference-platforms-manifest",
"mrel": "{arm.mrel}",
"pbrel": "{arm.pbrel}",
"pburl": "{linaro.url}/members/arm/platforms/{pbrel}",
@@ -382,7 +382,6 @@ ARMPLATDB = {
"oc.mb", "oc.scp", "oc.tfa", "fw.edkii", "oc.grub",
],
"pdir": "n1sdp",
- "murl": "https://git.linaro.org/landing-teams/working/arm/arm-reference-platforms-manifest",
"mrel": "???",
"tagkey": "N1SDP",
"pburl": "https://git.linaro.org/landing-teams/working/arm/n1sdp-board-firmware.git/snapshot/",
@@ -582,7 +581,6 @@ ARMPLATDB = {
"700": {
"name": "Corstone-700",
"pdir": "corstone700",
- "murl": "https://git.linaro.org/landing-teams/working/arm/arm-reference-platforms-manifest",
"mrel": "???",
"tagkey": "CORSTONE-700",
"knowntag": "CORSTONE-700-19.02",
@@ -757,7 +755,6 @@ ARMPLATDB = {
},
},
-
### Fedora Server
"fedora": {
"name": "Fedora Server",
@@ -1214,7 +1211,7 @@ ARMPLATDB = {
### Prebuilt archives
"archive": {
"url": "{@.pburl}",
- "md5name": "MD5SUMS",
+ "md5name": "MD5SUMS.txt",
"dir": "{basename}",
"name0": "{@.pdir}",
"name3": "uboot",
@@ -1358,6 +1355,7 @@ class Database(dict):
if item == old_item:
script.abort("recursive lookup")
if item is None and not noneAllowed:
+ log.info(d)
script.abort("lookup of {} (plat={}) returns None but nA=False"
.format(key, plat))
return item
@@ -1387,8 +1385,7 @@ class script:
def init():
# Parse arguments
p = argparse.ArgumentParser()
- p.add_argument("-v", help="[DEPRECATED] verbosity", action="count",
- default=0)
+ p.add_argument("-D", help="Debug mode", action="store_true")
p.add_argument("--qa_mode", help="for Arm internal QA purposes",
action="store_true")
p.add_argument("--no_check_apt_deps", action="store_true",
@@ -1396,21 +1393,18 @@ class script:
args = p.parse_args()
(script.qa_mode, script.no_check_apt_deps) = \
(args.qa_mode, args.no_check_apt_deps)
- if args.v > 0:
- print("[WARN] the -v flag is deprecated")
# Configure logging
logger = logging.getLogger(__name__)
logger.setLevel(logging.DEBUG)
fmt = logging.Formatter("%(levelname)s: %(message)s")
console = logging.StreamHandler()
- console.setLevel(logging.INFO)
+ console.setLevel(logging.DEBUG if args.D else logging.INFO)
console.setFormatter(fmt)
logfile = logging.FileHandler("log.txt", "w")
logfile.setLevel(logging.DEBUG)
logfile.setFormatter(fmt)
logger.addHandler(console)
logger.addHandler(logfile)
- log.info("Arm Reference Platforms Software {}".format(dblu("arm.rel")))
log.info("date is {}".format(time.strftime('%Y-%m-%d %H:%M:%S')))
log.info("running on {} host".format(HOST))
# Other setup
@@ -1958,7 +1952,7 @@ def tree_prompt( title, root ):
if len(root.children)==1:
root = root.children[0]
if not last_only_avail == root.name:
- log.warn("only avail. option is "+root.name)
+ log.info("only available option is "+root.name)
last_only_avail = root.name
else:
root = prompt(title, root.children)
@@ -2409,7 +2403,7 @@ class config:
mrel = prompt("Please select a manifest release tag to checkout", choices)
config.mrel = mrel.meta
else:
- config.mrel = mrel # Needs to be "refs/tags/"+mrel when we add support for LT-19.06
+ config.mrel = "refs/tags/"+mrel
config._add_cfg("Release", config.mrel)