From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UPbIa-0008WG-C5 for mharc-grub-devel@gnu.org; Tue, 09 Apr 2013 12:21:32 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44929) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPbIV-0008Sw-Mo for grub-devel@gnu.org; Tue, 09 Apr 2013 12:21:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UPbIU-0000eg-Aa for grub-devel@gnu.org; Tue, 09 Apr 2013 12:21:27 -0400 Received: from mail-la0-x232.google.com ([2a00:1450:4010:c03::232]:60725) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPbIU-0000eR-2z for grub-devel@gnu.org; Tue, 09 Apr 2013 12:21:26 -0400 Received: by mail-la0-f50.google.com with SMTP id el20so2106451lab.37 for ; Tue, 09 Apr 2013 09:21:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer; bh=+TZ/ceP7En6YEM5evtkVwQTPrD4idsmwQN9yHIP5oVE=; b=FqyreBpkAcPYy2h3q/aIlLyLAK7J5X0zGRw5vqhW/b7NCpT11tY/t4uIaXS7rtsNp3 ckiUZqwp+IGZ9+QFTrwtE8K9uL+pmb56wiXuhuO2iJKDX8WS/ZQmoSe1TTyDnbo+aWQj nXDIYOUzdpeYJU93R81dSQJXdDEmTMKD/pwoyb845I2BFcp7CvolqTI2nXctDoyQvMYY eYkALo4WoqRIQjMGQ9WVA0txHOelx9cfKkdVnMxsJ/NPHS3PdO1+Tu1myi9LWGiMbnFy hSDGWW9XftCbAMXe7riUCf6lxb7ATrWngRovoy3bdRH3dHBZ2KBxOiDUfBMF7ZOITWws aQ3w== X-Received: by 10.152.134.164 with SMTP id pl4mr14493234lab.54.1365524484626; Tue, 09 Apr 2013 09:21:24 -0700 (PDT) Received: from localhost.localdomain ([94.29.72.160]) by mx.google.com with ESMTPS id t17sm2857438lbd.11.2013.04.09.09.21.23 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Apr 2013 09:21:24 -0700 (PDT) From: Andrey Borzenkov To: grub-devel@gnu.org Subject: [PATCH] fix autogen.sh on "dirty" tree Date: Tue, 9 Apr 2013 20:20:26 +0400 Message-Id: <1365524426-534-1-git-send-email-arvidjaar@gmail.com> X-Mailer: git-send-email 1.8.1.4 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::232 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2013 16:21:30 -0000 bor@opensuse:~/obs/home:arvidjaar:grub2-next/grub2/grub-2.00> LC_MESSAGES=C ./autogen.sh Importing unicode... Importing libgcrypt... WARNING: grub-core/lib/libgcrypt-grub already exists WARNING: grub-core/lib/libgcrypt-grub/cipher already exists WARNING: grub-core/lib/libgcrypt-grub/mpi already exists WARNING: grub-core/lib/libgcrypt-grub/src already exists ln: failed to create symbolic link 'grub-core/lib/libgcrypt-grub/mpi/mpih-add1.c': File exists These files are symbolic links, so was not caught by "test -f". Use "test -h". Signed-off-by: Andrey Borzenkov --- ChangeLog | 5 +++++ autogen.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 083d86a..ecd6752 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-04-09 Andrey Borzenkov + + * autogen.sh: Use "-h", not "-f", to test for existence of symbolic + links under grub-core/lib/libgcrypt-grub/mpi. + 2013-04-08 Andrey Borzenkov * grub-core/Makefile.core.def: Add kern/elfXX.c to elf module diff --git a/autogen.sh b/autogen.sh index 7a4b5c8..d47650b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -24,7 +24,7 @@ ln -s ../../../grub-core/lib/libgcrypt-grub/src/g10lib.h include/grub/gcrypt/g10 cp -R grub-core/lib/libgcrypt/mpi/generic grub-core/lib/libgcrypt-grub/mpi/generic for x in mpi-asm-defs.h mpih-add1.c mpih-sub1.c mpih-mul1.c mpih-mul2.c mpih-mul3.c mpih-lshift.c mpih-rshift.c; do - if [ -f grub-core/lib/libgcrypt-grub/mpi/"$x" ]; then + if [ -h grub-core/lib/libgcrypt-grub/mpi/"$x" ]; then rm grub-core/lib/libgcrypt-grub/mpi/"$x" fi ln -s generic/"$x" grub-core/lib/libgcrypt-grub/mpi/"$x" -- tg: (d051a42..) u/libcrypt-autogen (depends on: master)