Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

FL-385: update parallel make patch, fix GRUB_PLATFORMS=emu build

  • Loading branch information...
commit dc9f3648a434d2c5a3e61445e9b04176b9bd8395 1 parent 728db37
@angryvincent angryvincent authored
View
2  sys-boot/grub/Manifest
@@ -1,4 +1,4 @@
DIST grub-1.98.tar.gz 2449386 SHA256 bef2c1892e052967b65aab6aa62ac702c0e50ef8848506eacf3c0b2f5007c614 SHA512 569626018d9994fb51c2ce9232c143291147f11b6290c530d57d3b11513d0d8f720cfe35c74e9ca42a442f7018b5d2e11c625dce2320bc9594378d6e067c8c44 WHIRLPOOL 400cdf9c7f16cb336f416b2b8c8a5ae897f6366e3aa4c7470a8e21f72722d96c801487fc6950f7306f65bc21af2a41a1c3a2efc05a8e24a726caa53105152881
DIST grub-1.99.tar.xz 2639224 SHA256 f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b
-DIST grub-2.00.tar.xz 5136412 RMD160 2980d850230b1de9436636bd10c6637b372ff10f SHA1 274d91e96b56a5b9dd0a07accff69dbb6dfb596b SHA256 784ec38e7edc32239ad75b8e66df04dc8bfb26d88681bc9f627133a6eb85c458
+DIST grub-2.00.tar.xz 5136412 SHA256 784ec38e7edc32239ad75b8e66df04dc8bfb26d88681bc9f627133a6eb85c458 SHA512 f0dbfc90639491e5c671d2df206dec0139171bf096a99ee236f7ebf21cdafc6e6d39a9607e14ad2a6aee7c199ecc63f0a39573d969318e1a0cd32f989aa6b44a WHIRLPOOL b9690c023ab507926b8615ce28bf9de82b793ebd02126a5ecd52a130ab4bc52e2ae650b02ae2d784d4089e2981be944ba8b4800cde742aab793ff0d9029843c8
DIST unifont-1.0.pf2.xz 742800 SHA256 6ebee98b7711a577b7d24bb7c73d7d6b6947e9e27b85196fd1a031d2ad748b37 SHA512 b68497cabbe3aae69efeb012085e4d633b27121fad310fdf10edef764cc7fbbd4578ac2bf09acc0d35956813d3ec664a896d6d700a688251dd9a84d3b9535119 WHIRLPOOL f1f320433ed4584c46212976a4f8fa19df3c229a4eda34feab3b954198ddfbcb97204950c7f63cbebff649dc0b5157bfce9dcdf99fa52e4202d38e916b5ab444
View
30 sys-boot/grub/files/grub-2.00-parallel-make.patch
@@ -1,16 +1,38 @@
Fix parallel make problems.
-Upstream changesets 4547, 4552.
+Upstream changesets 4547, 4552, 4578.
--- gentpl.py
+++ gentpl.py
-@@ -487,7 +487,7 @@
- def manpage():
+@@ -484,10 +484,10 @@
+ def installdir(default="bin"):
+ return "[+ IF installdir +][+ installdir +][+ ELSE +]" + default + "[+ ENDIF +]"
+
+-def manpage():
++def manpage(adddeps):
r = "if COND_MAN_PAGES\n"
r += gvar_add("man_MANS", "[+ name +].[+ mansection +]\n")
- r += rule("[+ name +].[+ mansection +]", "[+ name +]", """
-+ r += rule("[+ name +].[+ mansection +]", "[+ name +] grub-mkconfig_lib", """
++ r += rule("[+ name +].[+ mansection +]", "[+ name +] " + adddeps, """
chmod a+x [+ name +]
PATH=$(builddir):$$PATH pkgdatadir=$(builddir) $(HELP2MAN) --section=[+ mansection +] -i $(top_srcdir)/docs/man/[+ name +].h2m -o $@ [+ name +]
""")
+@@ -503,7 +503,7 @@
+ r += gvar_add("TESTS", "[+ name +]")
+ r += "[+ ELSE +]"
+ r += var_add(installdir() + "_PROGRAMS", "[+ name +]")
+- r += "[+ IF mansection +]" + manpage() + "[+ ENDIF +]"
++ r += "[+ IF mansection +]" + manpage("") + "[+ ENDIF +]"
+ r += "[+ ENDIF +]"
+
+ r += var_set(cname() + "_SOURCES", platform_sources(platform))
+@@ -532,7 +532,7 @@
+ r += gvar_add ("TESTS", "[+ name +]")
+ r += "[+ ELSE +]"
+ r += var_add(installdir() + "_SCRIPTS", "[+ name +]")
+- r += "[+ IF mansection +]" + manpage() + "[+ ENDIF +]"
++ r += "[+ IF mansection +]" + manpage("grub-mkconfig_lib") + "[+ ENDIF +]"
+ r += "[+ ENDIF +]"
+
+ r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """
--- grub-core/Makefile.am
+++ grub-core/Makefile.am
@@ -63,7 +63,7 @@
View
0  sys-boot/grub/grub-2.00-r5.ebuild → sys-boot/grub/grub-2.00-r6.ebuild
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.