Update client. Update grub

atratsevskiy
parent 5b3afa9d97
commit dea6b25cd8

@ -2,6 +2,7 @@ AUX calculate-client-3.1.1-r1.patch 14317 SHA256 16e2df039eedf0a03135975bf53f6fa
AUX calculate-client-3.1.3_alpha1-r1.patch 788 SHA256 6d0386566f312e628c02d015af06307e32e431a188199e34149ce6e00f3303a3 SHA512 8b6c7772282ae7b72771cb9706aeb5b129848f1fdcc55f14a4115515fa41249dffd070dc82d3d24c7ebf8c586f4a4b472138637fe8dcd4bc17e1900d79467a5a WHIRLPOOL ce751b3023d2fee9f331564ed54d9cdd3f2dd35545db1096e4020c6f91a10a76d3a9aaafe5ae81ea542845c794ba12d45f8aabbda47b0bad5412880a0f279d3a
AUX calculate-client-3.1.3_beta1-r1.patch 566 SHA256 daa0a7f9bee9223cc695d28ec25d7dbbd58818497bd452ec73abd55b89ab006c SHA512 8e614f638015027d5c053d1a6138afb03197b25c6a6f60709a429ca8ba94ed0e604711a30f60780f0c1b0ecb16365a307eb5ddeb732efc80b763d8df32dac464 WHIRLPOOL d54d970f4707a41daac7805b555591a103c8a05cfd0bb69af3efcc4d36baa5df8cd5f5b29a84da8ff2043837efcc2cb5798eaf749fb06d3226135e024f829e32
AUX calculate-client-3.1.4_beta1-r1.patch 1551 SHA256 bc1b080117875d28d72dc195e95ee45a6328fa6d3b4a0b814402fa3931bac940 SHA512 f9b52389d41973ec4701f52a10c6d69577b80cb3c96af4ef57f759232b097b88001c9898ba11492edf0a7c5faa772c8b8f95808a04a6787e17910e9ee010893f WHIRLPOOL d7963ee6d77f123643b8916df988b4862ab8241d6ec7583ece846f97739db6f7728f624c68cfe1ab3dd823259f58cd4d3cc9b965dde7f95c4dc16cc75249d1c7
AUX calculate-client-3.1.5_beta1-r1.patch 1044 SHA256 e0e49973f076b3e62617f977db388a78a689e14273de58c86a03f0fa4b273210 SHA512 3e400c25fb2b6f749c75daed2b5d652a511a5538330fba16ab9ec365622b5a1e8a1e067316fbfdab164e2f71806b883fb4f5c1d50462b7890a1d5f7554754971 WHIRLPOOL bd37fbedcc3f492b3233ab0a72a9ee821d010d4d7b1c509e651c4bdd0b791b83eec73a63d14cfd9007ac580f89c75452d25cbb13b8a71516156a61bf1aadb317
DIST calculate-client-3.1.1.tar.bz2 31247 SHA256 7b5a5f14d2f624443744944681d3467a51cb515418849a45f19647956441f62e SHA512 999cbb693a4af964bcf72f831dba72d273b87c48e73036d94a70db5ef98d886472fcbdfbeb891c198b61986096be9f140017ff3085216342f350af4c7be8dec2 WHIRLPOOL 9f38abe4e9e4443474a0f31e4b18ef9893f1bf15aba78b1e9d3f072385d40b04ed3d0821de9c28eabee0a3d774c15979dc7c32d116d6e223477a7c4c0034afbe
DIST calculate-client-3.1.2.tar.bz2 31269 SHA256 74fff4b21cf895a214b887b4680c1779d28bd8787fcea95455f4551fb1826f56 SHA512 14e745b1f5425219e0428c698a863ebe558d9d324ce5472950e9ec8bba5c81c55b10b10edd035fae523ac7f660ff98f8b53c7f8518c0a7e13ae24815b455b680 WHIRLPOOL 9b68bdababd5c9aae9c929dfaec709af35c4f7b74eedaeb76a4fb501f6ce88ef3a92c77ad0798947b653073e3d67d312eb94fb9a172559140a6d87672272c71b
DIST calculate-client-3.1.3.tar.bz2 31329 SHA256 4cdc5cfaa840a23fff1ac2d144aaf1605b400d2c9a8edb89bc1eae497e06cb34 SHA512 dcd11f9045edebc71bda157e734474b4fa2e0ead9ea12a6678f1949b9c80da941f636114263d9381268b152da88764e94570ca89368684d62e65d0f30a140621 WHIRLPOOL 5d18d5dfa0016d2553c9adc0b9b4a35a12f8e3376afb6b1f622d099d2827224bdb0242e80cea3c451c8a343a1fef33a29559888b5e732548d7665149910ab9c3
@ -24,6 +25,7 @@ EBUILD calculate-client-3.1.4_beta1-r1.ebuild 933 SHA256 876adee37511e70e548b75d
EBUILD calculate-client-3.1.4_beta1.ebuild 791 SHA256 46cb06c99c01cc22073b891d056ba3ec550765a683444dd393578b8d457aaa7c SHA512 e430a971c237cae6d5fee957d2b9ddc71a0ae7f6489699e3268ae22101930028bb4a74ee598b50f92f81e6b8613ee5ce8fce6bafcf7df092d4b684bf9997c3e5 WHIRLPOOL 63763d7f938453cd62504e43b08879d941e78b4fda2b85b66d412560fd70852e8b4c87f1306f390093c64ff952da721dadbf72f787dbb7c4b9daf50f8cd77b82
EBUILD calculate-client-3.1.5_alpha1.ebuild 783 SHA256 873813fb1e045d519fcea8a8ad1eb6eae5ac10fec2208b5053ea7463384ff3f3 SHA512 dc3be86a1c8583585727336abbea996294dc9df308668336ac27d8668a4c6279b5fda4ac1a334766c7ca42e3edf14533b6204f990df0b1fd28095ffb6ee2b813 WHIRLPOOL c63a78091ca21550bf8269fc5a999ef6d943db5bb8581dee9dde232a7fddc153302da695978ad176ee221e3aee6c2d6bceae7ca860242059e57d9c256a69eae8
EBUILD calculate-client-3.1.5_alpha2.ebuild 783 SHA256 e62aafed7696ed1bc891010ed7d97a6e20bca9a489cddc2af54f9e27cf8f1237 SHA512 ac3432c1838e6168f62aaafc02d771ab1bf069cd4cfb18608bc8319849c84901de2a7aa947109cc031aa627086e590504b97e0942c2057ad084429b578f47332 WHIRLPOOL 79429e00548facd4ebeb20cb5d6c6702ff2c3b1e039561bf368f1d7860911489d968bfc2214bca79966c77e7c7038d365362987e8ad9e02b83d7945dbeafdf07
EBUILD calculate-client-3.1.5_beta1-r1.ebuild 933 SHA256 fead2f86dcef23cd76a9601f372406282031aa1a36933ce652036909ec0e3d3c SHA512 15fa26d3846362fa3e597ec5adb5e89f7e0b21b126e166a08b1baa91baf8024c1e464ed1d4cd624de5c74f12f3001a40b703796a50c565f6d1ab84ae86d26db4 WHIRLPOOL 6123a0cc4a1a79638e1f18141a22c714f451220b160974d9897eb3d33eca9ba62d370f0280fe2379c00c2a5850c706c36e721023431e9a520db95baeeca1749e
EBUILD calculate-client-3.1.5_beta1.ebuild 791 SHA256 8b715ac85361d505db852ae3ea715b29ed13cc664689f8184236a7098d511eaa SHA512 41e5a69fdafbd4c324de4f4390f8d94107c278e866c2e66bc99fe55e7a62724331a5a0667172f01e3369a81b21222c17314a9fade5cadd07dea89cf970e033ec WHIRLPOOL e6f8599c558959a0d012b714e503b873021299300559ab940a05d3a3e2ad242d061de8405657f6f1abcb887dba5b6a4c46bd424e761ea599442dfc9815c10fcd
EBUILD calculate-client-3.1.9999.ebuild 879 SHA256 37385187f78bb708669b5cd2742173b117bb482c784f8f481ab7388554476d65 SHA512 87ebc2dfa965a9bb9d24af13a611e83e412cbabb12957bb14e2a1cd8b9f1951efbf690dcfa8f73711a02cfd0afbc9e9f37209ba9a3884b018c41b3a46e2e847b WHIRLPOOL 349da1bcb076af176079473ccb2fd1a4e3d8eb3ec2a7a6102272d1dd1073a8c181c49e02c89ede4b5cd829856f0c0f5db877b89eb0c6335ad678e58902db293b
MISC ChangeLog 21989 SHA256 065aa2c75428e965caef0348105d8e5464d4103f5f2eb16bb626c7a9278208df SHA512 76ad69386d986e2e65448394d738b4d6abbeffb4af38f13dcfbfe8af64796c9b97eda68eb8cbf749fe7ef2711067da430af1cc1a764712e8df853451f903ab57 WHIRLPOOL 58b0a2837255a2eb67606072ac1a6a06e0db7079b563d3b4c9df45b5dbe0fad31c409800da635a337ad976b31bb08549e89063796e8217d46c83ba8b5e22e1b8

