From 7b82656984513467af48872f6e808e61acfda918 Mon Sep 17 00:00:00 2001 From: Daniel Rosenberg Date: Tue, 2 Jun 2015 16:40:58 -0700 Subject: [PATCH] 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 --- core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 81a0270de..ece15ce14 100644 --- a/core/Makefile +++ b/core/Makefile @@ -844,7 +844,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)/