[23085] in Source-Commits
/svn/athena r22748 - trunk/debathena/scripts
daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Tue Feb 12 12:49:18 2008
Date: Tue, 12 Feb 2008 12:48:45 -0500 (EST)
From: ghudson@MIT.EDU
Message-Id: <200802121748.MAA19882@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: ghudson
Date: 2008-02-12 12:48:45 -0500 (Tue, 12 Feb 2008)
New Revision: 22748
Modified:
trunk/debathena/scripts/SbuildHack.pm
trunk/debathena/scripts/all-schroots
trunk/debathena/scripts/da
trunk/debathena/scripts/daequivsupload
trunk/debathena/scripts/daupload-release
trunk/debathena/scripts/sbuildhack
Log:
Fixes for r22739.
* debathena/scripts/da,
debathena/scripts/daequivsupload,
debathena/scripts/daupload-release,
debathena/scripts/all-schroots: Use "." instead of "source". The
latter is a csh-ism and will not work in /bin/sh on (at least)
Gutsy.
debathena/scripts/sbuildhack, debathena/scripts/SbuildHack.pm:
Pass the NMU tag in as an environment variable, since the useful
value of $0 is long gone by the time we execute a shell command
inside the sbuild perl script, making it hard to find
debian-versions.sh.
Modified: trunk/debathena/scripts/SbuildHack.pm
===================================================================
--- trunk/debathena/scripts/SbuildHack.pm 2008-02-12 03:47:50 UTC (rev 22747)
+++ trunk/debathena/scripts/SbuildHack.pm 2008-02-12 17:48:45 UTC (rev 22748)
@@ -8,7 +8,8 @@
my $v = shift;
my $binNMUver = shift;
die("Wrong binNMUver!") unless ($binNMUver == 171717);
- return "$v".`. $(dirname "$0")/debian-versions.sh; gettag $main::distribution`;
+ die("No NMUTAG set in environment!") unless ($ENV{"NMUTAG"});
+ return $v . $ENV{"NMUTAG"};
};
*old_begin_session = \&Sbuild::Chroot::begin_session;
Modified: trunk/debathena/scripts/all-schroots
===================================================================
--- trunk/debathena/scripts/all-schroots 2008-02-12 03:47:50 UTC (rev 22747)
+++ trunk/debathena/scripts/all-schroots 2008-02-12 17:48:45 UTC (rev 22748)
@@ -11,7 +11,7 @@
# Debian/Ubuntu version, and ephemeral session chroots are used
# instead of source chroots.
-source $(dirname "$0")/debian-versions.sh
+. $(dirname "$0")/debian-versions.sh
if [ "$1" = "-A" ]; then
Modified: trunk/debathena/scripts/da
===================================================================
--- trunk/debathena/scripts/da 2008-02-12 03:47:50 UTC (rev 22747)
+++ trunk/debathena/scripts/da 2008-02-12 17:48:45 UTC (rev 22748)
@@ -15,7 +15,7 @@
# Typically this script is used to build Debathena packages, in which
# case PROGRAM is sbuildhack and ARGUMENTS is a path to a .dsc file.
-source $(dirname "$0")/debian-versions.sh
+. $(dirname "$0")/debian-versions.sh
A=0
if [ "$1" = -A ]; then A=1; shift; fi
Modified: trunk/debathena/scripts/daequivsupload
===================================================================
--- trunk/debathena/scripts/daequivsupload 2008-02-12 03:47:50 UTC (rev 22747)
+++ trunk/debathena/scripts/daequivsupload 2008-02-12 17:48:45 UTC (rev 22748)
@@ -6,7 +6,7 @@
# packages are very simple, there is no need to build them separately
# for each dist.
-source $(dirname "$0")/debian-versions.sh
+. $(dirname "$0")/debian-versions.sh
: ${DEBATHENA_APT=/mit/debathena/apt}
Modified: trunk/debathena/scripts/daupload-release
===================================================================
--- trunk/debathena/scripts/daupload-release 2008-02-12 03:47:50 UTC (rev 22747)
+++ trunk/debathena/scripts/daupload-release 2008-02-12 17:48:45 UTC (rev 22748)
@@ -14,7 +14,7 @@
# subdirectory.
: ${DEBATHENA_APT=/mit/debathena/apt}
-source $(dirname "$0")/debian-versions.sh
+. $(dirname "$0")/debian-versions.sh
case "$(basename "$0")" in
daupload-release)
Modified: trunk/debathena/scripts/sbuildhack
===================================================================
--- trunk/debathena/scripts/sbuildhack 2008-02-12 03:47:50 UTC (rev 22747)
+++ trunk/debathena/scripts/sbuildhack 2008-02-12 17:48:45 UTC (rev 22748)
@@ -9,12 +9,15 @@
exit 1
}
+. $(dirname "$0")/debian-versions.sh
+
dist_arch=$1; shift
if [ -z "$dist_arch" ]; then usage; fi
IFS=- read dist arch <<EOF
$dist_arch
EOF
if [ -z "$dist" ] || [ -z "$arch" ]; then usage; fi
+export NMUTAG=`gettag "$dist"`
perl -I"$(dirname "$0")" -MSbuildHack \
/usr/bin/sbuild --binNMU=171717 --make-binNMU="Build with sbuild." \
-d "$dist" --arch="$arch" -v "$@"
