All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrey Borzenkov <arvidjaar@gmail.com>
To: grub-devel@gnu.org
Subject: [PATCH] fix autogen.sh on "dirty" tree
Date: Tue,  9 Apr 2013 20:20:26 +0400	[thread overview]
Message-ID: <1365524426-534-1-git-send-email-arvidjaar@gmail.com> (raw)

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 <arvidjaar@gmail.com>

---
 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 <arvidjaar@gmail.com>
+
+	* 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 <arvidjaar@gmail.com>
 
 	* 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)


             reply	other threads:[~2013-04-09 16:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-09 16:20 Andrey Borzenkov [this message]
2013-04-10 16:45 ` [PATCH] fix autogen.sh on "dirty" tree Andrey Borzenkov
2013-04-16 14:11   ` Vladimir 'φ-coder/phcoder' Serbinenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1365524426-534-1-git-send-email-arvidjaar@gmail.com \
    --to=arvidjaar@gmail.com \
    --cc=grub-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.