Re: [PATCH] Add support for compressing firmware in copy-firmware.sh

[Josh Boyer <jwboyer@kernel.org>]

On Sun, Jan 17, 2021 at 7:12 AM Peter Robinson <pbrobinson@gmail.com> wrote:
>
> As of kernel 5.3 there's initial support for loading compressed firmware.
> At this stage the only supported compression methis is "xz -C crc32" but
> this option brings significant benefits.
>
> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
> ---
>  Makefile         |  4 ++++
>  copy-firmware.sh | 47 +++++++++++++++++++++++++++++++----------------
>  2 files changed, 35 insertions(+), 16 deletions(-)

This doesn't seem to deal with filenames with spaces properly:

[jwboyer@vader linux-firmware]$ time make
FIRMWAREDIR=/tmp/firmware/comp installcompress
mkdir -p /tmp/firmware/comp
./copy-firmware.sh -C /tmp/firmware/comp
xz: brcm/brcmfmac43430a0-sdio.ONDA-V80: No such file or directory
xz: PLUS.txt: No such file or directory
xz: brcm/brcmfmac43455-sdio.MINIX-NEO: No such file or directory
xz: Z83-4.txt: No such file or directory

real 0m3.457s
user 0m2.115s
sys 0m1.476s
[jwboyer@vader linux-firmware]$

josh

> diff --git a/Makefile b/Makefile
> index e1c362f..9a48471 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -11,3 +11,7 @@ check:
>  install:
>         mkdir -p $(DESTDIR)$(FIRMWAREDIR)
>         ./copy-firmware.sh $(DESTDIR)$(FIRMWAREDIR)
> +
> +installcompress:
> +       mkdir -p $(DESTDIR)$(FIRMWAREDIR)
> +       ./copy-firmware.sh -C $(DESTDIR)$(FIRMWAREDIR)
> diff --git a/copy-firmware.sh b/copy-firmware.sh
> index 9b46b63..d154804 100755
> --- a/copy-firmware.sh
> +++ b/copy-firmware.sh
> @@ -6,6 +6,7 @@
>
>  verbose=:
>  prune=no
> +compress=no
>
>  while test $# -gt 0; do
>      case $1 in
> @@ -19,6 +20,11 @@ while test $# -gt 0; do
>              shift
>              ;;
>
> +        -C | --compress)
> +            compress=yes
> +            shift
> +            ;;
> +
>          *)
>              if test "x$destdir" != "x"; then
>                  echo "ERROR: unknown command-line options: $@"
> @@ -31,40 +37,49 @@ while test $# -gt 0; do
>      esac
>  done
>
> +if test "x$compress" = "xyes"; then
> +    cmpxtn=.xz
> +    grep '^File:' WHENCE | sed -e's/^File: *//g' -e's/"//g' | while read f; do
> +       test -f "$f" || continue
> +       $verbose "compressing $f"
> +       xz -C crc32 $f
> +    done
> +fi
> +
>  grep '^File:' WHENCE | sed -e's/^File: *//g' -e's/"//g' | while read f; do
> -    test -f "$f" || continue
> -    $verbose "copying file $f"
> -    mkdir -p $destdir/$(dirname "$f")
> -    cp -d "$f" $destdir/"$f"
> +    test -f "$f$cmpxtn" || continue
> +    $verbose "copying file $f$cmpxtn"
> +    mkdir -p $destdir/$(dirname "$f$cmpxtn")
> +    cp -d "$f$cmpxtn" $destdir/"$f$cmpxtn"
>  done
>
>  grep -E '^Link:' WHENCE | sed -e's/^Link: *//g' -e's/-> //g' | while read f d; do
> -    if test -L "$f"; then
> -        test -f "$destdir/$f" && continue
> -        $verbose "copying link $f"
> -        mkdir -p $destdir/$(dirname "$f")
> +    if test -L "$f$cmpxtn"; then
> +        test -f "$destdir/$f$cmpxtn" && continue
> +        $verbose "copying link $f$cmpxtn"
> +        mkdir -p $destdir/$(dirname "$f$cmpxtn")
>          cp -d "$f" $destdir/"$f"
>
>          if test "x$d" != "x"; then
> -            target=`readlink "$f"`
> +            target=`readlink "$f$cmpxtn"`
>
>              if test "x$target" != "x$d"; then
>                  $verbose "WARNING: inconsistent symlink target: $target != $d"
>              else
>                  if test "x$prune" != "xyes"; then
> -                    $verbose "WARNING: unneeded symlink detected: $f"
> +                    $verbose "WARNING: unneeded symlink detected: $f$cmpxtn"
>                  else
> -                    $verbose "WARNING: pruning unneeded symlink $f"
> -                    rm -f "$f"
> +                    $verbose "WARNING: pruning unneeded symlink $f$cmpxtn"
> +                    rm -f "$f$cmpxtn"
>                  fi
>              fi
>          else
> -            $verbose "WARNING: missing target for symlink $f"
> +            $verbose "WARNING: missing target for symlink $f$cmpxtn"
>          fi
>      else
> -        $verbose "creating link $f -> $d"
> -        mkdir -p $destdir/$(dirname "$f")
> -        ln -sf "$d" "$destdir/$f"
> +        $verbose "creating link $f$cmpxtn -> $d$cmpxtn"
> +        mkdir -p $destdir/$(dirname "$f$cmpxtn")
> +        ln -sf "$d$cmpxtn" "$destdir/$f$cmpxtn"
>      fi
>  done
>
> --
> 2.29.2
>