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

Fix cl-image (bug with --notree)

Browse Source
atratsevskiy
Mike Hiretsky 13 years ago
parent ac42726128
commit 0af22c72f9
5 changed files with 92 additions and 0 deletions
Show Stats Download Patch File Download Diff File

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

@ -5,6 +5,7 @@ AUX calculate-builder-2.2.25-r3.patch 2377 RMD160 27c4080989f7d04f20908b1465e441
AUX calculate-builder-2.2.25-r4.patch 2386 RMD160 99aa33b2591f5bf5e43f37276854732c19183169 SHA1 8d435aaa38d0fe64dcf6b06903b1e179a12df389 SHA256 463a74fcd4f7fc1f72c0b2476cb91778225c6176cd93628c47fb61259be1f9d1
AUX calculate-builder-2.2.25-r5.patch 2671 RMD160 c6787fde2fb41b756cb75e10646aac326bd8e0c6 SHA1 7e29c88907c9dbf62e985a2d65bc5104e0d26ba2 SHA256 aeed4dd42a04fb156c687f920e9b046bc2a8d5030a7880a59e7042a08bdfb628
AUX calculate-builder-2.2.26-r1.patch 415 RMD160 bf672af71a47185997031ac54a75ba7b35cff123 SHA1 14aca25a343bbb83c0fbc0fa8671468fb95aea45 SHA256 64beb206c47fe1bd912528de5f6df4c11f255bb25a5289b949a4f364e3f649a8
AUX calculate-builder-2.2.27-fix_notree.patch 631 RMD160 d3a0306f30b548716e743312b8c904dfb3d59586 SHA1 5d03126b5a524619f2d7416dee6052c387ae84d7 SHA256 95765aa903545c6ff7e524342db423b71759b44c511d131bb83d2403e7d58f1d
AUX calculate-builder-2.2.27-r1.patch 1034 RMD160 7edaa3350ace163af6ac6f576cc30b508cab891c SHA1 4dbcd27cbc7b9ee2da3a18b4e2da36cc24fcd4f8 SHA256 59d1cd208e89245f51fb071328405f8c810c502e549d6a71d9da9fc233d6943e
AUX calculate-builder-2.2.27-r2.patch 3321 RMD160 6a9b445fb14cdf15d5492b6d29379a702b433731 SHA1 1fb24e18ce38c5282146e0a6f0c441ae8b4971cd SHA256 985ec1f5625a483555d897f3afd5041c1ab17010edeaf48c90ea23d11fc73166
AUX calculate-builder-2.2.27-r3.patch 3317 RMD160 6d529c26ea3042534db59f339cf0592babf04237 SHA1 30b5ac6d7e481bc519bd849afbf1cc1d0d45dc97 SHA256 c80b97d609d03aacb330a0cab62adfee8126e89ef2e5dc577eb6d44b1bd49a26
@ -26,6 +27,7 @@ EBUILD calculate-builder-2.2.27-r1.ebuild 705 RMD160 54da126175ed8adca9f6fb5b451
EBUILD calculate-builder-2.2.27-r2.ebuild 728 RMD160 a89e78e340b054622370815f8e90c3f4218e0427 SHA1 69689afdcbf479d87091036bd74a5721aa764458 SHA256 e2366a7698b3357936864ec47c68ac2080ecd767e091b8df4d4d36aa1b3191ca
EBUILD calculate-builder-2.2.27-r3.ebuild 728 RMD160 bc2f519a76bb114f083869bab6e2f12eb6f3807a SHA1 eea960f6ead1b1ec3ce0685e817d3a0d87ee3987 SHA256 f9e6b6bdb017dc42e7b4b464509e1d8ddda185abbd6762646ea96e3933bad522
EBUILD calculate-builder-2.2.27-r4.ebuild 728 RMD160 22201f424af3a480f25f484d8ff1346df4494f01 SHA1 ad2fbfe2eda04a15320cd748113c7410a1fc7f37 SHA256 bd1841b0388efb6e48da497b3c78c56d9159d3d8d67f126543c2454645cb867e
EBUILD calculate-builder-2.2.27-r5.ebuild 815 RMD160 7d8c564671083e5d973819658815fcbbeecef907 SHA1 de3a62c05f21a009b7b71de7a39eb9802ec595a9 SHA256 d605e1148df946d4a3d8406d9e70764dab159596dc1fe3c90ac182c1ed299099
EBUILD calculate-builder-2.2.27.ebuild 587 RMD160 6afd1967c23603882fa4e3c363baa4da434b018d SHA1 51dcc6e56a98255be8079c6b981fc951c21f3a46 SHA256 f7f62dc434766592746e1b1d5d3ca93f49b84d263edf55e41ba3d5125305b0d2
EBUILD calculate-builder-2.2.9999.ebuild 571 RMD160 9342f8bb6fee2525ea214551f177a21170c8f320 SHA1 640d9424326321e45c59241384d3bdec58ff0a22 SHA256 829ecb63e72f27ae5f1cab9a22b3fad06addd81e7cf0f73fb99926dfe1d52102
MISC ChangeLog 20357 RMD160 dd7f1079a00a48b6efa384d362a542cc1acd6b83 SHA1 35449da9a1889eacbdbb5d489726ff790e0bf85b SHA256 adff43f5e9ecbc97fd2db9d9f8ffd0b358a5a8fd0bf95b2f53c632247927f2b1

