[23112] in Source-Commits
/svn/athena r22775 - in trunk/debathena/third/openafs: . hacked-arch
daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Mon Mar 3 16:57:39 2008
Date: Mon, 3 Mar 2008 16:57:08 -0500 (EST)
From: ghudson@MIT.EDU
Message-Id: <200803032157.QAA18299@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: ghudson
Date: 2008-03-03 16:57:07 -0500 (Mon, 03 Mar 2008)
New Revision: 22775
Added:
trunk/debathena/third/openafs/genchanges.sh
trunk/debathena/third/openafs/hacked-arch/
trunk/debathena/third/openafs/hacked-arch/arch
Modified:
trunk/debathena/third/openafs/build-openafs
trunk/debathena/third/openafs/upload-openafs
Log:
* debathena/third/openafs/hacked-arch/arch,
debathena/third/openafs/genchanges.sh: Import supporting files I
failed to include previously.
* debathena/third/openafs/build-openafs: Use current working directory
to find supporting files. Also fix a syntax error in a conditional.
* debathena/third/openafs/upload-openafs: Allow apt repository
location to be overridden with $DEBATHENA_APT.
Modified: trunk/debathena/third/openafs/build-openafs
===================================================================
--- trunk/debathena/third/openafs/build-openafs 2008-02-29 20:52:51 UTC (rev 22774)
+++ trunk/debathena/third/openafs/build-openafs 2008-03-03 21:57:07 UTC (rev 22775)
@@ -9,6 +9,7 @@
kversion=$(echo "$kernel" | sed 's/^.*-headers-//')
echo "Building for kernel $kversion..."
mkdir -p "$tmpdir/$dist/$kversion"
+ here=$(pwd)
schroot -c "$dist-sbuild" -u root -- sh -xec "
#echo 'deb http://localhost:9999/ubuntu edgy-backports main restricted universe multiverse' >> /etc/apt/sources.list
#echo 'deb-src http://localhost:9999/ubuntu edgy-backports main restricted universe multiverse' >> /etc/apt/sources.list
@@ -24,19 +25,19 @@
type linux64 >/dev/null || apt-get -y install linux32
export KPKG_ARCH=amd64
export PERSONALITY=linux64
- export PATH=/afs/sipb.mit.edu/project/debathena/packages/third/openafs/hacked-arch:\$PATH
+ export PATH=$here/hacked-arch:\$PATH
fi
if ! [ -e /usr/src/modules/openafs/debian/genchanges* ]; then
- install -m a=rx,u+w /afs/sipb.mit.edu/project/debathena/packages/third/openafs/genchanges.sh /usr/src/modules/openafs/debian/
+ install -m a=rx,u+w $here/genchanges.sh /usr/src/modules/openafs/debian/
fi
- if [ \"$dist\" = \"lenny-i386\" || \"$dist\" = \"lenny-amd64\" ]; then
- install -m a=rx,u+w /afs/sipb.mit.edu/project/debathena/packages/third/openafs/genchanges.sh /usr/src/modules/openafs/debian/genchanges
+ if [ \"$dist\" = \"lenny-i386\" -o \"$dist\" = \"lenny-amd64\" ]; then
+ install -m a=rx,u+w $here/genchanges.sh /usr/src/modules/openafs/debian/genchanges
fi
$PERSONALITY SIGNCHANGES=1 module-assistant -i -t -l '$kversion' auto-build openafs
mv /usr/src/openafs-modules* '$tmpdir/$dist/$kversion'" \
</dev/null
if [ $? -ne 0 ]; then
- echo "$dist $kernel" >> /mit/debathena/packages/third/openafs/failed.log
+ echo "$dist $kernel" >> $here/failed.log
fi
mkdir -p "$dist"
mv "$tmpdir/$dist/$kversion"/* "$dist"/
Added: trunk/debathena/third/openafs/genchanges.sh
Added: trunk/debathena/third/openafs/hacked-arch/arch
Property changes on: trunk/debathena/third/openafs/hacked-arch/arch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/debathena/third/openafs/upload-openafs
===================================================================
--- trunk/debathena/third/openafs/upload-openafs 2008-02-29 20:52:51 UTC (rev 22774)
+++ trunk/debathena/third/openafs/upload-openafs 2008-03-03 21:57:07 UTC (rev 22775)
@@ -1,12 +1,15 @@
#!/bin/bash
set -e
+
+: ${DEBATHENA_APT=/mit/debathena/apt}
+
for i in */; do
(
cd $i
diff -U0 \
<(ls *.deb 2>/dev/null | sort) \
- <(cd /mit/debathena/apt/pool/openafs/o/openafs && ls *.deb | sort) | \
+ <(cd $DEBATHENA_APT/pool/openafs/o/openafs && ls *.deb | sort) | \
sed -n 's/^-\(.*\)\.deb$/\1/ p' | \
- xargs -t -n1 -I@ reprepro --ignore=wrongdistribution -Vb /mit/debathena/apt -C openafs include "$(echo "$i" | sed 's/-[^-]*$//')" @.changes
+ xargs -t -n1 -I@ reprepro --ignore=wrongdistribution -Vb $DEBATHENA_APT -C openafs include "$(echo "$i" | sed 's/-[^-]*$//')" @.changes
)
done
