From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnout Vandecappelle Date: Fri, 01 May 2015 15:56:42 +0200 Subject: [Buildroot] [PATCH] toolchain-external: fix rebuild/reinstall for Linaro toolchains In-Reply-To: <1430303299-24519-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1430303299-24519-1-git-send-email-thomas.petazzoni@free-electrons.com> Message-ID: <5543861A.60701@mind.be> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net On 29/04/15 12:28, Thomas Petazzoni wrote: > For Linaro toolchains, a special post install staging hook is used to > create two symlinks needed for the dynamic loader to find the > libraries. However, the way the link is created prevents a 'make > toolchain-external-reinstall' from succeeding, because the symlink > already exists and points to a directory: > > ln -sf . /home/thomas/projets/outputs/training/target/lib/arm-linux-gnueabihf > ln: '/home/thomas/projets/outputs/training/target/lib/arm-linux-gnueabihf/.': cannot overwrite directory > > This commit adjust the hook to pass the '-n' option so that the link > name is treated as a normal file if it is a symbolic link to a > directory. > > Signed-off-by: Thomas Petazzoni Reviewed-by: Arnout Vandecappelle (Essensium/Mind) > --- > toolchain/toolchain-external/toolchain-external.mk | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk > index fd796a0..35bba31 100644 > --- a/toolchain/toolchain-external/toolchain-external.mk > +++ b/toolchain/toolchain-external/toolchain-external.mk > @@ -239,18 +239,18 @@ endif > # {/usr,}/lib/arm-linux-gnueabihf, but Buildroot copies them to > # {/usr,}/lib, so we need to create a symbolic link. > define TOOLCHAIN_EXTERNAL_LINARO_ARMHF_SYMLINK > - ln -sf . $(TARGET_DIR)/lib/arm-linux-gnueabihf > - ln -sf . $(TARGET_DIR)/usr/lib/arm-linux-gnueabihf > + ln -snf . $(TARGET_DIR)/lib/arm-linux-gnueabihf > + ln -snf . $(TARGET_DIR)/usr/lib/arm-linux-gnueabihf > endef > > define TOOLCHAIN_EXTERNAL_LINARO_ARMEBHF_SYMLINK > - ln -sf . $(TARGET_DIR)/lib/armeb-linux-gnueabihf > - ln -sf . $(TARGET_DIR)/usr/lib/armeb-linux-gnueabihf > + ln -snf . $(TARGET_DIR)/lib/armeb-linux-gnueabihf > + ln -snf . $(TARGET_DIR)/usr/lib/armeb-linux-gnueabihf > endef > > define TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SYMLINK > - ln -sf . $(TARGET_DIR)/lib/aarch64-linux-gnu > - ln -sf . $(TARGET_DIR)/usr/lib/aarch64-linux-gnu > + ln -snf . $(TARGET_DIR)/lib/aarch64-linux-gnu > + ln -snf . $(TARGET_DIR)/usr/lib/aarch64-linux-gnu > endef > > ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305),y) > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F