Submit #2606
closed
[PATCH] update contrib/bmake to bmake-20131001
Added by kAworu almost 11 years ago. Updated almost 11 years ago.
100%
Description
Update bmake to the latest version.
Files
Updated by kAworu almost 11 years ago
- File 0001-update-to-bmake-20131001.patch 0001-update-to-bmake-20131001.patch added
- % Done changed from 0 to 30
This patch the vendor/BMAKE branch in order to update bmake to bmake-20131001.
Updated by kAworu almost 11 years ago
- File 0001-update-to-bmake-20131001.patch 0001-update-to-bmake-20131001.patch added
- File 0002-Revert-local-modification-patches-done-to-bmake.patch 0002-Revert-local-modification-patches-done-to-bmake.patch added
- File 0003-bmake-up-to-date-README.DELETED-and-README.DRAGONFLY.patch 0003-bmake-up-to-date-README.DELETED-and-README.DRAGONFLY.patch added
- File 0004-bmake-Apply-local-modifications-patches.patch 0004-bmake-Apply-local-modifications-patches.patch added
- File 0005-bmake-local-modifications-in-order-to-make-it-compil.patch 0005-bmake-local-modifications-in-order-to-make-it-compil.patch added
- File 0006-bmake-updated-files-in-usr.bin-bmake.patch 0006-bmake-updated-files-in-usr.bin-bmake.patch added
- File 0007-bmake-update-README.DRAGONFLY.patch 0007-bmake-update-README.DRAGONFLY.patch added
- % Done changed from 30 to 100
Full patchset is attached against the master branch.
Updated by marino almost 11 years ago
Just going off the titles (I'll look in depth later), it seems some of these could be combined.
e.g. 0004 and 0005 could be flattened into one.
0003, 0006, and 0007 could be flattened into one.
so the master branch would see:
A) local modifications reverted
B) trivial merge with vendor/BMAKE
C) new local modifications added back
D) README.DELETED, README.DRAGONFLY, usr.bin/bmake/* all added in the same commit
(This minimizes the number of commits in which the master branch is "broken")
Updated by kAworu almost 11 years ago
- File 0001-update-to-bmake-20131001.patch 0001-update-to-bmake-20131001.patch added
- File 0002-bmake-Revert-local-modification-patches.patch 0002-bmake-Revert-local-modification-patches.patch added
- File 0003-bmake-new-local-modifications.patch 0003-bmake-new-local-modifications.patch added
- File 0004-bmake-added-new-README.DELETED-README.DRAGONFLY-and-.patch 0004-bmake-added-new-README.DELETED-README.DRAGONFLY-and-.patch added
marino wrote:
Just going off the titles (I'll look in depth later), it seems some of these could be combined.
e.g. 0004 and 0005 could be flattened into one.
0003, 0006, and 0007 could be flattened into one.so the master branch would see:
A) local modifications reverted
B) trivial merge with vendor/BMAKE
C) new local modifications added back
D) README.DELETED, README.DRAGONFLY, usr.bin/bmake/* all added in the same commit(This minimizes the number of commits in which the master branch is "broken")
Sure, I've come up with a cleaner patchset as you described (see attachments).
I don't fully understand why the branch merge is still the first patch although I did revert local modification patches first and then did the merge, as with the first time `git format-patch master' has produced the merge as first patch.
Also for bmake I found out that we could remove the mk/ directory, but I don't know if it is worth the (re)work.
Updated by marino almost 11 years ago
I think it's based on the timestamp when you committed it to the vendor branch. In that sense, it is first.
If you merge a branch that had it's last commit 1 week ago, that commit would appear a week in the past in the master branch.
Updated by marino almost 11 years ago
I don't consider README.DELETED or README.DRAGONFLY part of of the local modifications, so they shouldn't be removed and readded as new. They aren't part of the vendor branch so it's not a question of enabling a trivial merge.
I'll internally modify this, I'm testing the patches now.
Updated by marino almost 11 years ago
- Status changed from New to Closed
Okay, making the README.D* change was the only thing I had to do.
I successfully built a world from scratch, and even checked ports (devel/gmake).
Your (slightly modified) patches have been committed.
Nice work!