calculate
/
calculate-overlay
6
1
Fork 2
Code Issues Pull Requests 2 Releases Wiki Activity

Update grub

Browse Source
atratsevskiy
Хирецкий Михаил 11 years ago
parent 82ba860bcf
commit ee7e16589e
7 changed files with 96 additions and 0 deletions
Show Stats Download Patch File Download Diff File

1
profiles/templates/3.1/3_ac_install_live/1-live/sys-boot/grub/3.1.5/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate cl_ver>=3.1.5 append=skip

8
profiles/templates/3.1/3_ac_install_live/1-live/sys-boot/grub/3.1.5/default.grub
Unescape View File

@ -0,0 +1,8 @@
# Calculate format=openrc path=/etc/default name=grub
#?os_install_grub_terminal==console#
GRUB_TERMINAL=console
#os_install_grub_terminal#
#?os_install_grub_terminal==gfxterm#
!GRUB_TERMINAL=
#os_install_grub_terminal#

2
sys-apps/calculate-install/Manifest
Unescape View File

@ -15,6 +15,7 @@ AUX calculate-install-3.1.5_alpha2-r2.patch 8894 SHA256 697cd96d7eb4eec1af2cecc5
AUX calculate-install-3.1.5_alpha2-r3.patch 10091 SHA256 7b58e0289b60315600b8919256e11488474f8ba0955f12daa340ae7571bb3774 SHA512 5a1a3b70776f2b09a785a9472c46c3fbdb3f7fd47469b78ad53d654d8f550a822b0cc532905bcba87660c119da4a5e0dcb4057883a80148b4bf196b01822ab89 WHIRLPOOL 275b3733962420e0077692b3323f9353ccd42aac8478332ca8d64ec4ba6c7e1218205e825bdf24b746593b3389bf6afbfeb319725256cae5ec323f1ef5b4ec6c
AUX calculate-install-3.1.5_alpha2-r4.patch 10427 SHA256 9034f0d2df5ff7d52ef0661bc93ce6cbc3b8d1b8594c7c93c00ee2e276b9ee96 SHA512 8d2e1640b632d6c69989aa4ed02d329e07cf98386435bf71ba10394067a19c9a2fb4351ef1ffe47dbd139064a4a09b1ea9c966a58a789e9d59ee8becd9f7ff9d WHIRLPOOL 07c23f3fc32f3b6538b2d7327f21334e4ec6a7ca7df5ad552d9961baf814915b185dcd36d87acb55ae141364467369f54ede58b63d1e84f01ebb85f6dcbe8985
AUX calculate-install-3.1.5_alpha2-r5.patch 13262 SHA256 5c9f9d770efd548ab3502a889c0ae6560ede20dbc0072bd46ab1d2a9021c3863 SHA512 899c1b560c5a5b7bab8ba0391a3f2191827430dcc3f0cef51b692305f15c64055e5bcfa764ee63c836a8c1d3305d57ea62deb2162299349b1d568517e6cd2c53 WHIRLPOOL dde1f5a968cc59c6dc800fa0b3c43e9dddce25a6de850c34c8bdc188d5551c440acef47779fa8b9eeb227da5aefdab4b607bf8fa235a0b7253515e56695a8c89
AUX calculate-install-3.1.5_beta1-r1.patch 585 SHA256 0f8efa2a12066ee5bb2b18cbe3b7cb20aba7b0127ed171eed1c8d65e9b7d0458 SHA512 e578b763a8c0d1f8c28a6adc6037d164fe640f05cd4806e487294a483e4ec99413a2990cdad746015fcaba34113b6b0fd0e0a9a431ce03f4b09d395997e224b9 WHIRLPOOL a4b95a57bd22dad308447676bc43a681fa08e595db59c60cd7ca4f0e220d0c5c51c37db824bc218802c272e5118175973209096694008eed3aca6a2a4b45fa09
DIST calculate-install-3.1.1.tar.bz2 74372 SHA256 d1d18e85c686b66bf3e4a2f66a43fa59ecaa53518110dafb3ee51de161032137 SHA512 dfb315511f9f358a6ae39f0fd211faa7a862787c347b758f48f6dd6b7f373e93bc8b9b1abfc7e84c170d35b4bb4d22053149cd9ef2875a6f89b7115e678b110e WHIRLPOOL dbe98f30ad64739c54e4735344f2e5842f383556d78dd47c682a20938263eaaa305708e3a5c37983df874731329e4d5dfa29f5130552478dfd91078524d8a33d
DIST calculate-install-3.1.2.tar.bz2 74810 SHA256 04198079715e86aeb505c33583c4556eff2981f36cc85b6d09260f4e6b49ea72 SHA512 49611ae979ba894ccbf1306a185c0d9b7221389793d8fe4ce87d6da3d29e3a98f0be79440660970496f77f9cba5c6dc90832d5abc60c630d269fc9c66083709d WHIRLPOOL 7bcaffb6cdb38d734a03616e8107cc0e087ffad1de0de0ddb4783d239b08438bb56e2e043971c4ebde6c734770f552056ad343589c1acccf7bb38b396f162608
DIST calculate-install-3.1.3.tar.bz2 75004 SHA256 218d13ff06059ff85e5f473af55a46959cf0a21705f0cf1a4be833075e0b93c9 SHA512 6ea8ce4e78cde0031544628ae225d35ae1abc91d3fee99a14089c83669b3cf3b246e19c702437dbd823f18e37e43284d97a3196fc8296e4362b1800ba7093a00 WHIRLPOOL 3130479118e1314c17488c8c4bb04328726dfffc85e941e2447910795cc47e00a38b683b61a55eed2cdfe54b502826ea813c195e17caf5687855cafd62ebc148
@ -52,6 +53,7 @@ EBUILD calculate-install-3.1.5_alpha2-r3.ebuild 1067 SHA256 6b60afc2ec1a9a70e913
EBUILD calculate-install-3.1.5_alpha2-r4.ebuild 1067 SHA256 f23ccd4d679078166c7a46dfb163e6ef0823e198823b60968186665fedfe46cb SHA512 865d404d6e060c7c60a244b94e26f4e97a8abea9594e8b94bed43095668cb28ca261b879146ece064479b2c7ad32d5001cf99f76d268a7d16188523446fbc562 WHIRLPOOL 0937c8db78e750b2bc7c8a9c736bd07a6d675fdf08fd907b9bac8dd128c68804e812d48946e1ec19c65d508fcbacd9d9afc35096aa2ed3c4fc0e1df314b38ea2
EBUILD calculate-install-3.1.5_alpha2-r5.ebuild 1068 SHA256 0685ff1adfc8b40fe9dd27486eccb30eef96d9f3fefcfef51ce69b97c733972d SHA512 027e3fa56a30e3d7409930a42e671d41655b547148a00bcc2d94eb4836e94644fe438f92b1a3cc19301ecaa880c817a9f373cdabd6043b8ea3c216e53aff5894 WHIRLPOOL 4e6beb5a746848b48c18425da9eb39176985670469b0e714be126899a39ddf89887114385cba5362420e8b3274ff26011d89c01a2d82e4e3b767326afaef2b18
EBUILD calculate-install-3.1.5_alpha2.ebuild 923 SHA256 4482c82faad8498cee7a968bfe03b966dd184ccfe3d088de073ace77952c46be SHA512 5ca6141ff1065bed6521e23411335c0a9ecb9219becce082ff4fa1ffa4d1e2ecd1a63e42a1054afea08b3a941f3ade189f47c552ab86f62b8480eb44438cbec0 WHIRLPOOL 967597f22b9adf04930c243fe7345eb163cbe84193e49a3322c2eecb0dbf6f392252335b9f9cb42cd3fd706552be128d1cd5b103e0f188127963de9374eed821
EBUILD calculate-install-3.1.5_beta1-r1.ebuild 1075 SHA256 f408826afa1b07e28a19ef24edfcf4db6560d3ed7a26e29143a138107d6e28c9 SHA512 f7127f1f052a5f3ab6d2e5960ef29812ffa4b6200372a91af64305c90a815d39f1482ee9feaf5980f0dbfedbae2e25bb67d94d2760bd72918969b965ae9eacd6 WHIRLPOOL 026a6b3d91685f5297eac148a30552d5a9cab5dcee12ff75139aa9c22974aec62ee8d3dbeb3def7ff97cb7ddbbbc2259168f28c855616c5449022c639457cf39
EBUILD calculate-install-3.1.5_beta1.ebuild 932 SHA256 2b3d6880a907aec4925e49a4c80506aabd89416be3c59d41d42ec93b5e204bfe SHA512 ee91e713b82c43920b5089d2a0c91ed4a9c102b0217b38eb306debd25362ae39bf32f7635031eec6b099d7b365f1a344c2d801d90472a5c9595abbecd21255d5 WHIRLPOOL 17a35327fb3011036bf843901e76c908477f3bd5df7bac5d65cd6c4566a70b1959da8d1b77b827112176a2c543584f5470df55b4541872194f7bc3fba2b8807e
EBUILD calculate-install-3.1.9999.ebuild 683 SHA256 e97dd6f046d54a16eee281fa35790c92507b150bc940f3c2b36117e6f44f0a8d SHA512 c1179c500dcaa48506f6334e9e2ccc3cc70d712b2899d7e1d9265bc202f088ab71baa1aaea462deee56fdd5244bee4ab9b9a9da72f25ec511d4f2fa0c3c35f43 WHIRLPOOL 010d35b929fce496b5f16228688e23a95c9c87ebed0d290eeb454e5c1432b55b3b276dfb5786a27222543446a1090ce2f133d80373649fe72341b508d1e16a78
MISC ChangeLog 33978 SHA256 a1cc544f9763b08b3647d90fac1ec53748016bb23260181315896c8c02431443 SHA512 11a09ba60fbc727bd47b57653b4bb0937d98774eb9ca95680a5b55997c7e22db3976cbd0878d908fa0200e04b6cc9eb0ae9ac6f1623235490e2e46e54cc1f7f4 WHIRLPOOL 50352c2950f301cbb5116b8c9972e592767dcb03bd71d081c75de5e69b2a920331abec4756658faf64e291bf6f4f41df67b8d62946683629a2c99b48274eb2f3

