diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2020-03-28 18:45:02 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2020-03-28 18:45:02 +0000 |
| commit | 3499053bf3ec6a911ae6a993f86f395bab3815d2 (patch) | |
| tree | d5977e2ad1e8a125aa8579dd68133c0bab24e638 | |
| parent | 31ef3f49d4fd96b67b0e578c5f672fe428430b14 (diff) | |
| download | klibc-3499053bf3ec6a911ae6a993f86f395bab3815d2.tar.gz | |
[klibc] dash: README.dash: Change patch sync commands to use mailbox
It's going to be easier to operate on a mailbox than a lot of single
patches.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | usr/dash/README.dash | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/usr/dash/README.dash b/usr/dash/README.dash index 3846f0b525072a..de083092eceeac 100644 --- a/usr/dash/README.dash +++ b/usr/dash/README.dash @@ -6,18 +6,21 @@ It corresponds up to changeset 46abc8c6d8a5e9a5712bdc1312c0b6960eec65a4 omitting ee5cbe9fd6bc02f31b4d955606288de36c3d4eab. HOWTO sync branch: -1) Generate patch and fix up their path - git format-patch --subject-prefix=klibc -N <changeset>.. +1) Generate mailbox of patches and fix up their paths: + + git format-patch --subject-prefix=klibc -N --stdout <changeset>.. \ + > dash.mbox Path fixup: - perl -i -pe 's#^([-+]{3} [ab]/)src/#$1#g' 00*patch + perl -i -pe 's#^([-+]{3} [ab]/)src/#$1#g' dash.mbox + +2) Import patches from mailbox: -2) Import patches on by one git am --directory="usr/dash" --exclude="usr/dash/configure.ac" \ --exclude="usr/dash/ChangeLog" --exclude="usr/dash/dash.1" \ --exclude="usr/dash/Makefile.am" --exclude="usr/dash/mksignames.c" \ - --whitespace=fix -k -i -s ../dash/000X-foo.patch + --whitespace=fix -k -i -s ../dash/dash.mbox The only changes made are the addition of config.h, Kbuild usage, the omition of Changelog and manpage and automatic whitespace fixups. |