r3867 - in trunk/scripts/test_kernel_build: . etc lib
Simon Horman
horms at costa.debian.org
Mon Aug 15 08:29:55 UTC 2005
Author: horms
Date: 2005-08-15 08:29:55 +0000 (Mon, 15 Aug 2005)
New Revision: 3867
Added:
trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.unified
trunk/scripts/test_kernel_build/test_kernel_build.unified
Modified:
trunk/scripts/test_kernel_build/lib/libtkb.bin.generic
trunk/scripts/test_kernel_build/lib/libtkb.framework
trunk/scripts/test_kernel_build/lib/libtkb.generic
trunk/scripts/test_kernel_build/lib/libtkb.source
Log:
Build new single source packages
Copied: trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.unified (from rev 3865, trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.source)
===================================================================
--- trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.source 2005-08-15 06:24:04 UTC (rev 3865)
+++ trunk/scripts/test_kernel_build/etc/test_kernel_build.conf.unified 2005-08-15 08:29:55 UTC (rev 3867)
@@ -0,0 +1,25 @@
+#!/bin/bash
+######################################################################
+# Horms August 2005
+######################################################################
+
+if [ "$TKB_CONF_UNIFIED" != "YES" ]; then
+TKB_CONF_UNIFIED="YES"
+
+. "$TKB_ETC_DIR/test_kernel_build.conf"
+
+BUILD_TYPE="unified"
+
+S_SRC_BASE="$SVN_BASE/$SVN_SUBDIR/source"
+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_URL="$UPLOAD_URL_BASE/linux-2.6"
+S_TMP_DIR="$S_DST_DIR/tmp"
+S_LOG_DIR="$S_DST_DIR/log"
+S_LOG="$S_LOG_DIR/linux-2.6-$STAMP.log"
+
+fi # TKB_CONF_UNIFIED
Modified: trunk/scripts/test_kernel_build/lib/libtkb.bin.generic
===================================================================
--- trunk/scripts/test_kernel_build/lib/libtkb.bin.generic 2005-08-15 08:24:06 UTC (rev 3866)
+++ trunk/scripts/test_kernel_build/lib/libtkb.bin.generic 2005-08-15 08:29:55 UTC (rev 3867)
@@ -20,6 +20,7 @@
#N.B: this may not be in debian package order
S_TAG_VERSION="$(wget -O - -qnv $S_DOWNDLOAD_URL | sed -ne 's/.*kernel-tree-'${VERSION}'_\([^_]*\).*/\1/ p' | sort -n | tail -1)"
+ B_UPSTREAM_VERSION=$(upstream_version "$B_SRC_DIR")
B_DEB_VERSION=$(deb_version "$B_SRC_DIR")
if [ -z "$TAG_VERSION" ]; then
if [ -s "$TAG_RELEASE" ]; then
Modified: trunk/scripts/test_kernel_build/lib/libtkb.framework
===================================================================
--- trunk/scripts/test_kernel_build/lib/libtkb.framework 2005-08-15 08:24:06 UTC (rev 3866)
+++ trunk/scripts/test_kernel_build/lib/libtkb.framework 2005-08-15 08:29:55 UTC (rev 3867)
@@ -8,7 +8,8 @@
usage ()
{
- echo "Usage: $0 VERSION [START_STAGE] [END_STAGE]" 1>&2
+ echo "Usage: linux-2.6: $0 [START_STAGE] [END_STAGE]" 1>&2
+ echo " otherwise: $0 VERSION [START_STAGE] [END_STAGE]" 1>&2
exit 1
}
@@ -42,6 +43,12 @@
fi
}
+upstream_version ()
+{
+ local PRISTINE_RELEASE=$(deb_version $1)
+ echo ${PRISTINE_RELEASE%%-*}
+}
+
declare KSC_TMP
kernel_symbol_check_clean ()
{
Modified: trunk/scripts/test_kernel_build/lib/libtkb.generic
===================================================================
--- trunk/scripts/test_kernel_build/lib/libtkb.generic 2005-08-15 08:24:06 UTC (rev 3866)
+++ trunk/scripts/test_kernel_build/lib/libtkb.generic 2005-08-15 08:29:55 UTC (rev 3867)
@@ -18,6 +18,7 @@
usage
fi
VERSION="$1"
+
if [ $# -gt 1 ]; then
START_STAGE=$2
else
@@ -31,7 +32,7 @@
STAGE=0
case $VERSION in
- 2.6.[0-9]*)
+ 2.6|2.6.[0-9]*)
MAJOR_MINOR="2.6"
SVN_SUBDIR="kernel"
;;
Modified: trunk/scripts/test_kernel_build/lib/libtkb.source
===================================================================
--- trunk/scripts/test_kernel_build/lib/libtkb.source 2005-08-15 08:24:06 UTC (rev 3866)
+++ trunk/scripts/test_kernel_build/lib/libtkb.source 2005-08-15 08:29:55 UTC (rev 3867)
@@ -23,6 +23,7 @@
S_DEB_VERSION=$(deb_version "$S_SRC_DIR")
S_TAG_VERSION=$(tag_version "$S_SRC_DIR")
+ S_UPSTREAM_VERSION=$(upstream_version "$S_SRC_DIR")
log "Building as $(whoami)@$(hostname) (this will be included in dmsg)";
if [ -n "$RELEASE" ]; then
Copied: trunk/scripts/test_kernel_build/test_kernel_build.unified (from rev 3865, trunk/scripts/test_kernel_build/test_kernel_build.source)
===================================================================
--- trunk/scripts/test_kernel_build/test_kernel_build.source 2005-08-15 06:24:04 UTC (rev 3865)
+++ trunk/scripts/test_kernel_build/test_kernel_build.unified 2005-08-15 08:29:55 UTC (rev 3867)
@@ -0,0 +1,128 @@
+#!/bin/bash
+######################################################################
+# Horms August 2005
+######################################################################
+
+set -e
+
+TKB_BASE_DIR="$HOME/work/debian-kernel/test_kernel_build"
+TKB_LIB_DIR="$TKB_BASE_DIR/lib"
+TKB_ETC_DIR="$TKB_BASE_DIR/etc"
+
+. "$TKB_LIB_DIR/libtkb.framework"
+. "$TKB_LIB_DIR/libtkb.source"
+
+pre_conf_setup_generic 2.6 $@
+
+. "$TKB_ETC_DIR/test_kernel_build.conf.unified"
+
+post_conf_setup_source
+S_PKG_DIR="$S_DST_DIR/linux-2.6-$S_UPSTREAM_VERSION"
+
+LOG="$S_LOG"
+purgelog
+DST_DIR="$S_DST_DIR"
+STAGE_NAME="Creating linux-2.6 directory"
+stage_begin "$STAGE_NAME" || {
+ {
+ rm -rf "$S_DST_DIR" "$S_PKG_DIR" "$S_TMP_DIR" "$S_LOG_DIR"
+ mkdir -p "$S_DST_DIR" "$S_TMP_DIR" "$S_LOG_DIR"
+ }
+ stage_end $?
+}
+openlog
+log "Logs in $LOG.blah"
+
+STAGE_NAME="Fetching kernel-source tarball from debian archive"
+stage_begin "$STAGE_NAME" || {
+ (
+ cd "$DST_DIR" && \
+ apt-get source -d -q=1 "linux-2.6" && \
+ tar -zxf "linux-2.6_${S_UPSTREAM_VERSION}.orig.tar.gz" && \
+ test ! -d "linux-2.6-${S_UPSTREAM_VERSION}.orig" || \
+ mv "linux-2.6-${S_UPSTREAM_VERSION}.orig" \
+ "linux-2.6-${S_UPSTREAM_VERSION}"
+ ) >& "$LOG.$STAGE"
+ stage_end $?
+}
+
+STAGE_NAME="Copying linux-2.6 debian directory"
+stage_begin "$STAGE_NAME" || {
+ {
+ ( cd "$S_SRC_DIR/" && svn status; ) > "$LOG.$STAGE.svn" && \
+ rsync -av --exclude .svn --exclude ".*.sw[a-z]" \
+ "$S_SRC_DIR/" "$S_PKG_DIR/" && \
+ chmod u+x "$S_PKG_DIR/debian/rules" && \
+ ( cd "$S_PKG_DIR" && debian/rules debian/control || \
+ debian/rules debian/control; ) && \
+ echo "Do not remove this line. " > "$S_PKG_DIR/debian/official"
+ } >& "$LOG.$STAGE"
+ stage_end $?
+ if [ -s "$LOG.$STAGE.svn" ]; then
+ echo "=== SVN file stauts ==="
+ cat "$LOG.$STAGE.svn"
+ fi | tee -a "$LOG.$STAGE"
+}
+
+STAGE_NAME="Mangling linux-2.6 debian/{control,patches/series/}"
+stage_begin "$STAGE_NAME" || {
+ {
+ if [ -n "$RELEASE" ]; then
+ echo skip
+ else
+ sed -e "s/^\(kernel-source-$VERSION\) ($S_DEB_VERSION) /\1 ($S_TAG_VERSION) /" \
+ < "$S_PKG_DIR/debian/changelog" \
+ > "$S_PKG_DIR/debian/changelog.2" && \
+ mv "$S_PKG_DIR/debian/changelog.2" \
+ "$S_PKG_DIR/debian/changelog" && \
+ [ ! -f "$S_PKG_DIR/debian/patches-debian/series/$S_DEB_VERSION" ] || \
+ mv "$S_PKG_DIR/debian/patches-debian/series/$S_DEB_VERSION" \
+ "$S_PKG_DIR/debian/patches/series/$S_TAG_VERSION"
+ fi
+ } >& "$LOG.$STAGE"
+ stage_end $?
+}
+
+
+STAGE_NAME="Patching linux-2.6 tree"
+stage_begin "$STAGE_NAME" || {
+ (
+ cd "$S_PKG_DIR" && \
+ ./debian/rules patch
+ ) >& "$LOG.$STAGE"
+ stage_end $?
+}
+
+STAGE_NAME="Build linux-2.6 package"
+stage_begin "$STAGE_NAME" || {
+ (
+ cd "$S_PKG_DIR" && \
+ dpkg-buildpackage -us -uc -rfakeroot
+ ) >& "$LOG.$STAGE"
+ stage_end $?
+}
+
+STAGE_NAME="Uploading Kernel Source"
+stage_begin "$STAGE_NAME" || {
+ (
+ mkdir -p "$S_UPLOAD_DIR"
+ cp -vp "$S_DST_DIR"/kernel-*_"${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"
+ mkdir -p "$UP_LOG_DIR"
+ rm -f "$UP_LOG_DIR/"*.bz2
+ cp -p "$S_DST_DIR/log/"* "$UP_LOG_DIR"
+ bzip2 --best "$UP_LOG_DIR/"*
+ (cd "$S_UPLOAD_DIR" && dpkg-scansources . /dev/null | \
+ gzip --best > Sources.gz ; )
+ (cd "$S_UPLOAD_DIR" && dpkg-scanpackages . /dev/null | \
+ gzip --best > Packages.gz; )
+ print_readme_html "$S_UPLOAD_URL" > "$S_UPLOAD_DIR/README.html"
+ chmod -R a+rX "$S_UPLOAD_DIR"
+ ) >& "$LOG.$STAGE"
+ stage_end $?
+}
+
+STAGE_STATUS="ok"
+exit
More information about the Kernel-svn-changes
mailing list