parent
06623d92d3
commit
419e0116e0
@ -1,13 +1,15 @@
|
||||
AUX calculate-i18n-2.2.19_2.2.20_rc1.patch 2295 RMD160 8ba75a7c96bab8e8dd4d239a871a116235eff41f SHA1 0f39b63f327b47fbe7eec3cf6825445f9984cc50 SHA256 dddb70d0f1d953b08d90cd0ae4e36bb115760d92e0474eced16be1007fb43f21
|
||||
AUX calculate-i18n-2.2.19_lvmraid_rc1.patch 6856 RMD160 617266d25c707bd4e5fe86ffe4270054db5a51ba SHA1 e5c5b113119fcde735391f453bb14cd14110ab29 SHA256 eb9d34e460832f4be4897ade54ba16c5a25b6d91b606f8b5c3e4d6810bd73eb9
|
||||
AUX calculate-i18n-2.2.19_lvmraid_rc2.patch 7313 RMD160 2bd1e142f77f704f63825ae0a6eac9d66785f563 SHA1 96d1162db32711406b4429600f5b1efcfa1181a1 SHA256 f3e6b3878384eb9807e2c6518c891f0d034fe4ddbc8faffa3c2914774d0799a5
|
||||
AUX calculate-i18n-2.2.20-btrfs.patch 797 RMD160 7979e726cc50369f2242c8c8ca089fa5137ef4c6 SHA1 ad18bc8ab09bc932a9e6ebf0b849887267edb3f1 SHA256 7b2c3d5c0c1a0a8bee67c182dd00a86aa7e14becfc4429b49349d5075755b0ba
|
||||
DIST calculate-i18n-2.2.19.tar.bz2 27303 RMD160 6b26957485cf49dc247b7bcd2ab50c899e769d55 SHA1 82814fe0368452415ada35bf0bbc07426052fc7f SHA256 d6b4e1c6a15590b9bf1b8db0257a17e971571478d61054d4ab0453f2729d436d
|
||||
DIST calculate-i18n-2.2.20.tar.bz2 27970 RMD160 915663f7501e22d4c38fd5f2b931a87ef38e085c SHA1 f50321956541713d899dc9a806e2504f7c9f20ec SHA256 06e8a53009793d434b721014bf06fc5483f87163215e2d1323e3dde5767d3ab4
|
||||
EBUILD calculate-i18n-2.2.19-r1.ebuild 811 RMD160 39f70bc0afdb25768256cfcf3641a1ec5cbe45df SHA1 2c34db4e9a747dcd3c0d1a1b5d0aec4cbc99d880 SHA256 d1f6aeba79583e5349cd28b5c4b4411368790677f0c42ceec458430d3bd0c39c
|
||||
EBUILD calculate-i18n-2.2.19-r2.ebuild 810 RMD160 ecef9752f813c51089ebbb6dbfb539e92fb8f8c6 SHA1 d52b6ae0fbf7d119b4f5af05cb8713afe1b2f59a SHA256 10a683eba2afc303c3f2780d467ff3dc81b6fc1956214727b925d608c1a2de3b
|
||||
EBUILD calculate-i18n-2.2.19-r3.ebuild 810 RMD160 e9e12771f0e9acf1f5870c6468ef4e756805dd00 SHA1 ca48023bd04abca9d188b5fe40933590380a1fa4 SHA256 edb123c353497c7f59c5deced62a82fc46a3803aa2de6b436b17bead61108a8a
|
||||
EBUILD calculate-i18n-2.2.19.ebuild 681 RMD160 60530ce9315c8cd790e55e666c53103ac5c78f18 SHA1 235ca9b393df4663de1418d0c7af4d5113fcad5c SHA256 3610429929d9e00766b4758ada2773bfcd8b587d64c4a9712bcab4a5ee5ae448
|
||||
EBUILD calculate-i18n-2.2.20-r1.ebuild 803 RMD160 ffc07f72d8c275441ae555b618382f2320bb371c SHA1 d3421a1afbe0d70cdd9091e2573eb52aa201d919 SHA256 5895806fc799c7f25e30cb1b423750076f7b6f7b1ab25332341fc58e7064d98c
|
||||
EBUILD calculate-i18n-2.2.20.ebuild 682 RMD160 7c158a21d27de99c219ced2043fddd4f6629a132 SHA1 0d112aab5e8857131b30969a9011fed2f26955b8 SHA256 d9b2a1b26c155475f01d3e42dd15f0222f786b21806fe2fbc7f5b91285394e09
|
||||
EBUILD calculate-i18n-2.2.9999.ebuild 680 RMD160 b3d1cfb1045bc3b5da1be318c13fd15919f16aef SHA1 acfe16d8ac67eb88426f46980df3892d7c5a7de7 SHA256 623a395dd35d2620e697b9f8c97d58d3a7220cade8b3a69186050d921d26b802
|
||||
MISC ChangeLog 1137 RMD160 bf02f6081ac1549a9adbdb430bcaa03882a76e4e SHA1 54ba6668341013fe151c2f6592ff074aa888308a SHA256 bbeb94355e9786b514d349bf583767302e2089332eeab218832c0cb8bc148899
|
||||
MISC ChangeLog 1360 RMD160 44eb099de75115a897721f704705e4c370b35175 SHA1 f854daedcca9e749ca1094ec62e4fa1751196392 SHA256 7e0e9d97c69d9b7cd93bd010579d6f87918b4c953f82a123f177907cab585c7c
|
||||
MISC metadata.xml 276 RMD160 d9730825fc3ad1b5ea7ba45704121ebd29e38b11 SHA1 c4c1576efbc38119efca43cfa273cb9f433f1de1 SHA256 a2312171d1cbfac41a263c0be692d3d12cfa3aab51979af64487824ae674bc2c
|
||||
|
||||
@ -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 assembling tasks of Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-2.2.19
|
||||
!<sys-apps/calculate-install-2.2.19
|
||||
!<sys-apps/calculate-client-2.2.19
|
||||
!<sys-apps/calculate-desktop-2.2.19
|
||||
!<sys-apps/calculate-builder-2.2.19
|
||||
!<sys-apps/calculate-assemble-2.2.19"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# update for btrfs
|
||||
epatch "${FILESDIR}/calculate-i18n-2.2.20-btrfs.patch"
|
||||
}
|
||||
@ -0,0 +1,45 @@
|
||||
# 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.20
|
||||
~sys-apps/calculate-lib-2.2.20
|
||||
app-portage/layman
|
||||
!app-misc/livecd-tools
|
||||
!minimal? ( sys-boot/grub
|
||||
sys-apps/gptfdisk
|
||||
sys-fs/dosfstools
|
||||
sys-fs/squashfs-tools
|
||||
sys-block/parted )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# fix detect image
|
||||
epatch "${FILESDIR}/calculate-install-2.2.20-fix_detect_image.patch"
|
||||
# fix detect partable
|
||||
epatch "${FILESDIR}/calculate-install-2.2.20-fix_detect_partable.patch"
|
||||
# add btrfs support, fix option --iso
|
||||
epatch "${FILESDIR}/calculate-install-2.2.20-fix_iso_add_btrfs.patch"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For configure calculate-install perform:"
|
||||
einfo " cl-install --install"
|
||||
}
|
||||
@ -0,0 +1,94 @@
|
||||
commit 9ac03f444d5c360bb9e6bd59c41a0b1946deb6f5
|
||||
Author: Mike Hiretsky <mh@calculate.ru>
|
||||
Date: Mon Aug 1 12:44:18 2011 +0400
|
||||
|
||||
Fix --iso param. Add btrfs support.
|
||||
|
||||
diff --git a/pym/cl_distr.py b/pym/cl_distr.py
|
||||
index 9045f76..3e3df63 100644
|
||||
--- a/pym/cl_distr.py
|
||||
+++ b/pym/cl_distr.py
|
||||
@@ -722,6 +722,7 @@ class PartitionDistributive(Distributive):
|
||||
'ext4':'/sbin/mkfs.ext4 %s %s',
|
||||
'jfs':'/sbin/mkfs.jfs %s -f %s',
|
||||
'reiserfs':'/sbin/mkfs.reiserfs %s -f %s',
|
||||
+ 'btrfs':'/sbin/mkfs.btrfs %s %s',
|
||||
'xfs':'/sbin/mkfs.xfs %s -f %s',
|
||||
'vfat':'/usr/sbin/mkfs.vfat %s -F 32 %s',
|
||||
'ntfs-3g':'/usr/sbin/mkfs.ntfs %s -FQ %s',
|
||||
@@ -731,6 +732,7 @@ class PartitionDistributive(Distributive):
|
||||
labelForUtilities = { 'ext2':'-L %s',
|
||||
'ext3':'-L %s',
|
||||
'ext4':'-L %s',
|
||||
+ 'btrfs':'-L %s',
|
||||
'jfs':'-L %s',
|
||||
'reiserfs':'-l %s',
|
||||
'xfs':'-L %s',
|
||||
@@ -743,6 +745,7 @@ class PartitionDistributive(Distributive):
|
||||
'ext3' : '83',
|
||||
'ext4' : '83',
|
||||
'reiserfs' : '83',
|
||||
+ 'btrfs' : '83',
|
||||
'jfs' : '83',
|
||||
'xfs' : '83',
|
||||
'vfat' : '0b',
|
||||
@@ -753,6 +756,7 @@ class PartitionDistributive(Distributive):
|
||||
'ext3' : '0700',
|
||||
'ext4' : '0700',
|
||||
'reiserfs' : '0700',
|
||||
+ 'btrfs' : '0700',
|
||||
'jfs' : '0700',
|
||||
'xfs' : '0700',
|
||||
'vfat' : '0700',
|
||||
diff --git a/pym/cl_install.py b/pym/cl_install.py
|
||||
index 29865e1..8145976 100644
|
||||
--- a/pym/cl_install.py
|
||||
+++ b/pym/cl_install.py
|
||||
@@ -301,6 +301,10 @@ class convertDictOpt:
|
||||
"incompatible":["uni_xlate"]}},
|
||||
"incompatible":[],
|
||||
"makefs":"/usr/sbin/mkfs.vfat"},
|
||||
+ "btrfs":{"options":[],
|
||||
+ "pair":{},
|
||||
+ "incompatible":[],
|
||||
+ "makefs":"/sbin/mkfs.btrfs"},
|
||||
"ntfs":{"options":["uni_xlate","posix","nls",
|
||||
"utf8","iocharset",
|
||||
"uid","gid","umask"],
|
||||
@@ -1613,12 +1617,22 @@ class cl_install(color_print, SignalInterrupt):
|
||||
where="os_install_disk_mount", eq="/boot")
|
||||
rootDiskType = self.varSelect("os_disk_type",
|
||||
where="os_install_disk_mount", eq="/")
|
||||
+ bootDiskFormat = self.varSelect("os_install_disk_format",
|
||||
+ where="os_install_disk_mount", eq="/boot")
|
||||
+ rootDiskFormat = self.varSelect("os_install_disk_format",
|
||||
+ where="os_install_disk_mount", eq="/")
|
||||
bootDiskType = bootDiskType or rootDiskType
|
||||
+ bootDiskFormat = bootDiskFormat or rootDiskFormat
|
||||
if "lvm" in bootDiskType or "raid" in bootDiskType:
|
||||
self.printERROR(
|
||||
_("Legacy grub not support boot from raid or lvm without"
|
||||
" separate /boot partition"))
|
||||
return False
|
||||
+ if bootDiskFormat == "btrfs":
|
||||
+ self.printERROR(
|
||||
+ _("Legacy grub not support boot from btrfs without"
|
||||
+ " separate /boot partition"))
|
||||
+ return False
|
||||
return True
|
||||
|
||||
def setUsers(self,listUsers):
|
||||
@@ -2613,8 +2627,12 @@ the system") + " (yes/no)"
|
||||
"march" in imageData:
|
||||
self.clVars.Set('os_install_arch_machine',
|
||||
imageData['march'],True)
|
||||
+ self.clVars.Set('os_install_linux_build',
|
||||
+ imageData['build'],True)
|
||||
+ self.clVars.Set('os_install_linux_ver',
|
||||
+ imageData['ver'],True)
|
||||
self.setLinuxName(imageData['name'].upper())
|
||||
- self.clVars.Set('cl_image',True)
|
||||
+ self.clVars.Set('cl_image',isoimage,True)
|
||||
return True
|
||||
else:
|
||||
self.printERROR(_("Wrong image file"))
|
||||
@ -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.20"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# fix cpufreq
|
||||
epatch "${FILESDIR}/calculate-templates-2.2.20-fix_cpufreq.patch"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
:
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodir /usr/share/calculate/templates
|
||||
insinto /usr/share/calculate/templates
|
||||
doins -r *
|
||||
}
|
||||
@ -0,0 +1,90 @@
|
||||
commit 8d0365508714757b1f6ad3808a6a3a2702b4b49d
|
||||
Author: Mike Hiretsky <mh@calculate.ru>
|
||||
Date: Fri Jul 29 11:59:18 2011 +0400
|
||||
|
||||
Fix cpu freq increase and decrase.
|
||||
|
||||
diff --git install/1merge/acpid/default.sh install/1merge/acpid/default.sh
|
||||
index 5dc8186..d3ee684 100644
|
||||
--- install/1merge/acpid/default.sh
|
||||
+++ install/1merge/acpid/default.sh
|
||||
@@ -30,19 +30,54 @@ dec_backlight() {
|
||||
echo $(($cur_backlight - 1)) >$BACKLIGHT_DIR/brightness
|
||||
}
|
||||
|
||||
-FREQLIST=(2530000 1600000)
|
||||
+# set powersave cpu mode
|
||||
+powersave_cpu() {
|
||||
+ for cpunum in $(seq 0 $(( $(ls -d /sys/devices/system/cpu/cpu[0-9] | wc -w)-1)));do
|
||||
+ cpufreq-set -c$cpunum -g powersave
|
||||
+ done
|
||||
+}
|
||||
+
|
||||
+# set ondemand cpu mode
|
||||
+ondemand_cpu() {
|
||||
+ for cpunum in $(seq 0 $(( $(ls -d /sys/devices/system/cpu/cpu[0-9] | wc -w)-1)));do
|
||||
+ cpufreq-set -c$cpunum -g ondemand
|
||||
+ done
|
||||
+}
|
||||
+
|
||||
+# set specified freq for all process
|
||||
+set_freq() {
|
||||
+ for cpunum in $(seq 0 $(( $(ls -d /sys/devices/system/cpu/cpu[0-9] | wc -w)-1)));do
|
||||
+ cpufreq-set -c$cpunum -f$1
|
||||
+ done
|
||||
+}
|
||||
# increase cpu freq
|
||||
inc_freq() {
|
||||
- cpufreq-set -c0 -f ${FREQLIST[0]}
|
||||
- cpufreq-set -c1 -f ${FREQLIST[0]}
|
||||
- #cpufreq-set -g performance
|
||||
+ NEWCPUFREQ=
|
||||
+ for i in `cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_frequencies`;do
|
||||
+ if [[ $i == `cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq` ]];then
|
||||
+ if [[ -n $NEWCPUFREQ ]];then
|
||||
+ set_freq $NEWCPUFREQ
|
||||
+ else
|
||||
+ set_freq $i
|
||||
+ fi
|
||||
+ break
|
||||
+ fi
|
||||
+ S=$NEWCPUFREQ
|
||||
+ done
|
||||
}
|
||||
|
||||
# decrease cpu freq
|
||||
dec_freq() {
|
||||
- cpufreq-set -c0 -f ${FREQLIST[1]}
|
||||
- cpufreq-set -c1 -f ${FREQLIST[1]}
|
||||
- #cpufreq-set -g powersave
|
||||
+ NEWCPUFREQ=
|
||||
+ for i in `cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_frequencies`;do
|
||||
+ if [[ -n $NEWCPUFREQ ]];then
|
||||
+ set_freq $i
|
||||
+ break
|
||||
+ fi
|
||||
+ if [[ $i == `cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq` ]];then
|
||||
+ NEWCPUFREQ=$i
|
||||
+ fi
|
||||
+ done
|
||||
}
|
||||
|
||||
log_unhandled() {
|
||||
@@ -75,7 +110,7 @@ case "$group" in
|
||||
# multicore systems, make sure you set powersave mode
|
||||
# for each core!
|
||||
*0)
|
||||
- dec_freq
|
||||
+ powersave_cpu
|
||||
;;
|
||||
|
||||
# Add code here to handle when the system is plugged in
|
||||
@@ -83,7 +118,7 @@ case "$group" in
|
||||
# multicore systems, make sure you set performance mode
|
||||
# for each core!
|
||||
*1)
|
||||
- inc_freq
|
||||
+ ondemand_cpu
|
||||
;;
|
||||
|
||||
*) log_unhandled $* ;;
|
||||
@ -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.20-r3
|
||||
=sys-apps/calculate-templates-2.2.20-r1
|
||||
=sys-apps/calculate-lib-2.2.20-r2
|
||||
=sys-apps/calculate-i18n-2.2.20-r1
|
||||
|
||||
cl_assemble? ( =sys-apps/calculate-assemble-2.2.20 )
|
||||
cl_builder? ( =sys-apps/calculate-builder-2.2.20 )
|
||||
cl_client? ( =sys-apps/calculate-client-2.2.20 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-2.2.20 )
|
||||
cl_installgui? ( =app-misc/calculate-install-gui-2.2.20 )
|
||||
|
||||
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
|
||||
"
|
||||
|
||||
Loading…
Reference in new issue