Merge branch 'cleanup' into cooking

diff --git a/distro/archlinux/this/Makefile b/distro/archlinux/this/Makefile
index 6efdc00cc33f270ade32095552fd0c3528d0efef..e89880ff5548beb04c4347c39c89c909bc05cb86 100644 (file)
--- a/distro/archlinux/this/Makefile
+++ b/distro/archlinux/this/Makefile
@@ -7,6 +7,7 @@ PATCH   := $(shell sed -n -e '/GMQCC_VERSION_PATCH/{s/.* .* //;p;q;}' $(HEADER))
 PKGREL  := 1
 CARCH   := $(shell uname -m)
 PKGDIR  := gmqcc-$(MAJOR).$(MINOR).$(PATCH)-$(PKGREL)-$(CARCH)
+TARCOMP := -J
 PKG     := $(PKGDIR).pkg.tar.xz
 PKGINFO := $(PKGDIR)/.PKGINFO
 DESTDIR := distro/archlinux/this
@@ -41,11 +42,11 @@ base:
        @echo "makepkgopt = zipman" >> $(PKGINFO)
        @echo "makepkgopt = purge" >> $(PKGINFO)
        @echo "makepkgopt = !upx" >> $(PKGINFO)
-       @tar -C $(PKGDIR) -czf $(PKGDIR)/.MTREE \
+       @bsdtar -C $(PKGDIR) -czf $(PKGDIR)/.MTREE \
            --format=mtree \
            --options='!all,use-set,type,uid,gid,mode,time,size,md5,sha256,link' \
            .PKGINFO usr/
-       @tar -cJvf $(PKG) -C $(PKGDIR)/ .PKGINFO .MTREE usr/
+       @bsdtar $(TARCOMP) -cvf $(PKG) -C $(PKGDIR)/ .PKGINFO .MTREE usr/
        @rm -rf $(PKGDIR)
 
 clean: