Change cl-kernel output kernel files name

Change.log

@@ -7,6 +7,7 @@ CHANGE LOG
 * Set guest uid=1000.
 * Added the mounting of /var/calculate/remote by cl-builder.
 * Changed isolinux template for CSS.
+* Changed output kernel file names for cl-kernel.
 
 1.3.12
 * Fix creating format a digest file.

install/cl-kernel

@@ -142,29 +142,50 @@ old_file() {
 	 find ${dir} -lname "$filename" -exec ln -sf ${filename}${suffix} {} \;
 }
 
+detect_linux_shortname() {
+	local makeprofile=$(readlink /etc/make.profile)
+	local profile=
+	local system=
+	local shortname=
+	while [[ $profile != "calculate" && $profile != "." ]]
+	do
+		shortname=$system
+		system=$profile
+		profile=$(basename $makeprofile)
+		makeprofile=$(dirname $makeprofile)
+	done
+	if [[ $profile == "calculate" ]]
+	then
+		echo $shortname
+	else
+		echo "gentoo"
+	fi
+}
+
 install_kernel() {
-	old_file ${BOOT_DIR} vmlinuz-${KERNEL_VERSION} .old
-	old_file ${BOOT_DIR} System.map-${KERNEL_VERSION} .old
-	old_file ${BOOT_DIR} initramfs-${KERNEL_VERSION} .old
-	old_file ${BOOT_DIR} initramfs-${KERNEL_VERSION}-install .old
+	local NEW_KERNEL_VERSION=${KERNEL_VERSION%-calculate}-`arch`-$(detect_linux_shortname)
+	old_file ${BOOT_DIR} vmlinuz-${NEW_KERNEL_VERSION} .old
+	old_file ${BOOT_DIR} System.map-${NEW_KERNEL_VERSION} .old
+	old_file ${BOOT_DIR} initramfs-${NEW_KERNEL_VERSION} .old
+	old_file ${BOOT_DIR} initramfs-${NEW_KERNEL_VERSION}-install .old
 	old_file ${BOOT_DIR} vmlinuz .old
 	old_file ${BOOT_DIR} System.map .old
 	old_file ${BOOT_DIR} initrd .old
 	old_file ${BOOT_DIR} initrd-install .old
-	old_file ${BOOT_DIR} config-${KERNEL_VERSION} .old
+	old_file ${BOOT_DIR} config-${NEW_KERNEL_VERSION} .old
 	mv ${BOOT_DIR}/kernel-${KERNEL_NAME}-*-${KERNEL_VERSION} \
-		${BOOT_DIR}/vmlinuz-${KERNEL_VERSION}
-	ln -sf vmlinuz-${KERNEL_VERSION} ${BOOT_DIR}/vmlinuz
+		${BOOT_DIR}/vmlinuz-${NEW_KERNEL_VERSION}
+	ln -sf vmlinuz-${NEW_KERNEL_VERSION} ${BOOT_DIR}/vmlinuz
 	mv ${BOOT_DIR}/System.map-${KERNEL_NAME}-*-${KERNEL_VERSION} \
-		${BOOT_DIR}/System.map-${KERNEL_VERSION}
-	ln -sf System.map-${KERNEL_VERSION} ${BOOT_DIR}/System.map
+		${BOOT_DIR}/System.map-${NEW_KERNEL_VERSION}
+	ln -sf System.map-${NEW_KERNEL_VERSION} ${BOOT_DIR}/System.map
 	cp ${BOOT_DIR}/initramfs-${KERNEL_NAME}-*-${KERNEL_VERSION} \
-		${BOOT_DIR}/initramfs-${KERNEL_VERSION}
-	ln -sf initramfs-${KERNEL_VERSION} ${BOOT_DIR}/initrd
+		${BOOT_DIR}/initramfs-${NEW_KERNEL_VERSION}
+	ln -sf initramfs-${NEW_KERNEL_VERSION} ${BOOT_DIR}/initrd
 	mv ${BOOT_DIR}/initramfs-${KERNEL_NAME}-*-${KERNEL_VERSION} \
-		${BOOT_DIR}/initramfs-${KERNEL_VERSION}-install
-	ln -sf initramfs-${KERNEL_VERSION}-install ${BOOT_DIR}/initrd-install
-	cp ${KERNEL_DIR}/.config ${BOOT_DIR}/config-${KERNEL_VERSION}
+		${BOOT_DIR}/initramfs-${NEW_KERNEL_VERSION}-install
+	ln -sf initramfs-${NEW_KERNEL_VERSION}-install ${BOOT_DIR}/initrd-install
+	cp ${KERNEL_DIR}/.config ${BOOT_DIR}/config-${NEW_KERNEL_VERSION}
 }
 
 KERNEL_DIR=/usr/src/linux