[PATCH] fix removal of {cpu,machine} links on mingw/msys

[PATCH] fix removal of {cpu,machine} links on mingw/msys

[Andrey Borzenkov]

At least on Windows 2003 using "ln -s dir1 dir2" in msys shell succeeds,
but results in what looks like hard link. Subsequent "rm -f dir2" (e.g.
during second config.status invocation) fails. Check that we also can
remove link to directory.

Make it more clear in message that we are checking "ln -s".

---
 acinclude.m4 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 32d5477..b2bb88d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -418,15 +418,15 @@ else
 [fi]
 ])
 
-dnl Check if ln can handle directories properly (mingw).
+dnl Check if ln -s can handle directories properly (mingw).
 AC_DEFUN([grub_CHECK_LINK_DIR],[
-AC_MSG_CHECKING([whether ln can handle directories properly])
+AC_MSG_CHECKING([whether ln -s can handle directories properly])
 [mkdir testdir 2>/dev/null
 case $srcdir in
 [\\/$]* | ?:[\\/]* ) reldir=$srcdir/include/grub/util ;;
     *) reldir=../$srcdir/include/grub/util ;;
 esac
-if ln -s $reldir testdir/util 2>/dev/null ; then]
+if ln -s $reldir testdir/util 2>/dev/null && rm -f testdir/util 2>/dev/null ; then]
   AC_MSG_RESULT([yes])
   [link_dir=yes
 else
-- 
tg: (989af02..) u/mingw/dir-links (depends on: master)

Re: [PATCH] fix removal of {cpu,machine} links on mingw/msys

[Vladimir 'φ-coder/phcoder' Serbinenko]

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

On 28.12.2013 10:58, Andrey Borzenkov wrote:
> At least on Windows 2003 using "ln -s dir1 dir2" in msys shell succeeds,
> but results in what looks like hard link. Subsequent "rm -f dir2" (e.g.
> during second config.status invocation) fails. Check that we also can
> remove link to directory.
> 
> Make it more clear in message that we are checking "ln -s".
> 
Is there a way to reliably remove result of such test? We don't want to
leave a weird file after the test behind. Perhaps rm -rf since we know
that we test with newly-created directory?
> ---
>  acinclude.m4 | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/acinclude.m4 b/acinclude.m4
> index 32d5477..b2bb88d 100644
> --- a/acinclude.m4
> +++ b/acinclude.m4
> @@ -418,15 +418,15 @@ else
>  [fi]
>  ])
>  
> -dnl Check if ln can handle directories properly (mingw).
> +dnl Check if ln -s can handle directories properly (mingw).
>  AC_DEFUN([grub_CHECK_LINK_DIR],[
> -AC_MSG_CHECKING([whether ln can handle directories properly])
> +AC_MSG_CHECKING([whether ln -s can handle directories properly])
>  [mkdir testdir 2>/dev/null
>  case $srcdir in
>  [\\/$]* | ?:[\\/]* ) reldir=$srcdir/include/grub/util ;;
>      *) reldir=../$srcdir/include/grub/util ;;
>  esac
> -if ln -s $reldir testdir/util 2>/dev/null ; then]
> +if ln -s $reldir testdir/util 2>/dev/null && rm -f testdir/util 2>/dev/null ; then]
>    AC_MSG_RESULT([yes])
>    [link_dir=yes
>  else
> 



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

Re: [PATCH] fix removal of {cpu,machine} links on mingw/msys

[Andrey Borzenkov]

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

В Sat, 18 Jan 2014 19:14:43 +0100
Vladimir 'φ-coder/phcoder' Serbinenko <phcoder@gmail.com> пишет:

> On 28.12.2013 10:58, Andrey Borzenkov wrote:
> > At least on Windows 2003 using "ln -s dir1 dir2" in msys shell succeeds,
> > but results in what looks like hard link. Subsequent "rm -f dir2" (e.g.
> > during second config.status invocation) fails. Check that we also can
> > remove link to directory.
> > 
> > Make it more clear in message that we are checking "ln -s".
> > 
> Is there a way to reliably remove result of such test? We don't want to
> leave a weird file after the test behind. Perhaps rm -rf since we know
> that we test with newly-created directory?

Test does "rm -rf testdir" at the end already and it removes this.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] fix removal of {cpu,machine} links on mingw/msys

[Vladimir 'φ-coder/phcoder' Serbinenko]

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

On 18.01.2014 19:32, Andrey Borzenkov wrote:
> В Sat, 18 Jan 2014 19:14:43 +0100
> Vladimir 'φ-coder/phcoder' Serbinenko <phcoder@gmail.com> пишет:
> 
>> On 28.12.2013 10:58, Andrey Borzenkov wrote:
>>> At least on Windows 2003 using "ln -s dir1 dir2" in msys shell succeeds,
>>> but results in what looks like hard link. Subsequent "rm -f dir2" (e.g.
>>> during second config.status invocation) fails. Check that we also can
>>> remove link to directory.
>>>
>>> Make it more clear in message that we are checking "ln -s".
>>>
>> Is there a way to reliably remove result of such test? We don't want to
>> leave a weird file after the test behind. Perhaps rm -rf since we know
>> that we test with newly-created directory?
> 
> Test does "rm -rf testdir" at the end already and it removes this.
> 
Go ahead then.
> 
> 
> _______________________________________________
> 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: 274 bytes --]