diff options
| author | Ying Wang <wangying@google.com> | 2015-03-11 16:44:12 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-03-11 16:55:33 -0700 |
| commit | 437e43b55503dcda1c3dfdc23952943901a5d0cb (patch) | |
| tree | 6989b1965f0ef506ca5e51f42017c7dd1bd8940e | |
| parent | dedff62c8e44320dec8f667e27fdcd4cdff1430d (diff) | |
| download | build-437e43b55503dcda1c3dfdc23952943901a5d0cb.zip build-437e43b55503dcda1c3dfdc23952943901a5d0cb.tar.gz build-437e43b55503dcda1c3dfdc23952943901a5d0cb.tar.bz2 | |
Use "rsync -a" to copy over $(TARGET_ROOT_OUT) to $(TARGET_RECOVERY_OUT)
"cp -Rf" fails on Mac OS when some broken symlinks exist in the dest
dir.
Also switch to better shell error handling when copying
init.recovery.*.rc.
Change-Id: Idd05f7604736b234619f62be12dd108fac91fed1
| -rw-r--r-- | core/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/Makefile b/core/Makefile index 4f213a5..dbfaac0 100644 --- a/core/Makefile +++ b/core/Makefile @@ -825,13 +825,13 @@ define build-recoveryimage-target $(hide) mkdir -p $(TARGET_RECOVERY_OUT) $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/etc $(TARGET_RECOVERY_ROOT_OUT)/tmp @echo Copying baseline ramdisk... - $(hide) cp -R $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT) + $(hide) rsync -a $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT) # "cp -Rf" fails to overwrite broken symlinks on Mac. @echo Modifying ramdisk contents... $(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/init*.rc $(hide) cp -f $(recovery_initrc) $(TARGET_RECOVERY_ROOT_OUT)/ $(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/sepolicy $(hide) cp -f $(recovery_sepolicy) $(TARGET_RECOVERY_ROOT_OUT)/sepolicy - $(hide) -cp $(TARGET_ROOT_OUT)/init.recovery.*.rc $(TARGET_RECOVERY_ROOT_OUT)/ + $(hide) cp $(TARGET_ROOT_OUT)/init.recovery.*.rc $(TARGET_RECOVERY_ROOT_OUT)/ | true # Ignore error when the src file doesn't exist. $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/res $(hide) rm -rf $(TARGET_RECOVERY_ROOT_OUT)/res/* $(hide) cp -rf $(recovery_resources_common)/* $(TARGET_RECOVERY_ROOT_OUT)/res |