From 3806c7ec1996ff1f023262ab1439ad76d2df2a53 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 25 Aug 2009 09:29:21 +0200 Subject: [PATCH] don't fail if BR2_USE_UPDATES tries to update non-checkout Signed-off-by: aldot --- toolchain/uClibc/uclibc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index b5569d9..fe32004 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -133,7 +133,7 @@ $(wildcard $(BR2_DEPENDS_DIR)/br2/uclibc/*/*.h) # Some targets may wish to provide their own UCLIBC_CONFIG_FILE... $(UCLIBC_DIR)/.oldconfig: $(UCLIBC_DIR)/.unpacked $(UCLIBC_CONFIG_FILE) $(UCLIBC_CONFIGURED_PREREQ) ifeq ($(BR2_USE_UPDATES),y) - (test -d $(@D)/.git && cd $(@D) && $(GIT) pull --rebase) + (test -d $(@D)/.git && cd $(@D) && $(GIT) pull --rebase || true) endif cp -f $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.oldconfig $(SED) 's,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX="$(TARGET_CROSS)",g' \ -- 2.11.4.GIT