Update calculate-templates.

atratsevskiy
Mike Hiretsky 13 years ago
parent 5f3ef77c2b
commit b2c2b459e1

@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-templates-2.2.19-r2 (22 Jul 2011)
22 Jul 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-templates-2.2.19-r2.ebuild,
+files/calculate-templates-2.2.19_scandelay.patch:
Add scandelay
*calculate-templates-2.2.19-r1 (20 Jul 2011)
20 Jul 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -1,13 +1,15 @@
AUX calculate-templates-2.2.18-fix_corrupting_calculateenv.patch 628 RMD160 494cf84e27c85b9a51c41089de70b73cc1da714f SHA1 db81ba9bd4922d2b02dda0ed17adcd0f762b9b70 SHA256 e0fe5f803f77e476742dd0ac3d208fa63835e690774538a0deb79e84ff9b3686
AUX calculate-templates-2.2.18-to_2.2.19_rc2.patch 5487 RMD160 b7bcd0c83dcb31b3b09ada14f94d459ae06a0dba SHA1 ce93a9002fb8a6d1539b84e34eb48e556e8f3150 SHA256 7cf15d3cb3c98a590b5c0ab758d56a1a7349e4f22c191dc90059693bd9cba74d
AUX calculate-templates-2.2.19_2.2.20_rc1.patch 6841 RMD160 d87c07ee644363d4e2f5c5208393b5bc9fe83785 SHA1 98c98d513a1dabb0f2201ba4bacf8b9e2dd79525 SHA256 6717e3cde76931806ce06224b10bd05c5b9b5ceba216e519d1b6ffca92e15784
AUX calculate-templates-2.2.19_scandelay.patch 7808 RMD160 63abdd1e55e2fb8b4ae09407205c8bd0f483c85f SHA1 56943fa1d27f9ee7fae80cbc4f76b50c404b62dc SHA256 f4ddae283a2e9068a9d58834464f9132f337c3ab954e48458d8165b546632e05
DIST calculate-templates-2.2.18.tar.bz2 233661 RMD160 c8e42c3ed8860193286ff8eaeddcd1c75bb1ef0b SHA1 f197621e5777c16aca9b892d30ede172eee50522 SHA256 d3d236c7e0760db3ad9ea79f0fed9d9e5f97d69acabbae3bbc9c9d2e62a50984
DIST calculate-templates-2.2.19.tar.bz2 233495 RMD160 bd6ec2efa456b838c15664e7779d01cd760cb124 SHA1 c0f79506fb676a8c37efbdff4a0514a3a8ddb29e SHA256 f5124a64393a3c6d4a03bd3c0065cc7f5a3586f6d5de5362d1b373048b2303ab
EBUILD calculate-templates-2.2.18-r1.ebuild 726 RMD160 304648d6a89e09efc0d061bb4be7db19d564d8a4 SHA1 ca21af5b2a2e8eac31ff229044ac46a24fd21c40 SHA256 205eda568dfcef50964a9b86ad3699f2b3d3a197eb2f54d6e4d7c7bbb7173d22
EBUILD calculate-templates-2.2.18-r2.ebuild 725 RMD160 6ec963874d8a33e1189375af85c25c15c86296a4 SHA1 bff6d5cb2293c2af4688d1e6ba076fbeeb94c268 SHA256 5d2b047b17af6be7d726c6235aac967936868e5d1695fb457a2ebf645e47fe72
EBUILD calculate-templates-2.2.18.ebuild 581 RMD160 7069b5e31c10ade1bc04c3e1f4ff769ae0f80712 SHA1 d024d43f3c1496321bab619518c300d69385952c SHA256 c30ceff00fc644d3e968050f1cd7ceeffcf916d8d8fc5db723db13b0666ab500
EBUILD calculate-templates-2.2.19-r1.ebuild 722 RMD160 c550a2a328f8de550fd223e56d13c87ae02b9467 SHA1 2dd35d809bf516075bf214a00b661543f03ae808 SHA256 297b5bb37d1ae23ec5c181022aae17f262e314dfcba91aa2e2e34ad0e408aa9d
EBUILD calculate-templates-2.2.19-r2.ebuild 800 RMD160 e6770740189a5052d22898ba483bc8a2357b0e7d SHA1 d9a0653933ace2c31df5addf762eab7078114e05 SHA256 7043b94f563eb8ec9cfe47a214cc3444924d9a9dc9e665a3aba59c7d208c5460
EBUILD calculate-templates-2.2.19.ebuild 581 RMD160 72bb0867731be7212291c74f1aef675fc8f14c15 SHA1 581758b376e2864efc7848c5e6b2a1e5b5ee5de7 SHA256 767fdc5cfc8d738c5068b98f2fb48ef3a9781e56681d00c4b05f49e9e693c68b
EBUILD calculate-templates-2.2.9999.ebuild 572 RMD160 14e53f7c05efbb563b793b1025669cbe79d0838c SHA1 226d287ce0a00609ed6c871321abf5000565227e SHA256 5df16332077472571e2d4aae47e958d1e6efe3a8d694b61053778f75a537142f
MISC ChangeLog 26880 RMD160 16046ffeba384ae7e1fe67a2894570a20a85d21b SHA1 42b25d3803a11fb02cd391d3b30f60cb92d7cdf9 SHA256 ec3f9188d72430bca0d58d2dbf1338d2c813a59275006c2eff0fed1f8d2959c6
MISC ChangeLog 27097 RMD160 29afc70bf3d6821db6d6508bcadf06d5205be737 SHA1 b66b1a25378fe19e7d5a4102627e2f3d3f7cec2a SHA256 f36e942510bd15ab2cad8ac4bcfe32a23414a164df66de7cacb0e096ba4bf992
MISC metadata.xml 338 RMD160 4a1a51881bdf09b961217d2056114ca4ccb8b4d2 SHA1 5fcb2724427f9ac5dda07abb5c829c24e6db9ae6 SHA256 175d9ae86b71b291a519414e816b05290d0e4be74726cc8d5449a500c51a3b2d

