[PATCH] fix autogen.sh on "dirty" tree

[PATCH] fix autogen.sh on "dirty" tree

[Andrey Borzenkov]

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)

Re: [PATCH] fix autogen.sh on "dirty" tree

[Andrey Borzenkov]

В Tue,  9 Apr 2013 20:20:26 +0400
Andrey Borzenkov <arvidjaar@gmail.com> пишет:

>  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"


Hmm ... they become plain files in tardist ...

What is better - check for both -f and -h or simply use cp instead of
ln? cp looks simpler and directory is regenerated from scratch anyway.

Re: [PATCH] fix autogen.sh on "dirty" tree

[Vladimir 'φ-coder/phcoder' Serbinenko]

[-- Attachment #1: Type: text/plain, Size: 1070 bytes --]

On 10.04.2013 18:45, Andrey Borzenkov wrote:

> В Tue,  9 Apr 2013 20:20:26 +0400
> Andrey Borzenkov <arvidjaar@gmail.com> пишет:
> 
>>  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"
> 
> 
> Hmm ... they become plain files in tardist ...
> 
> What is better - check for both -f and -h or simply use cp instead of
> ln? cp looks simpler and directory is regenerated from scratch anyway.
> 

The idea behind ln is that if compilation fails on a file then when if
you modified the file reported in error your changes will be to definite
file, not to a temporary copy.

> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> https://lists.gnu.org/mailman/listinfo/grub-devel




[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 294 bytes --]