@ -0,0 +1,37 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.7"
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of setting and storing the user account in the domain"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-desktop-3.1.5_beta1
!<sys-apps/calculate-client-3.1.0
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=sys-apps/keyexec-0.1.2
sys-apps/keyutils
sys-auth/pam_keystore
dev-lang/swig"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-client-3.1.5_beta1-r1.patch"
}

@ -0,0 +1,35 @@
diff --git data/client data/client
index 4fc3175..64da473 100644
--- data/client
+++ data/client
@@ -39,10 +39,26 @@ start() {
if [[ -n $SERVERLIVE ]]
then
ebegin "Mounting domain resources"
- for COUNT in $( seq 0 30 )
- do
- ping -w4 -i0.5 -c3 $SERVERLIVE &>/dev/null && break || sleep 0.5
- done
+
+ local NET_CONF=`cl-core-variables-show --only-value install.os_install_net_conf`
+ if [[ $NET_CONF = "networkmanager" ]]
+ then
+ for COUNT in $( seq 0 24 )
+ do
+ NET_STATE=`qdbus --system org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager.state`
+ if [[ $NET_STATE = 40 ]]
+ then
+ ping -w4 -i0.5 -c3 $SERVERLIVE &>/dev/null && break || sleep 0.5
+ else
+ break
+ fi
+ done
+ else
+ for COUNT in $( seq 0 24 )
+ do
+ ping -w4 -i0.5 -c3 $SERVERLIVE &>/dev/null && break || sleep 0.5
+ done
+ fi
if [[ -z $SERVER ]]
then
cl-client $SERVERLIVE && cl-setup-system -l remote &>/dev/null

@ -59,6 +59,7 @@ EBUILD calculate-utilities-3.1.5_alpha2-r4.ebuild 809 SHA256 22b4b64ac120be73995
EBUILD calculate-utilities-3.1.5_alpha2-r5.ebuild 809 SHA256 eb47262f91a1b735eca7a0536a97ee104b7972abec3d0614c62935586f753ad6 SHA512 65e3f4e2fd4e5fedaa2dddd19c56bed43599aba34319ed038ad3334088aaa911c6e331329b3a475614d8455bc94fb0e4807f9760375e1a5a204d313f9ad5c0a9 WHIRLPOOL d17386d4fd556a2a5c20cf22b3b80d269bfe88c90cbf19705520c45b6830b0f834383ace13ddbcdf1fd50da992666053ace9b48fd3b780ccac7ba8deaa99934a
EBUILD calculate-utilities-3.1.5_alpha2-r6.ebuild 809 SHA256 54adb793d534d6daffc6f3a68c95eb25e0d7b43b1de9b0ef5b7ad9cc78ed1c2e SHA512 8770b916f06aedb1724b9841de27d04100c94aec7b54f08dc9cf9eb2041b9a65eb4b99bfed5fa1318171481681f5f25f08bc91efac136e5f6e871c2b40d99ef9 WHIRLPOOL 27acab57aca3276cadeb3afe0ea7f94a139e22a0d17828283201a887b1f603562df18bc6ad47f4c76b5eb7cfcf15bc7b757c4cfbda4cdb7033621b23041b369c
EBUILD calculate-utilities-3.1.5_alpha2.ebuild 803 SHA256 7e6e3b2adc60eb60f94d542dea9b9dfe7f0d0d08bcd5ff3b9846d69cf2311171 SHA512 994a12df56ab84d4ad80e90aaf8129ade5979d0457a74221ce0ac6c6964cfcb01a6dd2a4c45b60359be2ea55b8b113450d8f277bfee6040f3240d153fcc9274c WHIRLPOOL 60885af8a20916cdeee3cac4d8ad743fa0da83e6d1119255f16a15f9f91060ed7f8f5267fe3f8d1b25795827a823a9d1382cd02f3c4527adde5f4146d4e83f59
EBUILD calculate-utilities-3.1.5_beta1-r1.ebuild 806 SHA256 cdca49bb090f35da99bb1092b85c5a388f1a7ca3a83221f3e3ac9e0df5164a81 SHA512 7e6afd54d7288ce9eb8e87ccce9df886869d30dfeabbbc941503e95c373d27b34ae731fca9e3b4e6e9ca6ac065c05178081c790ad2b99d4d564e5432eaf794b5 WHIRLPOOL a720f02e8ec33025b77337cdd7822cc02c273cb61325d25b040ff7caa7bb14e8dfc401064e3b00abbe43794e2e2b70994b80526d60ae568799b5595d0eba4d0b
EBUILD calculate-utilities-3.1.5_beta1.ebuild 803 SHA256 5e80472ac4b8d065fa230ef050f155556dba8f0b73a87b98434035c1759fe932 SHA512 9e051f5ab2a08a0c9e6d8c82c9ab29eb6d0e9412ce6e1a03eb82c8229b745545f1b36ead9d820c711f8b8965d0238f5ed3b906f9d714be42fd970bcbb5c3a3eb WHIRLPOOL 6a0842c56fa70837002548ee0de5ddb0db3605957d9c60063124591ebcda0f24dc8ece9604c2847d4f4e04decff8703f130b1ea639ea74837ecd36ed6f97a1fb
EBUILD calculate-utilities-3.1.9999.ebuild 800 SHA256 9de4807341cb552ef8d4f702e9c4a0ca10c52c9d532cc2eb741cea29b92f09b5 SHA512 b35ed4d49c4943a5ad375e646bece419271900c50301153408b30dede0fe834e098baaa42a21c130730c0bc32ba09decc588277da6782d2010c18c9d8df679ae WHIRLPOOL 78e2c5ee8ef8356c4fc0275f920177778925278cad78585ed37c08048241f775030e59a0ced0696fba6379741fe865dc339d190c46b5f2173097328a73c64a24
MISC ChangeLog 38731 SHA256 7e70a0bc1f3b34c0011f3874773a698a4bb96eb6d3dad10903575156bb8578bc SHA512 2de466ea990b9eac702b81fd097c3f5d06d1f4db1a4bd1d1b7380b45e551f6fd62c16564ecfc810246157d3ef1113ae373041580e70981d44752e50ed6134bc0 WHIRLPOOL 5ca0cee1ad0e9419f91ec11a9629b9a29db9fcbed4f5ae0aef1f8a2170ff58112c8580d61884c56ee410a0abc201fa8f4419cea35077fc8bb84e733f6fa6f4db

@ -0,0 +1,26 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=4
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="cl_consolegui cl_client cl_desktop cl_console"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-3.1.5_beta1
=sys-apps/calculate-i18n-3.1.5_beta1
=sys-apps/calculate-lib-3.1.5_beta1
=sys-apps/calculate-core-3.1.5_beta1
=sys-apps/calculate-update-3.1.5_beta1
cl_client? ( =sys-apps/calculate-client-3.1.5_beta1-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-3.1.5_beta1 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.5_beta1 )
cl_console? ( =sys-apps/calculate-console-3.1.5_beta1 )
"

@ -23,5 +23,6 @@ EBUILD grub-1.99-r5.ebuild 2935 SHA256 717af30c0305eb0c89fe121528160810efcbadff9
EBUILD grub-1.99.ebuild 2797 SHA256 5256e478fc7a50b5df7b98900d7cc72bac82cc46681a235a44012809f7009bf8 SHA512 5a95409fa2839733e612c3bdb2c40104944ef605d5a98b8c7c495f0657de67b964a4f3219117a400a312cdc594d2abb419a265410bd14ce2149b70ea56bb3655 WHIRLPOOL b828fe74524048c60ee707735852d0d2a6ac93655d8db8890e89eeae587056007a65f08eeb61f6d9d1e53db71c29e8aed93d42d471facf1a50c894cac779a588
EBUILD grub-2.00-r3.ebuild 9524 SHA256 5875eb10b124e29a263c7bd6fd57efca427e63d7d0b1d06c376d8863205e4688 SHA512 21a874ba38a6f5908de903eac86b29c92f4596e053f7d91ff58c371ca79ccd9da4a8946ac7cc6837a40848b02cd8886a61c45675cddff889b99f604c3548a233 WHIRLPOOL a7451ce152f61ab0bc21c6344084d5e0171b30220ff73c71c8594874a7f313db3703bf9c317bec3dcc94e3652ad9c59bd19e640ff727070a36387681049d935a
EBUILD grub-2.00-r4.ebuild 9524 SHA256 5875eb10b124e29a263c7bd6fd57efca427e63d7d0b1d06c376d8863205e4688 SHA512 21a874ba38a6f5908de903eac86b29c92f4596e053f7d91ff58c371ca79ccd9da4a8946ac7cc6837a40848b02cd8886a61c45675cddff889b99f604c3548a233 WHIRLPOOL a7451ce152f61ab0bc21c6344084d5e0171b30220ff73c71c8594874a7f313db3703bf9c317bec3dcc94e3652ad9c59bd19e640ff727070a36387681049d935a
EBUILD grub-2.00-r5.ebuild 9457 SHA256 87033de96aa2bf92aff923d466a9fd2afd246dda51fd45e74ff2e6f70dbe0db4 SHA512 c57199a9050aa695f9b41e023db60e608de19b6e4ec256d544815500b0beff9c70abd02a1abff98422c207612e1735ae75a80e5384aff5948824b4f861783bf3 WHIRLPOOL 9bc35bc2e4d7aadb922cdbafb1de9eb48bb344410af39b22490f15c33a55353cc0ccc1658d18992ac4bfc0a982eea24df94777e5e03ffded21694c8bc5490d94
MISC ChangeLog 1275 SHA256 72979dcf1b9a759974c31e423b30b72c6c70c31ed0e37cab7bd3bcc7293acff7 SHA512 6464c2e7ea5f8b645cd98b7325cb2ecbbd05ea4afd85909d40d5b1cbcd27fc2983194bee0b95248b6d2261f650e365afe8f888a25171927dd291dd0814043ae6 WHIRLPOOL caaf41d9abc9df6b0fde8a212d0bdae30989b65f74834cc277b542320e48601065878cd2052f61feb9e08d1d4c4d2c2d2da5de0a7aeaf6b5c79c0948a81e6f94
MISC metadata.xml 349 SHA256 fcb983296ee1568339772668bcf236db0a24aabba6c328343d7bdb790978cbb9 SHA512 00ea2ff785a2de7aab609ec1997a397c5dc1dec103a84b0d7768aedb0e06de2ba81d719c0ae603c068d626f2238dd4f518cc8abdd2eb0cb8a0c1c05da28f85fb WHIRLPOOL 11b1eea531604cae84dff299c944b73a3567b112d94413772744865ba4176e20447a94197065912a4c7559791664af3bac2c9ba2ddc790ecda4607fdff5467c6

@ -0,0 +1,367 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00-r2.ebuild,v 1.5 2013/02/18 16:45:17 mr_bones_ Exp $
EAPI=4
if [[ ${PV} == "9999" ]] ; then
EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
LIVE_ECLASS="bzr"
SRC_URI=""
DO_AUTORECONF="true"
else
MY_P=${P/_/\~}
if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
else
SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
mirror://gentoo/${MY_P}.tar.xz"
fi
KEYWORDS="~amd64 ~x86"
S=${WORKDIR}/${MY_P}
DO_AUTORECONF="true"
fi
inherit eutils flag-o-matic multiprocessing pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
unset LIVE_ECLASS
DESCRIPTION="GNU GRUB boot loader"
HOMEPAGE="http://www.gnu.org/software/grub/"
LICENSE="GPL-3"
SLOT="2"
IUSE="custom-cflags debug device-mapper doc efiemu mount nls static sdl truetype libzfs"
GRUB_PLATFORMS=(
# everywhere:
emu
# mips only:
qemu-mips yeeloong
# amd64, x86, ppc, ppc64:
ieee1275
# amd64, x86:
coreboot multiboot efi-32 pc qemu
# amd64, ia64:
efi-64
)
IUSE+=" ${GRUB_PLATFORMS[@]/#/grub_platforms_}"
REQUIRED_USE="grub_platforms_qemu? ( truetype )
grub_platforms_yeeloong? ( truetype )"
# os-prober: Used on runtime to detect other OSes
# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
RDEPEND="
app-arch/xz-utils
>=sys-libs/ncurses-5.2-r5
debug? (
sdl? ( media-libs/libsdl )
)
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
libzfs? ( sys-fs/zfs )
mount? ( sys-fs/fuse )
truetype? (
media-libs/freetype
media-fonts/dejavu
>=media-fonts/unifont-5
)
ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
"
DEPEND="${RDEPEND}
>=dev-lang/python-2.5.2
sys-devel/flex
sys-devel/bison
sys-apps/help2man
sys-apps/texinfo
static? (
truetype? (
app-arch/bzip2[static-libs(+)]
media-libs/freetype[static-libs(+)]
sys-libs/zlib[static-libs(+)]
)
)
"
RDEPEND+="
kernel_linux? (
grub_platforms_efi-32? ( sys-boot/efibootmgr )
grub_platforms_efi-64? ( sys-boot/efibootmgr )
)
"
if [[ -n ${DO_AUTORECONF} ]] ; then
DEPEND+=" >=sys-devel/autogen-5.10"
fi
if [[ ${PV} != 9999 ]]; then
DEPEND+=" app-arch/xz-utils"
fi
export STRIP_MASK="*/grub/*/*.{mod,img}"
QA_EXECSTACK="
usr/bin/grub*
usr/sbin/grub*
usr/lib*/grub/*/*.mod
usr/lib*/grub/*/kernel.exec
usr/lib*/grub/*/kernel.img
usr/lib*/grub/*/setjmp.module
"
QA_WX_LOAD="
usr/lib*/grub/*/kernel.exec
usr/lib*/grub/*/kernel.img
usr/lib*/grub/*/*.image
"
QA_PRESTRIPPED="
usr/lib.*/grub/.*/kernel.img
"
grub_run_phase() {
local phase=$1
local platform=$2
[[ -z ${phase} || -z ${platform} ]] && die "${FUNCNAME} [phase] [platform]"
[[ -d "${WORKDIR}/build-${platform}" ]] || \
{ mkdir "${WORKDIR}/build-${platform}" || die ; }
pushd "${WORKDIR}/build-${platform}" > /dev/null || die
echo ">>> Running ${phase} for platform \"${platform}\""
echo ">>> Working in: \"${WORKDIR}/build-${platform}\""
grub_${phase} ${platform}
popd > /dev/null || die
}
grub_src_configure() {
local platform=$1
local with_platform=
local enable_efiemu="--disable-efiemu"
[[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
# Used below for efi cross-building
tc-export CC NM OBJCOPY STRIP
estack_push CTARGET "${CTARGET}"
estack_push TARGET_CC "${TARGET_CC}"
estack_push TARGET_CFLAGS "${TARGET_CFLAGS}"
estack_push TARGET_CPPFLAGS "${TARGET_CPPFLAGS}"
case ${platform} in
efi-32)
if [[ ${CHOST} == x86_64* ]]; then
CTARGET="${CTARGET:-i386}"
TARGET_CC="${TARGET_CC:-${CC}}"
export TARGET_CC
fi
with_platform="--with-platform=efi"
;;
efi-64)
if [[ ${CHOST} == i?86* ]]; then
CTARGET="${CTARGET:-x86_64}"
TARGET_CC="${TARGET_CC:-${CC}}"
TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
export TARGET_CC TARGET_CFLAGS TARGET_CPPFLAGS
fi
with_platform="--with-platform=efi"
;;
guessed) ;;
*)
with_platform="--with-platform=${platform}"
case ${CTARGET:-${CHOST}} in
i?86*|x86_64*)
enable_efiemu=$(use_enable efiemu)
;;
esac
;;
esac
ECONF_SOURCE="${S}" \
econf \
--libdir=/usr/lib \
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
--disable-werror \
--program-prefix= \
${with_platform} \
$(use_enable debug mm-debug) \
$(use_enable debug grub-emu-usb) \
$(use_enable device-mapper) \
${enable_efiemu} \
$(use_enable mount grub-mount) \
$(use_enable nls) \
$(use_enable truetype grub-mkfont) \
$(use_enable libzfs) \
$(use sdl && use_enable debug grub-emu-sdl)
estack_pop CTARGET CTARGET || die
estack_pop TARGET_CC TARGET_CC || die
estack_pop TARGET_CFLAGS TARGET_CFLAGS || die
estack_pop TARGET_CPPFLAGS TARGET_CPPFLAGS || die
}
grub_src_compile() {
default_src_compile
pax-mark -mpes "${grub_binaries[@]}"
}
grub_build_docs() {
emake -C docs html
}
grub_src_install() {
default_src_install
}
grub_install_docs() {
emake -C docs DESTDIR="${D}" install-html
}
pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
# Bug 439082
if $(tc-getLD) --version | grep -q "GNU gold"; then
eerror "GRUB does not function correctly when built with the gold linker."
eerror "Please select the bfd linker with binutils-config."
die "GNU gold detected"
fi
fi
}
src_prepare() {
if [[ ${PV} != 9999 ]]; then
epatch "${FILESDIR}/${P}-parallel-make.patch" #424231
epatch "${FILESDIR}/${P}-no-gets.patch" #424703
epatch "${FILESDIR}/${P}-config-quoting.patch" #426364
epatch "${FILESDIR}/${P}-tftp-endian.patch" # 438612
epatch "${FILESDIR}/${P}-hardcoded-awk.patch" #424137
epatch "${FILESDIR}/${P}-freebsd.patch" #442050
epatch "${FILESDIR}/${P}-compression.patch" #424527
fi
# fix texinfo file name, bug 416035
sed -i \
-e 's/^\* GRUB:/* GRUB2:/' \
-e 's/(grub)/(grub2)/' -- \
"${S}"/docs/grub.texi
epatch_user
# autogen.sh does more than just run autotools
if [[ -n ${DO_AUTORECONF} ]] ; then
sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die
(
autopoint() { :; }
. ./autogen.sh
) || die
fi
# install into the right dir for eselect #372735
sed -i \
-e '/^bashcompletiondir =/s:=.*:= $(datarootdir)/bash-completion:' \
util/bash-completion.d/Makefile.in || die
# get enabled platforms
GRUB_ENABLED_PLATFORMS=""
local i
for i in ${GRUB_PLATFORMS[@]}; do
use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
done
[[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"
einfo "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
}
src_configure() {
local i
use custom-cflags || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
use static && append-ldflags -static
use elibc_FreeBSD && append-cppflags "-isystem /usr/include"
# Sandbox bug 404013.
use libzfs && addpredict /etc/dfs:/dev/zfs
multijob_init
for i in ${GRUB_ENABLED_PLATFORMS}; do
multijob_child_init grub_run_phase ${FUNCNAME} ${i}
done
multijob_finish || die
}
src_compile() {
# Used for pax marking in grub_src_compile
local grub_binaries=(
grub-editenv
grub-fstest
grub-menulst2cfg
grub-mkimage
grub-mklayout
grub-mkpasswd-pbkdf2
grub-mkrelpath
grub-script-check
grub-bios-setup
grub-ofpathname
grub-probe
grub-sparc64-setup
)
use mount && grub_binaries+=( grub-mount )
use truetype && grub_binaries+=( grub-mkfont )
local i
for i in ${GRUB_ENABLED_PLATFORMS}; do
grub_run_phase ${FUNCNAME} ${i}
done
# Just build docs once
use doc && grub_run_phase build_docs ${i}
}
src_install() {
local i
for i in ${GRUB_ENABLED_PLATFORMS}; do
grub_run_phase ${FUNCNAME} ${i}
done
use doc && grub_run_phase install_docs ${i}
mv "${ED}"usr/share/info/grub{,2}.info || die
# can't be in docs array as we use default_src_install in different builddir
dodoc AUTHORS ChangeLog NEWS README THANKS TODO
insinto /etc/default
newins "${FILESDIR}"/grub.default-2 grub
}
pkg_preinst() {
has_version "<sys-boot/grub-2.00-r2:2" && \
[[ "$(df -TP /boot | awk 'NR>1{print $2}')" = 'zfs' ]]
display_zfs_feature_flag_warning=$?
}
pkg_postinst() {
# display the link to guide
elog "For information on how to configure grub-2 please refer to the guide:"
elog " http://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
if ! has_version sys-boot/os-prober; then
elog "Install sys-boot/os-prober to enable detection of other operating systems using grub2-mkconfig."
fi
if ! has_version dev-libs/libisoburn; then
elog "Install dev-libs/libisoburn to enable creation of rescue media using grub2-mkrescue."
fi
if has_version sys-boot/grub:0; then
ewarn "If you want to keep GRUB Legacy (grub-0.97) installed, please run"
ewarn "the following to add sys-boot/grub:0 to your world file."
ewarn "emerge --noreplace sys-boot/grub:0"
fi
if [[ $display_zfs_feature_flag_warning -eq 0 ]]; then
zfs_pool=$(df -TP /boot | awk 'NR>1{print $1}')
zfs_pool=${zfs_pool%%/*}
ewarn "The previous version of sys-boot/grub lacked support for ZFS feature flags."
ewarn "Your /boot is on ZFS. Running \"zpool upgrade ${zfs_pool}\" or \"zpool upgrade -a\""
ewarn "to upgrade your pool to support feature flags will prevent your system from booting."
ewarn "You should use grub2-install to reinstall your boot code. This will avoid problems."
fi
}
Loading…
Cancel
Save