From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B0206138334 for ; Thu, 30 May 2019 21:11:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 244E5E08CD; Thu, 30 May 2019 21:11:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EFE7EE08CD for ; Thu, 30 May 2019 21:11:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D65BA3453A6 for ; Thu, 30 May 2019 21:11:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1CEE3602 for ; Thu, 30 May 2019 21:11:42 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1559250625.0d88b842623fae95f7ac6e1111e566d8650a6319.mattst88@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto-s390.conf tools/catalyst-auto-s390x.conf X-VCS-Directories: tools/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 0d88b842623fae95f7ac6e1111e566d8650a6319 X-VCS-Branch: master Date: Thu, 30 May 2019 21:11:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 18c760e0-e7f8-4c71-954a-52c6ffa87d1b X-Archives-Hash: e6ce49269558bbdd47386ee5ea6f6cb7 commit: 0d88b842623fae95f7ac6e1111e566d8650a6319 Author: Matt Turner gentoo org> AuthorDate: Thu May 30 21:04:14 2019 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu May 30 21:10:25 2019 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0d88b842 catalyst-auto: Use xz instead of bz2 for s390 builds Signed-off-by: Matt Turner gentoo.org> tools/catalyst-auto-s390.conf | 10 +++++----- tools/catalyst-auto-s390x.conf | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf index b42797dc..30d78e76 100644 --- a/tools/catalyst-auto-s390.conf +++ b/tools/catalyst-auto-s390.conf @@ -24,9 +24,9 @@ give_latest_from_dates() { # Replace the date/time stamp in the filename to "latest". # Forms we handle: -# stage3-xxx-2018.0.tar.bz2 -# stage3-xxx-20180116.tar.bz2 -# stage3-xxx-20180116T015819Z.tar.bz2 +# stage3-xxx-2018.0.tar.xz +# stage3-xxx-20180116.tar.xz +# stage3-xxx-20180116T015819Z.tar.xz convert_filename() { sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g' } @@ -36,7 +36,7 @@ update_symlinks() { local d f for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do pushd "${d}" >/dev/null - for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates) ; do + for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do local of=$(echo "${f}" | convert_filename) ln -sf "${f}" "${of}" done @@ -60,7 +60,7 @@ post_build() { upload netboot2-s390-${TIMESTAMP}/netboot* ;; stage3.spec) - upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.bz2* + upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz* ;; esac diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf index 2f9b9b4a..e56b4c81 100644 --- a/tools/catalyst-auto-s390x.conf +++ b/tools/catalyst-auto-s390x.conf @@ -24,9 +24,9 @@ give_latest_from_dates() { # Replace the date/time stamp in the filename to "latest". # Forms we handle: -# stage3-xxx-2018.0.tar.bz2 -# stage3-xxx-20180116.tar.bz2 -# stage3-xxx-20180116T015819Z.tar.bz2 +# stage3-xxx-2018.0.tar.xz +# stage3-xxx-20180116.tar.xz +# stage3-xxx-20180116T015819Z.tar.xz convert_filename() { sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g' } @@ -36,7 +36,7 @@ update_symlinks() { local d f for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do pushd "${d}" >/dev/null - for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates) ; do + for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do local of=$(echo "${f}" | convert_filename) ln -sf "${f}" "${of}" done @@ -60,7 +60,7 @@ post_build() { upload netboot2-s390x-${TIMESTAMP}/netboot* ;; stage3.spec) - upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.bz2* + upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz* ;; esac