FreeBSD Bugzilla – Attachment 188719 Details for
Bug 223691
[exp-run] Migrate bsd.apache.mk to Uses/apache.mk
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
patching log and poudriere bulk
poudriere-bulk-Mk_Uses_apache.mk (text/plain), 10.87 KB, created by
Bernard Spil
on 2017-12-11 14:12:20 UTC
(
hide
)
Description:
patching log and poudriere bulk
Filename:
MIME Type:
Creator:
Bernard Spil
Created:
2017-12-11 14:12:20 UTC
Size:
10.87 KB
patch
obsolete
>Script started on Mon Dec 11 13:45:13 2017 >Command: sh ># date >Mon Dec 11 13:45:59 GMT 2017 ># cd /usr/ports ># svn st >? .portsnap.INDEX >? .snap >? INDEX-11 >M www/Makefile ># svn diff www/Makefile >Index: www/Makefile >=================================================================== >--- www/Makefile (revision 456022) >+++ www/Makefile (working copy) >@@ -2395,9 +2395,9 @@ > SUBDIR += unit > SUBDIR += unit-go > SUBDIR += unit-php56 >- SUBDIR += unit-php70 >- SUBDIR += unit-php71 >- SUBDIR += unit-php72 >+# SUBDIR += unit-php70 >+# SUBDIR += unit-php71 >+# SUBDIR += unit-php72 > SUBDIR += usermanager > SUBDIR += uwsgi > SUBDIR += uwsgitop ># fetch -o ~/patch-Mk_Uses_apache.mk https://brnrd.eu/bsd/patch-Mk_Uses_apache.mk > /root/patch-Mk_Uses_apache.mk 0% of 46 kB 0 Bps /root/patch-Mk_Uses_apache.mk 100% of 46 kB 3578 kBps 00m00s ># cp -p Mk/bsd.apache.mk Mk/Uses/apache.mk ># patch -p0 -V none -i ~/patch-Mk_Uses_apache.mk >Hmm... Looks like a unified diff to me... >The text leading up to this was: >-------------------------- >|Index: CHANGES >|=================================================================== >|--- CHANGES (revision 455909) >|+++ CHANGES (working copy) >-------------------------- >Patching file CHANGES using Plan A... >Hunk #1 succeeded at 10. >Hmm... The next patch looks like a unified diff to me... >The text leading up to this was: >-------------------------- >|Index: Mk/bsd.apache.mk >|=================================================================== >|--- Mk/bsd.apache.mk (revision 455400) >|+++ Mk/bsd.apache.mk (nonexistent) >-------------------------- >Patching file Mk/bsd.apache.mk using Plan A... >Empty context always matches. >Hunk #1 succeeded at 0 with fuzz 1. >Hmm... The next patch looks like a unified diff to me... >The text leading up to this was: >-------------------------- >| >|Property changes on: Mk/bsd.apache.mk >|___________________________________________________________________ >|Deleted: svn:eol-style >|## -1 +0,0 ## >|-native >|\ No newline at end of property >|Deleted: svn:keywords >|## -1 +0,0 ## >|-FreeBSD=%H >|\ No newline at end of property >|Deleted: svn:mime-type >|## -1 +0,0 ## >|-text/plain >|\ No newline at end of property >|Index: Mk/Uses/apache.mk >|=================================================================== >|--- Mk/Uses/apache.mk (revision 455400) >|+++ Mk/Uses/apache.mk (working copy) >-------------------------- >Patching file Mk/Uses/apache.mk using Plan A... >Hunk #1 succeeded at 1 with fuzz 1. >Hunk #2 succeeded at 142. >Hunk #3 succeeded at 159. >Hunk #4 succeeded at 190. >Hunk #5 succeeded at 230. >Hunk #6 succeeded at 241. >Hunk #7 succeeded at 295. >Hunk #8 succeeded at 313. >Hunk #9 succeeded at 341. >Hunk #10 succeeded at 387. >Hunk #11 succeeded at 429. >Hmm... The next patch looks like a unified diff to me... >The text leading up to this was: >-------------------------- >|Index: Mk/bsd.port.mk >|=================================================================== >|--- Mk/bsd.port.mk (revision 455899) >|+++ Mk/bsd.port.mk (working copy) >-------------------------- >Patching file Mk/bsd.port.mk using Plan A... >Hunk #1 succeeded at 437. >Hunk #2 succeeded at 1413. >Hunk #3 succeeded at 1984. >Hmm... The next patch looks like a unified diff to me... >The text leading up to this was: >-------------------------- >|Index: Mk/bsd.sanity.mk >|=================================================================== >|--- Mk/bsd.sanity.mk (revision 455400) >|+++ Mk/bsd.sanity.mk (working copy) >-------------------------- >Patching file Mk/bsd.sanity.mk using Plan A... >Hunk #1 succeeded at 176. >Hunk #2 succeeded at 238. >Hmm... The next patch looks like a unified diff to me... >The text leading up to this was: >-------------------------- >|Index: Mk/Uses/php.mk >|=================================================================== >|--- Mk/Uses/php.mk (revision 455909) >|+++ Mk/Uses/php.mk (working copy) >-------------------------- >Patching file Mk/Uses/php.mk using Plan A... >Hunk #1 succeeded at 206. >Hmm... The next patch looks like a unified diff to me... >The text leading up to this was: >-------------------------- >|Index: www/apache22/Makefile >|=================================================================== >|--- www/apache22/Makefile (revision 455934) >|+++ www/apache22/Makefile (working copy) >-------------------------- >Patching file www/apache22/Makefile using Plan A... >Hunk #1 succeeded at 26. >Hmm... The next patch looks like a unified diff to me... >The text leading up to this was: >-------------------------- >|Index: www/apache22/Makefile.modules >|=================================================================== >|--- www/apache22/Makefile.modules (revision 455934) >|+++ www/apache22/Makefile.modules (working copy) >-------------------------- >Patching file www/apache22/Makefile.modules using Plan A... >Hunk #1 succeeded at 83. >Hmm... The next patch looks like a unified diff to me... >The text leading up to this was: >-------------------------- >|Index: www/apache24/Makefile >|=================================================================== >|--- www/apache24/Makefile (revision 455934) >|+++ www/apache24/Makefile (working copy) >-------------------------- >Patching file www/apache24/Makefile using Plan A... >Hunk #1 succeeded at 20. >Hmm... The next patch looks like a unified diff to me... >The text leading up to this was: >-------------------------- >|Index: www/apache24/Makefile.modules >|=================================================================== >|--- www/apache24/Makefile.modules (revision 455934) >|+++ www/apache24/Makefile.modules (working copy) >-------------------------- >Patching file www/apache24/Makefile.modules using Plan A... >Hunk #1 succeeded at 68. >Hmm... The next patch looks like a unified diff to me... >The text leading up to this was: >-------------------------- >|Index: lang/php56/Makefile >|=================================================================== >|--- lang/php56/Makefile (revision 455400) >|+++ lang/php56/Makefile (working copy) >-------------------------- >Patching file lang/php56/Makefile using Plan A... >Hunk #1 succeeded at 88. >Hmm... The next patch looks like a unified diff to me... >The text leading up to this was: >-------------------------- >|Index: lang/php70/Makefile >|=================================================================== >|--- lang/php70/Makefile (revision 455400) >|+++ lang/php70/Makefile (working copy) >-------------------------- >Patching file lang/php70/Makefile using Plan A... >Hunk #1 succeeded at 92. >Hmm... The next patch looks like a unified diff to me... >The text leading up to this was: >-------------------------- >|Index: lang/php71/Makefile >|=================================================================== >|--- lang/php71/Makefile (revision 455400) >|+++ lang/php71/Makefile (working copy) >-------------------------- >Patching file lang/php71/Makefile using Plan A... >Hunk #1 succeeded at 94. >Hmm... The next patch looks like a unified diff to me... >The text leading up to this was: >-------------------------- >|Index: lang/php72/Makefile >|=================================================================== >|--- lang/php72/Makefile (revision 455400) >|+++ lang/php72/Makefile (working copy) >-------------------------- >Patching file lang/php72/Makefile using Plan A... >Hunk #1 succeeded at 87 (offset 1 line). >Hmm... The next patch looks like a unified diff to me... >The text leading up to this was: >-------------------------- >|Index: www/mod_auth_pubtkt/Makefile >|=================================================================== >|--- www/mod_auth_pubtkt/Makefile (revision 455934) >|+++ www/mod_auth_pubtkt/Makefile (working copy) >-------------------------- >Patching file www/mod_auth_pubtkt/Makefile using Plan A... >Hunk #1 succeeded at 18. >Hmm... The next patch looks like a unified diff to me... >The text leading up to this was: >-------------------------- >|Index: www/mod_evasive/Makefile >|=================================================================== >|--- www/mod_evasive/Makefile (revision 455934) >|+++ www/mod_evasive/Makefile (working copy) >-------------------------- >Patching file www/mod_evasive/Makefile using Plan A... >Hunk #1 succeeded at 30. >Hmm... The next patch looks like a unified diff to me... >The text leading up to this was: >-------------------------- >|Index: www/mod_mono/Makefile >|=================================================================== >|--- www/mod_mono/Makefile (revision 455934) >|+++ www/mod_mono/Makefile (working copy) >-------------------------- >Patching file www/mod_mono/Makefile using Plan A... >Hunk #1 succeeded at 23. >Hunk #2 succeeded at 33. >Hmm... The next patch looks like a unified diff to me... >The text leading up to this was: >-------------------------- >|Index: www/mod_perl2/Makefile >|=================================================================== >|--- www/mod_perl2/Makefile (revision 455934) >|+++ www/mod_perl2/Makefile (working copy) >-------------------------- >Patching file www/mod_perl2/Makefile using Plan A... >Hunk #1 succeeded at 33. >Hmm... The next patch looks like a unified diff to me... >The text leading up to this was: >-------------------------- >|Index: www/mod_scgi/Makefile >|=================================================================== >|--- www/mod_scgi/Makefile (revision 455934) >|+++ www/mod_scgi/Makefile (working copy) >-------------------------- >Patching file www/mod_scgi/Makefile using Plan A... >Hunk #1 succeeded at 22. >done ># poudriere bulk -j 111amd64 -a >[00:00:00] Creating the reference jail... done >[00:00:06] Mounting system devices for 111amd64-default >[00:00:06] Mounting ports/packages/distfiles >[00:00:06] Using packages from previously failed build >[00:00:06] Mounting packages from: /keg/data/packages/111amd64-default >[00:00:06] Appending to make.conf: /usr/local/etc/poudriere.d/111amd64-default-make.conf >/etc/resolv.conf -> /keg/data/.m/111amd64-default/ref/etc/resolv.conf >[00:00:06] Starting jail 111amd64-default >[00:00:06] Logs: /keg/data/logs/bulk/111amd64-default/2017-12-11_13h48m12s >[00:00:06] Loading MOVED >[00:00:06] Ports supports: FLAVORS SELECTED_OPTIONS >[00:00:06] Gathering ports metadata >[00:03:18] Calculating ports order and dependencies >[00:03:50] pkg package missing, skipping sanity >[00:03:50] Skipping incremental rebuild and repository sanity checks >[00:03:50] Cleaning the build queue >[00:03:54] Sanity checking build queue >[00:04:12] Balancing pool >[00:04:12] Recording filesystem state for prepkg... done >[00:04:13] Building 29221 packages using 32 builders >[00:04:13] Starting/Cloning builders >[00:04:28] Hit CTRL+t at any time to see build progress and stats >[00:04:28] [[0;31m01[0;0m] [00:00:00] Building [0;36mports-mgmt/pkg | pkg-1.10.3_1[0;0m[0;0m >[00:05:40] [[0;31m01[0;0m] [00:01:12] [0;32mFinished [0;36mports-mgmt/pkg | pkg-1.10.3_1[0;32m: Success[0;0m
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 223691
:
188031
|
188121
|
188122
|
188123
|
188696
|
188704
|
188718
| 188719 |
188804