diff options
-rwxr-xr-x | src/abslibre-tools/librestage | 6 | ||||
-rwxr-xr-x | src/librefetch/librefetch | 5 | ||||
-rw-r--r-- | src/librefetch/librefetch.8.ronn | 2 | ||||
-rwxr-xr-x | src/librefetch/librefetchdir/libmakepkg/tidy/purge.sh | 2 | ||||
-rwxr-xr-x | src/librefetch/librefetchdir/makepkg.gen | 17 | ||||
-rw-r--r-- | test/libremakepkg-test.sh | 10 |
6 files changed, 21 insertions, 21 deletions
diff --git a/src/abslibre-tools/librestage b/src/abslibre-tools/librestage index 17d8d5f..bec536c 100755 --- a/src/abslibre-tools/librestage +++ b/src/abslibre-tools/librestage @@ -4,7 +4,7 @@ # Copyright (C) 2010-2012 Nicolás Reynolds <fauno@parabola.nu> # Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) <hahj87@gmail.com> -# Copyright (C) 2013-2014, 2017 Luke Shumaker <lukeshu@parabola.nu> +# Copyright (C) 2013-2014, 2017-2018 Luke Shumaker <lukeshu@parabola.nu> # # License: GNU GPLv3+ # @@ -79,8 +79,8 @@ main() { # Look for (libre)makepkg output local CARCH _pkgname pkgnames pkgfile for CARCH in "${arch[@]}"; do - # This supports both pacman <= 5.0.1 pkgname-debug - # packages and pacman-git pkgbase-debug packages. + # This supports both pacman < 5.1 pkgname-debug + # packages and pacman >= 5.1 pkgbase-debug packages. pkgnames=("${pkgname[@]}" "${pkgname[@]/%/-debug}") in_array "$pkgbase" "${pkgname[@]}" || pkgnames+=("${pkgbase}-debug") for _pkgname in "${pkgnames[@]}"; do diff --git a/src/librefetch/librefetch b/src/librefetch/librefetch index 04dcfd2..e96b866 100755 --- a/src/librefetch/librefetch +++ b/src/librefetch/librefetch @@ -1,7 +1,7 @@ #!/usr/bin/env bash # librefetch # -# Copyright (C) 2013-2017 Luke Shumaker <lukeshu@parabola.nu> +# Copyright (C) 2013-2018 Luke Shumaker <lukeshu@parabola.nu> # # For just the create_signature() function: # Copyright (C) 2006-2013 Pacman Development Team <pacman-dev@archlinux.org> @@ -346,7 +346,8 @@ checkdepends=() ; unset "checkdepends_${CARCH}" makedepends=("${mkdepends[@]}") ; unset "makedepends_${CARCH}" #### -options=(!strip docs libtool staticlibs emptydirs !zipman purge !upx !optipng !debug) +# See packaging_options in the makepkg source +options=(!strip docs libtool staticlibs emptydirs !zipman !debug purge) PURGE_TARGETS=(.bzr/ .cvs/ .git/ .hg/ .svn/ .makepkg/) #### diff --git a/src/librefetch/librefetch.8.ronn b/src/librefetch/librefetch.8.ronn index 808c0fc..b65485f 100644 --- a/src/librefetch/librefetch.8.ronn +++ b/src/librefetch/librefetch.8.ronn @@ -167,7 +167,7 @@ Other changes: * <options=()> is set have `makepkg` avoid making changes to <$pkgdir>. The exact change is: - options=(!strip docs libtool staticlibs emptydirs !zipman purge !upx) + options=(!strip docs libtool staticlibs emptydirs !zipman !debug purge) * <PURGE_TARGETS=()> has VCS directories added to it: diff --git a/src/librefetch/librefetchdir/libmakepkg/tidy/purge.sh b/src/librefetch/librefetchdir/libmakepkg/tidy/purge.sh index 407d9d7..a37ff2f 100755 --- a/src/librefetch/librefetchdir/libmakepkg/tidy/purge.sh +++ b/src/librefetch/librefetchdir/libmakepkg/tidy/purge.sh @@ -2,7 +2,7 @@ # # purge.sh - Remove unwanted files from the package # -# Copyright (c) 2008-2016 Pacman Development Team <pacman-dev@archlinux.org> +# Copyright (c) 2008-2018 Pacman Development Team <pacman-dev@archlinux.org> # Copyright (c) 2013-2016, 2018 Luke Shumaker <lukeshu@parabola.nu> # # License: GNU GPLv2+ diff --git a/src/librefetch/librefetchdir/makepkg.gen b/src/librefetch/librefetchdir/makepkg.gen index 59052c6..dfe68f5 100755 --- a/src/librefetch/librefetchdir/makepkg.gen +++ b/src/librefetch/librefetchdir/makepkg.gen @@ -1,7 +1,7 @@ #!/usr/bin/sed -rf # librefetchdir/makepkg.gen # -# Copyright (C) 2013-2017 Luke Shumaker <lukeshu@parabola.nu> +# Copyright (C) 2013-2018 Luke Shumaker <lukeshu@parabola.nu> # # License: GNU GPLv3+ # @@ -22,15 +22,14 @@ /LIBRARY=/iexport LIBRARY="${0%/*}/libmakepkg" +/list_package_files\(\) \{/,/^\}$/ { + # Don't include dotfiles + s,\(.*; (.* \| LC_ALL=C sort)\),\1, +} + /create_package\(\) \{/,/^\}$/ { - /pkg_file=/d # allow us to set pkg_file - s/"?\$\{comp_files\[@\]\}"?// # do not include .{PKGINFO,BUILDINGO,CHANGELOG,INSTALL,MTREE} - # This is long/gross. What it does: - # - pass --format=ustar to bsdtar, to inhibit it using the pax format - # - take the files that would be included in the tarball, and use - # find/sort/--files-from to order them for bsdtar - s/bsdtar(.*) - ([^|]*) \|/find \2 -print0 | LC_ALL=C sort --zero-terminated | bsdtar --null --files-from - --format=ustar --no-recursion \1 - |/ - s/create_signature .*/&; return/ # do not procede to create symlinks + # allow us to set pkg_file + /pkg_file=/d } s|Making package:|Making source:| diff --git a/test/libremakepkg-test.sh b/test/libremakepkg-test.sh index 54816dd..363e4f7 100644 --- a/test/libremakepkg-test.sh +++ b/test/libremakepkg-test.sh @@ -155,7 +155,7 @@ it_detects_distcc_files() { not [[ -f $(echo libretools-hello-1.0-1-any.pkg.tar.?z) ]] } -it_symlinks_outputs() { +it_doesnt_symlink_outputs() { require network sudo || return 0 echo "WORKDIR='$tmpdir/workdir'" > $XDG_CONFIG_HOME/libretools/libretools.conf @@ -172,8 +172,8 @@ it_symlinks_outputs() { libremessages msg 'Creating a chroot, may take a few minutes' &>/dev/tty testsudo libremakepkg -l "$roundup_test_name" - [[ -f $(echo libretools-hello-1.0-1-any.pkg.tar.?z) ]] - [[ -L $(echo libretools-hello-1.0-1-any.pkg.tar.?z) ]] - [[ -f $(echo libretools-hello-1.0-1-any.src.tar.?z) ]] - [[ -L $(echo libretools-hello-1.0-1-any.src.tar.?z) ]] + not stat libretools-hello-1.0-1-any.pkg.tar.?z + not stat libretools-hello-1.0-1-any.src.tar.?z + [[ -f $(echo "$tmpdir/workdir/pkgdest"/libretools-hello-1.0-1-any.pkg.tar.?z) ]] + [[ -f $(echo "$tmpdir/workdir/srcpkgdest"/libretools-hello-1.0-1-any.src.tar.?z) ]] } |