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

resolved conflicts for merge of e1c31bac to master

Browse Source
This commit is contained in:
Doug Zongker
2009-06-24 13:58:30 -07:00
parent 3fbb580c10 e1c31bacae
commit a4ebcbb929
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/releasetools/common.py
View File

@@ -64,18 +64,29 @@ def LoadBoardConfig(fn):
def BuildAndAddBootableImage(sourcedir, targetname, output_zip): def BuildAndAddBootableImage(sourcedir, targetname, output_zip):
"""Take a kernel, cmdline, and ramdisk directory from the input (in """Take a kernel, cmdline, and ramdisk directory from the input (in
'sourcedir'), and turn them into a boot image. Put the boot image 'sourcedir'), and turn them into a boot image. Put the boot image
into the output zip file under the name 'targetname'.""" into the output zip file under the name 'targetname'. Returns
targetname on success or None on failure (if sourcedir does not
appear to contain files for the requested image)."""
print "creating %s..." % (targetname,) print "creating %s..." % (targetname,)
img = BuildBootableImage(sourcedir) img = BuildBootableImage(sourcedir)
if img is None:
return None
CheckSize(img, targetname) CheckSize(img, targetname)
ZipWriteStr(output_zip, targetname, img) ZipWriteStr(output_zip, targetname, img)
return targetname
def BuildBootableImage(sourcedir): def BuildBootableImage(sourcedir):
"""Take a kernel, cmdline, and ramdisk directory from the input (in """Take a kernel, cmdline, and ramdisk directory from the input (in
'sourcedir'), and turn them into a boot image. Return the image data.""" 'sourcedir'), and turn them into a boot image. Return the image
data, or None if sourcedir does not appear to contains files for
building the requested image."""
if (not os.access(os.path.join(sourcedir, "RAMDISK"), os.F_OK) or
not os.access(os.path.join(sourcedir, "kernel"), os.F_OK)):
return None
ramdisk_img = tempfile.NamedTemporaryFile() ramdisk_img = tempfile.NamedTemporaryFile()
img = tempfile.NamedTemporaryFile() img = tempfile.NamedTemporaryFile()
@@ -107,7 +118,8 @@ def BuildBootableImage(sourcedir):
p = Run(cmd, stdout=subprocess.PIPE) p = Run(cmd, stdout=subprocess.PIPE)
p.communicate() p.communicate()
assert p.returncode == 0, "mkbootimg of %s image failed" % (targetname,) assert p.returncode == 0, "mkbootimg of %s image failed" % (
os.path.basename(sourcedir),)
img.seek(os.SEEK_SET, 0) img.seek(os.SEEK_SET, 0)
data = img.read() data = img.read()

7
tools/releasetools/ota_from_target_files
View File

@@ -327,9 +327,10 @@ def WriteFullOTAPackage(input_zip, output_zip):
symlinks = CopySystemFiles(input_zip, output_zip) symlinks = CopySystemFiles(input_zip, output_zip)
script.MakeSymlinks(symlinks) script.MakeSymlinks(symlinks)
common.BuildAndAddBootableImage(os.path.join(OPTIONS.input_tmp, "RECOVERY"), if common.BuildAndAddBootableImage(
"system/recovery.img", output_zip) os.path.join(OPTIONS.input_tmp, "RECOVERY"),
Item.Get("system/recovery.img", dir=False) "system/recovery.img", output_zip):
Item.Get("system/recovery.img", dir=False)
FixPermissions(script) FixPermissions(script)