parent
5735841c38
commit
ecb5b5dd35
@ -0,0 +1,40 @@
|
|||||||
|
# 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/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-lib-2.2.31
|
||||||
|
!<sys-apps/calculate-1.4.0_p20100921
|
||||||
|
>=app-cdr/cdrtools-3.01_alpha13
|
||||||
|
>=sys-boot/grub-2.00-r3
|
||||||
|
>=sys-boot/syslinux-4.06
|
||||||
|
sys-fs/squashfs-tools"
|
||||||
|
|
||||||
|
RDEPEND="${DEPEND}"
|
||||||
|
|
||||||
|
src_unpack() {
|
||||||
|
unpack "${A}"
|
||||||
|
cd "${S}"
|
||||||
|
|
||||||
|
# remove depricated templates,UEFI hybrid
|
||||||
|
epatch "${FILESDIR}/calculate-builder-2.2.31-r4.patch"
|
||||||
|
# fix version of calculate builder to 2.2.32 for using iso grub templates
|
||||||
|
epatch "${FILESDIR}/calculate-builder-2.2.31-fix_version.patch"
|
||||||
|
# fix update grub-2.00
|
||||||
|
epatch "${FILESDIR}/calculate-builder-2.2.31-grub2.patch"
|
||||||
|
}
|
@ -1,20 +1,17 @@
|
|||||||
commit c539398bc22240aa4efb5391127a3d5e569c0321
|
|
||||||
Author: Mike Hiretsky <mh@calculate.ru>
|
|
||||||
Date: Wed Mar 20 17:07:12 2013 +0400
|
|
||||||
|
|
||||||
Fix update kernel entry for grub2
|
|
||||||
|
|
||||||
diff --git pym/cl_kernel.py pym/cl_kernel.py
|
diff --git pym/cl_kernel.py pym/cl_kernel.py
|
||||||
index 456efad..1ab977c 100644
|
index 456efad..4efd797 100644
|
||||||
--- pym/cl_kernel.py
|
--- pym/cl_kernel.py
|
||||||
+++ pym/cl_kernel.py
|
+++ pym/cl_kernel.py
|
||||||
@@ -398,7 +398,8 @@ class cl_kernel(color_print):
|
@@ -398,8 +398,10 @@ class cl_kernel(color_print):
|
||||||
' calculate=video:%s'%x11video,y,1)
|
' calculate=video:%s'%x11video,y,1)
|
||||||
|
|
||||||
# if has grub2
|
# if has grub2
|
||||||
- if filter(lambda x:x.startswith("grub-1.99"),
|
- if filter(lambda x:x.startswith("grub-1.99"),
|
||||||
|
- listDirectory('/var/db/pkg/sys-boot')):
|
||||||
+ if filter(lambda x:x.startswith("grub-1.99") or \
|
+ if filter(lambda x:x.startswith("grub-1.99") or \
|
||||||
+ x.startswith("grub-2"),
|
+ x.startswith("grub-2"),
|
||||||
listDirectory('/var/db/pkg/sys-boot')):
|
+ listDirectory('/var/db/pkg/sys-boot')) and \
|
||||||
|
+ os.environ["EBUILD_PHASE"] == '':
|
||||||
grubInstall = process('/usr/sbin/cl-core','--method','core_setup',
|
grubInstall = process('/usr/sbin/cl-core','--method','core_setup',
|
||||||
'--pkg-name','grub',
|
'--pkg-name','grub',
|
||||||
|
'--no-progress',stderr=None)
|
||||||
|
@ -0,0 +1,30 @@
|
|||||||
|
# Copyright 1999-2012 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_server
|
||||||
|
"
|
||||||
|
|
||||||
|
RDEPEND="${RDEPEND}
|
||||||
|
!sys-apps/calculate-templates
|
||||||
|
!<sys-apps/calculate-install-3.0.0_alpha1
|
||||||
|
=sys-apps/calculate-lib-2.2.31-r1
|
||||||
|
=sys-apps/calculate-i18n-2.2.31
|
||||||
|
|
||||||
|
cl_assemble? ( =sys-apps/calculate-assemble-2.2.31-r1 )
|
||||||
|
cl_builder? ( =sys-apps/calculate-builder-2.2.31-r7 )
|
||||||
|
|
||||||
|
cl_server? ( =sys-apps/calculate-server-2.1.16-r7 )
|
||||||
|
"
|
Loading…
Reference in new issue