[arch-dev-public] [PATCH] [makechrootpkg] Fixed changelog support to work with makepkg 3.4

Eric Bélanger snowmaniscool at gmail.com
Sun Jun 27 21:14:21 EDT 2010


On Sun, Jun 27, 2010 at 9:08 PM, Eric Bélanger <snowmaniscool at gmail.com> wrote:
> Signed-off-by: Eric Bélanger <snowmaniscool at gmail.com>
> ---
>  makechrootpkg |   16 +++++++++++++---
>  1 files changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/makechrootpkg b/makechrootpkg
> index 830a8af..01cb3a9 100755
> --- a/makechrootpkg
> +++ b/makechrootpkg
> @@ -175,9 +175,19 @@ for f in $install_files;do
>        fi
>  done
>
> -if [ -f 'ChangeLog' ]; then
> -       cp ChangeLog "$copydir/build/"
> -fi
> +changelog_files=$(grep 'changelog=' PKGBUILD)
> +for pkg in ${pkgname[@]}; do
> +       changelog_files+=' '
> +       changelog_files+=$(echo $changelog_files |sed "s/\$pkgname/$pkg/"|sed "s/\${pkgname}/$pkg/")
> +       changelog_files=$(eval echo $changelog_files |tr '[:blank:]' '\n'|sort |uniq)
> +done
> +
> +for f in $changelog_files;do
> +       changelog="${f#"changelog="}"
> +       if [ "$changelog" != "" -a -f "$changelog" ]; then
> +               cp "$changelog" "$copydir/build/"
> +       fi
> +done
>
>  chown -R nobody "$copydir/build"
>  chown -R nobody "$copydir/srcdest"
> --
> 1.7.1
>
>

BTW, it might be a good idea to make a new release of devtools with
this patch so that changelog can be used in packages built in chroot.


More information about the arch-dev-public mailing list