X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=id-deb-build%2Fid-pbuild.sh;h=5feb881c3798a454c46c79403e1f8b6672d72ea6;hb=4abb4ac4266d543e71358297166c1a6f360ad49e;hp=02306275d7534f65bff6d46346c946200495c71a;hpb=cf1c504d40f69b2d199922745ad85ae297b75810;p=git-tools-moved-to-github.git diff --git a/id-deb-build/id-pbuild.sh b/id-deb-build/id-pbuild.sh index 0230627..5feb881 100755 --- a/id-deb-build/id-pbuild.sh +++ b/id-deb-build/id-pbuild.sh @@ -13,7 +13,6 @@ Options: [--centos=distros] [--upload] [--concurrency=N] - [--product=X] EOF exit $1 } @@ -22,6 +21,7 @@ EOF upload=false do_help=false concurrency=4 +ARCHS="i386 amd64" if test -f IDMETA; then . ./IDMETA @@ -31,16 +31,15 @@ while test $# -gt 0; do -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; *) optarg= ;; esac - case $1 in --debian=*) - DEBIAN_DIST=$optarg + DEBIAN_DIST_A=$optarg ;; --ubuntu=*) - UBUNTU_DIST=$optarg + UBUNTU_DIST_A=$optarg ;; --centos=*) - CENTOS_DIST=$optarg + CENTOS_DIST_A=$optarg ;; --upload) upload=true @@ -48,9 +47,6 @@ while test $# -gt 0; do --concurrency=*) concurrency=$optarg ;; - --product=*) - PRODUCT=$optarg - ;; -*) do_help=yes ;; @@ -58,10 +54,22 @@ while test $# -gt 0; do shift done +if test "$DEBIAN_DIST_A" -o "$UBUNTU_DIST_A" -o "$CENTOS_DIST_A"; then + DEBIAN_DIST=$DEBIAN_DIST_A + UBUNTU_DIST=$UBUNTU_DIST_A + CENTOS_DIST=$CENTOS_DIST_A +fi + if test "$do_help" = "yes"; then usage 1 1>&2 fi +if test "$DEBIAN_DIST" -o "$UBUNTU_DIST"; then + debian=true +else + debian=false +fi + D0=`dirname $0` ID_DEB_BUILD=`cd $D0; pwd` PBUILDROOT=${ID_DEB_BUILD}/id-pbuild-root.sh @@ -70,101 +78,144 @@ if test ! -x $PBUILDROOT; then exit 1 fi -MKDEBSRC=${ID_DEB_BUILD}/id-mk-deb-src.sh -if test ! -x $MKDEBSRC; then - echo "$MKDEBSRC not found" - exit 1 +if test "$CENTOS_DIST"; then + RNAME=`awk '/Name:/ {print $2}' *.spec` + echo "RNAME=$RNAME" + if test "$NAME" -a "$NAME" != "$RNAME"; then + echo "NAME in IDMETA ($NAME) does not match RPM spec NAME ($RNAME)" + exit 1 + fi + PRODUCT=$RNAME fi - -if $upload; then - : -else - if test "${SUDO_USER}"; then - if test ! -d deb-src; then - $MKDEBSRC +if $debian; then + DNAME=`awk '/Source:/ {print $2}' debian/control` + if test "$NAME" -a "$NAME" != "$DNAME"; then + echo "NAME in IDMETA ($NAME) does not match debian/control ($DNAME)" + exit 1 + fi + PRODUCT=$DNAME + if ! $upload; then + MKDEBSRC=${ID_DEB_BUILD}/id-mk-deb-src.sh + if test ! -x $MKDEBSRC; then + echo "$MKDEBSRC not found" + exit 1 fi - else - if test -d deb-src; then - rm -f deb-src/*.gz - if test $? -ne 0; then - echo "deb-src could not be removed. Remove deb-src manually" - exit 1 + DCH=debian/changelog + if ! git ls-files $DCH --error-unmatch >/dev/null 2>&1; then + rm -f $DCH + echo "${DNAME} (${VERSION}-1.indexdata) unstable; urgency=medium" >$DCH + echo '' >>$DCH + echo ' * Upstream.' >>$DCH + echo '' >>$DCH + echo " -- `git config --get user.name` <`git config --get user.email`> `date -R`" >>$DCH + echo '' >>$DCH + fi + if test "${SUDO_USER}"; then + if test ! -d deb-src; then + $MKDEBSRC + fi + else + if test -d deb-src; then + rm -f deb-src/*.gz + if test $? -ne 0; then + echo "deb-src could not be removed. Remove deb-src manually" + exit 1 + fi fi + $MKDEBSRC fi - $MKDEBSRC fi +else + mkdir -p deb-src fi + cd deb-src -for f in *.dsc; do - if test -f "$f"; then - PKG=$f +if $debian; then + for f in *.dsc; do + if test -f "$f"; then + PKG=$f + fi + done + if test -z "$PKG"; then + echo "Specify .dsc file" + exit 1 + fi + if test ! -e "$PKG"; then + echo "${PKG} does not exist" + exit 1 + fi + if grep "Architecture: all" $PKG >/dev/null; then + USE_ARCHS=i386 + else + USE_ARCHS=$ARCHS fi -done -if test -z "$PKG"; then - echo "Specify .dsc file" - exit 1 -fi -if test ! -e "$PKG"; then - echo "${PKG} does not exist" - exit 1 -fi -if test -z "$PRODUCT"; then - PRODUCT=`echo *.dsc|sed 's/_.*//g'` -fi -ARCHS="i386 amd64" -if grep "Architecture: all" $PKG >/dev/null; then - USE_ARCHS=i386 -else - USE_ARCHS=$ARCHS fi -echo "Dsc $PKG . Product $PRODUCT" + +echo "Product: $PRODUCT" echo "Ubuntu distros: $UBUNTU_DIST" echo "Debian distros: $DEBIAN_DIST" echo "Centos distros: $CENTOS_DIST" -if test "${SUDO_USER}"; then - echo "Running as sudo." - echo "Tip: You can avoid it by adding the following in /etc/sudoers" - echo "${SUDO_USER} ALL=NOPASSWD: ${ID_DEB_BUILD}/id-pbuild-root.sh" - HOME_EXPORT=/home/${SUDO_USER} -else - sudo -k - HOME_EXPORT=$HOME -fi -if test ! -f ${HOME_EXPORT}/.pbuilderrc; then - echo "${HOME_EXPORT}/.pbuilderrc missing" - exit 1 + +if $debian; then + if test "${SUDO_USER}"; then + echo "Running as sudo." + echo "Tip: You can avoid it by adding the following in /etc/sudoers" + echo "${SUDO_USER} ALL=NOPASSWD: ${ID_DEB_BUILD}/id-pbuild-root.sh" + HOME_EXPORT=/home/${SUDO_USER} + else + sudo -k + HOME_EXPORT=$HOME + fi + if test ! -f ${HOME_EXPORT}/.pbuilderrc; then + echo "${HOME_EXPORT}/.pbuilderrc missing" + echo "You may need to run: ln -s ~/proj/git-tools/id-deb-build/pbuilderrc ~/.pbuilderrc" + exit 1 + fi fi if $upload; then for dist in ${CENTOS_DIST}; do arch=amd64 prodver=${PRODUCT}-${VERSION} - if ssh $dist "cd rpmbuild/SOURCES/${prodver} && ../../../proj/git-tools/id-rpm-build/upload-rpms.sh ${PRODUCT}.spec"; then + if ! scp ${ID_DEB_BUILD}/../id-rpm-build/upload-rpms.sh ${dist}:rpmbuild/SOURCES/${prodver}/; then + echo "Copy of upload-rpms.sh to $dist failed" + exit 1 + fi + if ssh $dist "cd rpmbuild/SOURCES/${prodver} && chmod +x upload-rpms.sh && ./upload-rpms.sh ${PRODUCT}.spec"; then : - else + else echo "Upload failed for $dist" exit 1 fi done for dist in ${UBUNTU_DIST}; do - scp ${dist}-*/* ftp.indexdata.dk:/home/ftp/pub/${PRODUCT}/ubuntu/${dist} + ssh ftp.indexdata.dk "mkdir -p /home/ftp/pub/${PRODUCT}/ubuntu/${dist}" + if ! scp ${dist}-*/* ftp.indexdata.dk:/home/ftp/pub/${PRODUCT}/ubuntu/${dist}; then + echo "Upload failed for $dist" + exit 1 + fi done for dist in ${DEBIAN_DIST}; do - scp ${dist}-*/* ftp.indexdata.dk:/home/ftp/pub/${PRODUCT}/debian/${dist} + ssh ftp.indexdata.dk "mkdir -p /home/ftp/pub/${PRODUCT}/debian/${dist}" + if ! scp ${dist}-*/* ftp.indexdata.dk:/home/ftp/pub/${PRODUCT}/debian/${dist}; then + echo "Upload failed for $dist" + exit 1 + fi done - echo "" - echo "====================================================" - echo "Remember to update APT/YUM on ftp.indexdata.dk !!!" - echo "" - echo "ssh ftp.indexdata.dk" - echo "cd ~/proj/git-tools/update-archive" - echo "sudo su" - echo "./update-archive.sh" - if test ${CENTOS_DIST}; then - echo "./update-yum-archive.sh" + if test "${CENTOS_DIST}"; then + if ! ssh ftp.indexdata.dk "sudo -n /home/indexdata/proj/git-tools/update-archive/update-yum-archive.sh"; then + echo "update-yum-archive.sh failed" + exit 1 + fi + fi + if test "${UBUNTU_DIST}" -o "${DEBIAN_DIST}"; then + if ! ssh ftp.indexdata.dk "sudo -n /home/indexdata/proj/git-tools/update-archive/update-archive.sh --ubuntu=\"${UBUNTU_DIST}\" --debian=\"${DEBIAN_DIST}\""; then + echo "update-archive.sh failed" + exit 1 + fi fi - echo "====================================================" + echo "Upload successful - we hope" exit 0 fi @@ -180,10 +231,10 @@ for dist in ${CENTOS_DIST}; do exit 1 fi - if ssh $dist "test -f .rpmmacros && test -d rpmbuild/SOURCES && test -d rpmbuild/RPMS && test -d rpmbuild/SRPMS && test -x proj/git-tools/id-rpm-build/upload-rpms.sh"; then + if ssh $dist "test -f .rpmmacros && test -d rpmbuild/SOURCES && test -d rpmbuild/RPMS && test -d rpmbuild/SRPMS"; then : else - echo "Host $dist does not seem to be prepared with git-tools and rpmbuild directories" + echo "Host $dist does not seem to be prepared with rpmbuild directories" exit 1 fi