[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

patch for generating kde cds



The attached patch to farbror's build machinery (already applied) should
make it generate single binary-only kde CDs along with the other weekly
CDs. These kde CDs contain only the kde-desktop task (although the CD
contents still need some tweaking), and automatically select that task.

Note that for now it has to use the daily d-i builds and sid d-i for the KDE
CDs, since a bug in rc1 prevents the preseeding working right using those
images.

This should be available in the regular builds this weekend, for now
there are sample jigdos here: http://kitenet.net/~joey/tmp/jigdo-cd/kde/

-- 
see shy jo
--- build/cronjob.weekly	2006-11-26 22:13:41.235600100 +0100
+++ joeyh/build/cronjob.weekly	2006-11-29 23:24:24.052577443 +0100
@@ -92,6 +92,14 @@
 	    if [ "$NOCD"x = ""x ] ; then
 		CDSTARTTIME=`date -u +%H:%M:%S`
 		DOJIGDO=1 DI_DIST="$DI_DIST" ./testingcds "$arch"
+		# kde cd
+		# (temporarily using daily d-i images and sid_d-i)
+		INSTALLER_CD=4 TASK=tasks/Debian_etch-kde \
+			KERNEL_PARAMS='tasks="kde-desktop, standard"' \
+			MAXCDS=1 NOSOURCE=1 DOJIGDO=1 \
+			DI=sid DI_WWW_HOME="default" DI_DIR="$ARCH_DI_DIR" \
+ 			DI_DIST="$DI_DIST" \
+			./testingcds "$arch"
 		CDENDTIME=`date -u +%H:%M:%S`
 		echo "$arch CDs started at $CDSTARTTIME, ended at $CDENDTIME"
 	    fi
--- build/testingcds	2006-11-29 23:56:19.011509746 +0100
+++ joeyh/build/testingcds	2006-11-30 00:44:26.726372247 +0100
@@ -73,6 +73,7 @@
     1) export DISKTYPE=businesscard;;
     2) export DISKTYPE=netinst;;
     3) export DISKTYPE=DVD;;
+    4) export DISKTYPE=kde-CD;;
     *) export DISKTYPE=CD;;
 esac
 
@@ -91,6 +92,9 @@
     if [ "$INSTALLER_CD"x = "3"x ] ; then
         OUT_TYPE=dvd
 	DCD="debian-cd.dvd"
+    elif [ "$INSTALLER_CD"x = "4"x ] ; then
+	OUT_TYPE=cd
+	DCD="debian-cd"
     else
         OUT_TYPE=cd
 	DCD="debian-cd"
@@ -107,7 +111,7 @@
         cd ..
     echo Making $ARCH "$OUT_TYPE"s in $OUT "($OUT/$ARCH/jigdo-${OUT_TYPE})"
     # this is for build.sh
-    if [ "$ARCH" = "i386" ] ; then
+    if [ "$ARCH" = "i386" ] && [ "$INSTALLER_CD" != 4 ]; then
         export IMAGETARGET=official_images
         unset NOSOURCE
     else
@@ -133,6 +137,12 @@
     else
         export OFFICIAL="Official NetInst Snapshot"
     fi
+elif [ "$INSTALLER_CD" = "4" ]; then
+    if [ "$DI"x = "sarge"x ] ; then
+       export OFFICIAL="Official KDE CD"
+    else
+       export OFFICIAL="Official KDE CD Snapshot"
+    fi
 fi
 
 rm -rvf "$OUT"

Attachment: signature.asc
Description: Digital signature


Reply to: