Fix bind mount point in install. Fix work with sys-apps/file-5.05atratsevskiy
parent
577428773d
commit
2f6eb65bc3
@ -0,0 +1,40 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="2"
|
||||
|
||||
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-lib-2.2.8-r1
|
||||
<sys-apps/calculate-lib-2.2.9
|
||||
app-portage/layman
|
||||
!minimal? ( sys-boot/grub
|
||||
sys-apps/gdisk
|
||||
sys-fs/dosfstools
|
||||
sys-fs/squashfs-tools
|
||||
sys-block/parted )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# fix bind mount point install
|
||||
epatch "${FILESDIR}/calculate-install-2.2.8-fix_bind_mounts.patch"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For configure calculate-install perform:"
|
||||
einfo " cl-install --install"
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
diff --git a/pym/cl_install.py b/pym/cl_install.py
|
||||
index a9b0a9c..3c479d3 100644
|
||||
--- a/pym/cl_install.py
|
||||
+++ b/pym/cl_install.py
|
||||
@@ -966,7 +966,8 @@ class cl_install(color_print, SignalInterrupt):
|
||||
mountPoint=mountPoint,
|
||||
fileSystem=fileSystem,
|
||||
isFormat=isFormat,
|
||||
- systemId=None)
|
||||
+ systemId=None,
|
||||
+ partitionTable=None)
|
||||
if flagMultipartition:
|
||||
# Set Multipartition
|
||||
target.multipartition=objMultiPartitions
|
||||
@ -0,0 +1,32 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="2"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The library for Calculate 2"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="2.2"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="minimal"
|
||||
DEPEND="~sys-apps/calculate-templates-2.2.8
|
||||
!<sys-apps/calculate-lib-2.1.8-r1
|
||||
!=sys-apps/calculate-lib-2.1.9
|
||||
!=sys-apps/calculate-lib-2.1.10
|
||||
!minimal? ( dev-python/py-smbpasswd )
|
||||
>=dev-python/pyxml-0.8
|
||||
sys-apps/file[python]"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# fix work with sys-apps/file-5.05
|
||||
epatch "${FILESDIR}/calculate-lib-2.2.8-file.patch"
|
||||
}
|
||||
@ -0,0 +1,26 @@
|
||||
diff --git a/pym/cl_utils.py b/pym/cl_utils.py
|
||||
index b84d6e6..d6fa979 100644
|
||||
--- a/pym/cl_utils.py
|
||||
+++ b/pym/cl_utils.py
|
||||
@@ -28,7 +28,11 @@ import re
|
||||
import sys
|
||||
import getpass
|
||||
from types import StringType
|
||||
-import magic as type_file
|
||||
+
|
||||
+try:
|
||||
+ from magic import open as type_file, MAGIC_NONE as MAGIC_NONE
|
||||
+except ImportError:
|
||||
+ from magic import open as type_file, NONE as MAGIC_NONE
|
||||
|
||||
import cl_lang
|
||||
tr = cl_lang.lang()
|
||||
@@ -73,7 +77,7 @@ class typeFile:
|
||||
"""Получение типа файла"""
|
||||
|
||||
def __init__(self, magic=0x410):
|
||||
- self.magicObject = type_file.open(type_file.MAGIC_NONE)
|
||||
+ self.magicObject = type_file(MAGIC_NONE)
|
||||
self.magicObject.load()
|
||||
self.magicObject.setflags(magic)
|
||||
|
||||
Loading…
Reference in new issue