projects
/
git-tools-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change Ubuntu mirror site
[git-tools-moved-to-github.git]
/
id-deb-build
/
id-pbuild.sh
diff --git
a/id-deb-build/id-pbuild.sh
b/id-deb-build/id-pbuild.sh
index
8c76b9e
..
6676f99
100755
(executable)
--- a/
id-deb-build/id-pbuild.sh
+++ b/
id-deb-build/id-pbuild.sh
@@
-11,8
+11,12
@@
Options:
EOF
exit $1
}
EOF
exit $1
}
+D0=`dirname $0`
+ID_DEB_BUILD=`cd $D0; pwd`
+
do_help=false
upload=false
do_help=false
upload=false
+ARCHS="i386 amd64"
while test $# -gt 0; do
case "$1" in
-*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
while test $# -gt 0; do
case "$1" in
-*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
@@
-58,7
+62,6
@@
if test "$DEBIAN_DIST_A" -o "$UBUNTU_DIST_A" -o "$CENTOS_DIST_A"; then
UBUNTU_DIST=$UBUNTU_DIST_A
CENTOS_DIST=$CENTOS_DIST_A
fi
UBUNTU_DIST=$UBUNTU_DIST_A
CENTOS_DIST=$CENTOS_DIST_A
fi
-ID_DEB_BUILD=~/proj/git-tools/id-deb-build
if test "$DEBIAN_DIST" -o "$UBUNTU_DIST"; then
debian=true
DNAME=`awk '/Source:/ {print $2}' debian/control`
if test "$DEBIAN_DIST" -o "$UBUNTU_DIST"; then
debian=true
DNAME=`awk '/Source:/ {print $2}' debian/control`
@@
-79,6
+82,7
@@
if test "$CENTOS_DIST"; then
fi
PRODUCT=$RNAME
if test ! -d ~/rpmbuild; then
fi
PRODUCT=$RNAME
if test ! -d ~/rpmbuild; then
+ echo "Creating ~/rpmbuild"
mkdir -p ~/pmbuild/BUILD
mkdir -p ~/rpmbuild/RPMS/noarch
mkdir -p ~/rpmbuild/RPMS/x86_64
mkdir -p ~/pmbuild/BUILD
mkdir -p ~/rpmbuild/RPMS/noarch
mkdir -p ~/rpmbuild/RPMS/x86_64
@@
-86,6
+90,12
@@
if test "$CENTOS_DIST"; then
mkdir -p ~/rpmbuild/SPECS
mkdir -p ~/rpmbuild/SRPMS
fi
mkdir -p ~/rpmbuild/SPECS
mkdir -p ~/rpmbuild/SRPMS
fi
+ if test ! -f ~/.rpmmacros; then
+ echo "Creating ~/.rpmmacros"
+ echo "%_topdir $HOME/rpmbuild" >~/.rpmmacros
+ echo "%_source_filedigest_algorithm 0" >>~/.rpmmacros
+ echo "%_binary_filedigest_algorithm 0" >>~/.rpmmacros
+ fi
else
centos=false
fi
else
centos=false
fi
@@
-212,7
+222,7
@@
if $debian; then
if grep "Architecture: all" $DSC >/dev/null; then
USE_ARCHS=i386
else
if grep "Architecture: all" $DSC >/dev/null; then
USE_ARCHS=i386
else
- USE_ARCHS="i386 amd64"
+ USE_ARCHS=$ARCHS
fi
for dist in ${DEBIAN_DIST} ${UBUNTU_DIST}; do
for arch in ${USE_ARCHS}; do
fi
for dist in ${DEBIAN_DIST} ${UBUNTU_DIST}; do
for arch in ${USE_ARCHS}; do