diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2015-12-30 12:36:24 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-12-30 14:10:21 -0800 |
| commit | 605b360651e85ca5923d0e9e8ea20343f7202301 (patch) | |
| tree | f141a91645313c5b757605198891f12bb2a6b5ef | |
| parent | f18abe54083fd0c89c372b1fad2ecd9abb6bf9db (diff) | |
| download | uhd-605b360651e85ca5923d0e9e8ea20343f7202301.tar.gz uhd-605b360651e85ca5923d0e9e8ea20343f7202301.tar.bz2 uhd-605b360651e85ca5923d0e9e8ea20343f7202301.zip | |
tools: made upload_debs.sh smarter about ignores
| -rwxr-xr-x | tools/debs/upload_debs.sh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tools/debs/upload_debs.sh b/tools/debs/upload_debs.sh index 9ecdbbbfb..c14096997 100755 --- a/tools/debs/upload_debs.sh +++ b/tools/debs/upload_debs.sh @@ -67,7 +67,7 @@ fi # Generate the TAR file to be uploaded. echo "Creating UHD source archive." -tar --exclude='*git*' --exclude='./debian' --exclude='*.swp' --exclude='fpga-src' --exclude='build' --exclude='images' --exclude='tags' -cJf ../uhd_${VERSION}.orig.tar.xz . +tar --exclude='*git*' --exclude='./debian' --exclude='*.swp' --exclude='fpga-src' --exclude='build' --exclude='./images/*.pyc' --exclude='./images/uhd-*' --exclude='tags' -cJf ../uhd_${VERSION}.orig.tar.xz . if [ $? != 0 ] then echo "Failed to create UHD source archive." @@ -75,9 +75,9 @@ then fi # debuild expects our directory name to be ${source package}-${version} -cd .. -ln -fs ${UHD_TOP_LEVEL} uhd-${VERSION} -cd uhd-${VERSION} +rm -f ${UHD_TOP_LEVEL}/../uhd-${VERSION} +ln -s ${UHD_TOP_LEVEL} ${UHD_TOP_LEVEL}/../uhd-${VERSION} +cd ${UHD_TOP_LEVEL}/../uhd-${VERSION} # # Generate package info for each version. @@ -109,7 +109,7 @@ do if [ $? != 0 ] then echo "Failed to generate package info for" ${RELEASE} - mv changelog.backup debian/changelog + mv ../changelog.backup debian/changelog exit 1 fi mv ../changelog.backup debian/changelog @@ -128,7 +128,6 @@ fi # Upload package into to Launchpad, which will automatically build packages for RELEASE in ${RELEASES} do - continue dput ${PPA} ../uhd_${VERSION}-0ubuntu1~${RELEASE}1_source.changes if [ $? != 0 ] then @@ -145,6 +144,6 @@ then if [ "$response" = "yes" ] then cd .. - rm -r ${UHD_TOP_LEVEL}/debian uhd-${VERSION} uhd_${VERSION}.orig.tar.xz uhd*dsc uhd*changes uhd*debian.tar.gz uhd*_source.build uhd*.upload + rm -r ${UHD_TOP_LEVEL}/debian uhd-${VERSION} uhd_${VERSION}.orig.tar.xz uhd*dsc uhd*changes uhd*debian.tar.xz uhd*_source.build uhd*.upload fi fi |