From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1093505-garchives=archives.gentoo.org@lists.gentoo.org>
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 B3315138334
for <garchives@archives.gentoo.org>; Thu, 30 May 2019 10:10:20 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A637FE0877;
Thu, 30 May 2019 10:10:19 +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 8A111E0877
for <gentoo-commits@lists.gentoo.org>; Thu, 30 May 2019 10:10:19 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 1E74B34530C
for <gentoo-commits@lists.gentoo.org>; Thu, 30 May 2019 10:10:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id DDC7855B
for <gentoo-commits@lists.gentoo.org>; Thu, 30 May 2019 10:09:59 +0000 (UTC)
From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" <grobian@gentoo.org>
Message-ID: <1559210969.ca08ed2aea1532dfd3d970f5a657abfc9e9e6f6f.grobian@gentoo>
Subject: [gentoo-commits] proj/portage-utils:master commit in: /
X-VCS-Repository: proj/portage-utils
X-VCS-Files: make-tarball.sh
X-VCS-Directories: /
X-VCS-Committer: grobian
X-VCS-Committer-Name: Fabian Groffen
X-VCS-Revision: ca08ed2aea1532dfd3d970f5a657abfc9e9e6f6f
X-VCS-Branch: master
Date: Thu, 30 May 2019 10:09:59 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 3044c436-2865-499e-a8cb-31946e4daa6e
X-Archives-Hash: caaa21f0b6a5ba4943ce6172c8db2919
commit: ca08ed2aea1532dfd3d970f5a657abfc9e9e6f6f
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu May 30 09:50:39 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu May 30 10:09:29 2019 +0000
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=ca08ed2a
make-tarball: update/fix for latest autotools build
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
make-tarball.sh | 31 +++++++++++++------------------
1 file changed, 13 insertions(+), 18 deletions(-)
diff --git a/make-tarball.sh b/make-tarball.sh
index 2052985..489ce4b 100755
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/bin/env bash
set -e
-if ! . /etc/init.d/functions.sh 2>/dev/null ; then
+if ! . ${EPREFIX}/lib/gentoo/functions.sh 2>/dev/null ; then
einfo() { printf ' * %b\n' "$*"; }
eerror() { einfo "$@" 1>&2; }
fi
@@ -26,38 +26,32 @@ git) ver="HEAD" ;;
fi
;;
esac
-p="portage-utils-${ver#v}"
+p="${TMPDIR:-/var/tmp}/portage-utils-${ver#v}"
rm -rf "${p}"
mkdir "${p}"
einfo "Checking out clean git sources ..."
git archive "${ver}" | tar xf - -C "${p}"
-cd "${p}"
+pushd "${p}" >/dev/null
einfo "Building autotools ..."
sed -i "/^AC_INIT/s:git:${ver#v}:" configure.ac
sed -i "/^AM_MAINTAINER_MODE/s:(.*)$::" configure.ac
-sed -i "1iPV := ${ver#v}" Makefile
-LC_ALL=C ${MAKE} -s autotools >/dev/null
+./autogen.sh
rm -rf autom4te.cache
-cd ..
+popd >/dev/null
einfo "Generating tarball ..."
-tar --numeric-owner -cf - "${p}" | xz > "${p}".tar.xz
+pushd "${p%/*}" >/dev/null
+tar --numeric-owner -cf - "${p##*/}" | xz > "${p}".tar.xz
+popd >/dev/null
rm -r "${p}"
-du -b "${p}".tar.*
-einfo "Checking tarball (simple) ..."
+einfo "Checking tarball ..."
+pushd "${p%/*}" >/dev/null
tar xf "${p}".tar.*
-pushd "${p}" >/dev/null
-v ${MAKE} -s
-v ${MAKE} -s check
popd >/dev/null
-rm -rf "${p}"
-
-einfo "Checking tarball (autotools) ..."
-tar xf "${p}".tar.*
pushd "${p}" >/dev/null
v ./configure -q
v ${MAKE} -s
@@ -67,6 +61,7 @@ rm -rf "${p}"
echo
einfo "All ready for distribution!"
-du -b "${p}".tar.*
+mv "${p}".tar.* .
+du -b "${p##*/}".tar.*
exit 0