diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-08-28 18:09:02 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-05-19 03:43:20 +0200 |
| commit | a2a62b3385c01467317922caa34dfda7d66e182b (patch) | |
| tree | 1dca764ad055279289b72421118f687d86d140cd | |
| parent | 1cb373677452b70bd24e9af6b2a725d6cea61474 (diff) | |
also include the platform into the build config
Change-Id: Ia586e813b33dde0e0b2468c54bed9471c03e8c5a
| -rw-r--r-- | Makefile.gbuild | 5 | ||||
| -rwxr-xr-x | bin/update/create_build_config.py | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Makefile.gbuild b/Makefile.gbuild index be6788b59a83..49fb3a604e0e 100644 --- a/Makefile.gbuild +++ b/Makefile.gbuild @@ -29,10 +29,11 @@ create-update-info: mkdir -p $(WORKDIR)/update-info $(eval BUILDID := $(shell git -C $(SRCDIR) log -1 --format=%H)) $(eval VERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX)$(LIBO_VERSION_SUFFIX_SUFFIX)) - $(SRCDIR)/bin/update/create_build_config.py "$(PRODUCTNAME)" "$(VERSION)" "$(BUILDID)" "$(UPDATE_CHANNEL)" "$(WORKDIR)/update-info" + $(eval PLATFORM := $(RTL_OS)_$(RTL_ARCH)) + $(SRCDIR)/bin/update/create_build_config.py "$(PRODUCTNAME)" "$(VERSION)" "$(BUILDID)" "$(UPDATE_CHANNEL)" "$(PLATFORM)" "$(WORKDIR)/update-info" mkdir -p $(WORKDIR)/mar/current-build tar zxvf $(WORKDIR)/installation/$(PRODUCTNAME)/archive/install/en-US/*tar.gz -C $(WORKDIR)/mar/current-build/ strip -g $(WORKDIR)/mar/current-build/*/program/* || true - MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/make_full_update.sh $(WORKDIR)/update-info/$(PRODUCTNAME)_$(VERSION)_$(RTL_OS)_$(RTL_ARCH)_$(BUILDID)_complete.mar $(WORKDIR)/mar/current-build/*/ + MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/make_full_update.sh $(WORKDIR)/update-info/$(PRODUCTNAME)_$(VERSION)_$(PLATFORM)_$(BUILDID)_complete.mar $(WORKDIR)/mar/current-build/*/ # vim: set noet sw=4 ts=4: diff --git a/bin/update/create_build_config.py b/bin/update/create_build_config.py index 964c92256fb7..7957be62d9fa 100755 --- a/bin/update/create_build_config.py +++ b/bin/update/create_build_config.py @@ -5,16 +5,17 @@ import sys import os def main(argv): - if len(argv) < 6: - print("Usage: create_build_config.py $PRODUCTNAME $VERSION $BUILDID $UPDATECHANNEL $TARGETDIR") + if len(argv) < 7: + print("Usage: create_build_config.py $PRODUCTNAME $VERSION $BUILDID $UPDATECHANNEL $PLATFORM $TARGETDIR") data = { 'productName' : argv[1], 'version' : argv[2], 'buildNumber' : argv[3], - 'updateChannel' : argv[4] + 'updateChannel' : argv[4], + 'platform' : argv[5] } - with open(os.path.join(argv[5], "build_config.json"), "w") as f: + with open(os.path.join(argv[6], "build_config.json"), "w") as f: json.dump(data, f, indent=4) if __name__ == "__main__": |