33
sys-apps/calculate-builder/calculate-builder-2.2.27-r5.ebuild
Unescape View File

@ -0,0 +1,33 @@
# 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 utilities for builder tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND=">=sys-kernel/calckernel-3.4.18
~sys-apps/calculate-install-2.2.27
!<sys-apps/calculate-1.4.0_p20100921
app-cdr/cdrkit
sys-fs/squashfs-tools"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix rescratch, change update portage
epatch "${FILESDIR}/calculate-builder-2.2.27-r4.patch"
# fix remove --notree
epatch "${FILESDIR}/calculate-builder-2.2.27-fix_notree.patch"
}

20
sys-apps/calculate-builder/files/calculate-builder-2.2.27-fix_notree.patch
Unescape View File

@ -0,0 +1,20 @@
commit 8b036a688338a0d1420b0b2bd74ce7fdce2fb4ca
Author: Mike Hiretsky <mh@calculate.ru>
Date: Tue Jan 31 08:46:41 2012 +0400
Fix remove notree.
diff --git pym/cl_image_cmd.py pym/cl_image_cmd.py
index 2029c03..f05ac27 100644
--- pym/cl_image_cmd.py
+++ pym/cl_image_cmd.py
@@ -167,9 +167,6 @@ class image_cmd(share_cmd):
if not self.isRoot() or not self.isScratch(True):
sys.exit(1)
- if values.notree:
- self.logicObj.clVars.Set('cl_builder_tree','off',True)
-
if values.noisohybrid:
self.logicObj.clVars.Set('cl_builder_isohybrid_set','off',True)

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

@ -46,6 +46,7 @@ EBUILD calculate-utilities-2.2.27-r22.ebuild 885 RMD160 7d7ef97ee1b86808f720f686
EBUILD calculate-utilities-2.2.27-r23.ebuild 885 RMD160 15983723382c6b4108a69f31288fcc61c7851660 SHA1 b4c4ce3d45c7cb64b421b7ecc0aed620889594cc SHA256 7bfc566099b941b6dc29254db7b308e5effba274d02c27f729b293cc73648480
EBUILD calculate-utilities-2.2.27-r24.ebuild 885 RMD160 aa0d0059e7e1fb51705e89167c0a8b1f931c3d43 SHA1 c15d9b68ee11351170e3c06d19bf794e36881952 SHA256 5522feaa6009f8073181e5a2ce91aba37ed86d0ebdd2f918b7797a406ba1d0c7
EBUILD calculate-utilities-2.2.27-r25.ebuild 886 RMD160 7b22a627f8bfaba590d2633c05d58b44b4c72d9a SHA1 d1477d53d5a3ef00c839029ca2bf7221d1458f61 SHA256 a3092415467da4fe1ccc5f97b7121e3246372231246605c67b9cf2d90ef74f14
EBUILD calculate-utilities-2.2.27-r26.ebuild 886 RMD160 d18958634f4993f6d141c56d2f4c94bb40db6e62 SHA1 d69c85d3d1ae6657f846bfe02df7583395ba89a0 SHA256 2ecbf904470d0adc7b47c17c2d652d2c453e2044dfef3c9854ec3bd7d8f37e9e
EBUILD calculate-utilities-2.2.27-r3.ebuild 873 RMD160 8628d675e4ba74655b5bf659d2174ea841a98546 SHA1 f1ee774dc3f3bf2d236ef9dabc238b158bea0fa4 SHA256 4f6f60097dec896b2d37be3351f5c8506bcfd8c59a9a8ba86ce3ebc30faba6ef
EBUILD calculate-utilities-2.2.27-r4.ebuild 876 RMD160 8933c301d60d0faf13a1a01c1c44c3207fc7676a SHA1 33f71f1ddf01e29e9dc82fdc6a14264fd9675f1c SHA256 f3652d96e6bbb08f550ec5537a166a0b349afcd1d1b7df444dc521c2cccef04a
EBUILD calculate-utilities-2.2.27-r5.ebuild 876 RMD160 e25441bf618945e03428d99d0c6c345783385c47 SHA1 11725a9b845cb06438dd69c8f6e4963f5bee4982 SHA256 872c0e3285f349a9698bf0d6a2879171e996fc517d6eb7e7009deb26bc7eaa6d

36
sys-apps/calculate-utilities/calculate-utilities-2.2.27-r26.ebuild
Unescape View File

@ -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.27-r6
=sys-apps/calculate-templates-2.2.27-r10
=sys-apps/calculate-lib-2.2.27-r3
=sys-apps/calculate-i18n-2.2.27-r2
cl_assemble? ( =sys-apps/calculate-assemble-2.2.27-r2 )
cl_builder? ( =sys-apps/calculate-builder-2.2.27-r5 )
cl_client? ( =sys-apps/calculate-client-2.2.27-r3 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.27 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.27-r2 )
cl_server? ( =sys-apps/calculate-server-2.1.15-r4 )
"
Write Preview
Loading…
Cancel
Save