mirror of
https://git.launchpad.net/ubuntu-dev-tools
synced 2025-03-16 01:21:07 +00:00
pbuilder-dist: Implemented architecture choosing for amd64.
This commit is contained in:
commit
254ce498a1
@ -18,31 +18,43 @@
|
|||||||
|
|
||||||
BASE_DIR="$HOME/pbuilder"
|
BASE_DIR="$HOME/pbuilder"
|
||||||
|
|
||||||
|
ARCH=`dpkg-architecture | grep "DEB_HOST_ARCH=" | cut -f2 -d '='`
|
||||||
|
|
||||||
if [ ! -z `echo \`basename $0\` | grep '-'` ]
|
if [ ! -z `echo \`basename $0\` | grep '-'` ]
|
||||||
then
|
then
|
||||||
if [ $# -lt 1 ]
|
if [ $# -lt 1 ]
|
||||||
then
|
then
|
||||||
echo "Insufficient number of arguments."
|
echo "Insufficient number of arguments."
|
||||||
echo "Usage: $0 <operation>"
|
echo "Usage: $0 "$( [ $ARCH != "amd64" ] || echo "[i386|amd64] " )"<operation>"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
DISTRIBUTION=`basename $0 | cut -f2 -d '-'`
|
DISTRIBUTION=`basename $0 | cut -f2 -d '-'`
|
||||||
OPERATION=$1
|
|
||||||
shift 1
|
|
||||||
else
|
else
|
||||||
if [ $# -lt 2 ]
|
if [ $# -lt 2 ]
|
||||||
then
|
then
|
||||||
echo "Insufficient number of arguments."
|
echo "Insufficient number of arguments."
|
||||||
echo "Usage: $0 <distribution> <operation>"
|
echo "Usage: $0 <distribution> ""$( [ $ARCH != "amd64" ] || echo "[i386|amd64] " )""<operation>"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
DISTRIBUTION=$1
|
DISTRIBUTION=$1
|
||||||
OPERATION=$2
|
shift 1
|
||||||
shift 2
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ $1 = "i386" ] || [ $1 = "amd64" ]
|
||||||
|
then
|
||||||
|
if [ $ARCH = "amd64" ]
|
||||||
|
then
|
||||||
|
BINARCH=$1
|
||||||
|
else
|
||||||
|
echo "Warning: Architecture switching is not supported on your system; ignoring argument."
|
||||||
|
fi
|
||||||
|
|
||||||
|
shift 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
OPERATION=$1
|
||||||
|
|
||||||
case $DISTRIBUTION in
|
case $DISTRIBUTION in
|
||||||
#warty|hoary|breezy)
|
#warty|hoary|breezy)
|
||||||
@ -98,5 +110,6 @@ fi
|
|||||||
sudo pbuilder $OPERATION \
|
sudo pbuilder $OPERATION \
|
||||||
--basetgz $BASE_DIR/$DISTRIBUTION-base.tgz \
|
--basetgz $BASE_DIR/$DISTRIBUTION-base.tgz \
|
||||||
--distribution $DISTRIBUTION \
|
--distribution $DISTRIBUTION \
|
||||||
|
$( [ -z $BINARCH ] || echo "--binary-arch $BINARCH" ) \
|
||||||
--buildresult $BASE_DIR/$DISTRIBUTION_result \
|
--buildresult $BASE_DIR/$DISTRIBUTION_result \
|
||||||
--othermirror "deb $ARCHIVE $DISTRIBUTION $COMPONENTS" $@
|
--othermirror "deb $ARCHIVE $DISTRIBUTION $COMPONENTS" $@
|
||||||
|
4
setup.py
4
setup.py
@ -19,12 +19,12 @@ setup(name='ubuntu-dev-tools',
|
|||||||
'check-symbols',
|
'check-symbols',
|
||||||
'get-branches',
|
'get-branches',
|
||||||
'pbuilder-dist',
|
'pbuilder-dist',
|
||||||
'update-maintainer',
|
'update-maintainer',
|
||||||
'dch-repeat',
|
'dch-repeat',
|
||||||
'mk-sbuild-lv',
|
'mk-sbuild-lv',
|
||||||
'pull-debian-debdiff',
|
'pull-debian-debdiff',
|
||||||
'what-patch',
|
'what-patch',
|
||||||
'suspicious-source',
|
'suspicious-source',
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user