kuraga
/
calculate-overlay
forked from calculate/calculate-overlay
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update kernel for KMS.

Browse Source
master
Хирецкий Михаил 14 years ago
parent 2d48c069ab
commit c1292bd603
8 changed files with 1039 additions and 3 deletions
Show Stats Download Patch File Download Diff File

2
eclass/calculate-kernel-2.eclass
Unescape View File

@ -87,8 +87,6 @@ vmlinuz_src_install() {
"/lib/modules/${KV_FULL}/build" ||
die "cannot install build symlink"
insinto /etc/modprobe.d
newins "${FILESDIR}"/modprobe_i915.conf i915.conf || die
}
calculate-kernel-2_src_install() {

7
sys-apps/calculate-templates/ChangeLog
Unescape View File

@ -2,6 +2,13 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-templates-2.2.4-r2 (27 Dec 2010)
27 Dec 2010; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-templates-2.2.4-r2.ebuild,
+files/calculate-templates-2.2.4-back_port.patch:
Back port last change.
*calculate-templates-2.2.4 (23 Dec 2010)
23 Dec 2010; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

4
sys-apps/calculate-templates/Manifest
Unescape View File

@ -1,11 +1,13 @@
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 34482 RMD160 8ab67d222090012c5cc357ce36bc5ec58595de8d SHA1 ec738f0ec282aeef033be53ec0c0a547e7ffa5d4 SHA256 05069fc9c65ae471bb41dddaac88945791ef21661d2ce6b5c7573413496d4453
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
DIST calculate-templates-2.2.4.tar.bz2 203885 RMD160 c1189caf3cf9499b5be5e232731f7150fa9b58e7 SHA1 3167a20dd43ef216f46c912fc53f65369fdca9c4 SHA256 27e206675b05ceea965297afecffa5120ee24037cf29cc66d7213671d0fbf63f
EBUILD calculate-templates-2.2.3-r2.ebuild 800 RMD160 f7c263fa2df6edcf49b59d56ac08a42c363e34fa SHA1 7df4e5b01737298e0ffddc65cd0915e5d1774ff7 SHA256 2781a2202c3ffcc6f983cc98950863988e5480876f70c68c76c2235bd490c47d
EBUILD calculate-templates-2.2.4-r1.ebuild 696 RMD160 79695e99022772684ebf8b65486fc7bc0335f36d SHA1 3ececffdf3bd5ad67e12d6e4e72688b3952c16e1 SHA256 c33c9c9e9bff7ffe3612fbed0b56443b7d87c6ee77c0aeff104128f4a376b5a2
EBUILD calculate-templates-2.2.4-r2.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 12556 RMD160 3eabc8494802df12a99e68302a7dc00a190fde2a SHA1 3f5f5db1aa446602660dea1f811efad89d5c84f5 SHA256 449ee94115c4e2f9e5068686a1d7c93fe331d53081983aa272631a6dcf4c1538
MISC ChangeLog 12779 RMD160 0a4adcea85613f64ee6fb3cb9926012a9405e5ac SHA1 c3913e590f2338002ad7dc542c274dbcd2ececc5 SHA256 b4b236c2a492b1aa57124683db97308da0e7833df2c0e805a74d8ad622c53ac7
MISC metadata.xml 338 RMD160 4a1a51881bdf09b961217d2056114ca4ccb8b4d2 SHA1 5fcb2724427f9ac5dda07abb5c829c24e6db9ae6 SHA256 175d9ae86b71b291a519414e816b05290d0e4be74726cc8d5449a500c51a3b2d

37
sys-apps/calculate-templates/calculate-templates-2.2.4-r2.ebuild
Unescape View File

@ -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 *
}

908
sys-apps/calculate-templates/files/calculate-templates-2.2.4-back_port.patch
Unescape View File

