r4101 - in dists/trunk/scripts/test_kernel_build: . etc lib
Simon Horman
horms at costa.debian.org
Thu Sep 1 04:17:06 UTC 2005
Author: horms
Date: 2005-09-01 04:17:06 +0000 (Thu, 01 Sep 2005)
New Revision: 4101
Added:
dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.post
Modified:
dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf
dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.i386
dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.powerpc
dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.source
dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.unified
dists/trunk/scripts/test_kernel_build/lib/libtkb.framework
dists/trunk/scripts/test_kernel_build/lib/libtkb.generic
dists/trunk/scripts/test_kernel_build/test_kernel_build.i386
dists/trunk/scripts/test_kernel_build/test_kernel_build.powerpc
dists/trunk/scripts/test_kernel_build/test_kernel_build.source
dists/trunk/scripts/test_kernel_build/test_kernel_build.unified
Log:
works again
Modified: dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf
===================================================================
--- dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf 2005-09-01 03:58:37 UTC (rev 4100)
+++ dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf 2005-09-01 04:17:06 UTC (rev 4101)
@@ -31,13 +31,16 @@
SUBJECT="Kernel Build"
## Various directories
-SVN_BASE="${HOME}/work/debian-kernel/svn/kernel/trunk"
-#SVN_BASE="${HOME}/work/debian-kernel/svn/kernel/sarge-security"
+SVN_ROOT="${HOME}/work/debian-kernel/svn/kernel"
+SVN_BASE_SARGE_SECURITY="${SVN_ROOT}/dists/sarge-security"
+SVN_BASE_SARGE="${SVN_ROOT}/dists/sarge"
+SVN_BASE_SID="${SVN_ROOT}/dists/sid"
+SVN_BASE_TRUNK="${SVN_ROOT}/dists/trunk"
+SVN_SUBDIR_2_4="kernel-2.4"
+SVN_SUBDIR_2_6_UNUNIFIED="kernel"
+SVN_SUBDIR_2_6=""
BUILD_BASE="${HOME}/tmp/debian-kernel-test"
UPLOAD_BASE="${HOME}/public_html/linux/packages/testing"
UPLOAD_URL_BASE="http://debian.vergenet.net/testing"
-S_DOWNDLOAD_URL="http://tabatha.lab.ultramonkey.org/~horms/linux/packages/testing/kernel-source-$VERSION/"
-STAMP="${VERSION}"
-
fi # TKB_CONF
Modified: dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.i386
===================================================================
--- dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.i386 2005-09-01 03:58:37 UTC (rev 4100)
+++ dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.i386 2005-09-01 04:17:06 UTC (rev 4101)
@@ -6,7 +6,7 @@
if [ "$TKB_CONF_I386" != "YES" ]; then
TKB_CONF_I386="YES"
-. "$TKB_ETC_DIR/test_kernel_build.conf"
+. "$TKB_ETC_DIR/test_kernel_build.conf.post"
BUILD_TYPE="i386"
KERNEL_ARCH="i386"
Added: dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.post
===================================================================
--- dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.post 2005-09-01 03:58:37 UTC (rev 4100)
+++ dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.post 2005-09-01 04:17:06 UTC (rev 4101)
@@ -0,0 +1,13 @@
+#!/bin/bash
+######################################################################
+# Horms October 2004
+######################################################################
+
+if [ "$TKB_CONF_POST" != "YES" ]; then
+TKB_CONF_POST="YES"
+
+S_DOWNDLOAD_URL="http://tabatha.lab.ultramonkey.org/~horms/linux/packages/testing/kernel-source-$VERSION/"
+
+STAMP="${VERSION}"
+
+fi # TKB_CONF_POST
Modified: dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.powerpc
===================================================================
--- dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.powerpc 2005-09-01 03:58:37 UTC (rev 4100)
+++ dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.powerpc 2005-09-01 04:17:06 UTC (rev 4101)
@@ -6,7 +6,7 @@
if [ "$TKB_CONF_PPC" != "YES" ]; then
TKB_CONF_PPC="YES"
-. "$TKB_ETC_DIR/test_kernel_build.conf"
+. "$TKB_ETC_DIR/test_kernel_build.conf.post"
BUILD_TYPE="powerpc"
KERNEL_ARCH="powerpc"
Modified: dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.source
===================================================================
--- dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.source 2005-09-01 03:58:37 UTC (rev 4100)
+++ dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.source 2005-09-01 04:17:06 UTC (rev 4101)
@@ -6,7 +6,7 @@
if [ "$TKB_CONF_SOURCE" != "YES" ]; then
TKB_CONF_SOURCE="YES"
-. "$TKB_ETC_DIR/test_kernel_build.conf"
+. "$TKB_ETC_DIR/test_kernel_build.conf.post"
BUILD_TYPE="source"
Modified: dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.unified
===================================================================
--- dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.unified 2005-09-01 03:58:37 UTC (rev 4100)
+++ dists/trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.unified 2005-09-01 04:17:06 UTC (rev 4101)
@@ -6,17 +6,17 @@
if [ "$TKB_CONF_UNIFIED" != "YES" ]; then
TKB_CONF_UNIFIED="YES"
-. "$TKB_ETC_DIR/test_kernel_build.conf"
+. "$TKB_ETC_DIR/test_kernel_build.conf.post"
BUILD_TYPE="unified"
-S_SRC_BASE="$SVN_BASE/$SVN_SUBDIR/source"
+S_SRC_BASE="$SVN_BASE/$SVN_SUBDIR"
S_DST_BASE="$BUILD_BASE"
S_SRC_DIR="$S_SRC_BASE/linux-2.6"
S_DST_DIR="$S_DST_BASE/linux-2.6"
#S_PKG_DIR="$S_DST_DIR/linux-2.6-$VERSION"
-S_UPLOAD_DIR="$UPLOAD_BASE/linux-2.5"
+S_UPLOAD_DIR="$UPLOAD_BASE/linux-2.6"
S_UPLOAD_URL="$UPLOAD_URL_BASE/linux-2.6"
S_TMP_DIR="$S_DST_DIR/tmp"
S_LOG_DIR="$S_DST_DIR/log"
Modified: dists/trunk/scripts/test_kernel_build/lib/libtkb.framework
===================================================================
--- dists/trunk/scripts/test_kernel_build/lib/libtkb.framework 2005-09-01 03:58:37 UTC (rev 4100)
+++ dists/trunk/scripts/test_kernel_build/lib/libtkb.framework 2005-09-01 04:17:06 UTC (rev 4101)
@@ -8,8 +8,24 @@
usage ()
{
- echo "Usage: linux-2.6: $0 [START_STAGE] [END_STAGE]" 1>&2
- echo " otherwise: $0 VERSION [START_STAGE] [END_STAGE]" 1>&2
+ local NAME="$(basename $0)"
+
+ cat 1>&2 << __EOF__
+Usage:
+ linux-2.6: $NAME BRANCH [START_STAGE] [END_STAGE]
+ otherwise: $NAME VERSION BRANCH [START_STAGE] [END_STAGE]
+
+Where:
+ BRANCH is one of: sarge, stable, sarge-security, stable-security, etch,
+ testing, sid, unstable, experimental
+ VERSION is one of: 2.6, 2.6.8, and 2.4.27
+ 2.6 is the new single source packaging
+ 2.6.8 and 2.4.27 is the old sarge-style packaging
+ START_STAGE is a number >= 0 (default 0)
+ END_STAGE is a number >= START_STAGE (default 1000)
+
+__EOF__
+
exit 1
}
@@ -31,15 +47,13 @@
return
fi
local DISTRIBUTION=$(deb_distribution $1)
- local UPSTREAM=${PRISTINE_RELEASE%%-*}
- local PRISTINE_DEBVERSION=${PRISTINE_RELEASE#$UPSTREAM-}
+ local TAIL=${PRISTINE_RELEASE##*[a-z-]}
+ local HEAD=${PRISTINE_RELEASE%%$TAIL}
- if [ "$DISTRIBUTION" != "UNRELEASED" ] ||
- echo $PRISTINE_DEBVERSION | grep "[^0-9]" > /dev/null
- then
- echo "$UPSTREAM-$PRISTINE_DEBVERSION.$TAG_VERSION"
+ if [ "$DISTRIBUTION" != "UNRELEASED" -a -n "$TAIL" ]; then
+ echo "${HEAD}${TAIL}.$TAG_VERSION"
else
- echo "$UPSTREAM-$(($PRISTINE_DEBVERSION - 1)).$TAG_VERSION"
+ echo "${HEAD}$(($TAIL - 1)).$TAG_VERSION"
fi
}
Modified: dists/trunk/scripts/test_kernel_build/lib/libtkb.generic
===================================================================
--- dists/trunk/scripts/test_kernel_build/lib/libtkb.generic 2005-09-01 03:58:37 UTC (rev 4100)
+++ dists/trunk/scripts/test_kernel_build/lib/libtkb.generic 2005-09-01 04:17:06 UTC (rev 4101)
@@ -6,7 +6,7 @@
if [ "$LIBTKB_GENERIC" != "YES" ]; then
LIBTKB_GENERIC="YES"
-declare VERSION START_STAGE END_STAGE STAGE MAJOR_MINOR SVN_SUBDIR
+declare VERSION BRANCH START_STAGE END_STAGE STAGE MAJOR_MINOR SVN_SUBDIR
pre_conf_setup_generic ()
{
if ! which fakeroot >& /dev/null; then
@@ -14,31 +14,55 @@
exit 1
fi
- if [ $# -lt 1 -o $# -gt 3 ]; then
+ if [ $# -lt 2 -o $# -gt 4 ]; then
usage
fi
VERSION="$1"
+ BRANCH="$2"
- if [ $# -gt 1 ]; then
- START_STAGE=$2
+ if [ $# -gt 2 ]; then
+ START_STAGE=$3
else
START_STAGE=0
fi
- if [ $# -gt 2 ]; then
- END_STAGE=$3
+ if [ $# -gt 3 ]; then
+ END_STAGE=$4
else
END_STAGE=1000
fi
STAGE=0
+ case $BRANCH in
+ sarge|stable)
+ SVN_BASE="$SVN_BASE_SARGE"
+ ;;
+ sarge-security|stable-security)
+ SVN_BASE="$SVN_BASE_SARGE_SECURITY"
+ ;;
+ sid|etch|unstable|testing)
+ SVN_BASE="$SVN_BASE_SID"
+ ;;
+ trunk|experimental)
+ SVN_BASE="$SVN_BASE_TRUNK"
+ ;;
+ *)
+ echo "Unknown Branch" 1>&2
+ usage
+ ;;
+ esac
+
case $VERSION in
- 2.6|2.6.[0-9]*)
+ 2.6)
MAJOR_MINOR="2.6"
- SVN_SUBDIR="kernel"
+ SVN_SUBDIR="$SVN_SUBDIR_2_6"
;;
+ 2.6.[0-9]*)
+ MAJOR_MINOR="2.6"
+ SVN_SUBDIR="$SVN_SUBDIR_2_6_UNUNIFIED"
+ ;;
2.4.[0-9]*)
MAJOR_MINOR="2.4"
- SVN_SUBDIR="kernel-2.4"
+ SVN_SUBDIR="$SVN_SUBDIR_2_4"
;;
*)
echo "Unknown Version" 1>&2
@@ -53,6 +77,12 @@
trap pm_quit SIGHUP
trap pm_quit SIGTERM
trap pm_quit SIGQUIT
+
+ if [ ! -d "$SVN_BASE/$SVN_SUBDIR" ]; then
+ echo "Error: $SVN_BASE/$SVN_SUBDIR does not seem to exist" 1>&2
+ echo "Error: $VERSION $BRANCH does not seem to exist" 1>&2
+ exit 1
+ fi
}
fi # LIBTKB_GENERIC
Modified: dists/trunk/scripts/test_kernel_build/test_kernel_build.i386
===================================================================
--- dists/trunk/scripts/test_kernel_build/test_kernel_build.i386 2005-09-01 03:58:37 UTC (rev 4100)
+++ dists/trunk/scripts/test_kernel_build/test_kernel_build.i386 2005-09-01 04:17:06 UTC (rev 4101)
@@ -9,6 +9,7 @@
TKB_LIB_DIR="$TKB_BASE_DIR/lib"
TKB_ETC_DIR="$TKB_BASE_DIR/etc"
+. "$TKB_ETC_DIR/test_kernel_build.conf"
. "$TKB_LIB_DIR/libtkb.framework"
. "$TKB_LIB_DIR/libtkb.i386"
Modified: dists/trunk/scripts/test_kernel_build/test_kernel_build.powerpc
===================================================================
--- dists/trunk/scripts/test_kernel_build/test_kernel_build.powerpc 2005-09-01 03:58:37 UTC (rev 4100)
+++ dists/trunk/scripts/test_kernel_build/test_kernel_build.powerpc 2005-09-01 04:17:06 UTC (rev 4101)
@@ -9,6 +9,7 @@
TKB_LIB_DIR="$TKB_BASE_DIR/lib"
TKB_ETC_DIR="$TKB_BASE_DIR/etc"
+. "$TKB_ETC_DIR/test_kernel_build.conf"
. "$TKB_LIB_DIR/libtkb.framework"
. "$TKB_LIB_DIR/libtkb.powerpc"
Modified: dists/trunk/scripts/test_kernel_build/test_kernel_build.source
===================================================================
--- dists/trunk/scripts/test_kernel_build/test_kernel_build.source 2005-09-01 03:58:37 UTC (rev 4100)
+++ dists/trunk/scripts/test_kernel_build/test_kernel_build.source 2005-09-01 04:17:06 UTC (rev 4101)
@@ -9,6 +9,7 @@
TKB_LIB_DIR="$TKB_BASE_DIR/lib"
TKB_ETC_DIR="$TKB_BASE_DIR/etc"
+. "$TKB_ETC_DIR/test_kernel_build.conf"
. "$TKB_LIB_DIR/libtkb.framework"
. "$TKB_LIB_DIR/libtkb.source"
Modified: dists/trunk/scripts/test_kernel_build/test_kernel_build.unified
===================================================================
--- dists/trunk/scripts/test_kernel_build/test_kernel_build.unified 2005-09-01 03:58:37 UTC (rev 4100)
+++ dists/trunk/scripts/test_kernel_build/test_kernel_build.unified 2005-09-01 04:17:06 UTC (rev 4101)
@@ -9,6 +9,7 @@
TKB_LIB_DIR="$TKB_BASE_DIR/lib"
TKB_ETC_DIR="$TKB_BASE_DIR/etc"
+. "$TKB_ETC_DIR/test_kernel_build.conf"
. "$TKB_LIB_DIR/libtkb.framework"
. "$TKB_LIB_DIR/libtkb.source"
@@ -70,7 +71,7 @@
if [ -n "$RELEASE" ]; then
echo skip
else
- sed -e "s/^\(kernel-source-$VERSION\) ($S_DEB_VERSION) /\1 ($S_TAG_VERSION) /" \
+ sed -e "1 s/($S_DEB_VERSION)/($S_TAG_VERSION)/" \
< "$S_PKG_DIR/debian/changelog" \
> "$S_PKG_DIR/debian/changelog.2" && \
mv "$S_PKG_DIR/debian/changelog.2" \
@@ -107,7 +108,7 @@
stage_begin "$STAGE_NAME" || {
(
mkdir -p "$S_UPLOAD_DIR"
- cp -vp "$S_DST_DIR"/kernel-*_"${S_TAG_VERSION}"*.{deb,dsc,changes,diff.gz} \
+ cp -vp "$S_DST_DIR"/linux-*_"${S_TAG_VERSION}"*.{deb,dsc,changes,diff.gz} \
"$S_DST_DIR/linux-2.6_${S_UPSTREAM_VERSION}.orig.tar.gz" \
"$S_UPLOAD_DIR"
UP_LOG_DIR="$S_UPLOAD_DIR/linux-2.6_${S_UPSTREAM_VERSION}-${S_TAG_VERSION}_$KERNEL_ARCH.log"
More information about the Kernel-svn-changes
mailing list