[SM-Commit] BZR Change 10 to cauldron-devel cauldron by Karsten Behrmann <BearPerson at gmx.net>

bzr at mail.sourcemage.org bzr at mail.sourcemage.org
Sat Apr 15 13:45:29 EDT 2006


------------------------------------------------------------
revno: 10
committer: Karsten Behrmann <BearPerson at gmx.net>
branch nick: devel
timestamp: Sun 2006-04-02 23:39:22 +0200
message:
  merge
    ------------------------------------------------------------
    merged: BearPerson at gmx.net-20060402213236-95f9985b83f1f362
    committer: Karsten Behrmann <BearPerson at gmx.net>
    branch nick: devel
    timestamp: Sun 2006-04-02 23:32:36 +0200
    message:
      Yay! criss-cross merges!
    ------------------------------------------------------------
    merged: BearPerson at sourcemage.org-20060402210248-262e0e2730e534d7
    committer: Karsten Behrmann <BearPerson at sourcemage.org>
    branch nick: test
    timestamp: Sun 2006-04-02 23:02:48 +0200
    message:
      remove silly p4 filename hack
    ------------------------------------------------------------
    merged: BearPerson at sourcemage.org-20060402193112-e0e3f631c919547f
    committer: Karsten Behrmann <BearPerson at sourcemage.org>
    branch nick: test
    timestamp: Sun 2006-04-02 21:31:12 +0200
    message:
      testify

=== added directory 'iso/skeleton/etc/init.d/runlevels/%DEV'
=== renamed file 'iso/skeleton/etc/init.d/runlevels/tmpfs.sh' => 'iso/skeleton/etc/init.d/runlevels/%DEV/tmpfs.sh'
=== modified file 'ChangeLog'
--- ChangeLog	
+++ ChangeLog	
@@ -1,6 +1,12 @@
 2006-04-02 Christopher Dombroski <cdombroski at icanttype.org>
 	* skeleton/usr/share/smgl.install/modules/diskStructure: added support
 	for formating and mounting lvm partitions
+
+2005-04-02 Karsten Behrmann <BearPerson at sourcemage.org>
+	* data/iso.command, skeleton/etc/init.d/runlevels/tmpfs.sh: --hack
+
+2006-04-02 Karsten Behrmann <BearPerson at sourcemage.org>
+	* *: turn into test in bzr
 
 2006-03-31 Karsten Behrmann <BearPerson at sourcemage.org>
 	* caster: fixes with detection if a spell needs to be updated

=== modified file 'README'
--- README	
+++ README	
@@ -1,5 +1,7 @@
-This directory contains the *development* version of ISO, installer and
+This directory contains the testing version of ISO, installer and
 general cauldron tools.
 
-Trigger a release by running misc/release.sh
-Devel releases need not be logged in the ChangeLog
+This means:
+- Only bugfixes, no new features
+- check your fixes for syntax errors
+- be careful ;-)

=== modified file 'iso/data/internal_version'
--- iso/data/internal_version	
+++ iso/data/internal_version	
@@ -1,1 +1,1 @@
-2005120721
+0

=== modified file 'iso/data/iso.command'
--- iso/data/iso.command	
+++ iso/data/iso.command	
@@ -1,8 +1,4 @@
 #!/bin/bash
-
-# Silly hack because perforce doesn't like the pathname
-mv $ISO_DIR/etc/init.d/runlevels/tmpfs.sh \
-    $ISO_DIR/etc/init.d/runlevels/%DEV/tmpfs.sh
 
 touch ${ISO_DIR}/etc/modules.devfsd # can't generate those on the fly,
 touch ${ISO_DIR}/etc/modules.conf   # just make sure they exist

=== modified file 'iso/generation-scripts/config'
--- iso/generation-scripts/config	
+++ iso/generation-scripts/config	
@@ -8,12 +8,12 @@
 STATE_DIR=$SCRIPTDIR/../data
 SKELETON=$SCRIPTDIR/../skeleton
 
-ISO_BRANCH=${ISO_BRANCH:-devel}
+ISO_BRANCH=${ISO_BRANCH:-test}
 ARCH=${ARCH:-i486-pc-linux-gnu}
 ISO_ARCH=${ISO_ARCH:-x86}
   # generic i386 and family
-SVERSION=${SVERSION:-test}
-GVERSION=${GVERSION:-test}
+SVERSION=${SVERSION:-stable}
+GVERSION=${GVERSION:-stable-rc}
 KVERSION=${KVERSION:-"2.6"}
 KERNEL_VERSION=${KERNEL_VERSION:-2.6.14.2}
 if [[ $KERNEL_VERSION == *.*.*.* ]] ;then
@@ -23,7 +23,7 @@
   KERNEL_MVERSION=${KERNEL_MVERSION:-$KERNEL_VERSION}
   # leave KERNEL_PATCHES unset if unset, otherwise don't change.
 fi
-ISO_VERSION=${ISO_VERSION:-$ISO_BRANCH-$(cat $STATE_DIR/internal_version)}
+ISO_VERSION=0.9.7-test$(cat $STATE_DIR/internal_version)
 ISO_FILENAME="smgl-${ISO_VERSION%%-*}-$ISO_ARCH-$KERNEL_VERSION-nptl-${ISO_VERSION#*-}.iso"
 IGNORE_FATAL=${IGNORE_FATAL:-yes}
 




More information about the SM-Commit mailing list