@ -0,0 +1,908 @@
diff --git a/install/1merge/calculate-sources/.calculate_directory b/install/1merge/calculate-sources/.calculate_directory
deleted file mode 100644
index b7692d9..0000000
--- a/install/1merge/calculate-sources/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&cl_chroot_status!=&&pkg(sys-kernel/calculate-sources)!= path=/etc name=modprobe.d
-
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
--- a/install/1merge/calculate-sources/modprobe_i915.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate comment=#
-# Intel 915 video driver kernel modules' configuration file.
-
-options i915 modeset=0
diff --git a/install/1merge/cds-themes/tty1/1024x600.cfg b/install/1merge/cds-themes/tty1/1024x600.cfg
new file mode 100644
index 0000000..580490e
--- /dev/null
+++ b/install/1merge/cds-themes/tty1/1024x600.cfg
@@ -0,0 +1,58 @@
+# Calculate comment=#
+
+# Full path to background image JPG/PNG
+# Image must has 240 colors, 16 need for fbcon.
+pic=/etc/splash/tty1/images/verbose-CDS-tty1-1024x600.jpg
+
+# transparent background color from fbcon. Usually is 0.
+bgcolor=0
+
+# Coordinates text window
+#tx,ty - top left corner
+#tw,th - width and height of text window, cann't be more screen resolution
+tx=25
+ty=22
+tw=979
+th=485
+
+# Full path to background image JPG/PNG silend mode.
+# Image must has 256 colors.
+silentpic=/etc/splash/tty1/images/silent-CDS-tty1-1024x600.jpg
+
+# Coords of system messages
+text_x=5
+text_y=582
+
+# system messages font size
+text_size=12
+
+# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
+text_color=0x7692b7
+
+# Path to TTF font, for system messages. Path may be:
+#- absolute (starts with '/')
+#- relative THEME_DIR (example /etc/splash)
+#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
+#text_font=<file>
+
+#progress bar for silent mode
+#box silent noover 350 318 654 323 #021F47
+box silent inter 376 319 376 322 #FFC867 #FFC867 #D48D17 #D48D17
+box silent 376 319 649 322 #FFC867 #FFC867 #D48D17 #D48D17
+
+#progress bar rectange for silent mode
+box silent 376 318 648 318 #AAAAAA
+box silent 376 323 648 323 #CCCCCC
+box silent 375 319 375 322 #AAAAAA
+box silent 649 319 649 322 #CCCCCC
+
+#
+#background color for text window in verbose mode
+#box noover 20 15 1004 529 #12233A
+
+#rectangle around text window in verbose mode
+box 19 14 19 505 #8C9096
+box 19 14 1005 14 #8C9096
+box 1005 14 1005 505 #eef4ff
+box 19 505 1005 505 #eef4ff
+
diff --git a/install/1merge/cds-themes/tty2/1024x600.cfg b/install/1merge/cds-themes/tty2/1024x600.cfg
new file mode 100644
index 0000000..e7d8885
--- /dev/null
+++ b/install/1merge/cds-themes/tty2/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CDS-tty1-1024x600.jpg</reg>
+<text>tty2/images/verbose-CDS-tty2-1024x600.jpg</text>
diff --git a/install/1merge/cds-themes/tty2/1024x768.cfg b/install/1merge/cds-themes/tty2/1024x768.cfg
index 16cb3da..88b4152 100644
--- a/install/1merge/cds-themes/tty2/1024x768.cfg
+++ b/install/1merge/cds-themes/tty2/1024x768.cfg
@@ -1,3 +1,3 @@
# Calculate format=patch link=/etc/splash/tty1/1024x768.cfg
-<reg>verbose-CDS-tty1.jpg</reg>
-<text>verbose-CDS-tty2.jpg</text>
+<reg>tty1/images/verbose-CDS-tty1.jpg</reg>
+<text>tty2/images/verbose-CDS-tty2.jpg</text>
diff --git a/install/1merge/cds-themes/tty2/800x600.cfg b/install/1merge/cds-themes/tty2/800x600.cfg
index 5ab6160..2846ffa 100644
--- a/install/1merge/cds-themes/tty2/800x600.cfg
+++ b/install/1merge/cds-themes/tty2/800x600.cfg
@@ -1,3 +1,3 @@
# Calculate format=patch link=/etc/splash/tty1/800x600.cfg
-<reg>verbose-CDS-tty1-800x600.jpg</reg>
-<text>verbose-CDS-tty2-800x600.jpg</text>
+<reg>tty1/images/verbose-CDS-tty1-800x600.jpg</reg>
+<text>tty2/images/verbose-CDS-tty2-800x600.jpg</text>
diff --git a/install/1merge/cds-themes/tty3/1024x600.cfg b/install/1merge/cds-themes/tty3/1024x600.cfg
new file mode 100644
index 0000000..9f59e69
--- /dev/null
+++ b/install/1merge/cds-themes/tty3/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CDS-tty1-1024x600.jpg</reg>
+<text>tty3/images/verbose-CDS-tty3-1024x600.jpg</text>
diff --git a/install/1merge/cds-themes/tty3/1024x768.cfg b/install/1merge/cds-themes/tty3/1024x768.cfg
index f64b691..eb8813b 100644
--- a/install/1merge/cds-themes/tty3/1024x768.cfg
+++ b/install/1merge/cds-themes/tty3/1024x768.cfg
@@ -1,3 +1,3 @@
# Calculate format=patch link=/etc/splash/tty1/1024x768.cfg
-<reg>verbose-CDS-tty1.jpg</reg>
-<text>verbose-CDS-tty3.jpg</text>
+<reg>tty1/images/verbose-CDS-tty1.jpg</reg>
+<text>tty3/images/verbose-CDS-tty3.jpg</text>
diff --git a/install/1merge/cds-themes/tty3/800x600.cfg b/install/1merge/cds-themes/tty3/800x600.cfg
index 9a5cc61..f81d9e5 100644
--- a/install/1merge/cds-themes/tty3/800x600.cfg
+++ b/install/1merge/cds-themes/tty3/800x600.cfg
@@ -1,3 +1,3 @@
# Calculate format=patch link=/etc/splash/tty1/800x600.cfg
-<reg>verbose-CDS-tty1-800x600.jpg</reg>
-<text>verbose-CDS-tty3-800x600.jpg</text>
+<reg>tty1/images/verbose-CDS-tty1-800x600.jpg</reg>
+<text>tty3/images/verbose-CDS-tty3-800x600.jpg</text>
diff --git a/install/1merge/cds-themes/tty4/1024x600.cfg b/install/1merge/cds-themes/tty4/1024x600.cfg
new file mode 100644
index 0000000..9b740c6
--- /dev/null
+++ b/install/1merge/cds-themes/tty4/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CDS-tty1-1024x600.jpg</reg>
+<text>tty4/images/verbose-CDS-tty4-1024x600.jpg</text>
diff --git a/install/1merge/cds-themes/tty4/1024x768.cfg b/install/1merge/cds-themes/tty4/1024x768.cfg
index a725ba5..9b5dd37 100644
--- a/install/1merge/cds-themes/tty4/1024x768.cfg
+++ b/install/1merge/cds-themes/tty4/1024x768.cfg
@@ -1,3 +1,3 @@
# Calculate format=patch link=/etc/splash/tty1/1024x768.cfg
-<reg>verbose-CDS-tty1.jpg</reg>
-<text>verbose-CDS-tty4.jpg</text>
+<reg>tty1/images/verbose-CDS-tty1.jpg</reg>
+<text>tty4/images/verbose-CDS-tty4.jpg</text>
diff --git a/install/1merge/cds-themes/tty4/800x600.cfg b/install/1merge/cds-themes/tty4/800x600.cfg
index 426b014..d6cccbb 100644
--- a/install/1merge/cds-themes/tty4/800x600.cfg
+++ b/install/1merge/cds-themes/tty4/800x600.cfg
@@ -1,3 +1,3 @@
# Calculate format=patch link=/etc/splash/tty1/800x600.cfg
-<reg>verbose-CDS-tty1-800x600.jpg</reg>
-<text>verbose-CDS-tty4-800x600.jpg</text>
+<reg>tty1/images/verbose-CDS-tty1-800x600.jpg</reg>
+<text>tty4/images/verbose-CDS-tty4-800x600.jpg</text>
diff --git a/install/1merge/cds-themes/tty5/1024x600.cfg b/install/1merge/cds-themes/tty5/1024x600.cfg
new file mode 100644
index 0000000..fa5e8d6
--- /dev/null
+++ b/install/1merge/cds-themes/tty5/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CDS-tty1-1024x600.jpg</reg>
+<text>tty5/images/verbose-CDS-tty5-1024x600.jpg</text>
diff --git a/install/1merge/cds-themes/tty5/1024x768.cfg b/install/1merge/cds-themes/tty5/1024x768.cfg
index e07bae4..9387aa2 100644
--- a/install/1merge/cds-themes/tty5/1024x768.cfg
+++ b/install/1merge/cds-themes/tty5/1024x768.cfg
@@ -1,3 +1,3 @@
# Calculate format=patch link=/etc/splash/tty1/1024x768.cfg
-<reg>verbose-CDS-tty1.jpg</reg>
-<text>verbose-CDS-tty5.jpg</text>
+<reg>tty1/images/verbose-CDS-tty1.jpg</reg>
+<text>tty5/images/verbose-CDS-tty5.jpg</text>
diff --git a/install/1merge/cds-themes/tty5/800x600.cfg b/install/1merge/cds-themes/tty5/800x600.cfg
index 483aba6..86d8860 100644
--- a/install/1merge/cds-themes/tty5/800x600.cfg
+++ b/install/1merge/cds-themes/tty5/800x600.cfg
@@ -1,3 +1,3 @@
# Calculate format=patch link=/etc/splash/tty1/800x600.cfg
-<reg>verbose-CDS-tty1-800x600.jpg</reg>
-<text>verbose-CDS-tty5-800x600.jpg</text>
+<reg>tty1/images/verbose-CDS-tty1-800x600.jpg</reg>
+<text>tty5/images/verbose-CDS-tty5-800x600.jpg</text>
diff --git a/install/1merge/cds-themes/tty6/1024x600.cfg b/install/1merge/cds-themes/tty6/1024x600.cfg
new file mode 100644
index 0000000..862bb94
--- /dev/null
+++ b/install/1merge/cds-themes/tty6/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CDS-tty1-1024x600.jpg</reg>
+<text>tty6/images/verbose-CDS-tty6-1024x600.jpg</text>
diff --git a/install/1merge/cds-themes/tty6/1024x768.cfg b/install/1merge/cds-themes/tty6/1024x768.cfg
index 2fd478e..747f724 100644
--- a/install/1merge/cds-themes/tty6/1024x768.cfg
+++ b/install/1merge/cds-themes/tty6/1024x768.cfg
@@ -1,3 +1,3 @@
# Calculate format=patch link=/etc/splash/tty1/1024x768.cfg
-<reg>verbose-CDS-tty1.jpg</reg>
-<text>verbose-CDS-tty6.jpg</text>
+<reg>tty1/images/verbose-CDS-tty1.jpg</reg>
+<text>tty6/images/verbose-CDS-tty6.jpg</text>
diff --git a/install/1merge/cds-themes/tty6/800x600.cfg b/install/1merge/cds-themes/tty6/800x600.cfg
index b654b2c..dec6a84 100644
--- a/install/1merge/cds-themes/tty6/800x600.cfg
+++ b/install/1merge/cds-themes/tty6/800x600.cfg
@@ -1,3 +1,3 @@
# Calculate format=patch link=/etc/splash/tty1/800x600.cfg
-<reg>verbose-CDS-tty1-800x600.jpg</reg>
-<text>verbose-CDS-tty6-800x600.jpg</text>
+<reg>tty1/images/verbose-CDS-tty1-800x600.jpg</reg>
+<text>tty6/images/verbose-CDS-tty6-800x600.jpg</text>
diff --git a/install/1merge/cld-themes/tty1/1024x600.cfg b/install/1merge/cld-themes/tty1/1024x600.cfg
new file mode 100644
index 0000000..bab6359
--- /dev/null
+++ b/install/1merge/cld-themes/tty1/1024x600.cfg
@@ -0,0 +1,58 @@
+# Calculate comment=#
+
+# Full path to background image JPG/PNG
+# Image must has 240 colors, 16 need for fbcon.
+pic=/etc/splash/tty1/images/verbose-CLD-tty1-1024x600.jpg
+
+# transparent background color from fbcon. Usually is 0.
+bgcolor=0
+
+# Coordinates text window
+#tx,ty - top left corner
+#tw,th - width and height of text window, cann't be more screen resolution
+tx=25
+ty=22
+tw=979
+th=485
+
+# Full path to background image JPG/PNG silend mode.
+# Image must has 256 colors.
+silentpic=/etc/splash/tty1/images/silent-CLD-tty1-1024x600.jpg
+
+# Coords of system messages
+text_x=5
+text_y=582
+
+# system messages font size
+text_size=12
+
+# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
+text_color=0x7692b7
+
+# Path to TTF font, for system messages. Path may be:
+#- absolute (starts with '/')
+#- relative THEME_DIR (example /etc/splash)
+#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
+#text_font=<file>
+
+#progress bar for silent mode
+#box silent noover 350 318 654 323 #021F47
+box silent inter 376 319 376 322 #FFC867 #FFC867 #D48D17 #D48D17
+box silent 376 319 649 322 #FFC867 #FFC867 #D48D17 #D48D17
+
+#progress bar rectange for silent mode
+box silent 376 318 648 318 #AAAAAA
+box silent 376 323 648 323 #CCCCCC
+box silent 375 319 375 322 #AAAAAA
+box silent 649 319 649 322 #CCCCCC
+
+#
+#background color for text window in verbose mode
+#box noover 20 15 1004 529 #12233A
+
+#rectangle around text window in verbose mode
+box 19 14 19 505 #8C9096
+box 19 14 1005 14 #8C9096
+box 1005 14 1005 505 #eef4ff
+box 19 505 1005 505 #eef4ff
+
diff --git a/install/1merge/cld-themes/tty2/1024x600.cfg b/install/1merge/cld-themes/tty2/1024x600.cfg
new file mode 100644
index 0000000..da1b870
--- /dev/null
+++ b/install/1merge/cld-themes/tty2/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CLD-tty1-1024x600.jpg</reg>
+<text>tty2/images/verbose-CLD-tty2-1024x600.jpg</text>
diff --git a/install/1merge/cld-themes/tty3/1024x600.cfg b/install/1merge/cld-themes/tty3/1024x600.cfg
new file mode 100644
index 0000000..4ce013e
--- /dev/null
+++ b/install/1merge/cld-themes/tty3/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CLD-tty1-1024x600.jpg</reg>
+<text>tty3/images/verbose-CLD-tty3-1024x600.jpg</text>
diff --git a/install/1merge/cld-themes/tty4/1024x600.cfg b/install/1merge/cld-themes/tty4/1024x600.cfg
new file mode 100644
index 0000000..4629ad6
--- /dev/null
+++ b/install/1merge/cld-themes/tty4/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CLD-tty1-1024x600.jpg</reg>
+<text>tty4/images/verbose-CLD-tty4-1024x600.jpg</text>
diff --git a/install/1merge/cld-themes/tty5/1024x600.cfg b/install/1merge/cld-themes/tty5/1024x600.cfg
new file mode 100644
index 0000000..76aac37
--- /dev/null
+++ b/install/1merge/cld-themes/tty5/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CLD-tty1-1024x600.jpg</reg>
+<text>tty5/images/verbose-CLD-tty5-1024x600.jpg</text>
diff --git a/install/1merge/cld-themes/tty6/1024x600.cfg b/install/1merge/cld-themes/tty6/1024x600.cfg
new file mode 100644
index 0000000..a1a29bd
--- /dev/null
+++ b/install/1merge/cld-themes/tty6/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CLD-tty1-1024x600.jpg</reg>
+<text>tty6/images/verbose-CLD-tty6-1024x600.jpg</text>
diff --git a/install/1merge/cldg-themes/tty1/1024x600.cfg b/install/1merge/cldg-themes/tty1/1024x600.cfg
new file mode 100644
index 0000000..b61d56c
--- /dev/null
+++ b/install/1merge/cldg-themes/tty1/1024x600.cfg
@@ -0,0 +1,58 @@
+# Calculate comment=#
+
+# Full path to background image JPG/PNG
+# Image must has 240 colors, 16 need for fbcon.
+pic=/etc/splash/tty1/images/verbose-CLDG-tty1-1024x600.jpg
+
+# transparent background color from fbcon. Usually is 0.
+bgcolor=0
+
+# Coordinates text window
+#tx,ty - top left corner
+#tw,th - width and height of text window, cann't be more screen resolution
+tx=25
+ty=22
+tw=979
+th=485
+
+# Full path to background image JPG/PNG silend mode.
+# Image must has 256 colors.
+silentpic=/etc/splash/tty1/images/silent-CLDG-tty1-1024x600.jpg
+
+# Coords of system messages
+text_x=5
+text_y=582
+
+# system messages font size
+text_size=12
+
+# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
+text_color=0x7692b7
+
+# Path to TTF font, for system messages. Path may be:
+#- absolute (starts with '/')
+#- relative THEME_DIR (example /etc/splash)
+#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
+#text_font=<file>
+
+#progress bar for silent mode
+#box silent noover 350 318 654 323 #021F47
+box silent inter 376 319 376 322 #FFC867 #FFC867 #D48D17 #D48D17
+box silent 376 319 649 322 #FFC867 #FFC867 #D48D17 #D48D17
+
+#progress bar rectange for silent mode
+box silent 376 318 648 318 #AAAAAA
+box silent 376 323 648 323 #CCCCCC
+box silent 375 319 375 322 #AAAAAA
+box silent 649 319 649 322 #CCCCCC
+
+#
+#background color for text window in verbose mode
+#box noover 20 15 1004 529 #12233A
+
+#rectangle around text window in verbose mode
+box 19 14 19 505 #8C9096
+box 19 14 1005 14 #8C9096
+box 1005 14 1005 505 #eef4ff
+box 19 505 1005 505 #eef4ff
+
diff --git a/install/1merge/cldg-themes/tty2/1024x600.cfg b/install/1merge/cldg-themes/tty2/1024x600.cfg
new file mode 100644
index 0000000..7af87b5
--- /dev/null
+++ b/install/1merge/cldg-themes/tty2/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CLDG-tty1-1024x600.jpg</reg>
+<text>tty2/images/verbose-CLDG-tty2-1024x600.jpg</text>
diff --git a/install/1merge/cldg-themes/tty3/1024x600.cfg b/install/1merge/cldg-themes/tty3/1024x600.cfg
new file mode 100644
index 0000000..00f2b6a
--- /dev/null
+++ b/install/1merge/cldg-themes/tty3/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CLDG-tty1-1024x600.jpg</reg>
+<text>tty3/images/verbose-CLDG-tty3-1024x600.jpg</text>
diff --git a/install/1merge/cldg-themes/tty4/1024x600.cfg b/install/1merge/cldg-themes/tty4/1024x600.cfg
new file mode 100644
index 0000000..069d9b6
--- /dev/null
+++ b/install/1merge/cldg-themes/tty4/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CLDG-tty1-1024x600.jpg</reg>
+<text>tty4/images/verbose-CLDG-tty4-1024x600.jpg</text>
diff --git a/install/1merge/cldg-themes/tty5/1024x600.cfg b/install/1merge/cldg-themes/tty5/1024x600.cfg
new file mode 100644
index 0000000..f5e0fe7
--- /dev/null
+++ b/install/1merge/cldg-themes/tty5/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CLDG-tty1-1024x600.jpg</reg>
+<text>tty5/images/verbose-CLDG-tty5-1024x600.jpg</text>
diff --git a/install/1merge/cldg-themes/tty6/1024x600.cfg b/install/1merge/cldg-themes/tty6/1024x600.cfg
new file mode 100644
index 0000000..343b58a
--- /dev/null
+++ b/install/1merge/cldg-themes/tty6/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CLDG-tty1-1024x600.jpg</reg>
+<text>tty6/images/verbose-CLDG-tty6-1024x600.jpg</text>
diff --git a/install/1merge/cldx-themes/tty1/1024x600.cfg b/install/1merge/cldx-themes/tty1/1024x600.cfg
new file mode 100644
index 0000000..07cecb6
--- /dev/null
+++ b/install/1merge/cldx-themes/tty1/1024x600.cfg
@@ -0,0 +1,58 @@
+# Calculate comment=#
+
+# Full path to background image JPG/PNG
+# Image must has 240 colors, 16 need for fbcon.
+pic=/etc/splash/tty1/images/verbose-CLDX-tty1-1024x600.jpg
+
+# transparent background color from fbcon. Usually is 0.
+bgcolor=0
+
+# Coordinates text window
+#tx,ty - top left corner
+#tw,th - width and height of text window, cann't be more screen resolution
+tx=25
+ty=22
+tw=979
+th=485
+
+# Full path to background image JPG/PNG silend mode.
+# Image must has 256 colors.
+silentpic=/etc/splash/tty1/images/silent-CLDX-tty1-1024x600.jpg
+
+# Coords of system messages
+text_x=5
+text_y=582
+
+# system messages font size
+text_size=12
+
+# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
+text_color=0x7692b7
+
+# Path to TTF font, for system messages. Path may be:
+#- absolute (starts with '/')
+#- relative THEME_DIR (example /etc/splash)
+#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
+#text_font=<file>
+
+#progress bar for silent mode
+#box silent noover 350 318 654 323 #021F47
+box silent inter 376 319 376 322 #FFC867 #FFC867 #D48D17 #D48D17
+box silent 376 319 649 322 #FFC867 #FFC867 #D48D17 #D48D17
+
+#progress bar rectange for silent mode
+box silent 376 318 648 318 #AAAAAA
+box silent 376 323 648 323 #CCCCCC
+box silent 375 319 375 322 #AAAAAA
+box silent 649 319 649 322 #CCCCCC
+
+#
+#background color for text window in verbose mode
+#box noover 20 15 1004 529 #12233A
+
+#rectangle around text window in verbose mode
+box 19 14 19 505 #8C9096
+box 19 14 1005 14 #8C9096
+box 1005 14 1005 505 #eef4ff
+box 19 505 1005 505 #eef4ff
+
diff --git a/install/1merge/cldx-themes/tty2/1024x600.cfg b/install/1merge/cldx-themes/tty2/1024x600.cfg
new file mode 100644
index 0000000..233436f
--- /dev/null
+++ b/install/1merge/cldx-themes/tty2/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CLDX-tty1-1024x600.jpg</reg>
+<text>tty2/images/verbose-CLDX-tty2-1024x600.jpg</text>
diff --git a/install/1merge/cldx-themes/tty3/1024x600.cfg b/install/1merge/cldx-themes/tty3/1024x600.cfg
new file mode 100644
index 0000000..f3c086d
--- /dev/null
+++ b/install/1merge/cldx-themes/tty3/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CLDX-tty1-1024x600.jpg</reg>
+<text>tty3/images/verbose-CLDX-tty3-1024x600.jpg</text>
diff --git a/install/1merge/cldx-themes/tty4/1024x600.cfg b/install/1merge/cldx-themes/tty4/1024x600.cfg
new file mode 100644
index 0000000..c1f6132
--- /dev/null
+++ b/install/1merge/cldx-themes/tty4/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CLDX-tty1-1024x600.jpg</reg>
+<text>tty4/images/verbose-CLDX-tty4-1024x600.jpg</text>
diff --git a/install/1merge/cldx-themes/tty5/1024x600.cfg b/install/1merge/cldx-themes/tty5/1024x600.cfg
new file mode 100644
index 0000000..6a2ffca
--- /dev/null
+++ b/install/1merge/cldx-themes/tty5/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CLDX-tty1-1024x600.jpg</reg>
+<text>tty5/images/verbose-CLDX-tty5-1024x600.jpg</text>
diff --git a/install/1merge/cldx-themes/tty6/1024x600.cfg b/install/1merge/cldx-themes/tty6/1024x600.cfg
new file mode 100644
index 0000000..5323f8c
--- /dev/null
+++ b/install/1merge/cldx-themes/tty6/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CLDX-tty1-1024x600.jpg</reg>
+<text>tty6/images/verbose-CLDX-tty6-1024x600.jpg</text>
diff --git a/install/1merge/cls-themes/tty1/1024x600.cfg b/install/1merge/cls-themes/tty1/1024x600.cfg
new file mode 100644
index 0000000..d0e9094
--- /dev/null
+++ b/install/1merge/cls-themes/tty1/1024x600.cfg
@@ -0,0 +1,58 @@
+# Calculate comment=#
+
+# Full path to background image JPG/PNG
+# Image must has 240 colors, 16 need for fbcon.
+pic=/etc/splash/tty1/images/verbose-CLS-tty1-1024x600.jpg
+
+# transparent background color from fbcon. Usually is 0.
+bgcolor=0
+
+# Coordinates text window
+#tx,ty - top left corner
+#tw,th - width and height of text window, cann't be more screen resolution
+tx=25
+ty=22
+tw=979
+th=485
+
+# Full path to background image JPG/PNG silend mode.
+# Image must has 256 colors.
+silentpic=/etc/splash/tty1/images/silent-CLS-tty1-1024x600.jpg
+
+# Coords of system messages
+text_x=5
+text_y=582
+
+# system messages font size
+text_size=12
+
+# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
+text_color=0x7692b7
+
+# Path to TTF font, for system messages. Path may be:
+#- absolute (starts with '/')
+#- relative THEME_DIR (example /etc/splash)
+#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
+#text_font=<file>
+
+#progress bar for silent mode
+#box silent noover 350 318 654 323 #021F47
+box silent inter 376 319 376 322 #FFC867 #FFC867 #D48D17 #D48D17
+box silent 376 319 649 322 #FFC867 #FFC867 #D48D17 #D48D17
+
+#progress bar rectange for silent mode
+box silent 376 318 648 318 #AAAAAA
+box silent 376 323 648 323 #CCCCCC
+box silent 375 319 375 322 #AAAAAA
+box silent 649 319 649 322 #CCCCCC
+
+#
+#background color for text window in verbose mode
+#box noover 20 15 1004 529 #12233A
+
+#rectangle around text window in verbose mode
+box 19 14 19 505 #8C9096
+box 19 14 1005 14 #8C9096
+box 1005 14 1005 505 #eef4ff
+box 19 505 1005 505 #eef4ff
+
diff --git a/install/1merge/cls-themes/tty2/1024x600.cfg b/install/1merge/cls-themes/tty2/1024x600.cfg
new file mode 100644
index 0000000..30ba779
--- /dev/null
+++ b/install/1merge/cls-themes/tty2/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CLS-tty1-1024x600.jpg</reg>
+<text>tty2/images/verbose-CLS-tty2-1024x600.jpg</text>
diff --git a/install/1merge/cls-themes/tty3/1024x600.cfg b/install/1merge/cls-themes/tty3/1024x600.cfg
new file mode 100644
index 0000000..bfb9e57
--- /dev/null
+++ b/install/1merge/cls-themes/tty3/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CLS-tty1-1024x600.jpg</reg>
+<text>tty3/images/verbose-CLS-tty3-1024x600.jpg</text>
diff --git a/install/1merge/cls-themes/tty4/1024x600.cfg b/install/1merge/cls-themes/tty4/1024x600.cfg
new file mode 100644
index 0000000..c745ed6
--- /dev/null
+++ b/install/1merge/cls-themes/tty4/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CLS-tty1-1024x600.jpg</reg>
+<text>tty4/images/verbose-CLS-tty4-1024x600.jpg</text>
diff --git a/install/1merge/cls-themes/tty5/1024x600.cfg b/install/1merge/cls-themes/tty5/1024x600.cfg
new file mode 100644
index 0000000..10869cd
--- /dev/null
+++ b/install/1merge/cls-themes/tty5/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CLS-tty1-1024x600.jpg</reg>
+<text>tty5/images/verbose-CLS-tty5-1024x600.jpg</text>
diff --git a/install/1merge/cls-themes/tty6/1024x600.cfg b/install/1merge/cls-themes/tty6/1024x600.cfg
new file mode 100644
index 0000000..a230829
--- /dev/null
+++ b/install/1merge/cls-themes/tty6/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CLS-tty1-1024x600.jpg</reg>
+<text>tty6/images/verbose-CLS-tty6-1024x600.jpg</text>
diff --git a/install/1merge/cmc-themes/tty1/1024x600.cfg b/install/1merge/cmc-themes/tty1/1024x600.cfg
new file mode 100644
index 0000000..6573b1b
--- /dev/null
+++ b/install/1merge/cmc-themes/tty1/1024x600.cfg
@@ -0,0 +1,58 @@
+# Calculate comment=#
+
+# Full path to background image JPG/PNG
+# Image must has 240 colors, 16 need for fbcon.
+pic=/etc/splash/tty1/images/verbose-CMC-tty1-1024x600.jpg
+
+# transparent background color from fbcon. Usually is 0.
+bgcolor=0
+
+# Coordinates text window
+#tx,ty - top left corner
+#tw,th - width and height of text window, cann't be more screen resolution
+tx=25
+ty=22
+tw=979
+th=485
+
+# Full path to background image JPG/PNG silend mode.
+# Image must has 256 colors.
+silentpic=/etc/splash/tty1/images/silent-CMC-tty1-1024x600.jpg
+
+# Coords of system messages
+text_x=5
+text_y=582
+
+# system messages font size
+text_size=12
+
+# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
+text_color=0x7692b7
+
+# Path to TTF font, for system messages. Path may be:
+#- absolute (starts with '/')
+#- relative THEME_DIR (example /etc/splash)
+#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
+#text_font=<file>
+
+#progress bar for silent mode
+#box silent noover 350 318 654 323 #021F47
+box silent inter 376 319 376 322 #FFC867 #FFC867 #D48D17 #D48D17
+box silent 376 319 649 322 #FFC867 #FFC867 #D48D17 #D48D17
+
+#progress bar rectange for silent mode
+box silent 376 318 648 318 #AAAAAA
+box silent 376 323 648 323 #CCCCCC
+box silent 375 319 375 322 #AAAAAA
+box silent 649 319 649 322 #CCCCCC
+
+#
+#background color for text window in verbose mode
+#box noover 20 15 1004 529 #12233A
+
+#rectangle around text window in verbose mode
+box 19 14 19 505 #8C9096
+box 19 14 1005 14 #8C9096
+box 1005 14 1005 505 #eef4ff
+box 19 505 1005 505 #eef4ff
+
diff --git a/install/1merge/cmc-themes/tty2/1024x600.cfg b/install/1merge/cmc-themes/tty2/1024x600.cfg
new file mode 100644
index 0000000..bf301b2
--- /dev/null
+++ b/install/1merge/cmc-themes/tty2/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CMC-tty1-1024x600.jpg</reg>
+<text>tty2/images/verbose-CMC-tty2-1024x600.jpg</text>
diff --git a/install/1merge/cmc-themes/tty2/1024x768.cfg b/install/1merge/cmc-themes/tty2/1024x768.cfg
index fe621d8..389b948 100644
--- a/install/1merge/cmc-themes/tty2/1024x768.cfg
+++ b/install/1merge/cmc-themes/tty2/1024x768.cfg
@@ -1,3 +1,3 @@
# Calculate format=patch link=/etc/splash/tty1/1024x768.cfg
-<reg>verbose-CMC-tty1.jpg</reg>
-<text>verbose-CMC-tty2.jpg</text>
+<reg>tty1/images/verbose-CMC-tty1.jpg</reg>
+<text>tty2/images/verbose-CMC-tty2.jpg</text>
diff --git a/install/1merge/cmc-themes/tty2/800x600.cfg b/install/1merge/cmc-themes/tty2/800x600.cfg
index 7aea025..bd30448 100644
--- a/install/1merge/cmc-themes/tty2/800x600.cfg
+++ b/install/1merge/cmc-themes/tty2/800x600.cfg
@@ -1,3 +1,3 @@
# Calculate format=patch link=/etc/splash/tty1/800x600.cfg
-<reg>verbose-CMC-tty1-800x600.jpg</reg>
-<text>verbose-CMC-tty2-800x600.jpg</text>
+<reg>tty1/images/verbose-CMC-tty1-800x600.jpg</reg>
+<text>tty2/images/verbose-CMC-tty2-800x600.jpg</text>
diff --git a/install/1merge/cmc-themes/tty3/1024x600.cfg b/install/1merge/cmc-themes/tty3/1024x600.cfg
new file mode 100644
index 0000000..fce5b33
--- /dev/null
+++ b/install/1merge/cmc-themes/tty3/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CMC-tty1-1024x600.jpg</reg>
+<text>tty3/images/verbose-CMC-tty3-1024x600.jpg</text>
diff --git a/install/1merge/cmc-themes/tty3/1024x768.cfg b/install/1merge/cmc-themes/tty3/1024x768.cfg
index 4844bbb..bf85c21 100644
--- a/install/1merge/cmc-themes/tty3/1024x768.cfg
+++ b/install/1merge/cmc-themes/tty3/1024x768.cfg
@@ -1,3 +1,3 @@
# Calculate format=patch link=/etc/splash/tty1/1024x768.cfg
-<reg>verbose-CMC-tty1.jpg</reg>
-<text>verbose-CMC-tty3.jpg</text>
+<reg>tty1/images/verbose-CMC-tty1.jpg</reg>
+<text>tty3/images/verbose-CMC-tty3.jpg</text>
diff --git a/install/1merge/cmc-themes/tty3/800x600.cfg b/install/1merge/cmc-themes/tty3/800x600.cfg
index 86caff5..64ec8ef 100644
--- a/install/1merge/cmc-themes/tty3/800x600.cfg
+++ b/install/1merge/cmc-themes/tty3/800x600.cfg
@@ -1,3 +1,3 @@
# Calculate format=patch link=/etc/splash/tty1/800x600.cfg
-<reg>verbose-CMC-tty1-800x600.jpg</reg>
-<text>verbose-CMC-tty3-800x600.jpg</text>
+<reg>tty1/images/verbose-CMC-tty1-800x600.jpg</reg>
+<text>tty3/images/verbose-CMC-tty3-800x600.jpg</text>
diff --git a/install/1merge/cmc-themes/tty4/1024x600.cfg b/install/1merge/cmc-themes/tty4/1024x600.cfg
new file mode 100644
index 0000000..c40851a
--- /dev/null
+++ b/install/1merge/cmc-themes/tty4/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CMC-tty1-1024x600.jpg</reg>
+<text>tty4/images/verbose-CMC-tty4-1024x600.jpg</text>
diff --git a/install/1merge/cmc-themes/tty4/1024x768.cfg b/install/1merge/cmc-themes/tty4/1024x768.cfg
index 4b26438..ef39f63 100644
--- a/install/1merge/cmc-themes/tty4/1024x768.cfg
+++ b/install/1merge/cmc-themes/tty4/1024x768.cfg
@@ -1,3 +1,3 @@
# Calculate format=patch link=/etc/splash/tty1/1024x768.cfg
-<reg>verbose-CMC-tty1.jpg</reg>
-<text>verbose-CMC-tty4.jpg</text>
+<reg>tty1/images/verbose-CMC-tty1.jpg</reg>
+<text>tty4/images/verbose-CMC-tty4.jpg</text>
diff --git a/install/1merge/cmc-themes/tty4/800x600.cfg b/install/1merge/cmc-themes/tty4/800x600.cfg
index fd515c9..0da109f 100644
--- a/install/1merge/cmc-themes/tty4/800x600.cfg
+++ b/install/1merge/cmc-themes/tty4/800x600.cfg
@@ -1,3 +1,3 @@
# Calculate format=patch link=/etc/splash/tty1/800x600.cfg
-<reg>verbose-CMC-tty1-800x600.jpg</reg>
-<text>verbose-CMC-tty4-800x600.jpg</text>
+<reg>tty1/images/verbose-CMC-tty1-800x600.jpg</reg>
+<text>tty4/images/verbose-CMC-tty4-800x600.jpg</text>
diff --git a/install/1merge/cmc-themes/tty5/1024x600.cfg b/install/1merge/cmc-themes/tty5/1024x600.cfg
new file mode 100644
index 0000000..67757e8
--- /dev/null
+++ b/install/1merge/cmc-themes/tty5/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CMC-tty1-1024x600.jpg</reg>
+<text>tty5/images/verbose-CMC-tty5-1024x600.jpg</text>
diff --git a/install/1merge/cmc-themes/tty5/1024x768.cfg b/install/1merge/cmc-themes/tty5/1024x768.cfg
index 02c5078..ca9cddf 100644
--- a/install/1merge/cmc-themes/tty5/1024x768.cfg
+++ b/install/1merge/cmc-themes/tty5/1024x768.cfg
@@ -1,3 +1,3 @@
# Calculate format=patch link=/etc/splash/tty1/1024x768.cfg
-<reg>verbose-CMC-tty1.jpg</reg>
-<text>verbose-CMC-tty5.jpg</text>
+<reg>tty1/images/verbose-CMC-tty1.jpg</reg>
+<text>tty5/images/verbose-CMC-tty5.jpg</text>
diff --git a/install/1merge/cmc-themes/tty5/800x600.cfg b/install/1merge/cmc-themes/tty5/800x600.cfg
index 0c48515..85197c1 100644
--- a/install/1merge/cmc-themes/tty5/800x600.cfg
+++ b/install/1merge/cmc-themes/tty5/800x600.cfg
@@ -1,3 +1,3 @@
# Calculate format=patch link=/etc/splash/tty1/800x600.cfg
-<reg>verbose-CMC-tty1-800x600.jpg</reg>
-<text>verbose-CMC-tty5-800x600.jpg</text>
+<reg>tty1/images/verbose-CMC-tty1-800x600.jpg</reg>
+<text>tty5/images/verbose-CMC-tty5-800x600.jpg</text>
diff --git a/install/1merge/cmc-themes/tty6/1024x600.cfg b/install/1merge/cmc-themes/tty6/1024x600.cfg
new file mode 100644
index 0000000..1800754
--- /dev/null
+++ b/install/1merge/cmc-themes/tty6/1024x600.cfg
@@ -0,0 +1,3 @@
+# Calculate format=patch link=/etc/splash/tty1/1024x600.cfg
+<reg>tty1/images/verbose-CMC-tty1-1024x600.jpg</reg>
+<text>tty6/images/verbose-CMC-tty6-1024x600.jpg</text>
diff --git a/install/1merge/cmc-themes/tty6/1024x768.cfg b/install/1merge/cmc-themes/tty6/1024x768.cfg
index c9b8dd5..ada8777 100644
--- a/install/1merge/cmc-themes/tty6/1024x768.cfg
+++ b/install/1merge/cmc-themes/tty6/1024x768.cfg
@@ -1,3 +1,3 @@
# Calculate format=patch link=/etc/splash/tty1/1024x768.cfg
-<reg>verbose-CMC-tty1.jpg</reg>
-<text>verbose-CMC-tty6.jpg</text>
+<reg>tty1/images/verbose-CMC-tty1.jpg</reg>
+<text>tty6/images/verbose-CMC-tty6.jpg</text>
diff --git a/install/1merge/cmc-themes/tty6/800x600.cfg b/install/1merge/cmc-themes/tty6/800x600.cfg
index 14ee764..eecea9b 100644
--- a/install/1merge/cmc-themes/tty6/800x600.cfg
+++ b/install/1merge/cmc-themes/tty6/800x600.cfg
@@ -1,3 +1,3 @@
# Calculate format=patch link=/etc/splash/tty1/800x600.cfg
-<reg>verbose-CMC-tty1-800x600.jpg</reg>
-<text>verbose-CMC-tty6-800x600.jpg</text>
+<reg>tty1/images/verbose-CMC-tty1-800x600.jpg</reg>
+<text>tty6/images/verbose-CMC-tty6-800x600.jpg</text>
diff --git a/install/1merge/xinit/conf.d/xdm b/install/1merge/xinit/conf.d/xdm
deleted file mode 100644
index eb21521..0000000
--- a/install/1merge/xinit/conf.d/xdm
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate comment=#
-
-CHECKVT=7
-#?pkg(kde-base/kdm)!=#
-DISPLAYMANAGER="kdm"
-#pkg#
-#?pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==#
-DISPLAYMANAGER="gdm"
-#pkg#
-#?pkg(x11-misc/slim)!=&&pkg(kde-base/kdm)==&&pkg(gnome-base/gdm)==#
-DISPLAYMANAGER="slim"
-#pkg#
diff --git a/install/1merge/xorg-server/conf.d/xdm b/install/1merge/xorg-server/conf.d/xdm
new file mode 100644
index 0000000..eb21521
--- /dev/null
+++ b/install/1merge/xorg-server/conf.d/xdm
@@ -0,0 +1,12 @@
+# Calculate comment=#
+
+CHECKVT=7
+#?pkg(kde-base/kdm)!=#
+DISPLAYMANAGER="kdm"
+#pkg#
+#?pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==#
+DISPLAYMANAGER="gdm"
+#pkg#
+#?pkg(x11-misc/slim)!=&&pkg(kde-base/kdm)==&&pkg(gnome-base/gdm)==#
+DISPLAYMANAGER="slim"
+#pkg#

