]>
Commit | Line | Data |
---|---|---|
66ee8158 | 1 | |
80008bca | 2 | util-linux |
5bbc26de | 3 | |
80008bca | 4 | util-linux is a random collection of Linux utilities |
601d12fb | 5 | |
80008bca | 6 | Note: for the years 2006-2010 this project was named "util-linux-ng". |
5bbc26de | 7 | |
5bbc26de KZ |
8 | MAILING LIST: |
9 | ||
d3b24397 | 10 | E-MAIL: util-linux@vger.kernel.org |
601d12fb | 11 | URL: http://vger.kernel.org/vger-lists.html#util-linux |
5bbc26de | 12 | |
80008bca | 13 | IRC CHANNEL: |
5bbc26de | 14 | |
80008bca | 15 | #util-linux at freenode.net: |
6a5486fd | 16 | |
80008bca | 17 | irc://chat.freenode.net/util-linux |
6a5486fd | 18 | |
80008bca WP |
19 | The IRC channel and Mailing list are for developers and project |
20 | maintainers. For end users it is recommended to utilize the | |
21 | distribution's support system. | |
6a5486fd | 22 | |
56cda4b7 KZ |
23 | BUG REPORTING: |
24 | ||
25 | E-MAIL: util-linux@vger.kernel.org | |
26 | Web: https://github.com/karelzak/util-linux/issues | |
27 | ||
80008bca WP |
28 | This project has no resources to provide support for distribution specific |
29 | issues. For end users it is recommended to utilize the distribution's | |
30 | support system. | |
31 | ||
32 | NLS (PO TRANSLATIONS): | |
33 | ||
34 | PO files are maintained by: | |
35 | http://translationproject.org/domain/util-linux.html | |
36 | ||
37 | VERSION SCHEMA: | |
38 | ||
39 | Standard releases: | |
40 | <major>.<minor>[.<maint>] | |
41 | major = fatal and deep changes | |
42 | minor = typical release with new features | |
43 | maint = maintenance releases; bug fixes only | |
44 | ||
45 | Development releases: | |
46 | <major>.<minor>-rc<N> | |
56cda4b7 | 47 | |
6a5486fd KZ |
48 | SOURCE CODE: |
49 | ||
80008bca WP |
50 | Download archive: |
51 | https://www.kernel.org/pub/linux/utils/util-linux/ | |
52 | ||
53 | SCM (Source Code Management) Repository: | |
56cda4b7 | 54 | |
80008bca WP |
55 | Primary repository: |
56 | git clone git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git | |
7ab6461f | 57 | |
80008bca WP |
58 | Backup repository: |
59 | git clone git://github.com/karelzak/util-linux.git | |
6a5486fd | 60 | |
80008bca WP |
61 | Web interfaces: |
62 | http://git.kernel.org/cgit/utils/util-linux/util-linux.git | |
63 | https://github.com/karelzak/util-linux | |
64 | ||
65 | Note: the GitHub repository may contain temporary development branches too. | |
7ab6461f KZ |
66 | |
67 | The kernel.org repository contains master (current development) and stable/* | |
68 | (maintenance) branches only. All master or stable/* changes are always pushed | |
80008bca | 69 | to both repositories at the same time. |
7ab6461f | 70 | |
80008bca WP |
71 | Repository Branches: 'git branch -a' |
72 | master branch | |
73 | - current development | |
74 | - the source for stable releases when deemed ready. | |
75 | - day-to-day status is: 'it works for me'. This means that its | |
76 | normal state is useful but not well tested. | |
77 | - long-term development or invasive changes in active development are | |
78 | forked into separate 'topic' branches from the tip of 'master'. | |
90a1baf6 | 79 | |
80008bca WP |
80 | stable/ branches |
81 | - public releases | |
82 | - branch name: stable/v<major>.<minor>. | |
83 | - created from the 'master' branch after two or more release | |
84 | candidates and the final public release. This means that the stable | |
85 | releases are committed, tagged, and reachable in 'master'. | |
86 | - these branches then become forked development branches. This means | |
87 | that any changes made to them diverge from the 'master' branch. | |
88 | - maintenance releases are part of, and belong to, their respective | |
89 | stable branch. As such, they are tags(<major>.<minor>.<maint>) and | |
90 | not branches of their own. They are not part of, visible in, or | |
91 | have anything to do with the 'master' development branch. In git | |
92 | terminology: maintenance releases are not reachable from 'master'. | |
93 | - when initially cloned (as with the 'git clone' command given above) | |
94 | these branches are created as 'remote tracking branches' and are | |
95 | only visible by using the -a or -r options to 'git branch'. To | |
96 | create a local branch use the desired tag with this command: | |
97 | 'git checkout -b v2.29.2 v2.29.2' | |
b2e00b5f | 98 | |
80008bca WP |
99 | Tags: 'git tag' |
100 | - a new tag object is created for every release. | |
101 | - tag name: v<version>. | |
102 | - all tags are signed by the maintainer's PGP key. | |
6a5486fd | 103 | |
80008bca WP |
104 | Known Bugs: |
105 | - don't use tag v2.13.1 (created and published by mistake), | |
106 | use v2.13.1-REAL instead. | |
5bbc26de | 107 | |
80008bca | 108 | WORKFLOW EXAMPLE: |
5bbc26de | 109 | |
80008bca | 110 | 1) development (branch: <master>) |
5bbc26de | 111 | |
80008bca | 112 | 2) master release (tags: v2.29-rc1, v2.29-rc2, v2.29, branch: <master>) |
5bbc26de | 113 | |
80008bca | 114 | 3) development (work on v2.30, branch: <master>) |
6a5486fd | 115 | |
80008bca WP |
116 | 4) fork -- create a new branch <stable/v2.29> based on tag v2.29 |
117 | ||
118 | 4a) new patches or cherry-pick patches from <master> (branch: <stable/v2.29>) | |
119 | ||
120 | 4b) stable release (tag: v2.29.1, branch: <stable/v2.29>) | |
121 | ||
122 | 4c) more patches; another release (tag: v2.29.2, branch: <stable/v2.29>) | |
123 | ||
124 | 5) master release v2.30 (branch: <master>) | |
125 | ... | |
126 | ||
127 | where 3) and 4) happen simultaneously. | |
5bbc26de | 128 |