parent
27e55c1d76
commit
fa01a1e7ff
@ -0,0 +1,43 @@
|
||||
# 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 setting and storing the user account in the domain"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="kde xfce gnome"
|
||||
|
||||
DEPEND="~sys-apps/calculate-desktop-2.2.27
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
>=sys-auth/pam_ldap-180[ssl]
|
||||
>=sys-auth/nss_ldap-239
|
||||
>=sys-apps/keyexec-0.1.2
|
||||
sys-apps/keyutils
|
||||
sys-auth/pam_keystore
|
||||
dev-lang/swig
|
||||
xfce? ( x11-misc/xdialog )
|
||||
gnome? ( x11-misc/xdialog )
|
||||
kde? ( kde-base/kdialog )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# fix domain install
|
||||
epatch "${FILESDIR}/calculate-client-2.2.27-r1.patch"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For configure calculate-client perform:"
|
||||
einfo " cl-client --install"
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
diff --git pym/cl_client.py pym/cl_client.py
|
||||
index eea7ccc..ca2e11d 100644
|
||||
--- pym/cl_client.py
|
||||
+++ pym/cl_client.py
|
||||
@@ -1807,6 +1807,13 @@ class client(share, commandServer, encrypt):
|
||||
if not self.addDaemonAutostart("client"):
|
||||
return False
|
||||
if onlyEnv:
|
||||
+ # apply templates (this appling client templates need
|
||||
+ # for safety executing cl-install --startup for
|
||||
+ # already domained computers
|
||||
+ if self.clVars.Get("os_remote_auth") and \
|
||||
+ not self.applyTemplatesFromSystem():
|
||||
+ self.printERROR(_("Failed to apply install templates"))
|
||||
+ return False
|
||||
return True
|
||||
if domain and not self.mountRemote():
|
||||
return False
|
||||
@@ -2187,7 +2194,7 @@ class client(share, commandServer, encrypt):
|
||||
if not pathUserList:
|
||||
continue
|
||||
pathUser = "/".join(pathUserList[1:])
|
||||
- srcDir = pathJoin(previousHome, pathUser)
|
||||
+ srcDir = pathJoin(previousHome, pathUser)
|
||||
if os.path.exists(srcDir) and not os.path.exists(homeDir):
|
||||
flagMovedUsers = True
|
||||
destDir = os.path.dirname(homeDir)
|
||||
@@ -2195,7 +2202,7 @@ class client(share, commandServer, encrypt):
|
||||
%{"src":srcDir,"dest":homeDir})
|
||||
if not self.copyTemplateDir(srcDir, destDir):
|
||||
return False
|
||||
- if flagMovedUsers and not os.listdir(previousHome):
|
||||
+ if flagMovedUsers and not os.listdir(previousHome):
|
||||
os.rmdir(previousHome)
|
||||
return True
|
||||
|
||||
@ -0,0 +1,46 @@
|
||||
# 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 pxe"
|
||||
|
||||
DEPEND="~sys-apps/calculate-templates-2.2.27
|
||||
~sys-apps/calculate-lib-2.2.27
|
||||
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 )
|
||||
pxe? ( sys-apps/calculate-server
|
||||
net-ftp/tftp-hpa
|
||||
net-misc/dhcp
|
||||
net-fs/nfs-utils )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# fix activity,boot nfs,install handbook
|
||||
epatch "${FILESDIR}/calculate-install-2.2.27-r2.patch"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For configure calculate-install perform:"
|
||||
einfo " cl-install --install"
|
||||
}
|
||||
@ -0,0 +1,275 @@
|
||||
diff --git data/calculate data/calculate
|
||||
index 7339b32..3609ae4 100644
|
||||
--- data/calculate
|
||||
+++ data/calculate
|
||||
@@ -22,7 +22,7 @@ depend() {
|
||||
check_install_ability()
|
||||
{
|
||||
local pkg=$1
|
||||
- FETCHCOMMAND=false DISTDIR=/usr/portage/distfiles emerge -fq $pkg &>/dev/null
|
||||
+ FEATURES="-getbinpkg" FETCHCOMMAND=false DISTDIR=/usr/portage/distfiles emerge -fq $pkg &>/dev/null
|
||||
}
|
||||
|
||||
is_already_install()
|
||||
@@ -38,7 +38,7 @@ install_pkg()
|
||||
{
|
||||
local pkg=$1
|
||||
ebegin "Installing $pkg"
|
||||
- FETCHCOMMAND=false DISTDIR=/usr/portage/distfiles emerge $pkg &>/dev/null
|
||||
+ FEATURES="-getbinpkg" FETCHCOMMAND=false DISTDIR=/usr/portage/distfiles emerge $pkg &>/dev/null
|
||||
}
|
||||
|
||||
variable_value()
|
||||
@@ -120,6 +120,10 @@ start() {
|
||||
source /etc/profile
|
||||
/sbin/update-modules
|
||||
|
||||
+ # reinit net.* services
|
||||
+ local roottype=`variable_value os_root_type`
|
||||
+ [[ $roottype == "livecd" ]] && udevadm trigger --action="add" --subsystem-match=net
|
||||
+
|
||||
/sbin/rc-update --update
|
||||
return 0
|
||||
}
|
||||
diff --git pym/cl_fill_install.py pym/cl_fill_install.py
|
||||
index 438dedc..dcd6cd3 100644
|
||||
--- pym/cl_fill_install.py
|
||||
+++ pym/cl_fill_install.py
|
||||
@@ -128,6 +128,7 @@ class fillVars(object, glob_attr):
|
||||
interfaces = ip.getInterfaces()
|
||||
net_hash = {}
|
||||
pciEthernet = lspci(shortInfo=True)
|
||||
+ nfsRoot = self.Get('os_install_root_dev') == '/dev/nfs'
|
||||
for interface in interfaces:
|
||||
ipaddr,mask = ip.receiveIpAndMask(interface)
|
||||
dhcp = ip.isDhcpIp(interface)
|
||||
@@ -142,7 +143,7 @@ class fillVars(object, glob_attr):
|
||||
mapInterface["network"] = ip.getIpNet(ipaddr,mask=mask)
|
||||
else:
|
||||
mapInterface["network"] = ""
|
||||
- mapInterface["dhcp"] = "on" if dhcp else "off"
|
||||
+ mapInterface["dhcp"] = "on" if dhcp or nfsRoot else "off"
|
||||
mapInterface["mac"] = mac
|
||||
mapInterface["name"] = "{vendor} {name}".format(**pciInfo)
|
||||
net_hash[interface]=mapInterface
|
||||
@@ -1146,7 +1147,8 @@ class fillVars(object, glob_attr):
|
||||
if filter(lambda x:x.lower() == ("networkmanager"),
|
||||
listDirectory('/etc/runlevels/boot')+
|
||||
listDirectory('/etc/runlevels/default')) \
|
||||
- or self.Get('os_install_root_type') == "livecd":
|
||||
+ or self.Get('os_install_root_type') == "livecd" and \
|
||||
+ self.Get('os_install_root_dev') != "/dev/nfs":
|
||||
if isPkgInstalled("net-misc/networkmanager",
|
||||
prefix=self.Get('cl_chroot_path')):
|
||||
return "networkmanager"
|
||||
@@ -1158,6 +1160,10 @@ class fillVars(object, glob_attr):
|
||||
|
||||
def get_os_install_net_domain(self):
|
||||
"""Domain"""
|
||||
+ if path.exists('/proc/self/fd/1') and \
|
||||
+ readlink('/proc/self/fd/1') == '/dev/console' and \
|
||||
+ self.Get('os_root_dev') == '/dev/nfs':
|
||||
+ return "local"
|
||||
textLines = self._runos("hostname -d 2>&1")
|
||||
domain = ""
|
||||
if textLines:
|
||||
diff --git pym/cl_install.py pym/cl_install.py
|
||||
index 185b229..7fe9d38 100644
|
||||
--- pym/cl_install.py
|
||||
+++ pym/cl_install.py
|
||||
@@ -29,8 +29,9 @@ from cl_utils import runOsCommand,appendProgramToEnvFile, \
|
||||
cmpVersion,STDOUT,getUdevDeviceInfo, \
|
||||
getLvmPartitions,getInstalledVideo, \
|
||||
getSupportArch, refreshLVM, refreshUdev, \
|
||||
- isPkgInstalled
|
||||
+ isPkgInstalled, checkUtils, countPartitions
|
||||
from cl_vars_share import varsShare
|
||||
+from subprocess import Popen,PIPE,STDOUT
|
||||
|
||||
from cl_kernel_utils import KernelConfig,InitRamFs
|
||||
|
||||
@@ -899,7 +900,8 @@ class cl_install(color_print, SignalInterrupt):
|
||||
pxe = clGet('os_install_pxe')=='on'
|
||||
pxeflash = flash or pxe
|
||||
usbhdd = clGet('os_install_root_type')=="usb-hdd"
|
||||
- hdd = clGet('os_install_root_type')=="hdd"
|
||||
+ hdd = clGet('os_install_root_type')=="hdd" and not pxe
|
||||
+ x11print = bool(clGet('os_install_x11_video_drv'))
|
||||
if not flash:
|
||||
musers = ", ".join(set(clGet('cl_migrate_user'))-set(['root'])) \
|
||||
or _("none")
|
||||
@@ -939,8 +941,9 @@ class cl_install(color_print, SignalInterrupt):
|
||||
(_("Number of processors"),clGet('hr_cpu_num'),hdd),
|
||||
(_("Videocard"),clGet('hr_video_name'),hdd),
|
||||
(_("{0} video driver").format("Xorg"),
|
||||
- clGet('os_install_x11_video_drv'),hdd),
|
||||
- (_("Screen resolution"),clGet('os_install_x11_resolution'),hdd)
|
||||
+ clGet('os_install_x11_video_drv'),hdd and x11print),
|
||||
+ (_("Screen resolution"),clGet('os_install_x11_resolution'),
|
||||
+ hdd and x11print)
|
||||
],
|
||||
[(_("Network devices"),not pxeflash),
|
||||
(self.printNetworkTables,None,True)
|
||||
@@ -948,11 +951,12 @@ class cl_install(color_print, SignalInterrupt):
|
||||
[(_("Routes"),not pxeflash),
|
||||
(self.printRouteTables,None,True)
|
||||
],
|
||||
- [(_("Location"),not pxe),
|
||||
- (_("Master boot record")+" (MBR)",mbrdisk,True),
|
||||
+ [(_("Location"),True),
|
||||
+ (_("Master boot record")+" (MBR)",mbrdisk,not pxe),
|
||||
+ (_("PXE installation directory"),clGet('os_install_pxe_path'),pxe),
|
||||
(self.printLocationTables,None,True)
|
||||
],
|
||||
- [(_("Perform pre-install checkups"),True)]
|
||||
+ [(_("Perform pre-install checkups"),not pxe)]
|
||||
]
|
||||
|
||||
for section in printData:
|
||||
@@ -1781,33 +1785,67 @@ class cl_install(color_print, SignalInterrupt):
|
||||
return ""
|
||||
|
||||
def setActivePartition(self,partition):
|
||||
- """TODO: don't work with GPT. Don't work must be rewrite!!!!!"""
|
||||
- reActive = re.compile('^%s\s*[*]'%partition)
|
||||
- device = filter(lambda x:x in partition,
|
||||
- self.clVars.Get('os_device_dev'))
|
||||
- if not device:
|
||||
- raise DistributiveError(_("Failed to find the parent device"))
|
||||
- device = device[0]
|
||||
-
|
||||
- fdiskProcess = process("/sbin/fdisk","-l",device)
|
||||
- if fdiskProcess.failed():
|
||||
- raise DistributiveError(_("Failed to get device information\n%s")%
|
||||
- fdiskProcess.read())
|
||||
- if not filter(reActive.search,fdiskProcess):
|
||||
- grubDisk = self.getFieldByField("grub","mount","/",
|
||||
- secondPrefix="os_install_disk")
|
||||
- if grubDisk and grubDisk.rpartition(',')[2].isdigit():
|
||||
- fdiskProcess = process("/sbin/fdisk", device)
|
||||
- fdiskProcess.write("a\n%d\nw\n"%
|
||||
- (int(grubDisk.rpartition(',')[2])+1))
|
||||
- if fdiskProcess.success():
|
||||
- return True
|
||||
- if filter(reActive.search,process("/sbin/fdisk",
|
||||
- "-l",device)):
|
||||
- return True
|
||||
- raise DistributiveError(_("Failed to set the active partition"))
|
||||
- else:
|
||||
+ """Change partition id, specified by systemid"""
|
||||
+ deviceName = detectDeviceForPartition(partition)
|
||||
+ if deviceName is None:
|
||||
+ raise DistributiveError(
|
||||
+ _("Failed to determine the parent device for %s")%partition)
|
||||
+ # device hasn't any partition
|
||||
+ elif deviceName == "":
|
||||
+ return True
|
||||
+ fdiskProg, gdiskProg, partedProg = checkUtils('/sbin/fdisk',
|
||||
+ '/usr/sbin/gdisk','/usr/sbin/parted')
|
||||
+
|
||||
+ parttable = self.varSelect("os_disk_table",where="os_disk_dev",
|
||||
+ eq=partition)
|
||||
+ partitionNumber = \
|
||||
+ getUdevDeviceInfo(name=partition).get('ID_PART_ENTRY_NUMBER','')
|
||||
+ devicePartitionCount = countPartitions(deviceName)
|
||||
+ if deviceName and not partitionNumber:
|
||||
+ raise DistributiveError(
|
||||
+ _("Failed to determine the partition number for %s")%partition)
|
||||
+ bootFlag = "boot" if parttable == "dos" else "legacy_boot"
|
||||
+ parted = process(partedProg, "-m",deviceName,"print")
|
||||
+ DEVICENUM,FLAGS = 0,6
|
||||
+ changeActive = \
|
||||
+ map(lambda x:x[DEVICENUM],
|
||||
+ filter(lambda x:x[DEVICENUM] != partitionNumber and \
|
||||
+ bootFlag in x[FLAGS].strip(';').split(', ') or \
|
||||
+ x[DEVICENUM] == partitionNumber and \
|
||||
+ not bootFlag in x[FLAGS].strip(';').split(', '),
|
||||
+ filter(lambda x:len(x)>=7,
|
||||
+ map(lambda x:x.split(':'),
|
||||
+ parted.readlines()[2:]))))
|
||||
+ if not changeActive:
|
||||
return True
|
||||
+ if parttable == "dos":
|
||||
+ pipe = Popen([fdiskProg,deviceName],
|
||||
+ stdin=PIPE, stdout=PIPE,stderr=PIPE)
|
||||
+ for partnum in changeActive:
|
||||
+ pipe.stdin.write("a\n%s\n"%partnum)
|
||||
+ pipe.stdin.write("w\n")
|
||||
+ pipe.stdin.close()
|
||||
+ pipe.wait()
|
||||
+ elif parttable == "gpt":
|
||||
+ pipe = Popen([gdiskProg,deviceName],
|
||||
+ stdin=PIPE, stdout=PIPE,stderr=PIPE)
|
||||
+ if devicePartitionCount > 1:
|
||||
+ pipe.stdin.write("x\n")
|
||||
+ for partnum in changeActive:
|
||||
+ pipe.stdin.write("a\n%s\n2\n\n"%partnum)
|
||||
+ pipe.stdin.write("w\nY\n")
|
||||
+ else:
|
||||
+ pipe.stdin.write("x\na\n2\n\nw\nY\n")
|
||||
+ pipe.stdin.close()
|
||||
+ pipe.wait()
|
||||
+ for waittime in (0.1,0.2,0.5,1,2,4):
|
||||
+ if path.exists(partition):
|
||||
+ return True
|
||||
+ else:
|
||||
+ sleep(waittime)
|
||||
+ raise InstallError(
|
||||
+ _("Failed to found partition %s after changing the activity")%
|
||||
+ partition)
|
||||
|
||||
def installSyslinuxBootloader(self,target):
|
||||
"""Install boot loader by syslinux
|
||||
@@ -1881,6 +1919,13 @@ class cl_install(color_print, SignalInterrupt):
|
||||
|
||||
def installGrub2Bootloader(self,target):
|
||||
"""Install grub2 boot loader"""
|
||||
+ for bootPath in ("/boot","/"):
|
||||
+ # get grub disk by mount point
|
||||
+ bootDisk = self.varSelect(
|
||||
+ "os_disk_dev",where="os_install_disk_mount",eq=bootPath)
|
||||
+ if bootDisk:
|
||||
+ self.setActivePartition(bootDisk)
|
||||
+ break
|
||||
cmdGrubInstall = self.clVars.Get('os_grub2_path')
|
||||
#if not self.setBiosGrubForBootPartition():
|
||||
# raise DistributiveError(
|
||||
@@ -1912,6 +1957,8 @@ class cl_install(color_print, SignalInterrupt):
|
||||
bootDisk = self.varSelect(
|
||||
"os_disk_grub",where="os_install_disk_mount",eq=bootPath)
|
||||
if bootDisk:
|
||||
+ self.setActivePartition(self.varSelect(
|
||||
+ "os_disk_dev",where="os_install_disk_mount",eq=bootPath))
|
||||
break
|
||||
mbrDisk = self.clVars.Get('os_install_mbr')
|
||||
mbrDiskNum = self.varSelect(
|
||||
@@ -2399,10 +2446,13 @@ class cl_install(color_print, SignalInterrupt):
|
||||
_("Coping configuration files to the new system"))
|
||||
fileMask = r"/etc/udev/rules\.d/70-persistent-net\.rules"
|
||||
if self.clVars.Get('os_root_type') != "livecd":
|
||||
- fileMask = "(%s|/etc/ssh/ssh_host_.*)"%fileMask
|
||||
+ fileMask = \
|
||||
+ "(%s|/etc/ssh/ssh_host_.*|/root/.ssh/(id_.*|known_hosts))"% \
|
||||
+ fileMask
|
||||
fileCpy = otherfilesCopy(target=targetDistr.getDirectory(),
|
||||
reTest=fileMask)
|
||||
fileCpy.performCopy('/etc')
|
||||
+ fileCpy.performCopy('/root/.ssh')
|
||||
self.printByResult(True)
|
||||
|
||||
# optimize initrd
|
||||
diff --git setup.py setup.py
|
||||
index 606fdc5..ef19785 100755
|
||||
--- setup.py
|
||||
+++ setup.py
|
||||
@@ -34,7 +34,9 @@ var_data_files = []
|
||||
data_files += [('/etc/init.d', ['data/calculate']),
|
||||
('/usr/bin',['data/xautologin']),
|
||||
('/usr/share/calculate/doc', ['data/handbook-en.html',
|
||||
- 'data/handbook-ru.html']),
|
||||
+ 'data/handbook-ru.html',
|
||||
+ 'data/handbook-es.html',
|
||||
+ 'data/handbook-fr.html']),
|
||||
('/bin',['data/bashlogin'])]
|
||||
|
||||
BUILD_MAN_PATH = "build/man"
|
||||
@ -0,0 +1,35 @@
|
||||
# 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 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-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/iproute2
|
||||
sys-apps/pciutils
|
||||
sys-fs/lvm2
|
||||
sys-fs/mdadm
|
||||
sys-apps/file[python]"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# fix for pxe
|
||||
epatch "${FILESDIR}/calculate-lib-2.2.27-r2.patch"
|
||||
}
|
||||
@ -0,0 +1,56 @@
|
||||
diff --git pym/cl_fill.py pym/cl_fill.py
|
||||
index 9faee1b..cccb95c 100644
|
||||
--- pym/cl_fill.py
|
||||
+++ pym/cl_fill.py
|
||||
@@ -19,10 +19,11 @@ import os
|
||||
import types
|
||||
import pwd, grp
|
||||
import cl_overriding
|
||||
+import socket
|
||||
|
||||
from cl_vars_share import varsShare, clLocale
|
||||
from os.path import exists as pathexists
|
||||
-from os import path
|
||||
+from os import path,readlink
|
||||
from cl_utils import isMount, genpassword, \
|
||||
getAvailableVideo, process, \
|
||||
listDirectory,isPkgInstalled,lspci, readLinesFile, \
|
||||
@@ -79,6 +80,10 @@ class fillVars(varsShare):
|
||||
|
||||
def get_os_net_domain(self):
|
||||
"""Get net domain name"""
|
||||
+ if path.exists('/proc/self/fd/1') and \
|
||||
+ readlink('/proc/self/fd/1') == '/dev/console' and \
|
||||
+ self.Get('os_root_dev') == '/dev/nfs':
|
||||
+ return "local"
|
||||
textLines = self._runos("hostname -d 2>&1")
|
||||
if textLines is False:
|
||||
cl_overriding.printERROR(_("Error executing 'hostname -d'"))
|
||||
@@ -125,6 +130,10 @@ class fillVars(varsShare):
|
||||
|
||||
def get_os_net_hostname(self):
|
||||
"""Get hostname of computer"""
|
||||
+ if path.exists('/proc/self/fd/1') and \
|
||||
+ readlink('/proc/self/fd/1') == '/dev/console' and \
|
||||
+ self.Get('os_root_dev') == '/dev/nfs':
|
||||
+ return socket.gethostname()
|
||||
textLines = self._runos("hostname -s 2>&1")
|
||||
hostname = ""
|
||||
if textLines:
|
||||
diff --git pym/cl_utils.py pym/cl_utils.py
|
||||
index 1fb3743..90245e1 100644
|
||||
--- pym/cl_utils.py
|
||||
+++ pym/cl_utils.py
|
||||
@@ -1333,6 +1333,12 @@ def refreshUdev():
|
||||
"""Run command which refresh information about device in udev"""
|
||||
udevadm = getProgPath('/sbin/udevadm')
|
||||
if udevadm:
|
||||
+ blkidFile = '/etc/blkid.tab'
|
||||
+ if path.exists(blkidFile):
|
||||
+ try:
|
||||
+ os.unlink(blkidFile)
|
||||
+ except OSError:
|
||||
+ pass
|
||||
process(udevadm,"trigger","--subsystem-match","block").success()
|
||||
|
||||
def getPasswdUsers(minId=1000,maxId=65000):
|
||||
@ -0,0 +1,37 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="Templates for calculate utilities 2.2"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND="~sys-apps/calculate-lib-2.2.27"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# nvidia-blacklist
|
||||
epatch "${FILESDIR}/calculate-templates-2.2.27-r2.patch"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
:
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodir /usr/share/calculate/templates
|
||||
insinto /usr/share/calculate/templates
|
||||
doins -r *
|
||||
}
|
||||
@ -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-r2
|
||||
=sys-apps/calculate-templates-2.2.27-r2
|
||||
=sys-apps/calculate-lib-2.2.27-r2
|
||||
=sys-apps/calculate-i18n-2.2.27-r1
|
||||
|
||||
cl_assemble? ( =sys-apps/calculate-assemble-2.2.27 )
|
||||
cl_builder? ( =sys-apps/calculate-builder-2.2.27 )
|
||||
cl_client? ( =sys-apps/calculate-client-2.2.27-r1 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-2.2.27 )
|
||||
cl_installgui? ( =app-misc/calculate-install-gui-2.2.27 )
|
||||
|
||||
cl_server? ( =sys-apps/calculate-server-2.1.15-r4 )
|
||||
"
|
||||
Loading…
Reference in new issue