@@ -78,8 +78,8 @@ agreement is shown below and at http://developercertificate.org/.
78
78
DCO Sign-Off Methods
79
79
====================
80
80
81
- The DCO requires a sign-off message in the following format appear on each
82
- commit in the pull request::
81
+ The DCO requires that a sign-off message, in the following format,
82
+ appears on each commit in the pull request::
83
83
84
84
Signed-off-by: Acrnus Jones <acrnusj@gmail.com>
85
85
@@ -95,9 +95,9 @@ Prerequisites
95
95
.. _project ACRN website : https://projectacrn.org
96
96
97
97
As a contributor, you'll want to be familiar with project ACRN, how to
98
- configure, install, and use it as explained in the ` project ACRN website `_
99
- and how to set up your development environment as introduced in the
100
- project ACRN `Getting Started Guide `_.
98
+ configure, install, and use it as explained on the
99
+ ` project ACRN website `_, and how to set up your development environment
100
+ as introduced in the project ACRN `Getting Started Guide `_.
101
101
102
102
.. _Getting Started Guide :
103
103
https://projectacrn.github.io/getting_started/
@@ -114,17 +114,24 @@ Repository layout
114
114
To clone the ACRN hypervisor repository use::
115
115
116
116
git clone https://github.com/projectacrn/acrn-hypervisor
117
-
117
+
118
118
To clone the ACRN device model repository use::
119
119
120
120
git clone https://github.com/projectacrn/acrn-devicemodel
121
121
122
+ To clone the ACRN documentation repository use::
123
+
124
+ git clone https://github.com/projectacrn/acrn-documentation
125
+
122
126
The project ACRN directory structure is described in the `Hypervisor
123
127
Primer `_ document. In addition to the ACRN hypervisor and device model itself,
124
- you'll also find the sources for technical documentation, sample code
125
- and supported board configurations . All of these are available for
128
+ you'll also find the sources for technical documentation available from
129
+ the ` ACRN documentation site `_ . All of these are available for
126
130
developers to contribute to and enhance.
127
131
132
+ .. _ACRN documentation site :
133
+ https://projectacrn.github.io/
134
+
128
135
.. _Hypervisor Primer :
129
136
https://projectacrn.github.io/hypervisor_primer
130
137
@@ -134,8 +141,9 @@ Submitting Issues
134
141
.. _ACRN-dev mailing list :
135
142
https://lists.projectacrn.org/g/acrn-dev
136
143
137
- Before starting on a patch, first check in our issues in the `ACRN-dev
138
- mailing list `_ system to see what's been reported on the issue you'd
144
+ Issue tracking for ACRN is done using the `ACRN-dev mailing list `_.
145
+ Before starting on a patch, first read through discussions in the `ACRN-dev
146
+ mailing list `_ to see what's been reported on the issue you'd
139
147
like to address. Have a conversation on the `ACRN-dev mailing list `_ to
140
148
see what others think of your issue (and proposed solution). You may
141
149
find others that have encountered the issue you're finding, or that have
@@ -158,7 +166,7 @@ Signed-off-by
158
166
159
167
The name in the commit message ``Signed-off-by: `` line and your email must
160
168
match the change authorship information. Make sure your :file: `.gitconfig `
161
- is set up correctly:
169
+ is set up correctly by using :
162
170
163
171
.. code-block :: console
164
172
@@ -203,7 +211,8 @@ and test your changes thoroughly before submitting.
203
211
The general GitHub workflow used by project ACRN developers uses a combination of
204
212
command line Git commands and browser interaction with GitHub. As it is with
205
213
Git, there are multiple ways of getting a task done. We'll describe a typical
206
- workflow here:
214
+ workflow here for the acrn-hypervisor repo that can also be used for the
215
+ acrn-devicemodel and acrn-documentation repos:
207
216
208
217
.. _Create a Fork of acrn-hypervisor :
209
218
https://github.com/projectacrn/acrn-hypervisor#fork-destination-box
@@ -232,14 +241,18 @@ workflow here:
232
241
233
242
#. Make changes, test locally, change, test, test again, ...
234
243
235
- #. When things look good, start the pull request process by adding your changed
236
- files::
244
+ #. When things look good, start the pull request process by checking
245
+ which files have not been staged::
246
+
247
+ git status
248
+
249
+ Then add the changed files::
237
250
238
251
git add [file(s) that changed, add -p if you want to be more specific]
239
252
240
- You can see files that are not yet staged using ::
253
+ (or to have all changed files added use) ::
241
254
242
- git status
255
+ git add -A
243
256
244
257
#. Verify changes to be committed look as you expected::
245
258
@@ -259,9 +272,9 @@ workflow here:
259
272
260
273
git push origin fix_comment_typo
261
274
262
- #. In your web browser, go to your forked repo and click on the Compare & pull
263
- request button for the branch you just worked on and you want to open a pull
264
- request with .
275
+ #. In your web browser, go to your personal forked repo and click on the Compare & pull
276
+ request button for the branch you just worked on and you want to
277
+ submit to the upstream repo .
265
278
266
279
#. Review the pull request changes, and verify that you are opening a pull request
267
280
for the appropriate branch. The title and message from your commit message should
@@ -285,7 +298,12 @@ workflow here:
285
298
and use the same process described above to work on this new topic branch.
286
299
287
300
#. If reviewers do request changes to your patch, you can interactively rebase
288
- commit(s) to fix review issues. In your development repo::
301
+ commit(s) to fix review issues. In your development repo, make the
302
+ needed changes on the branch you made the initial submission::
303
+
304
+ git checkout fix-comment-typo
305
+
306
+ then::
289
307
290
308
git fetch --all
291
309
git rebase --ignore-whitespace upstream/master
@@ -311,8 +329,9 @@ workflow here:
311
329
312
330
By force pushing your update, your original pull request will be updated with
313
331
your changes so you won't need to resubmit the pull request.
314
-
315
- You can follow the same workflow for contributing to acrn-devicemodel.
332
+
333
+ You can follow the same workflow for contributing to acrn-devicemodel
334
+ or acrn-documentation repos.
316
335
317
336
318
337
Commit Guidelines
0 commit comments