From acad4fc83127619b45a3e30541b5a0d4c965f609 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Wed, 14 Sep 2011 17:57:08 +0000 Subject: [PATCH] Run the configure phase for the package only in the pkg_config. Fixes bug #382769. Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64 --- sys-boot/grub/ChangeLog | 7 ++++++- sys-boot/grub/Manifest | 16 +++------------- sys-boot/grub/grub-1.99-r2.ebuild | 24 +++++++++++++++--------- sys-boot/grub/grub-9999.ebuild | 24 +++++++++++++++--------- 4 files changed, 39 insertions(+), 32 deletions(-) diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index 3a19abb8dbd2..b9dbc571a2e6 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.166 2011/09/10 02:33:59 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.167 2011/09/14 17:57:08 scarabeus Exp $ + + 14 Sep 2011; Tomáš Chvátal grub-1.99-r2.ebuild, + grub-9999.ebuild: + Run the configure phase for the package only in the pkg_config. Fixes bug + #382769. 10 Sep 2011; Ryan Hill grub-0.97-r10.ebuild: Release patchset 1.11 to work around miscompilation with gcc-4.6 (bug diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index 3bbd687f8e0a..de4d8ee9edbd 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 1.99-call_proper_grub_probe.patch 536 RMD160 28e914f6ef8e2d9eb73316fa8e5d29b6541d806f SHA1 91237ebbe574baf48d05302c01422c0f0b5c8b49 SHA256 0e27b4ba6a0deedef2f65822e3b76aea4a817cb7219b01c29c8f682c450bd5e8 AUX 1.99-do_not_stat_so_often.patch 1731 RMD160 ed04af18876c27ca6a85d627d2082a773add19c8 SHA1 ee1936e26f2a3f564195385465752ccee7d29713 SHA256 a33fdbcab7fa4ad66b26598d9a6f1703f419229058c1e9c9c14edb6272783727 AUX 1.99-improve_devmapper.patch 7134 RMD160 a8dbf91626c607f5fec85235a2042b7e82ffd8d2 SHA1 d3684f80d5f319059ccee1f6822b5a96dd467258 SHA256 b12624944d129820966146d55693b325d48d5d56901727142e386be082661778 @@ -41,14 +38,7 @@ EBUILD grub-0.97-r6.ebuild 8801 RMD160 3da0ba7ea62758c9fd352f7290b441c3e9f08fb6 EBUILD grub-0.97-r8.ebuild 8941 RMD160 4caee80e02de14e6a88a3ab016df32f90c258f09 SHA1 be1f73938f4763cf6413afee97062abb8666ffbb SHA256 5876009e82e6556be90d2355defd3039d244f5a53313ba29ce937e9c14e169ff EBUILD grub-0.97-r9.ebuild 9045 RMD160 5db30743506d7ae274695a94bd1c7c5fea8003e2 SHA1 4796cd56c8e77239719bd31a0542b11129e7922f SHA256 153939f732549503f08dd2acff27325b3e398ffc065e16c1749281c6c66a97d5 EBUILD grub-0.97.ebuild 4494 RMD160 f798b7101af90add6d45725e34aeb7f219e0b748 SHA1 fbb215b293127635ba41e7fa952518e5e07f118a SHA256 d08c03989b1cd6ad91fa2e1a098e0230994570472d0f11a6d926e21e06071c58 -EBUILD grub-1.99-r2.ebuild 7620 RMD160 df3854ea2235b50295296c5b29b0a0cb4280e8fd SHA1 da5b1c08f21d5ec766f496bad85f26cee5d3c540 SHA256 cb7ba451e3d2da3b6d57abc28b043e236a8694b3281151da1a02cfa7e2b82ea3 -EBUILD grub-9999.ebuild 7405 RMD160 1e9b0eabdcf24c6293430ef78a58ae7c5cb3eb99 SHA1 68920d20d00398be3d5d5443655346eab629cfc5 SHA256 587b12dd04385081d006aea0579203a717576b0555969645a17ddcf067034f86 -MISC ChangeLog 34186 RMD160 a43d50794d568926dbc32346353f221d3ce93ed9 SHA1 b09bef26513bfda10f970722510067beee30e0a3 SHA256 5f3fe7d53acc1f1be0e124a6cff542416c124038491fbc920b58471203655aa0 +EBUILD grub-1.99-r2.ebuild 7702 RMD160 f101c28d65d7e2149b81b53c0d36fb54e6ddd185 SHA1 90cffc7796ff84287eb44f201e4a17ed99cb6d0d SHA256 d1b3cfdbcf77120f24d0341d32c968b71bd17c40c5ae2de64d1fc4a3bc00a521 +EBUILD grub-9999.ebuild 7487 RMD160 b76535cc3461605dac35feb7d6d4e2c9ca9d9946 SHA1 b22cfc108bcf15758a15c383f080f841168beb19 SHA256 1039008f6e7bbccaa362d6a425d6e2531e5a7227c749e09ecbea0359053e9d13 +MISC ChangeLog 34370 RMD160 899dd80d504d68ca010a936978345c523e51167e SHA1 823f40aad95cf906534af6cf614a409b4aa22470 SHA256 424a8fc167adbeeed575c430c688c0766392a6877f4a407502b68a78b8581246 MISC metadata.xml 515 RMD160 7ff103974a6e301b4ba14c55c674c1bf35b1a045 SHA1 05d70f211a5f37e1368b74f7a74b0830d8198787 SHA256 dc713fb7db877b0d8405ac8dba28c4253347205a46d677ffe71901c2f017fb0c ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) - -iEYEARECAAYFAk5qzskACgkQiqiDRvmkBmJIJACdHqFjYqWnptgSR98ZEfEMmung -L9AAoO4QT4Ua8xztmlb7BZjx6xUBpZlf -=uBn0 ------END PGP SIGNATURE----- diff --git a/sys-boot/grub/grub-1.99-r2.ebuild b/sys-boot/grub/grub-1.99-r2.ebuild index e4b4d285551d..a459df8060d3 100644 --- a/sys-boot/grub/grub-1.99-r2.ebuild +++ b/sys-boot/grub/grub-1.99-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.2 2011/09/06 15:31:59 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.3 2011/09/14 17:57:08 scarabeus Exp $ EAPI=4 @@ -245,12 +245,15 @@ src_install() { cat <> "${ED}"/lib*/grub2/grub-mkconfig_lib GRUB_DISTRIBUTOR="Gentoo" EOF + + elog "Remember to run emerge --config =${CATEGORY}/${P} in order" + elog "to set up basic settings for this package." } setup_boot_dir() { local dir=$1 - # display the link to guide if user didn't set up anything yet. + # display the link to guide elog "For informations how to configure grub-2 please reffer to the guide:" elog " http://dev.gentoo.org/~scarabeus/grub-2-guide.xml" @@ -265,7 +268,7 @@ setup_boot_dir() { einfo "Even if we just created configuration for your grub2 using old" einfo "grub-legacy configuration file you should migrate to use new style" - einfo "configuration in '${ROOT}/etc/grub.d'." + einfo "configuration in '${ROOT}/etc/grub.d' and '${ROOT}/etc/defaults/grub'." einfo else @@ -275,18 +278,21 @@ setup_boot_dir() { ewarn "Running grub2-mkconfig failed! Check your configuration files!" fi - elog "Remember to run \"grub2-mkconfig -o '${dir}/grub.cfg'\" every time" - elog "you update the configuration files!" - elog "Remember to run grub2-install to install your grub every time" elog "you update this package!" } -pkg_postinst() { +pkg_config() { + local dir + mount-boot_mount_boot_partition - setup_boot_dir "${ROOT}"boot/grub2 + einfo "Enter the directory where you want to setup grub2 ('${ROOT}boot/grub2/'):" + read dir + + [[ -z ${dir} ]] && dir="${ROOT}"boot/grub2 + + setup_boot_dir "${dir}" - # needs to be called after we call setup_boot_dir mount-boot_pkg_postinst } diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 2040fd4ec7b5..697bef02927a 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.41 2011/09/06 15:31:59 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.42 2011/09/14 17:57:08 scarabeus Exp $ EAPI=4 @@ -241,12 +241,15 @@ src_install() { cat <> "${ED}"/lib*/grub2/grub-mkconfig_lib GRUB_DISTRIBUTOR="Gentoo" EOF + + elog "Remember to run emerge --config =${CATEGORY}/${P} in order" + elog "to set up basic settings for this package." } setup_boot_dir() { local dir=$1 - # display the link to guide if user didn't set up anything yet. + # display the link to guide elog "For informations how to configure grub-2 please reffer to the guide:" elog " http://dev.gentoo.org/~scarabeus/grub-2-guide.xml" @@ -261,7 +264,7 @@ setup_boot_dir() { einfo "Even if we just created configuration for your grub2 using old" einfo "grub-legacy configuration file you should migrate to use new style" - einfo "configuration in '${ROOT}/etc/grub.d'." + einfo "configuration in '${ROOT}/etc/grub.d' and '${ROOT}/etc/defaults/grub'." einfo else @@ -271,18 +274,21 @@ setup_boot_dir() { ewarn "Running grub2-mkconfig failed! Check your configuration files!" fi - elog "Remember to run \"grub2-mkconfig -o '${dir}/grub.cfg'\" every time" - elog "you update the configuration files!" - elog "Remember to run grub2-install to install your grub every time" elog "you update this package!" } -pkg_postinst() { +pkg_config() { + local dir + mount-boot_mount_boot_partition - setup_boot_dir "${ROOT}"boot/grub2 + einfo "Enter the directory where you want to setup grub2 ('${ROOT}boot/grub2/'):" + read dir + + [[ -z ${dir} ]] && dir="${ROOT}"boot/grub2 + + setup_boot_dir "${dir}" - # needs to be called after we call setup_boot_dir mount-boot_pkg_postinst } -- 2.26.2