StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix releasetools for non-linux architectures

Browse Source 
The ota and img building scripts contained some hardcoded 'linux-x86'
paths.  Remove and replace with a slightly redefined -p option.
Modify Makefile to pass correct -p when building.
This commit is contained in:
Doug Zongker
2009-06-18 08:35:12 -07:00
parent 1bc6248b35
commit 602a84e0bb
3 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/Makefile
View File

@@ -880,6 +880,7 @@ $(INTERNAL_OTA_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR)
$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) otatools $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) otatools
@echo "Package OTA: $@" @echo "Package OTA: $@"
$(hide) ./build/tools/releasetools/ota_from_target_files \ $(hide) ./build/tools/releasetools/ota_from_target_files \
-p $(HOST_OUT) \
-b $(TARGET_DEVICE_DIR)/BoardConfig.mk \ -b $(TARGET_DEVICE_DIR)/BoardConfig.mk \
-k $(KEY_CERT_PAIR) \ -k $(KEY_CERT_PAIR) \
$(BUILT_TARGET_FILES_PACKAGE) $@ $(BUILT_TARGET_FILES_PACKAGE) $@
@@ -1005,6 +1006,7 @@ INTERNAL_UPDATE_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip
$(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) otatools $(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) otatools
@echo "Package: $@" @echo "Package: $@"
$(hide) ./build/tools/releasetools/img_from_target_files \ $(hide) ./build/tools/releasetools/img_from_target_files \
-p $(HOST_OUT) \
-b $(TARGET_DEVICE_DIR)/BoardConfig.mk \ -b $(TARGET_DEVICE_DIR)/BoardConfig.mk \
$(BUILT_TARGET_FILES_PACKAGE) $@ $(BUILT_TARGET_FILES_PACKAGE) $@

40
tools/releasetools/common.py
View File

@@ -29,8 +29,7 @@ if not hasattr(os, "SEEK_SET"):
class Options(object): pass class Options(object): pass
OPTIONS = Options() OPTIONS = Options()
OPTIONS.signapk_jar = "out/host/linux-x86/framework/signapk.jar" OPTIONS.search_path = "out/host/linux-x86"
OPTIONS.dumpkey_jar = "out/host/linux-x86/framework/dumpkey.jar"
OPTIONS.max_image_size = {} OPTIONS.max_image_size = {}
OPTIONS.verbose = False OPTIONS.verbose = False
OPTIONS.tempfiles = [] OPTIONS.tempfiles = []
@@ -145,11 +144,11 @@ def GetKeyPasswords(keylist):
no_passwords.append(k) no_passwords.append(k)
continue continue
p = subprocess.Popen(["openssl", "pkcs8", "-in", k+".pk8", p = Run(["openssl", "pkcs8", "-in", k+".pk8",
"-inform", "DER", "-nocrypt"], "-inform", "DER", "-nocrypt"],
stdin=devnull.fileno(), stdin=devnull.fileno(),
stdout=devnull.fileno(), stdout=devnull.fileno(),
stderr=subprocess.STDOUT) stderr=subprocess.STDOUT)
p.communicate() p.communicate()
if p.returncode == 0: if p.returncode == 0:
no_passwords.append(k) no_passwords.append(k)
@@ -179,12 +178,13 @@ def SignFile(input_name, output_name, key, password, align=None):
else: else:
sign_name = output_name sign_name = output_name
p = subprocess.Popen(["java", "-jar", OPTIONS.signapk_jar, p = Run(["java", "-jar",
key + ".x509.pem", os.path.join(OPTIONS.search_path, "framework", "signapk.jar"),
key + ".pk8", key + ".x509.pem",
input_name, sign_name], key + ".pk8",
stdin=subprocess.PIPE, input_name, sign_name],
stdout=subprocess.PIPE) stdin=subprocess.PIPE,
stdout=subprocess.PIPE)
if password is not None: if password is not None:
password += "\n" password += "\n"
p.communicate(password) p.communicate(password)
@@ -192,7 +192,7 @@ def SignFile(input_name, output_name, key, password, align=None):
raise ExternalError("signapk.jar failed: return code %s" % (p.returncode,)) raise ExternalError("signapk.jar failed: return code %s" % (p.returncode,))
if align: if align:
p = subprocess.Popen(["zipalign", "-f", str(align), sign_name, output_name]) p = Run(["zipalign", "-f", str(align), sign_name, output_name])
p.communicate() p.communicate()
if p.returncode != 0: if p.returncode != 0:
raise ExternalError("zipalign failed: return code %s" % (p.returncode,)) raise ExternalError("zipalign failed: return code %s" % (p.returncode,))
@@ -221,8 +221,8 @@ def CheckSize(data, target):
COMMON_DOCSTRING = """ COMMON_DOCSTRING = """
-p (--path) <dir> -p (--path) <dir>
Prepend <dir> to the list of places to search for binaries run Prepend <dir>/bin to the list of places to search for binaries
by this script. run by this script, and expect to find jars in <dir>/framework.
-v (--verbose) -v (--verbose)
Show command lines being executed. Show command lines being executed.
@@ -264,15 +264,13 @@ def ParseOptions(argv,
elif o in ("-v", "--verbose"): elif o in ("-v", "--verbose"):
OPTIONS.verbose = True OPTIONS.verbose = True
elif o in ("-p", "--path"): elif o in ("-p", "--path"):
os.environ["PATH"] = a + os.pathsep + os.environ["PATH"] OPTIONS.search_path = a
path_specified = True
else: else:
if extra_option_handler is None or not extra_option_handler(o, a): if extra_option_handler is None or not extra_option_handler(o, a):
assert False, "unknown option \"%s\"" % (o,) assert False, "unknown option \"%s\"" % (o,)
if not path_specified: os.environ["PATH"] = (os.path.join(OPTIONS.search_path, "bin") +
os.environ["PATH"] = ("out/host/linux-x86/bin" + os.pathsep + os.pathsep + os.environ["PATH"])
os.environ["PATH"])
return args return args

4
tools/releasetools/sign_target_files_apks
View File

@@ -278,7 +278,9 @@ def ReplaceOtaKeys(input_tf_zip, output_tf_zip):
# recovery uses a version of the key that has been slightly # recovery uses a version of the key that has been slightly
# predigested (by DumpPublicKey.java) and put in res/keys. # predigested (by DumpPublicKey.java) and put in res/keys.
p = common.Run(["java", "-jar", OPTIONS.dumpkey_jar] + mapped_keys, p = common.Run(["java", "-jar",
os.path.join(OPTIONS.search_path, "framework", "dumpkey.jar")]
+ mapped_keys,
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
data, _ = p.communicate() data, _ = p.communicate()
if p.returncode != 0: if p.returncode != 0: