diff options
| author | Clark Williams <clark.williams@gmail.com> | 2013-11-15 15:39:21 -0600 |
|---|---|---|
| committer | Clark Williams <clark.williams@gmail.com> | 2013-11-15 15:39:21 -0600 |
| commit | 7ff65cfa9d4e73841d9dbf05b2678902f12014a7 (patch) | |
| tree | 1e8c6b7142503a21ea7049dd19913abf7b81cc1c | |
| parent | 4ab63398b92d693c23e19882a5397ee9b950dfe7 (diff) | |
| download | rt-tests-7ff65cfa9d4e73841d9dbf05b2678902f12014a7.tar.gz | |
updated Makefile and do-git-push script to use kup
Signed-off-by: Clark Williams <clark.williams@gmail.com>
| -rw-r--r-- | Makefile | 7 | ||||
| -rwxr-xr-x | scripts/do-git-push | 18 |
2 files changed, 14 insertions, 11 deletions
@@ -148,9 +148,12 @@ release: distclean changelog mkdir -p releases mkdir -p tmp/rt-tests cp -r Makefile COPYING ChangeLog src tmp/rt-tests - tar -C tmp -czf rt-tests-$(VERSION_STRING).tar.gz rt-tests + rm -f rt-tests-$(VERSION_STRING).tar rt-tests-$(VERSION_STRING).tar.asc + tar -C tmp -cf rt-tests-$(VERSION_STRING).tar rt-tests + gpg2 --default-key clrkwllms@kernel.org --detach-sign --armor rt-tests-$(VERSION_STRING).tar + gzip rt-tests-$(VERSION_STRING).tar rm -f ChangeLog - cp rt-tests-$(VERSION_STRING).tar.gz releases + cp rt-tests-$(VERSION_STRING).tar.gz rt-tests-$(VERSION_STRING).tar.asc releases .PHONY: push push: release diff --git a/scripts/do-git-push b/scripts/do-git-push index e290310..1530d10 100755 --- a/scripts/do-git-push +++ b/scripts/do-git-push @@ -1,6 +1,6 @@ #!/bin/sh # -# script to automate pushing rt-tests tarball and git branch to +# script to automate pushing rt-tests tarball and git branch to # kernel.org. # # This won't work if you aren't me :) @@ -28,7 +28,7 @@ fi version=$1 accnt=clrkwllms@master.kernel.org -destpath=/pub/linux/kernel/people/clrkwllms/rt-tests +destpath=/pub/linux/kernel/people/clrkwllms/ branch=$(git symbolic-ref -q HEAD) if [ $testing -eq 1 ]; then @@ -88,6 +88,8 @@ fi # copy the tarball if it isn't already there tar=rt-tests-$version.tar.gz +asc=rt-tests-$version.tar.asc + if [ ! -e $tar ]; then echo "Generating tarfile $tar" @@ -96,20 +98,18 @@ else echo "Using existing tarfile $tar" fi -if ssh $accnt ls $destpath/$tar >/dev/null 2>&1 +if kup ls $destpath | grep $tar > /dev/null 2>&1 then - echo "Tarfile $tar already on kernel.org" + echo "Tarfile $tar is already on kernel.org" else - echo "Copying tarball $tar to kernel.org" + echo "Copying tarfile $tar to kernel.org" if [ $testing -eq 0 ]; then - scp $tar $accnt:$destpath + kup put $tar $asc $destpath/$tar else - echo "testing: copy tarball" + echo "testing: copy tarfile" fi fi [ $testing -eq 1 ] && dryrun=--dry-run echo "Pushing master and tags to kernel.org" git push $dryrun --tags origin master - - |