@ -0,0 +1,39 @@
# 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.19"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# update to 2.2.20 rc1 patch
epatch "${FILESDIR}/calculate-templates-2.2.19_2.2.20_rc1.patch"
# scandelay
epatch "${FILESDIR}/calculate-templates-2.2.19_scandelay.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -0,0 +1,86 @@
commit 0b04de81481615520fe913005d8a79397c4427c3
Author: Mike Hiretsky <mh@calculate.ru>
Date: Fri Jul 22 10:17:36 2011 +0400
Add scan delay for live image boot.
diff --git a/builder/iso/calcboot/isolinux/isolinux.cfg.desktop b/builder/iso/calcboot/isolinux/isolinux.cfg.desktop
index 433c1f6..0681bc1 100644
--- a/builder/iso/calcboot/isolinux/isolinux.cfg.desktop
+++ b/builder/iso/calcboot/isolinux/isolinux.cfg.desktop
@@ -22,7 +22,7 @@ LABEL cld-docache
MENU LABEL #-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# (RAM)
#os_builder_linux_subname#
KERNEL /boot/vmlinuz
- APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume doscsi docache
+ APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume doscsi docache scandelay=2
LABEL cld-nox
#?os_builder_linux_subname!=#
@@ -32,7 +32,7 @@ LABEL cld-nox
MENU LABEL #-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# (No-X)
#os_builder_linux_subname#
KERNEL /boot/vmlinuz
- APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume doscsi nox
+ APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume doscsi nox scandelay=2
LABEL cld-builder
#?os_builder_linux_subname!=#
@@ -42,7 +42,7 @@ LABEL cld-builder
MENU LABEL #-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# Builder
#os_builder_linux_subname#
KERNEL /boot/vmlinuz
- APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume doscsi scratch
+ APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume doscsi scratch scandelay=2
LABEL memtest
MENU LABEL Memtest86+
diff --git a/builder/iso/calcboot/isolinux/isolinux.cfg.server b/builder/iso/calcboot/isolinux/isolinux.cfg.server
index 0aff1e9..ca72883 100644
--- a/builder/iso/calcboot/isolinux/isolinux.cfg.server
+++ b/builder/iso/calcboot/isolinux/isolinux.cfg.server
@@ -8,37 +8,37 @@ LABEL cds
MENU LABEL #-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-#
KERNEL /boot/vmlinuz
#?os_builder_linux_shortname!=CSS#
- APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume elevator=deadline
+ APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume elevator=deadline scandelay=2
#os_builder_linux_shortname#
#?os_builder_linux_shortname==CSS#
- APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot console=tty1 udev quiet noresume elevator=deadline splash=off
+ APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot console=tty1 udev quiet noresume elevator=deadline splash=off scandelay=2
#os_builder_linux_shortname#
LABEL cds-docache
MENU LABEL #-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# (RAM)
KERNEL /boot/vmlinuz
#?os_builder_linux_shortname!=CSS#
- APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume elevator=deadline docache
+ APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume elevator=deadline docache scandelay=2
#os_builder_linux_shortname#
#?os_builder_linux_shortname==CSS#
- APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot console=tty1 udev quiet noresume elevator=deadline splash=off docache
+ APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot console=tty1 udev quiet noresume elevator=deadline splash=off docache scandelay=2
#os_builder_linux_shortname#
#?os_builder_linux_shortname!=CSS#
LABEL cds-nofb
MENU LABEL #-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# (No-FB)
KERNEL /boot/vmlinuz
- APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot console=tty1 udev quiet noresume elevator=deadline splash=off
+ APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot console=tty1 udev quiet noresume elevator=deadline splash=off scandelay=2
#os_builder_linux_shortname#
LABEL cds-builder
MENU LABEL #-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# Builder
KERNEL /boot/vmlinuz
#?os_builder_linux_shortname!=CSS#
- APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume elevator=deadline scratch
+ APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet noresume elevator=deadline scratch scandelay=2
#os_builder_linux_shortname#
#?os_builder_linux_shortname==CSS#
- APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot console=tty1 udev quiet noresume elevator=deadline splash=off scratch
+ APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot console=tty1 udev quiet noresume elevator=deadline splash=off scratch scandelay=2
#os_builder_linux_shortname#
#?os_builder_linux_shortname!=CSS#

