diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
| commit | bd4aeefe33e63f613512604e47bfca7b2187697d (patch) | |
| tree | adb35b5a9a00ee7ea591ab0c987f70167c23b597 /sys-boot/colo | |
| parent | 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff) | |
gentoo resync : 03.11.2019
Diffstat (limited to 'sys-boot/colo')
| -rw-r--r-- | sys-boot/colo/Manifest | 3 | ||||
| -rw-r--r-- | sys-boot/colo/colo-1.22.ebuild | 10 | ||||
| -rw-r--r-- | sys-boot/colo/files/colo-stage2_src_heap-fix.patch | 24 |
3 files changed, 31 insertions, 6 deletions
diff --git a/sys-boot/colo/Manifest b/sys-boot/colo/Manifest index 03f64db42e51..8a3ebc92736d 100644 --- a/sys-boot/colo/Manifest +++ b/sys-boot/colo/Manifest @@ -1,6 +1,7 @@ +AUX colo-stage2_src_heap-fix.patch 715 BLAKE2B 4ee7b5d308fbe6d05741916e5c86af837abf17e8514c3686da47794109ec3e73d9247429a6488c0b7b11070d8ac5cf2b40ef8320c4a6e36704bacbd942df5e4c SHA512 eb7d440dc68bbf06ebb27a3d37439e7e141db4649a7b18f3acc1ea7b0ab7478dad7c3088eb8f8418cee2d35acb2e87f32b3dd39f3c77995ada5fdbb63c25ae49 AUX default.colo 840 BLAKE2B a97a6a0d121edccf49842c0b14f3b4d48e0e12d92c7a40e3a78ad09d4bfa7f4f9664f12e68d81226d4413e20ddfa9f471a628a509d3adb492c56d785252df26c SHA512 fdf82c9a6adaa5711d8d2c0efc6dc051158ed815f6b870b516eec497d8ce17608fd01dc795e35aaa22cc33c97bc9458803976f5265a196adbb5a89457e88e2b0 AUX menu.colo 1517 BLAKE2B 04d4ea5118ebe89229607a9beb8f6713a40f945df1d3ae0de867eed4cbf1df7be9ad30ddcc0a24a2489de1719424ea77d24a0c66ed42f6ce9da97b9bf175bd60 SHA512 a7357e176f45d5d352ea450349986ae5493900d60b363f688371348b727859d7be9b2a732e5210beba5216bfa8b8e6c861f2433573a009aabb71569eefcc5eaa AUX simple.colo 539 BLAKE2B fa8a255ffeac0ad14c0fc392fe65e89c9e627c022d0adbd9e1b1add70cc0535b9837f45d59ea1b43ae6919637a36c5364d38e75d4b5be7102e5dbf2c1727565d SHA512 38b3481adbad50c344f87cfd9a5346a78158cfd298194f715b40ad582d5fad9ad6e16f773004a8732e673bc8b3791dde39da10ac85c72a8e236837ca82a91d1a DIST colo-1.22.tar.gz 257968 BLAKE2B f7c8f97b3fed2d2071b89f84e3e78e814914999a3038c854d92e651e4c3a1aa1889e3486f2de94c561475befe4e4a4606e4873c4174ff0b24dcc290f494f5acb SHA512 c983f36991a6275d4864cbd12e00f4e73d3b722746b3d3c8442afc8fe00d5432772c93007999858afb0993e1a4917f94bc9803f017ace3e65535cad7e8fb9b1e -EBUILD colo-1.22.ebuild 3686 BLAKE2B 4855eb63e2142bd72d551432e8eb432d014ea1420de0d86727394a3140f684d255c5e81ab8a318b3ba738d482ef86d3b22cb58c665c725f5ac678b64f7883c68 SHA512 fe3a086342425a04afbc4517e28833968d0fc69a4852c16510a10b41b0ce22d9c823a0facb8d17c2e05232d1029ae8c5dc10147657f62837dac4d570a5f3f4cb +EBUILD colo-1.22.ebuild 3732 BLAKE2B 85ba505a299c539e4f2f60d9e408b8e9fd7146ac1b6dbea53093ec0980ec0beb08f5893ef497c4eef3031ae64509bb1e54a10908af3949cd90b0c0b49123e12c SHA512 97f659697aa18344fd66a8a03b5fa0d26efa9c03d15f60db44fec2d81e4cdf0d7621d554b7f1ff24c0e3b404f5766a5e31c00d7327467ba20d175b57436aeaa8 MISC metadata.xml 359 BLAKE2B df83dfc360f7f6ee89e81f5af531ecd3fb650ff69ef92e7829ed23b7ff3c304d263acea308d96d179a5274409a35801a082ceec3ad11e8dec06481e36a8f646f SHA512 5471afe51705e3499f4820e3a9e6af18166075fec78eee0f60866ce844b06f73148663630f9aedbb4f300f26608d8135385135a142533553939ed2924e97826f diff --git a/sys-boot/colo/colo-1.22.ebuild b/sys-boot/colo/colo-1.22.ebuild index 36d8c6e08464..d18a3506ac89 100644 --- a/sys-boot/colo/colo-1.22.ebuild +++ b/sys-boot/colo/colo-1.22.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=0 - +EAPI=6 inherit eutils toolchain-funcs DESCRIPTION="CObalt LOader - Modern bootloader for Cobalt MIPS machines" @@ -16,8 +15,9 @@ DEPEND="" RDEPEND="" RESTRICT="strip" -src_unpack() { - unpack ${A} +src_prepare() { + epatch "${FILESDIR}"/colo-stage2_src_heap-fix.patch + default } src_compile() { diff --git a/sys-boot/colo/files/colo-stage2_src_heap-fix.patch b/sys-boot/colo/files/colo-stage2_src_heap-fix.patch new file mode 100644 index 000000000000..6cd4e3a2a226 --- /dev/null +++ b/sys-boot/colo/files/colo-stage2_src_heap-fix.patch @@ -0,0 +1,24 @@ +diff -Naurp colo-1.22.orig/stage2/src/heap.c colo-1.22/stage2/src/heap.c +--- colo-1.22.orig/stage2/src/heap.c 2006-01-22 10:26:56.000000000 -0500 ++++ colo-1.22/stage2/src/heap.c 2019-10-20 23:20:17.167266445 -0400 +@@ -25,16 +25,16 @@ static size_t next_size; + void heap_reset(void) + { + extern char __text; +- void *restrict; ++ void *restrict2; + + assert(!((unsigned long) &__text & 15)); + + free_lo = KSEG0(0); + free_hi = KSEG0(&__text) - (32 << 10); // XXX + +- restrict = KSEG0(ram_restrict) - (16 << 10); // XXX +- if(free_hi > restrict) +- free_hi = restrict; ++ restrict2 = KSEG0(ram_restrict) - (16 << 10); // XXX ++ if(free_hi > restrict2) ++ free_hi = restrict2; + + image_size = 0; + image_size_mark = 0; |