From 98107ac07f394fb625bf2260c29f86b115036f48 Mon Sep 17 00:00:00 2001 From: Filippo Squillace Date: Tue, 15 Sep 2020 14:06:03 +0200 Subject: [PATCH 1/3] Change format package from xz --- .gitignore | 2 +- lib/core/build.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2d39c41..b47a408 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ *.swp -*pkg.tar.xz +*pkg.tar.* *.tar.gz *.SRCINFO diff --git a/lib/core/build.sh b/lib/core/build.sh index 9a224f0..af0c5bb 100644 --- a/lib/core/build.sh +++ b/lib/core/build.sh @@ -17,7 +17,7 @@ function _install_pkg_from_aur(){ $CURL "https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=${pkgname}" [ -z "${installname}" ] || $CURL "https://aur.archlinux.org/cgit/aur.git/plain/${installname}?h=${pkgname}" makepkg -sfcd - sudo pacman --noconfirm --root ${maindir}/root -U ${pkgname}*.pkg.tar.xz + sudo pacman --noconfirm --root ${maindir}/root -U ${pkgname}*.pkg.tar.* } function _install_pkg(){ @@ -29,7 +29,7 @@ function _install_pkg(){ builtin cd ${working_dir} makepkg -sfcd makepkg --printsrcinfo > ${pkgbuilddir}/.SRCINFO - sudo pacman --noconfirm --root ${maindir}/root -U *.pkg.tar.xz + sudo pacman --noconfirm --root ${maindir}/root -U *.pkg.tar.* } function _prepare() { From 84f4d2037022227d741c37b9fdc1992d93daadcf Mon Sep 17 00:00:00 2001 From: Filippo Squillace Date: Tue, 15 Sep 2020 19:31:24 +0200 Subject: [PATCH 2/3] Disable integ test for ARM --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 025ddc7..b4126d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,8 @@ script: - ${PWD}/lib/checks/check_all.sh - yes | junest setup --delete - - export JUNEST_HOME=~/.junest-arm - - junest proot --fakeroot -- ${PWD}/lib/checks/check.sh --skip-aur-tests - - junest proot -- ${PWD}/lib/checks/check.sh --skip-aur-tests --use-sudo - - yes | junest setup --delete + # ARM with qemu does seem to work properly. Disabling integ tests for ARM for now. + #- export JUNEST_HOME=~/.junest-arm + #- junest proot --fakeroot -- ${PWD}/lib/checks/check.sh --skip-aur-tests + #- junest proot -- ${PWD}/lib/checks/check.sh --skip-aur-tests --use-sudo + #- yes | junest setup --delete From 440dde65643fd401eae30afd29fb14cca609000e Mon Sep 17 00:00:00 2001 From: Filippo Squillace Date: Tue, 15 Sep 2020 19:40:16 +0200 Subject: [PATCH 3/3] 7.2.2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index b26a34e..77f5bec 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.2.1 +7.2.2