Update for change version.

atratsevskiy
Mike Hiretsky 13 years ago
parent 997691f2a1
commit 3181f90113

@ -1,2 +1,2 @@
EBUILD calculate-meta-11.9.ebuild 711 RMD160 a9ee5d3e306afb0c5c3176fffab32b9f79a6c153 SHA1 3f1e232d2eeb098deee1a84e9007a4c26dc1041b SHA256 6a48ab2e12fb21a6b89cb3d336bdd764906713b97efa1a26fa3705da7b5d3378
EBUILD calculate-meta-11.9-r1.ebuild 778 RMD160 9b7dfb243f476498b620681cd651a578ef6c1c12 SHA1 ddc45c445754e1396d1961b2eac98059b0a9038f SHA256 27c72faff7136de293987c6b1257c0698512a763adf6758507a22d98b5372d7f
MISC ChangeLog 1425 RMD160 76dd0120ea127726c735783e5a4820994b71385e SHA1 7a0a1fa2da60ab4448dc627a5cdd5f8183774a8b SHA256 9081434fb321f8b29a6b0d7691e026d9c8c1e3c4bfd0175965c38d32aa25a124

@ -36,3 +36,7 @@ RDEPEND="${RDEPEND}
cdistro_CSS? ( app-misc/css-meta )
"
pkg_postinst()
{
cl-template -l all --merge sys-apps/baselayout
}

@ -0,0 +1,8 @@
# autoswitch to new gcc
if [[ ${EBUILD_PHASE} == postinst ]]
then
einfo "The current gcc config will be automatically switch to the newly"
einfo "installed gcc version ${GCC_CONFIG_VER}"
gcc-config ${CTARGET}-${GCC_CONFIG_VER} &>/dev/null
fi

