source: branches/fc13-dev/server/doc/upgrade-tips @ 2409

Last change on this file since 2409 was 1661, checked in by ezyang, 14 years ago
Mass documentation update.
File size: 6.8 KB
Line 
1Upgrading Scripts for a new Fedora distribution
2===============================================
3
41. Gather knowledge
5-------------------
6
7You should read the Release Notes for all of the intervening
8releases.  For example, here are the Fedora 13 release notes:
9
10    http://docs.fedoraproject.org/en-US/Fedora/13/html/Release_Notes/
11
12Because we sometimes skip releases, you should read any skipped
13release's report notes.
14
15Example:
16
17    In Fedora 12, i586 was deprecated in favor of i686; this meant
18    that any parts of Scripts that referenced i586 explicitly had to
19    changed to i686.
20
212. Update the Scripts build environment
22---------------------------------------
23
24A large amount of the Scripts source repository is Fedora Release
25specific, so when you are ramping up the new release, you will want
26a new branch to do development on, before merging back upon the
27official release.  You can do this with:
28
29    svn cp svn://scripts.mit.edu/trunk \
30           svn://scripts.mit.edu/branches/fcXX-dev
31
32On the new branch, there are a number of files you will have to
33update:
34
352.1 Mock
36
37Mock needs to be setup for the new environment.  The first thing to do
38is to update the Makefile by substituting
39s/scripts-fcOLD/scripts-fcNEW/g on the /usr/bin/mock invocations.
40After that, you need to go to /etc/mock and create the new cfg file
41for the new scripts-fcXX-ARCH configurations (where ARCH is x86_64 and
42i386).  You can base the new cfg off of the older version's, however
43you will want to make the following changes:
44
45    * Update all references to the old Fedora release to the new
46      Fedora release.  This includes root, dist, mirrorlist, baseurl
47
48    * Temporarily disabling the web.mit.edu Scripts RPM repository
49      and the local RPM repository by setting enabled=0 (it's there for
50      a reason!)  However, the local RPM repository is fairly painless
51      to create and will come in handy when you start attempting to
52      build packages that have dependencies on other scriptsified
53      packages: you can set one up as scripts-build with:
54
55        mkdir ~/mock-local
56        createrepo ~/mock-local
57
583. Rebuild Scripts packages
59---------------------------
60
61In order to support specific extra functionality, we have scriptsified
62a variety of Fedora packages.  When the base packages get upgrades,
63we need to upgrade the scriptsification.  Some of the following topics
64are covered in 'package-build-howto', but a new Fedora release tends
65to also result in somewhat rarer situations.
66
67As you finish building packages, you'll want to place them somewhere
68so they don't get blown away on a successive mock build.  ~/mock-local
69is a good choice.  The Mock RPMs will be created in:
70
71    /var/lib/mock/$MOCK_ENV/result/
72
73Here are some of the common troubles you'll have to deal with:
74
753.1 Spec patches are no longer necessary
76
77When a Fedora release gets EOL'ed, we may continue to backport
78patches for CVE's manually.  When we upgrade to a non-EOL'd release,
79those patches will generally become unnecessary and can be dropped.
80
81You can drop a modified specfile from the repository simply by
82`svn rm`ing:
83
84    * The spec patch in server/fedora/specs,
85    * The source code patch in server/common/patches, and
86    * The upstream_yum entry in server/fedora/Makefile
87
88If a specfile merely bumps the version field, there may be no extra
89patch (this indicates that the maintainer rebuilt the package simply
90by manually dropping the new source tarball in rpmbuild/SOURCES,
91which is kind of sketchy but works.  See -c 1586 for an example.)
92
933.2 Spec patches no longer apply
94
95Symptom:
96
97    $ make patch-specs
98    patching file openssh.spec
99    Hunk #1 succeeded at 74 with fuzz 2 (offset 11 lines).
100    Hunk #2 failed at 88.
101    Hunk #3 succeeded at 177 (offset 14 lines).
102    Hunk #4 succeeded at 270 with fuzz 2 (offset 36 lines).
103    1 out of 4 hunks failed--saving rejects to openssh.spec.rej
104
105Fix:
106
107    The main thing to remember is where the generated files live
108    they are placed in rpmbuild/SPECS/openssh.spec{.rej,.orig}.
109    A workflow for fixing them might look like:
110
111        1. Inspect the rejects file.
112        2. As much as possible, manually fix the original diff
113           file in /srv/repository/server/fedora/specs
114        3. If absolutely necessary, edit the rpmbuild/SPECS/openssh.spec
115           file with any final changes (this is dangerous because
116           this file is blown away on a successive make)
117        4. Generate a new unified diff:
118             diff -u openssh.spec.orig openssh.spec > \
119                 /srv/repository/server/fedora/specs\openssh.spec.patch
120
1213.3 Mock fails with no error message
122
123Fix: You forgot to add scripts-build to the mock group.  See
124     https://bugzilla.redhat.com/show_bug.cgi?id=630791
125     [XXX: remove this entry when this bug is fixed]
126
1273.4 Source patches no longer apply
128
129Symptoms:
130
131    Generally, you will see these error messages after Mock starts
132    building (if they occur before Mock, that means it's a bug in the
133    spec patch, not a source patch that the spec patch references.)
134
135Fix:
136
137    The error message will be from within a schroot that Mock is using.
138    As a result, it's not immediately obvious where the files live.
139
140    The easiest approach is to use rpmbuild to manually reapply the
141    patches.
142
143        rpmbuild -bp path/to/foo.spec
144
145    If this fails complaining about a dependency, you should install
146    the dependency and add it to the Makefile.
147
148    Once you've fixed the patch, you can rerun rpmbuild after running
149
150        make setup
151
152    (This is useful if you can't do a full make due to another mock
153    process running.)
154
1554. "Officializing" everything
156-----------------------------
157
158web.mit.edu scripts repository (/mit/scripts/rpm-fcXX and
159/mit/scripts/rpm-fcXX-testing) needs to be made.  It's quite simple;
160all you need to do is copy the RPMs from the build server to there
161(probably going through a trusted machine, since you don't want to
162put your root tickets on a server.)  When you're done, run `createrepo`
163on the directory.
164
165Note that if you do a successive rebuild without bumping the Subversion
166revision (via a `svn up`), the new package will have the *same* version
167and yum will probably insist on using the old cached version.  You can
168use `yum clean all` to reset your cache and force yum to get the latest
169version.
170
1715. Update fs sysname
172--------------------
173
174Update /etc/sysconfig/openafs with an extra amd64_fedoraX_scripts and
175amd64_fedoraX sysname.  The format should be evident from the existing
176entries.  [XXX There might be other things you want]
177
1786. Extra stuff
179--------------
180
181Fedora occasionally updates the architecture name for 32-bit; the last
182such update was in Fedora 12, when i586 became i686.  Fixing this
183usually just involves replacing i586 with i686 in the appropriate places
184(Makefile, specfiles, /etc/mock configuration).  Note that for
185hysterical raisins we still refer to our 32-bit builds as i386.
186[XXX: Maybe this should change]
Note: See TracBrowser for help on using the repository browser.