@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-utilities-2.2.19-r3 (22 Jul 2011)
22 Jul 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-utilities-2.2.19-r3.ebuild:
Update for templates.
*calculate-utilities-2.2.19-r1 (20 Jul 2011)
20 Jul 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -5,6 +5,7 @@ EBUILD calculate-utilities-2.2.18-r4.ebuild 838 RMD160 1c1d3d84cf446d36e5b9373f5
EBUILD calculate-utilities-2.2.18.ebuild 829 RMD160 e73b8763bd13098473327959bc435ff52d470836 SHA1 b394d0126e846d4780a77f2f89429f6bf8734a27 SHA256 550f341dc60ca43b23100152a58c30178cb1c88456d007bb1439fb4cb949fcd1
EBUILD calculate-utilities-2.2.19-r1.ebuild 880 RMD160 34b0400709429affb5e0eff5080c9b2a4c7ac597 SHA1 e6e96c29b30f0d0886587b3b314f3963cf7d77ce SHA256 349da99b0bb6ebb1237e735f228660974146cb8cc21a34b8eba44cc3056976a1
EBUILD calculate-utilities-2.2.19-r2.ebuild 880 RMD160 c1324e3b0b801b2ca9b766905fd652ae78159977 SHA1 55c675eb6c921bed4b4a49edf45fcb3f0946ad10 SHA256 d420f0e39ddd493e44ae5b872480a7e4cebfa5d85fe40a37fc15999bac21076b
EBUILD calculate-utilities-2.2.19-r3.ebuild 880 RMD160 263f3de7fbf855f7a95233fcf371835d15d0784c SHA1 10c17209fd42a9cca2f3ddc372c143b8a1c4ff47 SHA256 2e460bdce8630e606fa3982cda9a48591afa4ca0478c9b67a5199884a751a7e3
EBUILD calculate-utilities-2.2.19.ebuild 862 RMD160 3c63622728c5486252332890f946fb29bc5af5ca SHA1 1d923fbbb9959dbfed1fbe3f08e530e2e365d940 SHA256 881356df9ab4e47bff03ca9eed44656b38702b1f60055c4b1c446ba49e7f4040
EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66
MISC ChangeLog 16214 RMD160 722963c7b009ccb13bb05c0622c1f123eccb4fc4 SHA1 ac4989e34900b00047cb848e0630a08c5985c8fc SHA256 98e5f8b1f93515c549b0f50aa455304435ab32ff315fb61ff376616ce24fafed
MISC ChangeLog 16386 RMD160 a1bc730151617e59591147371e7cef867f1ebe8c SHA1 ed905b400219bfa3298e88f7fec9622803bb2163 SHA256 43330d065b983e546cff4d6dbf34846a273d4cec71ad93ddd2d3fecf6d865230

@ -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.19-r1
=sys-apps/calculate-templates-2.2.19-r2
=sys-apps/calculate-lib-2.2.19-r2
=sys-apps/calculate-i18n-2.2.19-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.19-r1 )
cl_builder? ( =sys-apps/calculate-builder-2.2.19-r1 )
cl_client? ( =sys-apps/calculate-client-2.2.19 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.19 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.19 )
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
"
Loading…
Cancel
Save