Gentoo Archives: gentoo-commits

From: Mike Pagano <mpagano@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/linux-patches:genpatches-misc commit in: scripts/
Date: Fri, 20 Jun 2014 00:46:56
Message-Id: 1403225201.cf8ea0ccae44f50bb07348c5f474e00b56ad4255.mpagano@gentoo
1 commit: cf8ea0ccae44f50bb07348c5f474e00b56ad4255
2 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 20 00:46:41 2014 +0000
4 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 20 00:46:41 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/linux-patches.git;a=commit;h=cf8ea0cc
7
8 Start porting gpdorelease to git
9
10 ---
11 scripts/gpdorelease | 48 +++++++++++++++++++++++++++++++++---------------
12 1 file changed, 33 insertions(+), 15 deletions(-)
13
14 diff --git a/scripts/gpdorelease b/scripts/gpdorelease
15 index 1bb67e0..9f8ca05 100755
16 --- a/scripts/gpdorelease
17 +++ b/scripts/gpdorelease
18 @@ -1,6 +1,7 @@
19 #!/bin/bash
20
21 -#updated for 3.0
22 +# updated for git
23 +# updated for 3.0
24
25 function usage {
26 echo ">>> USAGE: gpdorelease <version>"
27 @@ -14,11 +15,15 @@ function usage {
28 echo " Example for kernel version 3.1.1: gpdorelease 3.1"
29 }
30
31 +echo "This is still under testing."
32 +exit -1
33 +
34 if [[ ${#@} == 0 ]] ; then
35 usage
36 exit -1
37 fi
38
39 +
40 if [[ ${1} == "--config" ]] ; then
41 echo "Sourcing ${2} instead of ~/.genpatchesrc"
42 source ${2}
43 @@ -34,12 +39,12 @@ fi
44
45 BRANCH="$1"
46
47 -if [[ $(svn status ${LOCAL_PATCHES_TRUNK} | wc -l) != "0" ]] ; then
48 +if [[ $(git -C ${LOCAL_PATCHES_TRUNK} status --porcelain | wc -l) != "0" ]] ; then
49 echo ">>> ERROR: There are uncommited changes in ${LOCAL_PATCHES_TRUNK}"
50 exit -1
51 fi
52
53 -EXISTING_TAGS="$(svn ls ${REMOTE_TAGS})"
54 +EXISTING_TAGS="$(git -C ${LOCAL_PATCHES_TRUNK} tag -l)"
55
56 lastver=0
57 for i in $EXISTING_TAGS ; do
58 @@ -50,6 +55,7 @@ for i in $EXISTING_TAGS ; do
59 fi
60 done
61
62 +
63 if [[ -z $lastrelease ]] ; then
64 newrel="1"
65 else
66 @@ -71,31 +77,43 @@ echo "Press enter to continue."
67
68 read
69
70 -svn copy ${REMOTE_TRUNK}/${BRANCH} ${REMOTE_TAGS}/${newfullver} -m "${newfullver} release"
71 +# checkout branch
72 +cd ${LOCAL_PATCHES_TRUNK}
73 +
74 +git -C ${LOCAL_PATCHES_TRUNK} checkout ${BRANCH}
75 +
76 +#svn copy ${REMOTE_TRUNK}/${BRANCH} ${REMOTE_TAGS}/${newfullver} -m "${newfullver} release"
77
78 file_base="/tmp/${TARBALL_BASENAME}-$newfullver.base.tar.xz"
79 file_extras="/tmp/${TARBALL_BASENAME}-$newfullver.extras.tar.xz"
80 file_experimental="/tmp/${TARBALL_BASENAME}-$newfullver.experimental.tar.xz"
81 -dir="${BRANCH}"
82 -cd ${LOCAL_PATCHES_TRUNK}
83
84 +# build tarballs
85 if [[ "${WE_WANT}" == *"base"* ]] ; then
86 - [ -n "$(find ${dir}/[012]* 2>/dev/null)" ] && tar -cvJf ${file_base} ${dir}/[012]*
87 + [ -n "$(find ./[012]* 2>/dev/null)" ] && tar -cvJf ${file_base} ./[012]*
88 fi
89
90 if [[ "${WE_WANT}" == *"extras"* ]] ; then
91 - [ -n "$(find ${dir}/[34]* 2>/dev/null)" ] && tar -cvJf ${file_extras} ${dir}/[34]*
92 + [ -n "$(find ./[34]* 2>/dev/null)" ] && tar -cvJf ${file_extras} ./[34]*
93 fi
94
95 if [[ "${WE_WANT}" == *"experimental"* ]] ; then
96 - [ -n "$(find ${dir}/50* 2>/dev/null)" ] && tar -cvJf ${file_experimental} ${dir}/50*
97 + [ -n "$(find ./50* 2>/dev/null)" ] && tar -cvJf ${file_experimental} ./50*
98 fi
99
100 -scp /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:/space/distfiles-local
101 +#tag release
102
103 -if [[ ${DO_WEBSITE} == "yes" ]] ; then
104 - mv ${file_base} ${file_extras} ${file_experimental} ${WEB_LOCAL}/tarballs/
105 - gpdoweb
106 -fi
107 +#push tag
108 +
109 +# copy files to distfiles-local
110 +scp /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:/tmp
111 +
112 +#checkout master
113 +echo "checkout command is git -C ${LOCAL_PATCHES_TRUNK} checkout master"
114 +
115 +##if [[ ${DO_WEBSITE} == "yes" ]] ; then
116 +# mv ${file_base} ${file_extras} ${file_experimental} ${WEB_LOCAL}/tarballs/
117 +# gpdoweb
118 +#fi
119
120 -[[ ${DO_EMAIL_ANNOUNCEMENT} == "yes" ]] && gpdoemail $newfullver $KERNEL_NAME
121 +#[[ ${DO_EMAIL_ANNOUNCEMENT} == "yes" ]] && gpdoemail $newfullver $KERNEL_NAME