Fix detect build for update system.

atratsevskiy
Mike Hiretsky 13 years ago
parent 113074b6d7
commit 308f856535

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

@ -13,6 +13,7 @@ AUX calculate-install-2.2.20-fix_iso_add_btrfs.patch 4339 RMD160 01a46841d1c7db4
AUX calculate-install-2.2.20-many_bugfix.patch 16735 RMD160 3b860cb7d0d2e216186c2f0c735d7b2988b43b8f SHA1 b6920691924bbb0a7d925c2ac5caeaeab99d8428 SHA256 126ab7b6d096f688c10733e74c3ef367f6363aca06783654f8847bfb849a3c63
AUX calculate-install-2.2.20-net_network.patch 1496 RMD160 142d7420565283eee8949b6c21afbd6806e72ab3 SHA1 6f112deaf6b9b47bbf1afc7c93464dda96546265 SHA256 93ccc4026a767cac3f9e861ffe1e7a3299ce2b3f808cd10ff684a60f0c47b6f8
AUX calculate-install-2.2.20_2.2.21_rc1.patch 36707 RMD160 279605cc9ce454e93f5620d0151eaa5b5a83dc09 SHA1 f5e3104b869d74ae207604d6685924d79a2a1223 SHA256 b68a756710d7abf60fc61b0154e870e152b2d2d533e1ccf229189555f933e796
AUX calculate-install-2.2.21-r1.patch 1059 RMD160 b78b780b87f73504c45c4b9e6feb89a4489e101a SHA1 5eb9ff84ed9bf9c7a6b8706bda463451ccc804ea SHA256 412598c1c2ebe23f245f1e0597b0938b9be76050e8b21906c053202b9ec54025
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
@ -38,7 +39,8 @@ EBUILD calculate-install-2.2.20-r7.ebuild 1123 RMD160 217263e576e5ab235891e13c52
EBUILD calculate-install-2.2.20-r8.ebuild 938 RMD160 d2beaf2db6e430ca8e0357f380558453fe30fea9 SHA1 3b57794dcf2cfbe5c0815b58f43fb8d4a8fb3803 SHA256 6e14bf1ee6ea50e2e1d59f5fb26b77535eb722c01d740b8f173adb80db6e3c83
EBUILD calculate-install-2.2.20-r9.ebuild 938 RMD160 d2beaf2db6e430ca8e0357f380558453fe30fea9 SHA1 3b57794dcf2cfbe5c0815b58f43fb8d4a8fb3803 SHA256 6e14bf1ee6ea50e2e1d59f5fb26b77535eb722c01d740b8f173adb80db6e3c83
EBUILD calculate-install-2.2.20.ebuild 774 RMD160 975cdfee5054db3a097a2edbd5bbd4db002b921d SHA1 efdeb24c9021ccbe384190f2e742d41620dd3e20 SHA256 549b961eeb2d3bcbfa526f3b5ed0368439a599e8a797d229a60bc8d0d7ae33c5
EBUILD calculate-install-2.2.21-r1.ebuild 960 RMD160 616508e423d7926c59c3c52a53b085fa28a174ac SHA1 57c81447cabf469331299f74ff4771a4f41a6487 SHA256 80e0fecf61a6ee9d13fe5dba1eefc276aeb07c49c745092581657b599e3883f8
EBUILD calculate-install-2.2.21.ebuild 804 RMD160 97f3e98ea3fd7bdf8e54ee23b5c2661c8962e19f SHA1 e7759746ffe19f70c159961a3e261bd09f2e89a1 SHA256 c6d80514eb5cd12eb9e9f687fdd54e2cbc1727a1e2b5b5cc3541e67536d51841
EBUILD calculate-install-2.2.9999.ebuild 595 RMD160 8f9b9a14fed39ded9c2a9d9343aa4e892d620172 SHA1 09aff28bdaa486868e2caddc7911732a905336ee SHA256 534e6c6e465177e269ce7beed96dab08a124878591088c1bf38095e855ca1180
MISC ChangeLog 26676 RMD160 c7dbc6b36827795f28acbc0ce71530056112ef52 SHA1 7004d1db095184d3697576582b4774d52c368c6f SHA256 9ed6c5ae0892b4cbfcd932f69c9324cf12cd2475974b91e4ae0682016e4502f6
MISC ChangeLog 26884 RMD160 12bce332228cacdc5309ed6782b52694febdef1e SHA1 78cf7efbec7cb3e6e14bfe0363fa2c1aa1e388df SHA256 c2b99df169e2497f6efe317173421d8c6b794fc4399bf8435d67098db63aaef9
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.21
~sys-apps/calculate-lib-2.2.21
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 bug of caching detected images and installed os
epatch "${FILESDIR}/calculate-install-2.2.21-r1.patch"
}
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