4
sys-kernel/calculate-sources/Manifest
Unescape View File

@ -15,13 +15,17 @@ DIST linux-2.6.34.tar.bz2 67633622 RMD160 dafd721b00c13e3652405b517b379eed10020b
DIST linux-2.6.35.tar.bz2 69305709 RMD160 f5d91abb4fa72fac812578d830b22180d85a0e6f SHA1 4cb1fbfbeedcd658ca37739679c65dfaa136bf4e SHA256 18b2e2c336032e366c942622b77302cb05fc034fb19018f086a4ebc9ed41bfcf
DIST patch-2.6.32.24.bz2 625226 RMD160 0c93627648f2ac1a7e5dee0c3ce7b7c1d9de4987 SHA1 c82ec2f079356173992956d4201ee198d3a86471 SHA256 b84e59395e168c2300f6d858d1a7cb998bf6a04355ad8587fe7146c6ab457ce8
DIST patch-2.6.32.25.bz2 640020 RMD160 73460e9d3a3b34979814f21e291f2c02bc931e44 SHA1 f812ee7ac3887ca2ce41dd4ec2c99b70f069be37 SHA256 402f740b25c6e69344219164250a1181c74bbc8bb25149b3a0fa8d818706f32f
DIST patch-2.6.32.27.bz2 676264 RMD160 0e88faace47a53442cbbbcbf7f5f7802e00ba3ce SHA1 78111d270e40026e14fd8fe6524ff633ef9a41bc SHA256 a847710f1e1806d869042d85c015723be251dc9ccfb7ef624669e6f60252f423
DIST patch-2.6.34.7.bz2 184957 RMD160 0f72e9496ff0082df05424ec75aff166ba6dff27 SHA1 b346d804a428239145b6c058ff0df88792c31094 SHA256 b146904ea07cc87a3fbcbd4eab51d331d56718431539e6aa29c24b072e6b7832
DIST patch-2.6.35.5.bz2 115391 RMD160 8a6d0b71aa043531575203aa61ac6807532f35e8 SHA1 1267c980179fe4ab35ac7344523c4dd616d2d5a6 SHA256 94bbeb43c6bd8047fa5f42766a68879199dfdadee11bd3e8f10f1317f698b0f4
DIST patch-2.6.35.8.bz2 164082 RMD160 b4203c84b1d5f8303df250ac013c3368e36404f1 SHA1 4bcc29163a5e98c20e76981b6f2c466925d98500 SHA256 cc8bd636ba49ee7ad1095cebf32a4bf0d2edcd60a5aaf29206297e9218904eb1
DIST patch-2.6.35.9.bz2 184494 RMD160 875835bdd6726a0e8fcbefcdb91b09489cc548ba SHA1 49a7240a24b179553fa27873df4e65d288a2bdbe SHA256 337a1649110d5bd4d08b178b9437d88df692b2d4ed62b988083a132d0e057725
EBUILD calculate-sources-2.6.32.24.ebuild 748 RMD160 b896fde446060469ef43da0ca52a7654df6b9536 SHA1 906107a1c742698f796e030415ab07988dc3209b SHA256 a7dbbc43e6ca706102c2a66495f4593ee64d69823264a2dca6c19d87291a116c
EBUILD calculate-sources-2.6.32.25.ebuild 730 RMD160 03829000741607b551f63823a12df566bae495d6 SHA1 65c76f8c936acda61f12991e3756db6a4f3f4142 SHA256 0e0593a099c5d3d5f087e1fd5f55eb94a7d49ee6d1e4c55e5b5e23f19b0ddd71
EBUILD calculate-sources-2.6.32.27.ebuild 730 RMD160 03829000741607b551f63823a12df566bae495d6 SHA1 65c76f8c936acda61f12991e3756db6a4f3f4142 SHA256 0e0593a099c5d3d5f087e1fd5f55eb94a7d49ee6d1e4c55e5b5e23f19b0ddd71
EBUILD calculate-sources-2.6.34.7.ebuild 753 RMD160 cc938b6909723106e1b2b23f9ee49b9855514183 SHA1 36696c2368094d4162ed0960a2289d87b653c291 SHA256 8da5819f6353ab765a6135853be0dd648d555edd21b24c81e71acf9687d5351c
EBUILD calculate-sources-2.6.35.5.ebuild 730 RMD160 03829000741607b551f63823a12df566bae495d6 SHA1 65c76f8c936acda61f12991e3756db6a4f3f4142 SHA256 0e0593a099c5d3d5f087e1fd5f55eb94a7d49ee6d1e4c55e5b5e23f19b0ddd71
EBUILD calculate-sources-2.6.35.8.ebuild 1313 RMD160 4553f019e6508dd227c6ea420ebc2451b3faecc4 SHA1 17ba0b5bc45eea22a3c5ad4844af607cd860c5ba SHA256 0dddce97d7af6c123402068687c87d96ca50da4421364f9db5939a9a22acefe6
EBUILD calculate-sources-2.6.35.9.ebuild 1313 RMD160 4553f019e6508dd227c6ea420ebc2451b3faecc4 SHA1 17ba0b5bc45eea22a3c5ad4844af607cd860c5ba SHA256 0dddce97d7af6c123402068687c87d96ca50da4421364f9db5939a9a22acefe6
MISC ChangeLog 4487 RMD160 65114f33a03ed42ff5bec0a107cf9df16d62001e SHA1 d849597ad1c5ae0db7fa5d2eb59f737d4c0c0597 SHA256 a377a8e2cc7e6429fca574b819360f167b94d6090b3bff4f8f0d446eb51f2b23
MISC metadata.xml 523 RMD160 855108e020b3f1fe32f843accc94a57f15affa0e SHA1 7fbeb862ff719c9ef63925b7f18104ff6eac27dd SHA256 997dc6d02e44eef86cc9653d7588b9f65e9033f02e28b3a8d98f48df82561f3c

