Submit #2606

[PATCH] update contrib/bmake to bmake-20131001

Added by kAworu 8 months ago. Updated 8 months ago.

Status:ClosedStart date:11/22/2013
Priority:LowDue date:
Assignee:marino% Done:

100%

Category:-
Target version:-

Description

Update bmake to the latest version.

0001-update-to-bmake-20131001.patch Magnifier (504 KB) kAworu, 11/22/2013 02:16 AM

0002-Revert-local-modification-patches-done-to-bmake.patch Magnifier (3.73 KB) kAworu, 11/22/2013 02:26 AM

0001-update-to-bmake-20131001.patch Magnifier (504 KB) kAworu, 11/22/2013 02:26 AM

0003-bmake-up-to-date-README.DELETED-and-README.DRAGONFLY.patch Magnifier (1.23 KB) kAworu, 11/22/2013 02:26 AM

0004-bmake-Apply-local-modifications-patches.patch Magnifier (2.1 KB) kAworu, 11/22/2013 02:26 AM

0005-bmake-local-modifications-in-order-to-make-it-compil.patch Magnifier (1.51 KB) kAworu, 11/22/2013 02:26 AM

0006-bmake-updated-files-in-usr.bin-bmake.patch Magnifier (1.39 KB) kAworu, 11/22/2013 02:26 AM

0007-bmake-update-README.DRAGONFLY.patch Magnifier (687 Bytes) kAworu, 11/22/2013 02:26 AM

0002-bmake-Revert-local-modification-patches.patch Magnifier (3.72 KB) kAworu, 11/22/2013 07:57 AM

0001-update-to-bmake-20131001.patch Magnifier (504 KB) kAworu, 11/22/2013 07:57 AM

0003-bmake-new-local-modifications.patch Magnifier (2.63 KB) kAworu, 11/22/2013 07:57 AM

0004-bmake-added-new-README.DELETED-README.DRAGONFLY-and-.patch Magnifier (2.43 KB) kAworu, 11/22/2013 07:57 AM

History

#1 Updated by kAworu 8 months ago

This patch the vendor/BMAKE branch in order to update bmake to bmake-20131001.

#3 Updated by marino 8 months ago

  • Assignee set to marino

I'll take it.

#4 Updated by marino 8 months 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")

#5 Updated by kAworu 8 months ago

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.

#6 Updated by marino 8 months 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.

#7 Updated by marino 8 months 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.

#8 Updated by marino 8 months 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!

Also available in: Atom PDF