From: Daniel Rosenberg Date: Tue, 2 Jun 2015 23:40:58 +0000 (-0700) Subject: build: core: Fix issue in recovery X-Git-Tag: android-x86-7.1-r1~492^2~51^2~20 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=752ecc219a;p=android-x86%2Fbuild.git build: core: Fix issue in recovery Now that symlinks are created at build time, the rsync while making recovery runs into issues around the etc symlink Change-Id: Ie781507b22e4661629840075b274eaab2f712de6 --- diff --git a/core/Makefile b/core/Makefile index 8ef0e39a0..142f41a28 100644 --- a/core/Makefile +++ b/core/Makefile @@ -870,7 +870,7 @@ 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) rsync -a $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT) # "cp -Rf" fails to overwrite broken symlinks on Mac. + $(hide) rsync -a --exclude=etc $(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)/