26
sys-kernel/calculate-sources/calculate-sources-2.6.32.27.ebuild
Unescape View File

@ -0,0 +1,26 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
ETYPE="sources"
inherit calculate-kernel-2
DESCRIPTION="Full sources including the Calculate patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
KEYWORDS="amd64 x86"
HOMEPAGE="http://www.calculate-linux.org"
SRC_URI="${KERNEL_URI} ${ARCH_URI} ${CALC_URI}"
UNIPATCH_LIST="${DISTDIR}/${PN}-${CKV}.tar.bz2"
DEPEND="vmlinuz? ( >=sys-kernel/calckernel-3.4.10.903-r23
sys-apps/calculate-builder
|| ( app-arch/xz-utils app-arch/lzma-utils )
sys-apps/v86d )"
pkg_postinst() {
calculate-kernel-2_pkg_postinst
einfo "For more info on this patchset, and how to report problems, see:"
einfo "${HOMEPAGE}"
}

54
sys-kernel/calculate-sources/calculate-sources-2.6.35.9.ebuild
Unescape View File

@ -0,0 +1,54 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
ETYPE="sources"
inherit calculate-kernel-2 eutils
DESCRIPTION="Full sources including the Calculate patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
KEYWORDS="amd64 x86"
HOMEPAGE="http://www.calculate-linux.org"
SRC_URI="${KERNEL_URI} ${ARCH_URI} ${CALC_URI}"
UNIPATCH_LIST="${DISTDIR}/${PN}-${CKV}.tar.bz2"
DEPEND="vmlinuz? ( >=sys-kernel/calckernel-3.4.10.903-r23
sys-apps/calculate-builder
|| ( app-arch/xz-utils app-arch/lzma-utils )
sys-apps/v86d )"
IUSE="bfq bfs"
src_unpack() {
calculate-kernel-2_src_unpack
# apply patch bfq
if use bfq
then
epatch "${FILESDIR}/4700_BFQ_2.6.35.patch" || \
die "Failed apply bfq patch"
fi
# apply patch bfs
if use bfs
then
epatch "${FILESDIR}/4600_sched-bfs_2.6.35.patch" || \
die "Failed apply bfs patch"
fi
}
pkg_postinst() {
calculate-kernel-2_pkg_postinst
if use bfq
then
ewarn ""
ewarn "Change value of elevator to bfq in /boot/grub/grub.conf for"
ewarn "using BFQ I/O scheduler."
ewarn "Part of grub.conf for example:"
ewarn "kernel /boot/vmlinuz-a7acd396 root=/dev/sda2 elevator=bfq"
ewarn ""
fi
einfo "For more info on this patchset, and how to report problems, see:"
einfo "${HOMEPAGE}"
}
Write Preview
Loading…
Cancel
Save