From a137004caf66bf13fbc9bfdfeeae4811fde8ac37 Mon Sep 17 00:00:00 2001 From: wiktor w brodlo Date: Wed, 3 Aug 2011 13:23:24 +0000 Subject: sys-boot/grub: add x86 to supported target CPUs --- sys-boot/grub/Manifest | 3 ++- .../grub/files/add-x86-to-supported-targets.patch | 24 ++++++++++++++++++++++ sys-boot/grub/grub-1.99.ebuild | 1 + 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 sys-boot/grub/files/add-x86-to-supported-targets.patch diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index a441e28..592cb1d 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -1,5 +1,6 @@ AUX 00_fonts 462 RMD160 828b03d1201aa8b8abe339305ff4e2a8b99d1d33 SHA1 fcdaf4ac95ca318750c33153be993dac0e9c8c99 SHA256 fbe13c4e5373835fb529c6c9454ac07a3e523bd56529483d0ec86f9583ae8fed AUX 05_distro_theme 1180 RMD160 ee8d8707e07dbf9877be5bbc9322263822d4ddad SHA1 ad9fb101b7f959ca2392d404a86bec299f326c88 SHA256 cff76aaf874da7270265eca015ffada92f30609699f8cc956a4df0c480a9a5fc +AUX add-x86-to-supported-targets.patch 990 RMD160 395ed2d9d04175be37cd3a742d424949685240c6 SHA1 d6d7c4148b98292131bcad3ac78279a2c348d39d SHA256 6d1db9234781f058cc7ed70b913f7658adc24434a62d40dcc9175d2c799fef15 AUX default-splash-5.4.png 641815 RMD160 175bf793a542654e765fecca89f6c628e7a8a586 SHA1 a8ceabcef3854517d879522ab5155540ddeca3d9 SHA256 f9eedc888fd11d899000397f073d042ce5a4230923966f9d12828263f0a2d14a AUX default-splash-6.png 1006813 RMD160 9c00ed318f4b40486289b1bcf9d7d085d5d9c67c SHA1 aea9184f94b7c60deef172e730b5aada5fe209de SHA256 27da12fccce3fc4a40724471b9ebd4c2fed30c743fcd049a4c53963f87e17e24 AUX default-splash.png 379111 RMD160 c399047d7d63e72495416f0f25cdc4c7bcc38946 SHA1 d0e6e920e4ce973c460d4bb994e4a87e2e32e8aa SHA256 09de78447d236669252b4669a341b5589043466bcb6bbf80e334462024c655c8 @@ -45,4 +46,4 @@ AUX ubuntu-upstream-1.98/975_hostdisk_hd.diff 4125 RMD160 bc514a49151ca9e155be5b AUX ubuntu-upstream/01_uuids_and_lvm_dont_play_along_nicely.diff 611 RMD160 0269ad21a4e5723383b2f04670088cc6b1a1e636 SHA1 344e63b80d9e3d057d41bc50e980a1b1c311a426 SHA256 282635fd75266dfe9222afc892f02a9f9fbc227f05556054531fb63704f9cd55 AUX ubuntu-upstream/904_disable_floppies.diff 743 RMD160 bc98e9c85245edac6c666f0eeca51da2b6b9cfb6 SHA1 bdba3cfe65b73c86ab3e74858a6baa3f8b20cf1e SHA256 930b1d38af76e477d4c0d9e357441882da3367fbe107561aa7fc25e8ccad2a80 DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa147747 SHA1 a5ae9558f30ce7757a76aa130088b053a87e2fb6 SHA256 f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b -EBUILD grub-1.99.ebuild 7916 RMD160 e618e7f288c31a5b416a0fad4b72fe90af357758 SHA1 814c151efe231f60070df99577a92e7bfe20cd40 SHA256 37ace13a11f91e2dfe0b3070d23437fbd803073fdc52866439fba43b3e476f39 +EBUILD grub-1.99.ebuild 7973 RMD160 8c061b61fecbdfa046ee0d5f5d5d36f898867f68 SHA1 9f868129c603e8e5a966863b21e5ba76a5f4bff2 SHA256 e1e1866d956ca3ff4030dda1d6a7b8ba1be08190e47b93955007647a18837a9a diff --git a/sys-boot/grub/files/add-x86-to-supported-targets.patch b/sys-boot/grub/files/add-x86-to-supported-targets.patch new file mode 100644 index 0000000..9e9dbc7 --- /dev/null +++ b/sys-boot/grub/files/add-x86-to-supported-targets.patch @@ -0,0 +1,24 @@ +diff -rupN grub-1.99.orig//configure grub-1.99//configure +--- grub-1.99.orig//configure 2011-05-14 20:57:49.000000000 +0000 ++++ grub-1.99//configure 2011-08-03 13:18:05.013238567 +0000 +@@ -3821,7 +3821,7 @@ TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(t + TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_builddir)/include" + + case "$target_cpu" in +- i[3456]86) target_cpu=i386 ;; ++ i[3456]86|x86) target_cpu=i386 ;; + amd64) target_cpu=x86_64 ;; + sparc) target_cpu=sparc64 ;; + mipsel|mips64el) +diff -rupN grub-1.99.orig//configure.ac grub-1.99//configure.ac +--- grub-1.99.orig//configure.ac 2011-05-13 19:47:26.000000000 +0000 ++++ grub-1.99//configure.ac 2011-08-03 13:14:35.012238732 +0000 +@@ -68,7 +68,7 @@ TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(t + TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_builddir)/include" + + case "$target_cpu" in +- i[[3456]]86) target_cpu=i386 ;; ++ i[[3456]]86|x86) target_cpu=i386 ;; + amd64) target_cpu=x86_64 ;; + sparc) target_cpu=sparc64 ;; + mipsel|mips64el) diff --git a/sys-boot/grub/grub-1.99.ebuild b/sys-boot/grub/grub-1.99.ebuild index 4635fd0..a9a7532 100644 --- a/sys-boot/grub/grub-1.99.ebuild +++ b/sys-boot/grub/grub-1.99.ebuild @@ -160,6 +160,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-1.98-genkernel-initramfs-single.patch # Gentoo doesn't play nicely with load_video epatch "${FILESDIR}"/disable_load_video.patch + epatch "${FILESDIR}"/add-x86-to-supported-targets.patch sed -i -e '/^autoreconf/ d' autogen.sh || die (. ./autogen.sh) || die -- cgit v1.2.3-65-gdbad