45
sys-apps/calculate-install/calculate-install-3.1.5_beta1-r1.ebuild
Unescape View File

@ -0,0 +1,45 @@
# 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 installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="pxe minimal"
DEPEND="~sys-apps/calculate-core-3.1.5_beta1
!<sys-apps/calculate-install-2.2.29
app-portage/layman
>=virtual/udev-197
!app-misc/livecd-tools
sys-apps/iproute2[-minimal]
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )
pxe? ( sys-apps/calculate-server
net-ftp/tftp-hpa
net-misc/dhcp
net-fs/nfs-utils )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-install-3.1.5_beta1-r1.patch"
}

13
sys-apps/calculate-install/files/calculate-install-3.1.5_beta1-r1.patch
Unescape View File

@ -0,0 +1,13 @@
diff --git install/variables/system.py install/variables/system.py
index 2e33a49..184f651 100644
--- install/variables/system.py
+++ install/variables/system.py
@@ -644,7 +644,7 @@ class VariableOsInstallGrubTerminal(Variable):
return 'console'
grubDefault = path.join(self.Get('cl_chroot_path'),
'etc/default/grub')
- if getValueFromConfig(grubDefault,'GRUB_TERMINAL_OUTPUT') == 'console':
+ if getValueFromConfig(grubDefault,'GRUB_TERMINAL') == 'console':
return 'console'
return 'gfxterm'

1
sys-apps/calculate-utilities/Manifest
Unescape View File

@ -60,6 +60,7 @@ EBUILD calculate-utilities-3.1.5_alpha2-r5.ebuild 809 SHA256 eb47262f91a1b735eca
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-r2.ebuild 809 SHA256 958947c2a6fcc531395c4c3557d922fe2c39b7ee23fc82940d1a0d95bbfb34d0 SHA512 0db830da015c6e83e18f4324c13b1dc4410080b9350a160d1610d76d86949b32dcf6bc820343b9e273763f2950ff42d845365997d76cf077a364277ce9909b9c WHIRLPOOL 2f69d5b96f2d472f717bade1d5daa79d5e2ea48fe66f245fd51ddb83bcf7a383efdd4f911c0d31e4087eb935f81547ade9a418a75ebf96ae30d0b37a033f650f
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

26
sys-apps/calculate-utilities/calculate-utilities-3.1.5_beta1-r2.ebuild
Unescape View File

@ -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-r1
=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 )
"
Write Preview
Loading…
Cancel
Save