1 |
commit: d9147eaa58db3f3a9d1f7a5213a454cae2f1e7a5 |
2 |
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 20 12:22:30 2014 +0000 |
4 |
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 20 12:22:30 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/linux-patches.git;a=commit;h=d9147eaa |
7 |
|
8 |
Updated gpdorelease for svn to git conversion |
9 |
|
10 |
--- |
11 |
scripts/gpdorelease | 19 ++++++++++--------- |
12 |
1 file changed, 10 insertions(+), 9 deletions(-) |
13 |
|
14 |
diff --git a/scripts/gpdorelease b/scripts/gpdorelease |
15 |
index 9f8ca05..4625190 100755 |
16 |
--- a/scripts/gpdorelease |
17 |
+++ b/scripts/gpdorelease |
18 |
@@ -15,9 +15,6 @@ function usage { |
19 |
echo " Example for kernel version 3.1.1: gpdorelease 3.1" |
20 |
} |
21 |
|
22 |
-echo "This is still under testing." |
23 |
-exit -1 |
24 |
- |
25 |
if [[ ${#@} == 0 ]] ; then |
26 |
usage |
27 |
exit -1 |
28 |
@@ -78,17 +75,18 @@ echo "Press enter to continue." |
29 |
read |
30 |
|
31 |
# checkout branch |
32 |
+echo "Checking out branch ${BRANCH}" |
33 |
cd ${LOCAL_PATCHES_TRUNK} |
34 |
|
35 |
git -C ${LOCAL_PATCHES_TRUNK} checkout ${BRANCH} |
36 |
|
37 |
-#svn copy ${REMOTE_TRUNK}/${BRANCH} ${REMOTE_TAGS}/${newfullver} -m "${newfullver} release" |
38 |
- |
39 |
file_base="/tmp/${TARBALL_BASENAME}-$newfullver.base.tar.xz" |
40 |
file_extras="/tmp/${TARBALL_BASENAME}-$newfullver.extras.tar.xz" |
41 |
file_experimental="/tmp/${TARBALL_BASENAME}-$newfullver.experimental.tar.xz" |
42 |
|
43 |
# build tarballs |
44 |
+echo "Creating tarballs in /tmp..." |
45 |
+ |
46 |
if [[ "${WE_WANT}" == *"base"* ]] ; then |
47 |
[ -n "$(find ./[012]* 2>/dev/null)" ] && tar -cvJf ${file_base} ./[012]* |
48 |
fi |
49 |
@@ -102,14 +100,17 @@ if [[ "${WE_WANT}" == *"experimental"* ]] ; then |
50 |
fi |
51 |
|
52 |
#tag release |
53 |
+echo "Tagging with ${newfullver}" |
54 |
+git -C ${LOCAL_PATCHES_TRUNK} tag ${newfullver} |
55 |
|
56 |
#push tag |
57 |
+echo "Pushing tag ${newfullver}" |
58 |
+git push --tags -u origin ${BRANCH} |
59 |
|
60 |
# copy files to distfiles-local |
61 |
-scp /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:/tmp |
62 |
- |
63 |
-#checkout master |
64 |
-echo "checkout command is git -C ${LOCAL_PATCHES_TRUNK} checkout master" |
65 |
+#scp /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:/tmp |
66 |
+echo "scp'in files to dev.gentoo.org:/space/distfiles-local" |
67 |
+scp /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:/space/distfiles-local |
68 |
|
69 |
##if [[ ${DO_WEBSITE} == "yes" ]] ; then |
70 |
# mv ${file_base} ${file_extras} ${file_experimental} ${WEB_LOCAL}/tarballs/ |