Release Engineering: Update master to 2.3.0-DEVELOPMENT v2.3.0
authorMatthew Dillon <dillon@apollo.backplane.com>
Thu, 5 Feb 2009 05:03:11 +0000 (21:03 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Thu, 5 Feb 2009 05:03:11 +0000 (21:03 -0800)
Makefile
sys/conf/newvers.sh
sys/conf/subvers-DEVELOPMENT_2_3 [new file with mode: 0644]
sys/sys/param.h

index 3d5485c..c24ff20 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -190,32 +190,33 @@ upgrade:  upgrade_etc
 upgrade_etc:
        @cd ${.CURDIR}/etc; make -m ${.CURDIR}/share/mk upgrade_etc
 
+## Remove obsolete CVS commands, we are using GIT now.
+##
+## Convenient targets for use by the CVS repository meister.
+##
+#update_preview_tag:     iamoncrater
+#      cvs -d /cvs rtag -a -F DragonFly_Preview src
 #
-# Convenient targets for use by the CVS repository meister.  
+#update_release1_2_slip_tag:     iamoncrater
+#      cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_2 DragonFly_RELEASE_1_2_Slip src
 #
-update_preview_tag:     iamoncrater
-       cvs -d /cvs rtag -a -F DragonFly_Preview src
-
-update_release1_2_slip_tag:     iamoncrater
-       cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_2 DragonFly_RELEASE_1_2_Slip src
-
-update_release1_4_slip_tag:     iamoncrater
-       cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_4 DragonFly_RELEASE_1_4_Slip src
-
-update_release1_6_slip_tag:     iamoncrater
-       cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_6 DragonFly_RELEASE_1_6_Slip src
-
-update_release1_8_slip_tag:     iamoncrater
-       cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_8 DragonFly_RELEASE_1_8_Slip src
-
-update_release1_10_slip_tag:     iamoncrater
-       cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_10 DragonFly_RELEASE_1_10_Slip src
-
-update_release1_12_slip_tag:     iamoncrater
-       cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_12 DragonFly_RELEASE_1_12_Slip src
-
-update_release2_0_slip_tag:     iamoncrater
-       cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_2_0 DragonFly_RELEASE_2_0_Slip src
+#update_release1_4_slip_tag:     iamoncrater
+#      cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_4 DragonFly_RELEASE_1_4_Slip src
+#
+#update_release1_6_slip_tag:     iamoncrater
+#      cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_6 DragonFly_RELEASE_1_6_Slip src
+#
+#update_release1_8_slip_tag:     iamoncrater
+#      cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_8 DragonFly_RELEASE_1_8_Slip src
+#
+#update_release1_10_slip_tag:     iamoncrater
+#      cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_10 DragonFly_RELEASE_1_10_Slip src
+#
+#update_release1_12_slip_tag:     iamoncrater
+#      cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_12 DragonFly_RELEASE_1_12_Slip src
+#
+#update_release2_0_slip_tag:     iamoncrater
+#      cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_2_0 DragonFly_RELEASE_2_0_Slip src
 
 iamoncrater:
        @ [ "`hostname`" = "crater.dragonflybsd.org" ] || \
index 98c342d..47c6ed4 100644 (file)
 # $FreeBSD: src/sys/conf/newvers.sh,v 1.44.2.30 2003/04/04 07:02:46 murray Exp $
 # $DragonFly: src/sys/conf/newvers.sh,v 1.23 2008/07/14 04:01:44 dillon Exp $
 
-tag="\$Name:  $"
-
-# Extract the tag name, if any.
-#
-BRANCH=$(echo $tag | awk '{ print $2; }')
-
-# Remove any DragonFly_ prefix or _Slip suffix.  Release branches are 
-# typically extracted using a slip tag rather than the branch tag in order
-# to guarentee that the subversion file is synchronized with the files being
-# extracted.
+# Set the branch
 #
-BRANCH=${BRANCH#DragonFly_}
-BRANCH=${BRANCH%_Slip}
-
-# This case occurs if we have checked out without a tag (i.e. HEAD), either
-# implicitly or explicitly.
-#
-if [ "X${BRANCH}" = "X$" ]; then
-    BRANCH="DEVELOPMENT_2_1"
-fi
-if [ "X${BRANCH}" = "XHEAD" ]; then
-    BRANCH="DEVELOPMENT_2_1"
-fi
-if [ "X${BRANCH}" = "XPreview" ]; then
-    BRANCH="PREVIEW_2_1"
-    SHORTTAG="DEVELOPMENT_2_1"
-fi
-
-# This case occurs if the $Name:  $ field has not been expanded.
-#
-if [ "X${BRANCH}" = "X" ]; then
-    BRANCH="UNKNOWN"
-fi
+BRANCH="DEVELOPMENT_2_3"
 
 TYPE="DragonFly"
 
diff --git a/sys/conf/subvers-DEVELOPMENT_2_3 b/sys/conf/subvers-DEVELOPMENT_2_3
new file mode 100644 (file)
index 0000000..6d290b4
--- /dev/null
@@ -0,0 +1,3 @@
+# Subversion control for DragonFly 2.3.X-DEVELOPMENT
+#
+0      -
index 0265dca..4671736 100644 (file)
  * 200000 - 2.0 branch
  * 200100 - base development version after 2.0 branch
  * 200101 - lchflags syscall
+ * 200200 - 2.2 branch
+ * 200201 - base development version after 2.2 branch
  */
 #undef __DragonFly_version
-#define __DragonFly_version 200101     /* Master, propagated to newvers */
+#define __DragonFly_version 200201     /* Master, propagated to newvers */
 
 #ifdef __FreeBSD__
 /*