fix deb build fstab

This reverts commit 03a8c20b51, and
updates the fstab to have two entries for the radio block device.

Change-Id: I118dc87e0af39645664bc7430d4f193553df5500
This commit is contained in:
Doug Zongker 2013-12-17 12:35:49 -08:00 committed by The Android Automerger
parent 659190c59e
commit ddb5532cb9
2 changed files with 8 additions and 7 deletions

View file

@ -8,6 +8,7 @@
/dev/block/platform/msm_sdcc.1/by-name/userdata /data ext4 noatime,nosuid,nodev,barrier=1,data=ordered,nomblk_io_submit,errors=panic wait,check,encryptable=/dev/block/platform/msm_sdcc.1/by-name/metadata
/dev/block/platform/msm_sdcc.1/by-name/persist /persist ext4 nosuid,nodev,barrier=1,data=ordered,nodelalloc wait
/dev/block/platform/msm_sdcc.1/by-name/radio /firmware vfat ro,uid=1000,gid=1000,fmask=0337,dmask=0227,iocharset=iso8859-1,shortname=mixed,errors=remount-ro wait
/dev/block/platform/msm_sdcc.1/by-name/radio /radio emmc defaults defaults
/dev/block/platform/msm_sdcc.1/by-name/boot /boot emmc defaults defaults
/dev/block/platform/msm_sdcc.1/by-name/recovery /recovery emmc defaults defaults
/dev/block/platform/msm_sdcc.1/by-name/misc /misc emmc defaults defaults

View file

@ -29,9 +29,9 @@ def IncrementalOTA_VerifyEnd(info):
if not target_radio_img or not source_radio_img: return
if source_radio_img != target_radio_img:
info.script.CacheFreeSpaceCheck(len(source_radio_img))
_, radio_device = common.GetTypeAndDevice("/firmware", info.info_dict)
info.script.PatchCheck("EMMC:%s:%d:%s:%d:%s" % (
radio_device,
radio_type, radio_device = common.GetTypeAndDevice("/radio", info.info_dict)
info.script.PatchCheck("%s:%s:%d:%s:%d:%s" % (
radio_type, radio_device,
len(source_radio_img), common.sha1(source_radio_img).hexdigest(),
len(target_radio_img), common.sha1(target_radio_img).hexdigest()))
@ -79,10 +79,10 @@ def IncrementalOTA_InstallEnd(info):
else:
common.ZipWriteStr(info.output_zip, "radio.img.p", d)
info.script.Print("Patching radio...")
_, radio_device = common.GetTypeAndDevice(
"/firmware", info.info_dict)
radio_type, radio_device = common.GetTypeAndDevice(
"/radio", info.info_dict)
info.script.ApplyPatch(
"%s:%s:%d:%s:%d:%s" % ("EMMC", radio_device,
"%s:%s:%d:%s:%d:%s" % (radio_type, radio_device,
sf.size, sf.sha1, tf.size, tf.sha1),
"-", tf.size, tf.sha1, sf.sha1, "radio.img.p")
@ -90,7 +90,7 @@ def IncrementalOTA_InstallEnd(info):
def WriteRadio(info, radio_img):
info.script.Print("Writing radio...")
common.ZipWriteStr(info.output_zip, "radio.img", radio_img)
_, device = common.GetTypeAndDevice("/firmware", info.info_dict)
_, device = common.GetTypeAndDevice("/radio", info.info_dict)
info.script.AppendExtra(
'package_extract_file("radio.img", "%s");' % (device,))