Update install and templates.

atratsevskiy
parent 3a6836f53a
commit 2366895e1d

@ -1,4 +1,5 @@
AUX calculate-install-2.2.4-fix_fstab.patch 1910 RMD160 78bbef8679649b246952740b2bf4ca076962071d SHA1 692237adf3458fe6963e59d631a88c514d9dd868 SHA256 24016b4c01ceb954c87dde7a01fc2e066947ab79c34711eb9ce8f6dd5b570427
AUX calculate-install-2.2.4-fix_linux_ver.patch 817 RMD160 696ee5b33ba921572e5a7e5cbd40202b6cf337ec SHA1 6deea968ceba287e87e7477a7cb3ed3daf4006f4 SHA256 cc868d5938ea01890ae22523c82211b8eb8b05e42d534cb90bcf24ca0f86e3df
AUX calculate-install-2.2.4-fix_uuid_fstab.patch 2855 RMD160 a7ca8c3a974ec0fcd22bf6eb17dd31215b103b43 SHA1 5e085ba66fbde593e7382131d10eb3f9b05251db SHA256 d71e8c0a78fc66c518e9d720f64fd72de11ffe813eb06c45f895321fa48104fa
DIST calculate-install-2.2.3.tar.bz2 61306 RMD160 21022f3b0afdeea728940164c25f0b028b446ad2 SHA1 6515b31a3c1a130c3d8a097cb0fa099b966b93bc SHA256 70b75fd42bb54bbdffd01ef677f784da5febfd269e6d255dc5c4240420de4b7f
DIST calculate-install-2.2.4.tar.bz2 62718 RMD160 6949c3d43568b26f871abef2cafba5d94116868d SHA1 b5181c9037fe007f8984517da9c601f0b704bab3 SHA256 8ca05ef67b4ea1b1a25d12a810aaebdbfa91fb93d507f44e43394b5eb6c33836
@ -6,6 +7,7 @@ EBUILD calculate-install-2.2.3.ebuild 692 RMD160 3db608b914b4d52de5d319fc86dbbf1
EBUILD calculate-install-2.2.4-r2.ebuild 692 RMD160 22ead77a586d837929de72be176e746397a46ebd SHA1 0ba3d6f755a5538afbf1628fb690fe95cb7e39ec SHA256 70319e169428f04fd0cef7bc70c530897b2630c9ff4e6ad19ff5dc5f39fff5ca
EBUILD calculate-install-2.2.4-r3.ebuild 845 RMD160 b82cdf585d1f6f19a7f8f2bb15a9f1f75af4a571 SHA1 ba269c1567a54044b788f6e13cab1e1d4c37ba37 SHA256 cc62078379733460d1b18ce1e7a68dce1410f5a4d04d4e5f247504ba0d6d4371
EBUILD calculate-install-2.2.4-r4.ebuild 840 RMD160 6bbfec345aa38b6bae55e629e53be91668c9f7e0 SHA1 2cf5a1546d04147554f81a57ac556385684aab5c SHA256 78a5b224d95ff9a7fe9cf2819028d4d12517925874d6091a9bc1dc1fe61122fd
EBUILD calculate-install-2.2.4-r5.ebuild 943 RMD160 e440d6b454ee7117f8794f656a975c88b24aa197 SHA1 43a13a2fd0610d899d5373197cc62b26560df400 SHA256 7ec255af6ea6d48202862b15910d0e3cfb6a6f0ed321d0cb031a5c56a624f836
EBUILD calculate-install-2.2.9999.ebuild 540 RMD160 038eb80ed7ab1120e6305cbfe2eca480a48aa1c0 SHA1 0cc13d21f94d71f0e6bb6dce3e8abfa1f2f66a4f SHA256 7f9bd4b0b6c2fa260f2e93c78fdee24b32545dc2a98e19363f4933dcc32d3557
MISC ChangeLog 15018 RMD160 b085485b7eb4938b1801993753eb8ac07d8f7b73 SHA1 40dae007dd8509d6c67714a4830d7c10e72991b5 SHA256 45100b6ffcdcc3ae7b44f7bde7edeb02104f41e8e340a77f99dc4726b074c018
MISC metadata.xml 310 RMD160 769e4f17a9354da6b168b72a5d65d978f65bf6dd SHA1 83aaae376052d69c7327e880cf028ebc0dea608b SHA256 c29d3efc676d8308872920db5223c78469db86ac236b5d45c3ee98ceb8fca846

