Add support Calculate Linux Scratch KDE (CLSK).

Change.log

@@ -14,6 +14,7 @@ CHANGE LOG
 * Fix actions order of flash rebuilding.
 * Add removing network from boot runlevel after emerge openrc.
 * Fix hal profile of setting keyboards.
+* Add support install and build new distributive Calculate Linux Scratch KDE (CLSK).
 
 1.2.3
 * Использование Calculate Overlay для профилей сборки системы

install/builder/packages/desktop?calculate=CLSK/desktop

@@ -0,0 +1,5 @@
+#------------------------------------------------------------------------------
+# Meta-package for build system
+#------------------------------------------------------------------------------
+
+clsk-meta

install/builder/profile/ISO/target/isolinux/isolinux.cfg?system=desktop

@@ -10,7 +10,7 @@ LABEL cld
 #?calculate=CLS#
 	MENU LABEL #-calculatename-# #-linuxver-# LiveCD
 #calculate#
-#?calculate=CLSG?calculate=CLDX#
+#?calculate=CLSG?calculate=CLSK?calculate=CLDX#
 	MENU LABEL #-calculatename-# #-linuxver-# #-calculatesubname-# LiveCD
 #calculate#
 	KERNEL /boot/vmlinuz
@@ -23,7 +23,7 @@ LABEL cld-docache
 #?calculate=CLS#
 	MENU LABEL #-calculatename-# #-linuxver-# LiveCD (RAM)
 #calculate#
-#?calculate=CLSG?calculate=CLDX#
+#?calculate=CLSG?calculate=CLSK?calculate=CLDX#
 	MENU LABEL #-calculatename-# #-linuxver-# #-calculatesubname-# LiveCD (RAM)
 #calculate#
 	KERNEL /boot/vmlinuz
@@ -35,7 +35,7 @@ LABEL cld-nox
 #?calculate=CLD#
 	MENU LABEL #-calculatename-# #-linuxver-# #-calculatesubname-# LiveDVD (No-X)
 #calculate#
-#?calculate=CLSG?calculate=CLDX#
+#?calculate=CLSG?calculate=CLSK?calculate=CLDX#
 	MENU LABEL #-calculatename-# #-linuxver-# #-calculatesubname-# LiveCD (No-X)
 #calculate#
 #?calculate!=CLS#
@@ -50,7 +50,7 @@ LABEL cld-scratch
 #?calculate=CLS#
 	MENU LABEL #-calculatename-# #-linuxver-# LiveCD Builder
 #calculate#
-#?calculate=CLSG?calculate=CLDX#
+#?calculate=CLSG?calculate=CLSK?calculate=CLDX#
 	MENU LABEL #-calculatename-# #-linuxver-# #-calculatesubname-# LiveCD Builder
 #calculate#
 	KERNEL /boot/vmlinuz

install/calculate

@@ -512,7 +512,7 @@ sub getarg{
 		printmes(gettext('Similarly for optional arguments').".\n\n");
 
 		printmes(gettext('Location').":\n");
-		printmes("  -s, --os=[CLD|CLDX|CLS|CLSG|CDS] "); printmes(gettext('select operation system')); printmes(" (Calculate Linux Desktop KDE, Calculate Linux Desktop XFCE, Calculate Linux Scratch, Calculate Linux Scratch GNOME, Calculate Directory Server)\n");
+		printmes("  -s, --os=[CLD|CLDX|CLS|CLSG|CLSK|CDS] "); printmes(gettext('select operation system')); printmes(" (Calculate Linux Desktop KDE, Calculate Linux Desktop XFCE, Calculate Linux Scratch, Calculate Linux Scratch GNOME, Calculate Linux Scratch KDE, Calculate Directory Server)\n");
 
 		printmes("  -d, --disk=DISK\t"); printmes(gettext('installation or building system volume')."\n");
 		printmes("  -b, --build\t\t"); printmes(gettext('installation for assembling')."\n");
@@ -829,11 +829,13 @@ sub welcome{
 		CDS => "Calculate Directory Server",
 		CLS => "Calculate Linux Scratch",
 		CLSG => "Calculate Linux Scratch",
+		CLSK => "Calculate Linux Scratch",
 	);
 	%{$data{ver_desktop}} = (
 		CLD => "KDE",
 		CLDX => "XFCE",
 		CLSG => "GNOME",
+		CLSK => "KDE",
 	);
 
 	#если передан параметр выбора системы, установим значения
@@ -868,7 +870,7 @@ sub welcome{
 	if($data{'calculate'}=~m/^CLD/){
 		@{$data{other}}{'calculatesubname'} = ["KDE", "XFCE"];
 		$data{'calculatesubname'} = $data{ver_desktop}{$data{calculate}};
-	}elsif($data{'calculate'}=~m/CLSG/){
+	}elsif($data{'calculate'}=~m/CLSG/ || $data{'calculate'}=~m/CLSK/){
 		$data{'calculatesubname'} = $data{ver_desktop}{$data{calculate}};
 	}
 
@@ -1363,7 +1365,7 @@ sub checksystem{
 					$data{netconf} .= "\nconfig_$dev=( \"$addr$net{$mask}\" )";
 				}
 				$dev_open = 1;
-				if($data{calculate} ne "CLS" && $data{calculate} ne "CLSG"){
+				if($data{calculate} ne "CLS" && $data{calculate} ne "CLSG" && $data{calculate} ne "CLSK"){
 					$data{netconf} .= "\nmodules_eth0=( \"!plug\" )";
 				}
 		}	}
@@ -2898,6 +2900,8 @@ sub checkready{
 				number_ver($data{linuxver}) > number_ver('9.9.9')) ||
 			($data{calculate} eq "CLSG" &&
 				number_ver($data{linuxver}) > number_ver('9.9.9')) ||
+			($data{calculate} eq "CLSK" &&
+				number_ver($data{linuxver}) > number_ver('9.9.9')) ||
 			($data{calculate} eq "CDS" &&
 				number_ver($data{linuxver}) > number_ver('9.9.9'))
 			) && !defined $data{arg}{'force'}
@@ -6812,7 +6816,7 @@ sub beep{
 # Соберем бинарные пакеты дополнений (nVideo драйвера)
 #------------------------------------------------------------------------------
 sub makepkg{
-	if($data{system} eq "server" || $data{calculate} eq "CLS" || $data{calculate} eq "CLSG"){return 1;}
+	if($data{system} eq "server" || $data{calculate} eq "CLS" || $data{calculate} eq "CLSG" || $data{calculate} eq "CLSK"){return 1;}
 
 	printmes(gettext('Make nvidia drivers')."\n");
 

install/profile/desktop/etc/conf.d/xdm

@@ -1,7 +1,7 @@
 #-title-#
 
 CHECKVT=7
-#?calculate=CLD#
+#?calculate=CLD?calculate=CLSK#
 DISPLAYMANAGER="kdm"
 #calculate#
 #?calculate=CLDX#