From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QVMD5-0004Gy-Bz for garchives@archives.gentoo.org; Sat, 11 Jun 2011 11:18:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A28BB1C026; Sat, 11 Jun 2011 11:18:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 633921C026 for ; Sat, 11 Jun 2011 11:18:23 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D876C1B4002 for ; Sat, 11 Jun 2011 11:18:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 158B78003C for ; Sat, 11 Jun 2011 11:18:22 +0000 (UTC) From: "Tomas Chvatal" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tomas Chvatal" Message-ID: <809b6f1e3e4be9ee8f28530b29111e6d6ff835f4.scarabeus@gentoo> Subject: [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/ X-VCS-Repository: dev/scarabeus X-VCS-Files: sys-boot/grub/Manifest sys-boot/grub/grub-1.99.ebuild sys-boot/grub/grub-9999.ebuild X-VCS-Directories: sys-boot/grub/ X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal X-VCS-Revision: 809b6f1e3e4be9ee8f28530b29111e6d6ff835f4 Date: Sat, 11 Jun 2011 11:18:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 92e8bb011ce1b66b40dc67315ce936e2 commit: 809b6f1e3e4be9ee8f28530b29111e6d6ff835f4 Author: Tomas Chvatal gentoo org> AuthorDate: Sat Jun 11 11:17:59 2011 +0000 Commit: Tomas Chvatal gentoo org> CommitDate: Sat Jun 11 11:17:59 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/scarabeus.git;= a=3Dcommit;h=3D809b6f1e [sys-boot/grub] Rename efi cutting so it does not break qemu targets. Add= loongson target for live version as yeelong was renamed. --- sys-boot/grub/Manifest | 4 ++-- sys-boot/grub/grub-1.99.ebuild | 14 +++++++------- sys-boot/grub/grub-9999.ebuild | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index 9f6ccf6..75508d4 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -1,5 +1,5 @@ AUX grub.default 1127 RMD160 a884e842cb203687cac4cac6551b0feed58d3b7a SH= A1 5878147845b5d4b4aac34ce046ead60b93c3170c SHA256 32664f2e0bdd05cf9579f8= e098aa0add76ef7bf7b37eb103c6d0f625204f44d3 DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa1= 47747 SHA1 a5ae9558f30ce7757a76aa130088b053a87e2fb6 SHA256 f308148d4c83c6= f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b -EBUILD grub-1.99.ebuild 7683 RMD160 586653c6286ea53086b11dfe663a5052dd2a= 78c1 SHA1 77ac581dc7e23d937ff37308faa2d226f8a6fe8c SHA256 022b97492e4b2b1= cace0f853e87b8282a2e6cdfe19e0d469836b400c0fd9cea7 -EBUILD grub-9999.ebuild 7683 RMD160 586653c6286ea53086b11dfe663a5052dd2a= 78c1 SHA1 77ac581dc7e23d937ff37308faa2d226f8a6fe8c SHA256 022b97492e4b2b1= cace0f853e87b8282a2e6cdfe19e0d469836b400c0fd9cea7 +EBUILD grub-1.99.ebuild 7683 RMD160 12631ba0d4d494bc0de901cbc11fb76f3493= 8f29 SHA1 c2a90722db4cf03ed6334cc597f3504884814b4c SHA256 3bde7f19ec359b7= ce33e50b1d7b4fd07f27e6bdcf576bb54cbb06fe3b6d9319b +EBUILD grub-9999.ebuild 7684 RMD160 ad7613fb1cccf77d2a81a75840db737cf641= a936 SHA1 c46926839bc99ede02aaa21709fcd702c7fefa08 SHA256 bf2c6a9db29e0e3= a39ae345bafe0cb43dde0330348e4c8922dc9e10924d46139 MISC metadata.xml 264 RMD160 3cb995676f964b9637fbfc0027a81b9409802608 SH= A1 c4d35e3a71c545cdf1aae525de803126bf54f596 SHA256 9bd1ce830cf1b821978ab9= 0c81b2e369177a8d7c1bfe2dd2868419872c097f64 diff --git a/sys-boot/grub/grub-1.99.ebuild b/sys-boot/grub/grub-1.99.ebu= ild index c229a4c..1f19fd3 100644 --- a/sys-boot/grub/grub-1.99.ebuild +++ b/sys-boot/grub/grub-1.99.ebuild @@ -26,7 +26,7 @@ SLOT=3D"2" [[ ${PV} !=3D "9999" ]] && KEYWORDS=3D"~amd64 ~x86 ~mips ~ppc ~ppc64" IUSE=3D"custom-cflags debug device-mapper nls static sdl truetype" =20 -GRUB_PLATFORMS=3D"coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu = qemu-mips yeeloong" +GRUB_PLATFORMS=3D"coreboot efi_32 efi_64 emu ieee1275 multiboot pc qemu = qemu-mips yeeloong" # everywhere: # emu # mips only: @@ -34,9 +34,9 @@ GRUB_PLATFORMS=3D"coreboot efi-32 efi-64 emu ieee1275 m= ultiboot pc qemu qemu-mips # amd64, x86, ppc, ppc64 # ieee1275 # amd64, x86 -# coreboot, multiboot, efi-32, pc, qemu +# coreboot, multiboot, efi_32, pc, qemu # amd64 -# efi-64 +# efi_64 for i in ${GRUB_PLATFORMS}; do IUSE+=3D" grub_platforms_${i}" done @@ -132,16 +132,16 @@ grub_src_configure() { # check if we have to specify the target (EFI) # or just append correct --with-platform if [[ -n ${platform} ]]; then - if [[ ${platform/-*} =3D=3D ${platform} ]]; then + if [[ ${platform/_*} =3D=3D ${platform} ]]; then platform=3D" --with-platform=3D${platform}" else # EFI platform hack - [[ ${platform/*-} =3D=3D 32 ]] && target=3Di386 - [[ ${platform/*-} =3D=3D 64 ]] && target=3Dx86_64 + [[ ${platform/*_} =3D=3D 32 ]] && target=3Di386 + [[ ${platform/*_} =3D=3D 64 ]] && target=3Dx86_64 # program-prefix is required empty because otherwise it is equal to # target variable, which we do not want at all platform=3D" - --with-platform=3D${platform/-*} + --with-platform=3D${platform/_*} --target=3D${target} --program-prefix=3D " diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebu= ild index c229a4c..7ae0b4e 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -26,17 +26,17 @@ SLOT=3D"2" [[ ${PV} !=3D "9999" ]] && KEYWORDS=3D"~amd64 ~x86 ~mips ~ppc ~ppc64" IUSE=3D"custom-cflags debug device-mapper nls static sdl truetype" =20 -GRUB_PLATFORMS=3D"coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu = qemu-mips yeeloong" +GRUB_PLATFORMS=3D"coreboot efi_32 efi_64 emu ieee1275 multiboot pc qemu = qemu-mips loongson" # everywhere: # emu # mips only: -# qemu-mips, yeelong +# qemu-mips, loongson # amd64, x86, ppc, ppc64 # ieee1275 # amd64, x86 -# coreboot, multiboot, efi-32, pc, qemu +# coreboot, multiboot, efi_32, pc, qemu # amd64 -# efi-64 +# efi_64 for i in ${GRUB_PLATFORMS}; do IUSE+=3D" grub_platforms_${i}" done @@ -132,16 +132,16 @@ grub_src_configure() { # check if we have to specify the target (EFI) # or just append correct --with-platform if [[ -n ${platform} ]]; then - if [[ ${platform/-*} =3D=3D ${platform} ]]; then + if [[ ${platform/_*} =3D=3D ${platform} ]]; then platform=3D" --with-platform=3D${platform}" else # EFI platform hack - [[ ${platform/*-} =3D=3D 32 ]] && target=3Di386 - [[ ${platform/*-} =3D=3D 64 ]] && target=3Dx86_64 + [[ ${platform/*_} =3D=3D 32 ]] && target=3Di386 + [[ ${platform/*_} =3D=3D 64 ]] && target=3Dx86_64 # program-prefix is required empty because otherwise it is equal to # target variable, which we do not want at all platform=3D" - --with-platform=3D${platform/-*} + --with-platform=3D${platform/_*} --target=3D${target} --program-prefix=3D "