@ -0,0 +1,40 @@
# Copyright 1999-2010 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.4
app-portage/layman
!minimal? ( sys-boot/grub
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix read options from fstab with UUID
epatch "${FILESDIR}/calculate-install-2.2.4-fix_fstab.patch"
# fix fill method install_linux_ver
epatch "${FILESDIR}/calculate-install-2.2.4-fix_linux_ver.patch"
}
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

@ -0,0 +1,19 @@
commit 37821912d0b2af355e5a4532fc5e78e6bbea4acb
Author: Mike Hiretsky <mh@calculate.ru>
Date: Mon Dec 27 20:05:07 2010 +0300
Fix fill method os_install_linux_ver.
diff --git a/pym/cl_fill_install.py b/pym/cl_fill_install.py
index 3977c35..e2b7fac 100644
--- a/pym/cl_fill_install.py
+++ b/pym/cl_fill_install.py
@@ -672,7 +672,7 @@ class fillVars(object, glob_attr):
self.Get('cl_image_path'),
self.Get('os_install_arch_machine'),
self.Get('os_install_linux_shortname'))
- if not imagename:
+ if not imagename and self.Get('cl_action') != 'merge':
return ""
d = DistributiveRepository()._getfromcontent(imagename)
if "linuxver" in d and d['linuxver'] != "0":

