1 |
commit: 470ee34f9ad87845f24fe4fe1bcd4d6b3f1be5e3 |
2 |
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 30 12:55:34 2014 +0000 |
4 |
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 30 12:55:34 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/linux-patches.git;a=commit;h=470ee34f |
7 |
|
8 |
Update documentation scripts |
9 |
|
10 |
--- |
11 |
repo-doc/00_intro | 13 ++++++------- |
12 |
repo-doc/10_scripts | 35 +++++++++++++++++++++++------------ |
13 |
repo-doc/20_release-howto | 6 +----- |
14 |
3 files changed, 30 insertions(+), 24 deletions(-) |
15 |
|
16 |
diff --git a/repo-doc/00_intro b/repo-doc/00_intro |
17 |
index 9153a1b..895a117 100644 |
18 |
--- a/repo-doc/00_intro |
19 |
+++ b/repo-doc/00_intro |
20 |
@@ -1,16 +1,17 @@ |
21 |
Repository layout for linux-patches/genpatches-2.6 |
22 |
================================================== |
23 |
|
24 |
-trunk: This contains the 'branches' which we are actively developing. |
25 |
- Each branch is held in its own directory, e.g. "2.6.11" and "2.6.12-pre" |
26 |
- -pre versions represent development patchsets for latest -rc kernels. |
27 |
+trunk: Trunk only contains the 0000_README file and one generic patch |
28 |
+ |
29 |
+branch: For each kernel branch we support we have a correspding branch in |
30 |
+ our repo. We have branches at the minor level. e.g. 3.14,3.15,etc |
31 |
|
32 |
tags: Whenever we snapshot a branch and release it in tarballs, we tag it in |
33 |
the repository, as the full kernel name plus our own release version, |
34 |
e.g. 2.6.11-9 |
35 |
|
36 |
historical: When we stop actively developing a branch, we move the branch as-is |
37 |
- to here. |
38 |
+ to here. TODO |
39 |
|
40 |
Checking out the working repository |
41 |
=================================== |
42 |
@@ -18,7 +19,5 @@ Checking out the working repository |
43 |
Most of the time, you will only need to work under trunk - there is no point |
44 |
checking out all the tagged and historical branches. |
45 |
|
46 |
-# svn co \ |
47 |
- svn+ssh://username@××××××××××.org/var/svnroot/linux-patches/genpatches-2.6/trunk genpatches |
48 |
- |
49 |
+# git clone git+ssh://git@×××××××××××××××××××.org/proj/linux-patches.git |
50 |
|
51 |
|
52 |
diff --git a/repo-doc/10_scripts b/repo-doc/10_scripts |
53 |
index 823ddf6..e73eb47 100644 |
54 |
--- a/repo-doc/10_scripts |
55 |
+++ b/repo-doc/10_scripts |
56 |
@@ -26,33 +26,38 @@ variables. |
57 |
Here's a sample config: |
58 |
|
59 |
--- start ~/.genpatchesrc ----------------------------------------------------- |
60 |
-# Your username for Gentoo SVN |
61 |
-USERNAME="dsd" |
62 |
+# Your username for Gentoo Git |
63 |
+USERNAME="mpagano" |
64 |
|
65 |
-# The path to the directory where you have checked out trunk |
66 |
-LOCAL_PATCHES_TRUNK="/home/dsd/projects/gentoo/genpatches" |
67 |
+# The path to the directory where you have cloned the repo |
68 |
+LOCAL_PATCHES_TRUNK="/home/mike/gentoo/linux-patches" |
69 |
+ |
70 |
+#temporary directory |
71 |
+LOCAL_TMP="/tmp" |
72 |
|
73 |
# Remote repository configuration |
74 |
-REMOTE_BASE="svn+ssh://${USERNAME}@svn.gentoo.org/var/svnroot/linux-patches" |
75 |
-REMOTE_TRUNK="${REMOTE_BASE}/genpatches-2.6/trunk" |
76 |
-REMOTE_TAGS="${REMOTE_BASE}/genpatches-2.6/tags" |
77 |
+REMOTE_BASE="git+ssh://git@×××××××××××××××××××.org/proj/linux-patches.git" |
78 |
|
79 |
TARBALL_BASENAME="genpatches" |
80 |
KERNEL_NAME="genpatches" |
81 |
-WE_WANT="base extras experimental" |
82 |
|
83 |
-DO_WEBSITE="yes" |
84 |
+DO_WEBSITE="no" |
85 |
DO_EMAIL_ANNOUNCEMENT="yes" |
86 |
|
87 |
# Website/email stuff |
88 |
-WEB_LOCAL="/home/dsd/projects/gentoo/genpatches-misc/web" |
89 |
-WEB_GENPATCHES_BASE="dev.gentoo.org:/home/dsd/public_html/genpatches" |
90 |
-SENDMAIL="ssh dsd@zog /usr/sbin/sendmail" |
91 |
+WEB_LOCAL="/home/mike/gentoo/linux-patches-misc/web" |
92 |
+WEB_GENPATCHES_BASE="dev.gentoo.org:/home/mpagano/public_html/genpatches" |
93 |
+SENDMAIL="ssh mpagano@××××××××××.org /usr/sbin/sendmail" |
94 |
+ |
95 |
+WE_WANT="base extras experimental" |
96 |
+ |
97 |
--- end ~/.genpatchesrc ------------------------------------------------------- |
98 |
|
99 |
gppatch |
100 |
======= |
101 |
|
102 |
+TODO - not yet converted go support git migration |
103 |
+ |
104 |
Applies a single genpatches patch to a kernel source tree in the current |
105 |
directory. |
106 |
|
107 |
@@ -71,6 +76,8 @@ To dry-run a patch you can do: |
108 |
gpmultipatch |
109 |
============ |
110 |
|
111 |
+TODO - not yet converted go support git migration |
112 |
+ |
113 |
Applies a trunk genpatches branch to a kernel source tree in the current |
114 |
directory. |
115 |
|
116 |
@@ -112,6 +119,8 @@ Post-commit hooks |
117 |
gpcreatebranch |
118 |
============== |
119 |
|
120 |
+TODO - not yet converted go support git migration |
121 |
+ |
122 |
Copy one branch to another under trunk. |
123 |
|
124 |
Example: This will create a 2.6.13-pre branch from the 2.6.12 branch |
125 |
@@ -121,6 +130,8 @@ Example: This will create a 2.6.13-pre branch from the 2.6.12 branch |
126 |
gpmvhistorical |
127 |
============== |
128 |
|
129 |
+TODO - not yet converted go support git migration |
130 |
+ |
131 |
Move a trunk branch into historical |
132 |
|
133 |
Example: Move 2.6.11 into historical: |
134 |
|
135 |
diff --git a/repo-doc/20_release-howto b/repo-doc/20_release-howto |
136 |
index 7bea709..f28cfd7 100644 |
137 |
--- a/repo-doc/20_release-howto |
138 |
+++ b/repo-doc/20_release-howto |
139 |
@@ -13,10 +13,6 @@ the last 2.6.11 release. If there was no previous release, it will use |
140 |
"2.6.11-1", but if it (e.g.) found the previous release to be "2.6.11-3" then |
141 |
it will use a new version of "2.6.11-4". |
142 |
|
143 |
-It will then copy the 2.6.11 branch into tags as the new version number deduced |
144 |
-above. |
145 |
- |
146 |
It will then generate tarballs of the branch, named with the same version tag, |
147 |
placed into /tmp. These tarballs will then be uploaded to distfiles-local on |
148 |
-toucan. |
149 |
- |
150 |
+woodpecker. |