@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-install-2.2.24-r1 (21 Sep 2011)
21 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-install-2.2.24-r1.ebuild,
+files/calculate-install-2.2.24-r1.patch:
Update for bugfix
*calculate-install-2.2.24 (20 Sep 2011)
20 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -19,6 +19,7 @@ AUX calculate-install-2.2.21-r3.patch 18457 RMD160 2aceaf84cc1df2da2ad55846e499a
AUX calculate-install-2.2.21-r4.patch 21745 RMD160 28c1f6f07679026427ebe9b83ea82c94cab4a546 SHA1 1afde387c2465c303aec5a339b393a58d415371a SHA256 6136768eecd676a83c7d7bd2c775b6f16b9fc6b3329edb5671dea737c201afda
AUX calculate-install-2.2.22-r1.patch 14684 RMD160 a21d98228bf1359cc175a9362c6f19629f9f2836 SHA1 1b762db6e3b8a554d9831755f307a060c62c8b8e SHA256 d63b8e2b362a7c4c4bb735b333f6b444b3271444022e022fd673c995fea23f5b
AUX calculate-install-2.2.22-r2.patch 16029 RMD160 8dea869b99a9f77c4114623a6b3fb3614562beee SHA1 1b40f0642a68c6652a854e4707ff3509b44becd8 SHA256 6d6921ffd09b82f3b8a8fa311bf970f89cb91d13a31ed67d0a3c65ded1d4f307
AUX calculate-install-2.2.24-r1.patch 2887 RMD160 081aaf2ac8d65f300e503c8b543f46d1e122dbc8 SHA1 a32ced7cfa312e82c8d64f786985beff0ace8f9c SHA256 ad961a894ddd39231084cbabb40e864063b8d8e6f242a7c92204d797e04aef11
DIST calculate-install-2.2.18.tar.bz2 75850 RMD160 56b1058d1977957cc6ceb8322a049af4dbb8f0cc SHA1 4e990cf5bd6310942b54995293f1f7ea82726aa9 SHA256 2a1b9c3fa93a958f19f05af51f80adf25f5ee0867452fac0304ec721de19cd97
DIST calculate-install-2.2.19.tar.bz2 63943 RMD160 8c76315aea89d20239b11c7e6017766b5e5e93db SHA1 1127468d3b221333e820e142fc1b9afaef507ee3 SHA256 5dedcb4c3d42ca4d87b2a2fa0d72704be3748865907b991dddbeba493e0da80a
DIST calculate-install-2.2.20.tar.bz2 65317 RMD160 f91f5b8e6a1f3a41cda246a983274b7665a98259 SHA1 a530fcc91cbb952e36e4e42175c45182d828a987 SHA256 06e3360e3d9e3e599d6696f121908390a241baa16fe9400657ea0a29c0f85fc1
@ -56,7 +57,8 @@ EBUILD calculate-install-2.2.22-r1.ebuild 925 RMD160 ac0f26beb482bd7fb41b7454036
EBUILD calculate-install-2.2.22-r2.ebuild 977 RMD160 19ffd3a4821bf7fb540ffa593e51f41d6a09c6ca SHA1 079e3a07b79cea4834059f7fe0334407e3b422df SHA256 62d7502d21412150bb5a44c0b16c3d728f020c91151d768926fc42824c1a92b3
EBUILD calculate-install-2.2.22.ebuild 804 RMD160 f011db7025c81f626ce9d85fba4a96c26cb3498b SHA1 758b096513299357983dfb3aa768940cf9ccbda3 SHA256 df1d9df0112e396d62de4ef9402756d6596ef26dede6fcdb850af8efe0f58758
EBUILD calculate-install-2.2.23.ebuild 805 RMD160 9212040f478e51777364257abb34dfb3008306e9 SHA1 02f776f17b6b33c3d2f3bd186795be34e074274e SHA256 21d4db0926c2a67ba249c38e80a246ede4ec1741bb17b7f7d5f3f3b3515e9964
EBUILD calculate-install-2.2.24-r1.ebuild 932 RMD160 3816f9b8ccac79597a2ad67ac08f323aed855af0 SHA1 5119b9b5e09704e3f20ec8e465e3d2bb6cd426af SHA256 8a07bbb2443b7e22f1a67a4b37baaff69803b02422cd047639a4fc8afa2c733d
EBUILD calculate-install-2.2.24.ebuild 805 RMD160 03a686ea79b138f2c91e9b7e0ec2282ad28f5f78 SHA1 7cb0dc07aa7eaec1ba6d8d722c08b0936a4b12a9 SHA256 f425da4dbc0ccac4b126517d4770a273add08f26f147d599b6261662561eb2ab
EBUILD calculate-install-2.2.9999.ebuild 595 RMD160 8f9b9a14fed39ded9c2a9d9343aa4e892d620172 SHA1 09aff28bdaa486868e2caddc7911732a905336ee SHA256 534e6c6e465177e269ce7beed96dab08a124878591088c1bf38095e855ca1180
MISC ChangeLog 28416 RMD160 4eb739fc57a77676c06ffd12930ab0b51a29765b SHA1 21f35c68d288724f4d9408a619c8c4fcdeee55a7 SHA256 1219727ca78e6605dd3943e22d0534bb09611363c9a9b479665d895f4317e178
MISC ChangeLog 28624 RMD160 f6768713d01355a83a24aa2a1dec89d5e4f4ab95 SHA1 a368fc1c70834528900ef5089b7f64986c9f5a51 SHA256 482d6721df28cea3e654ddfbe6d7cbd86d2f3c9b4f61ac3af6cfd4b9e616d7de
MISC metadata.xml 310 RMD160 769e4f17a9354da6b168b72a5d65d978f65bf6dd SHA1 83aaae376052d69c7327e880cf028ebc0dea608b SHA256 c29d3efc676d8308872920db5223c78469db86ac236b5d45c3ee98ceb8fca846

@ -0,0 +1,42 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${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="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-templates-2.2.24
~sys-apps/calculate-lib-2.2.24
app-portage/layman
!app-misc/livecd-tools
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# Fix get current version
epatch "${FILESDIR}/calculate-install-2.2.24-r1.patch"
}
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