@ -0,0 +1,28 @@
commit 71456c2c67431006fdf49cd7e9cc17103a387d40
Author: Mike Hiretsky <mh@calculate.ru>
Date: Fri Aug 19 10:54:23 2011 +0400
Bugfix caching of param detected images and installed system.
diff --git a/pym/cl_distr.py b/pym/cl_distr.py
index 057e50d..b622e6d 100644
--- a/pym/cl_distr.py
+++ b/pym/cl_distr.py
@@ -136,7 +136,7 @@ class DistributiveRepository:
"""Get info from content"""
origfilename = filename
if filename in DistributiveRepository.contentCache:
- return DistributiveRepository.contentCache[filename]
+ return DistributiveRepository.contentCache[filename].copy()
varsShare = self.varsShare
distr = None
# may be directory is isodir (directory which contains iso image)
@@ -184,7 +184,7 @@ class DistributiveRepository:
if distr:
distr.close()
DistributiveRepository.contentCache[origfilename] = d
- return d
+ return d.copy()
def _getdistrinfo(self,filename):
"""Get information by distributive"""

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

@ -30,6 +30,7 @@ EBUILD calculate-utilities-2.2.20-r7.ebuild 874 RMD160 56dd33f00d8f7b8ac30b045e4
EBUILD calculate-utilities-2.2.20-r8.ebuild 874 RMD160 48712477e41efeaf75903e5f21720eaf3133e98d SHA1 1ab738e1ef168defb9ea7708368a94e26c3e6bed SHA256 d143efee43c2b3633dec4b2af3f9097534a13623f721c796078fcd91946c5e2c
EBUILD calculate-utilities-2.2.20-r9.ebuild 874 RMD160 5ff0ffa5245061f5ffe5292cfba868e98a6241a9 SHA1 817d412a924a443c2e1b96abb2f63d23dc03adcd SHA256 b853c43c9ba82a594c8d2101a749fc2783bac9c25c4e4226aabb1e889642efd9
EBUILD calculate-utilities-2.2.20.ebuild 862 RMD160 192cb774b0a4c7dc0ce9f12a7736ad2f62febe14 SHA1 709c0aeb568224264988e15c4f914187eb6c00c2 SHA256 33618ea225c693f3a532f146e0ebcd7ac5d86c121dedb0f8cc7cfda8e938569d
EBUILD calculate-utilities-2.2.21-r1.ebuild 865 RMD160 d09702a54724755cca89e16bccb953ebad700625 SHA1 95f6bf58c10b76813b785edb86a434aaebd6d0a1 SHA256 7c2179eb3b399f465ce81ad5e705b35f605f2620d08fc179fe57159773be8e35
EBUILD calculate-utilities-2.2.21.ebuild 862 RMD160 3786826c24e6bfc0fb9e5b413c85e429ae412723 SHA1 8beb4139d5f2828421d57c4ab7ba6e8a2e59d9ef SHA256 530ea787bfee6bd4308bb782b82a42f0e60d02fa692877135f3fe8402c4ba677
EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66
MISC ChangeLog 20072 RMD160 d19ba321a3e016ea87233548b57c9f07e94b7468 SHA1 c04c2bc9803b1a9669c59ef1be90b2994defe47c SHA256 f23d89f6d4b9475977c42db3908be99c47cc0ad4c9215e5b72aec7f66b1809fb
MISC ChangeLog 20241 RMD160 544af2e0752b366a01d51a5ee8e0a49e11e79d5a SHA1 66edd894ffe946f350fb2eea3b54293a5f6c5270 SHA256 57c02bf60b37dce62f2821f49421dda50978465db945392cd6e2555d6bb349dd

@ -0,0 +1,37 @@
# 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.21-r1
=sys-apps/calculate-templates-2.2.21
=sys-apps/calculate-lib-2.2.21
=sys-apps/calculate-i18n-2.2.21
cl_assemble? ( =sys-apps/calculate-assemble-2.2.21 )
cl_builder? ( =sys-apps/calculate-builder-2.2.21 )
cl_client? ( =sys-apps/calculate-client-2.2.21 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.21 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.21 )
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
"
Loading…
Cancel
Save