|
Arjun Shankar |
2aa1cb2 |
This package supports working with patch files using quilt.
|
|
Arjun Shankar |
2aa1cb2 |
|
|
Arjun Shankar |
2aa1cb2 |
To regenerate the quilt series file run:
|
|
Arjun Shankar |
2aa1cb2 |
./gen-quilt-series.sh
|
|
Arjun Shankar |
2aa1cb2 |
|
|
Arjun Shankar |
2aa1cb2 |
Setup environment:
|
|
Arjun Shankar |
2aa1cb2 |
export QUILT_PATCHES=$PWD
|
|
Arjun Shankar |
2aa1cb2 |
|
|
Arjun Shankar |
2aa1cb2 |
Setup the source:
|
|
Arjun Shankar |
2aa1cb2 |
./quilt-patch.sh [-f]
|
|
Arjun Shankar |
2aa1cb2 |
|
|
Arjun Shankar |
2aa1cb2 |
Use `-f` if you want to have quilt-patch always remove the existing
|
|
Arjun Shankar |
2aa1cb2 |
source directory before starting. Otherwise you'll be patching on top of
|
|
Arjun Shankar |
2aa1cb2 |
an already patched tree generated perhaps by `*pkg prep`.
|
|
Arjun Shankar |
2aa1cb2 |
|
|
Arjun Shankar |
2aa1cb2 |
To add a new patch:
|
|
Arjun Shankar |
2aa1cb2 |
|
|
Arjun Shankar |
2aa1cb2 |
Option 1: Create a new patch:
|
|
Arjun Shankar |
2aa1cb2 |
|
|
Arjun Shankar |
2aa1cb2 |
cd flex-2.6.1/
|
|
Arjun Shankar |
2aa1cb2 |
quilt new flex-rh1439367.patch
|
|
Arjun Shankar |
2aa1cb2 |
quilt add tests/test-bison-yylloc/parser.y
|
|
Arjun Shankar |
2aa1cb2 |
# edit tests/test-bison-yylloc/parser.y
|
|
Arjun Shankar |
2aa1cb2 |
# you may add and edit several files in the same fashion
|
|
Arjun Shankar |
2aa1cb2 |
|
|
Arjun Shankar |
2aa1cb2 |
Option 2: Add an already prepared patch (e.g. from an upstream commit):
|
|
Arjun Shankar |
2aa1cb2 |
|
|
Arjun Shankar |
2aa1cb2 |
cd flex-2.6.1/
|
|
Arjun Shankar |
2aa1cb2 |
quilt import -P flex-rh1439367.patch ~/backport/obsolete-bison.patch
|
|
Arjun Shankar |
2aa1cb2 |
quilt push # if this fails, manually deal with conflicts (as in Option 1)
|
|
Arjun Shankar |
2aa1cb2 |
|
|
Arjun Shankar |
2aa1cb2 |
Finally:
|
|
Arjun Shankar |
2aa1cb2 |
quilt refresh -p ab
|
|
Arjun Shankar |
2aa1cb2 |
cd ..
|
|
Arjun Shankar |
2aa1cb2 |
git add flex-rh1439367.patch
|
|
Arjun Shankar |
2aa1cb2 |
# edit flex.spec to build with the new patch
|
|
Arjun Shankar |
2aa1cb2 |
git add flex.spec
|
|
Arjun Shankar |
2aa1cb2 |
git commit
|
|
Arjun Shankar |
2aa1cb2 |
|
|
Arjun Shankar |
2aa1cb2 |
You're done!
|