@ -0,0 +1,80 @@
diff --git data/bashlogin data/bashlogin
index ea9493a..4152a1c 100644
--- data/bashlogin
+++ data/bashlogin
@@ -1,7 +1,26 @@
#!/bin/bash
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
export HOME=/root
cat /etc/motd 2>/dev/null
-cd /root
-[[ -e .bash_profile ]] && source .bash_profile
-exec -l /bin/bash -i
+cd $HOME
+if [[ -f .bashrc ]]
+then
+ source .bashrc
+elif [[ -f .bash_profile ]]
+then
+ source .bash_profile
+fi
+exec -l -a bash /bin/bash
diff --git data/calculate data/calculate
index f213a07..b320228 100644
--- data/calculate
+++ data/calculate
@@ -1,4 +1,17 @@
#!/sbin/runscript
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
depend() {
need localmount root fsck modules
diff --git data/xautologin data/xautologin
index c33a1bf..8604572 100644
--- data/xautologin
+++ data/xautologin
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2010 Calculate Ltd. http://www.calculate-linux.org
+# Copyright 2011 Calculate Ltd. http://www.calculate-linux.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git pym/cl_fill_install.py pym/cl_fill_install.py
index f7e861c..ed47357 100644
--- pym/cl_fill_install.py
+++ pym/cl_fill_install.py
@@ -845,6 +845,8 @@ class fillVars(object, glob_attr):
self.Get('os_install_linux_shortname'))
if not imagename and self.Get('cl_action') != 'merge':
return ""
+ if self.Get('cl_action') != "system":
+ return self.Get('os_linux_ver')
d = DistributiveRepository()._getfromcontent(imagename)
if "linuxver" in d and d['linuxver'] != "0":
return d['linuxver']

@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-utilities-2.2.24-r1 (21 Sep 2011)
21 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-utilities-2.2.24-r1.ebuild:
Update for install
*calculate-utilities-2.2.24 (20 Sep 2011)
20 Sep 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -55,6 +55,7 @@ EBUILD calculate-utilities-2.2.23-r7.ebuild 876 RMD160 3760c87284f0b3e62eab9b176
EBUILD calculate-utilities-2.2.23-r8.ebuild 876 RMD160 9a9aec67e2cc77827af4be88f5334a536080221c SHA1 e65c0565bfc368fb0ce87e3efee2b9efce59bcf4 SHA256 12a989b192ef339ca7927ebf5fdf2b9d7c10aff8d23577e3fa95fed7656fb344
EBUILD calculate-utilities-2.2.23-r9.ebuild 876 RMD160 e4460ad5393441079e2ff57dc3bb4e653e3e0b81 SHA1 a9ccf06ff7503d757b832e56470f4cf1a92d8ec4 SHA256 76fa6fb16855d43985e690f43bb18ee6cf341694c14af1307cbefa23c3cb92ed
EBUILD calculate-utilities-2.2.23.ebuild 861 RMD160 a625469de75e5f99cc6d7b39496787b4a0c405f6 SHA1 bcbd37e0e4b92a070f68b8aac7a0c3f2c62a9b21 SHA256 4b5b2b88c9a225f33e7b3175bd02e38ccc03c5ae3be54894e92162b9b34ba106
EBUILD calculate-utilities-2.2.24-r1.ebuild 864 RMD160 a22eb8673a948936e0badbe143b5fedfbfbd8c51 SHA1 0b5d4989ce0937f069e8d99fbb210592f473d8dc SHA256 12b90974f2941a3c49f816bc89075dbb641a16654709baa1ff9ee2fb20815e20
EBUILD calculate-utilities-2.2.24.ebuild 861 RMD160 71a8eac35eade9be90df9cacbb5b4d9ba07d3664 SHA1 258da46af67a0e0995074a9c7f01b33234711ca9 SHA256 f1a33869f243365632a9af11ab9ed2538a6b2c183dd9ddbf28d48ad564df3d54
EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66
MISC ChangeLog 23828 RMD160 5fe9c922760ffc10a6fe94a176ed9e21e6d5dce7 SHA1 7f95564bfd4a91d6671665fe89ab4cae6494530c SHA256 f35639cd30025ecc0ae51f91524ed54084a54f05beaf98767360c02cda3821c6
MISC ChangeLog 23997 RMD160 808c8f7e9cd48d9ccb162a69b465ecb3497c9b68 SHA1 f5988a802590c3a80a16c25deaba986a82046bf9 SHA256 6497d2f12b56ed9bc93902a75be9209e70914c9fd82dbee49843f521bd8c5daa

@ -0,0 +1,36 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.24-r1
=sys-apps/calculate-templates-2.2.24
=sys-apps/calculate-lib-2.2.24
=sys-apps/calculate-i18n-2.2.24
cl_assemble? ( =sys-apps/calculate-assemble-2.2.24 )
cl_builder? ( =sys-apps/calculate-builder-2.2.24 )
cl_client? ( =sys-apps/calculate-client-2.2.24 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.24 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.24 )
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
"
Loading…
Cancel
Save