[PATCH] copy-firmware: Always write Link: entries

[PATCH] copy-firmware: Always write Link: entries

[Tony Nguyen]

File: entries in the WHENCE file overwrite existing files in the target
directory, however, Link: entries are skipped if the file exists in the
target directory. This can cause issues if the Link: entry is updated, but
the target directory contains an old symlink. Do not skip writing Link:
entries if the file exists, always create the symlink. This matches the
behavior of File: entries and ensures symlinks will contain values from
the WHENCE file.

Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
 copy-firmware.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/copy-firmware.sh b/copy-firmware.sh
index eda16c357779..9b46b63913ab 100755
--- a/copy-firmware.sh
+++ b/copy-firmware.sh
@@ -62,7 +62,6 @@ grep -E '^Link:' WHENCE | sed -e's/^Link: *//g' -e's/-> //g' | while read f d; d
             $verbose "WARNING: missing target for symlink $f"
         fi
     else
-        test -f "$destdir/$f" && continue
         $verbose "creating link $f -> $d"
         mkdir -p $destdir/$(dirname "$f")
         ln -sf "$d" "$destdir/$f"
-- 
2.20.1

Re: [PATCH] copy-firmware: Always write Link: entries

[Josh Boyer]

Applied and pushed out.

josh

On Mon, Sep 28, 2020 at 8:31 PM Tony Nguyen <anthony.l.nguyen@intel.com> wrote:
>
> File: entries in the WHENCE file overwrite existing files in the target
> directory, however, Link: entries are skipped if the file exists in the
> target directory. This can cause issues if the Link: entry is updated, but
> the target directory contains an old symlink. Do not skip writing Link:
> entries if the file exists, always create the symlink. This matches the
> behavior of File: entries and ensures symlinks will contain values from
> the WHENCE file.
>
> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
> ---
>  copy-firmware.sh | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/copy-firmware.sh b/copy-firmware.sh
> index eda16c357779..9b46b63913ab 100755
> --- a/copy-firmware.sh
> +++ b/copy-firmware.sh
> @@ -62,7 +62,6 @@ grep -E '^Link:' WHENCE | sed -e's/^Link: *//g' -e's/-> //g' | while read f d; d
>              $verbose "WARNING: missing target for symlink $f"
>          fi
>      else
> -        test -f "$destdir/$f" && continue
>          $verbose "creating link $f -> $d"
>          mkdir -p $destdir/$(dirname "$f")
>          ln -sf "$d" "$destdir/$f"
> --
> 2.20.1
>