@ -1,6 +1,6 @@
AUX calculate-templates-2.2.3-fix_flash_install.patch 319 RMD160 c365b5a1b038f7f8ce2ba3e0056ffe0071731c2e SHA1 75ed08181e61050ecd79a51a63a5041161d98adb SHA256 0816aaedca262faa724bc034299a89e3009d2cf2ec72bded03b1104f7168910a
AUX calculate-templates-2.2.3-fix_samsung_templates.patch 7129 RMD160 5708c2079b8269eeb0629b4b1319865950d61963 SHA1 2a25544357be1cc2e3312035ea1449610afd502a SHA256 01fcf0edd39634d0c85510371452e058eb4f94aeb3b4942ef577f1990d198dd5
AUX calculate-templates-2.2.4-back_port.patch 583844 RMD160 5a15269fc2aecfe0381abea5aed7d8bdc9f3b971 SHA1 4e9720763bc1b25c8a65e9102c9125356535536a SHA256 fd604ddb3f84a76b0b1fd89127a33b904fa149bad7fa95bbf90220a39b2217c3
AUX calculate-templates-2.2.4-back_port.patch 584489 RMD160 0c73148941ebbb12d0bd4e996dda6907c89f8560 SHA1 31686faa5948f1ed0e96538ec3d1178568d33d08 SHA256 4f183a2ea4795c45a6beb224d3862de686025ca30da07dd79804dbb491a09253
AUX calculate-templates-2.2.4-back_port_uvesafb.patch 35810 RMD160 9a7a4221a06b9c2ab7f802b0d9cec9647bab758a SHA1 6a4805f00236021f5fb31d3d54a33baa7bb158b2 SHA256 20a6b05be7de370473cbf83612245a2cf6c77ba404344859bb9c83ed6bfa7103
AUX calculate-templates-2.2.4-fix_themes.patch 9850 RMD160 fad48c1c56a6e68a0cc58d792390f11a6b2bb7a2 SHA1 fe9dd2064c07b55f54a7d8c286c22f0ea5c74529 SHA256 5a019e3de8d23b4496f9eff212b89176db4cf2d61db2eadd71ec167ba858e824
DIST calculate-templates-2.2.3.tar.bz2 204601 RMD160 4353347ae2fb0f08435b4b432fd211dbafd5c10e SHA1 e891163f165c1657225bbce47fbf05296c7eaedc SHA256 4f56e61dd42d1d642fe953d75eff782dc4e3c53e640a87addd6624f5ee567c63
@ -9,6 +9,7 @@ EBUILD calculate-templates-2.2.3-r2.ebuild 800 RMD160 f7c263fa2df6edcf49b59d56ac
EBUILD calculate-templates-2.2.4-r1.ebuild 696 RMD160 79695e99022772684ebf8b65486fc7bc0335f36d SHA1 3ececffdf3bd5ad67e12d6e4e72688b3952c16e1 SHA256 c33c9c9e9bff7ffe3612fbed0b56443b7d87c6ee77c0aeff104128f4a376b5a2
EBUILD calculate-templates-2.2.4-r3.ebuild 700 RMD160 ce7e52fe4adc1f3891f28b8acb44696f59843a8d SHA1 1852e179ec42b693da5aa45d970ace3037db9991 SHA256 8ebd60ae6a02bf526a544f1a62229b9189c6d6f8ce34ec5cf8baf61b7e158dfd
EBUILD calculate-templates-2.2.4-r4.ebuild 692 RMD160 fbd675e1988bedb28410ce9e517352f364830b6a SHA1 76f6e223c55248f8a8c62a74cf725e5fd81e666f SHA256 6831158d4f74ef5673f06f1ca70b71440551c96319aa049f68c4b32441885b4b
EBUILD calculate-templates-2.2.4-r5.ebuild 692 RMD160 fbd675e1988bedb28410ce9e517352f364830b6a SHA1 76f6e223c55248f8a8c62a74cf725e5fd81e666f SHA256 6831158d4f74ef5673f06f1ca70b71440551c96319aa049f68c4b32441885b4b
EBUILD calculate-templates-2.2.4.ebuild 561 RMD160 d0af742ee41ab2c56e0c5af6b8d240ac379bb317 SHA1 870e7364ede01e30ac935a080034e3c7af4de0fc SHA256 5b311c77218df881f7847755f1161d6087c98450c62f9df4f505e3d0156063b1
EBUILD calculate-templates-2.2.9999.ebuild 572 RMD160 f3863438bdc490429c0fe18ff2e885ee566c3e61 SHA1 d9baafda4369d59124caa73245d3f8ec10613382 SHA256 13edc4707924171922107591bf9dd842e350aaaac9874505e039b0a68b093e70
MISC ChangeLog 12779 RMD160 0a4adcea85613f64ee6fb3cb9926012a9405e5ac SHA1 c3913e590f2338002ad7dc542c274dbcd2ececc5 SHA256 b4b236c2a492b1aa57124683db97308da0e7833df2c0e805a74d8ad622c53ac7

@ -0,0 +1,37 @@
# Copyright 1999-2010 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="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=""
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# backport for 2.2.4
epatch "${FILESDIR}/calculate-templates-2.2.4-back_port.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -28,6 +28,22 @@ index 0000000..00c36a3
+ fi
+}
+
diff --git a/install/1merge/calculate-sources/modprobe.d/i915.conf b/install/1merge/calculate-sources/modprobe.d/i915.conf
new file mode 100644
index 0000000..69ad5b9
--- /dev/null
+++ b/install/1merge/calculate-sources/modprobe.d/i915.conf
@@ -0,0 +1,2 @@
+# Calculate comment=#
+# This file will be removed
diff --git a/install/1merge/calculate-sources/modprobe.d/modprobe_i915.conf b/install/1merge/calculate-sources/modprobe.d/modprobe_i915.conf
new file mode 100644
index 0000000..69ad5b9
--- /dev/null
+++ b/install/1merge/calculate-sources/modprobe.d/modprobe_i915.conf
@@ -0,0 +1,2 @@
+# Calculate comment=#
+# This file will be removed
diff --git a/install/1merge/calculate-sources/modprobe_i915.conf b/install/1merge/calculate-sources/modprobe_i915.conf
deleted file mode 100644
index c6a113e..0000000

Loading…
Cancel
Save