[kernel] r4768 - in people/horms/test_kernel_build: . etc lib
Simon Horman
horms at costa.debian.org
Thu Nov 10 04:36:57 UTC 2005
Author: horms
Date: Thu Nov 10 04:36:56 2005
New Revision: 4768
Modified:
people/horms/test_kernel_build/etc/test_kernel_build.conf
people/horms/test_kernel_build/lib/libtkb.bin.generic
people/horms/test_kernel_build/lib/libtkb.generic
people/horms/test_kernel_build/lib/libtkb.source
people/horms/test_kernel_build/test_kernel_build.i386
people/horms/test_kernel_build/test_kernel_build.old
people/horms/test_kernel_build/test_kernel_build.powerpc
people/horms/test_kernel_build/test_kernel_build.source
people/horms/test_kernel_build/test_kernel_build.unified
people/horms/test_kernel_build/test_kernel_build_all
Log:
Add buildops, vairous fixes
Modified: people/horms/test_kernel_build/etc/test_kernel_build.conf
==============================================================================
--- people/horms/test_kernel_build/etc/test_kernel_build.conf (original)
+++ people/horms/test_kernel_build/etc/test_kernel_build.conf Thu Nov 10 04:36:56 2005
@@ -35,6 +35,7 @@
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_ETCH="${SVN_ROOT}/dists/etch"
SVN_BASE_TRUNK="${SVN_ROOT}/dists/trunk"
SVN_SUBDIR_2_4="kernel-2.4"
SVN_SUBDIR_2_6_UNUNIFIED="kernel"
@@ -43,4 +44,6 @@
UPLOAD_BASE="${HOME}/public_html/linux/packages/testing"
UPLOAD_URL_BASE="http://debian.vergenet.net/testing"
+DEBBUILDOPTS_BASE="-rfakeroot -us -uc"
+
fi # TKB_CONF
Modified: people/horms/test_kernel_build/lib/libtkb.bin.generic
==============================================================================
--- people/horms/test_kernel_build/lib/libtkb.bin.generic (original)
+++ people/horms/test_kernel_build/lib/libtkb.bin.generic Thu Nov 10 04:36:56 2005
@@ -47,6 +47,13 @@
log "Using: kernel-source $S_TAG_VERSION"
log "Building: $KERNEL_PKG_NAME-$KERNEL_ARCH $B_DEB_VERSION -> $B_TAG_VERSION"
fi
+ log "Building: Base options to dpkg-buildpackage: \"$DEBBUILDOPTS_BASE\""
+ if [ -n "$DEBBUILDOPTS" ]; then
+ log "Building: User supplied options to dpkg-buildpackage: \"$DEBBUILDOPTS\""
+ log "Building: Over-ride DEBBUILDOPTS in envornment to alter"
+ else
+ log "Building: Set DEBBUILDOPTS in envornment to add options"
+ fi
}
Modified: people/horms/test_kernel_build/lib/libtkb.generic
==============================================================================
--- people/horms/test_kernel_build/lib/libtkb.generic (original)
+++ people/horms/test_kernel_build/lib/libtkb.generic Thu Nov 10 04:36:56 2005
@@ -39,9 +39,12 @@
sarge-security|stable-security)
SVN_BASE="$SVN_BASE_SARGE_SECURITY"
;;
- sid|etch|unstable|testing)
+ sid|unstable)
SVN_BASE="$SVN_BASE_SID"
;;
+ etch|testing)
+ SVN_BASE="$SVN_BASE_ETCH"
+ ;;
trunk|experimental)
SVN_BASE="$SVN_BASE_TRUNK"
;;
Modified: people/horms/test_kernel_build/lib/libtkb.source
==============================================================================
--- people/horms/test_kernel_build/lib/libtkb.source (original)
+++ people/horms/test_kernel_build/lib/libtkb.source Thu Nov 10 04:36:56 2005
@@ -35,6 +35,13 @@
log "Building: TAG_VERSION=\"$TAG_VERSION\", override in environment"
log "Building: kernel-source $S_DEB_VERSION -> $S_TAG_VERSION"
fi
+ log "Building: Base options to dpkg-buildpackage: \"$DEBBUILDOPTS_BASE\""
+ if [ -n "$DEBBUILDOPTS" ]; then
+ log "Building: User supplied options to dpkg-buildpackage: \"$DEBBUILDOPTS\""
+ log "Building: Over-ride DEBBUILDOPTS in envornment to alter"
+ else
+ log "Building: Set DEBBUILDOPTS in envornment to add options"
+ fi
}
fi # LIBTKB_SOURCE
Modified: people/horms/test_kernel_build/test_kernel_build.i386
==============================================================================
--- people/horms/test_kernel_build/test_kernel_build.i386 (original)
+++ people/horms/test_kernel_build/test_kernel_build.i386 Thu Nov 10 04:36:56 2005
@@ -106,7 +106,7 @@
stage_begin "$STAGE_NAME" || {
(
cd $B_PKG_DIR && \
- time dpkg-buildpackage -rfakeroot -us -uc
+ time dpkg-buildpackage -rfakeroot -us -uc $DEBBUILDOPTS
) >& "$LOG.$STAGE"
stage_end $?
}
Modified: people/horms/test_kernel_build/test_kernel_build.old
==============================================================================
--- people/horms/test_kernel_build/test_kernel_build.old (original)
+++ people/horms/test_kernel_build/test_kernel_build.old Thu Nov 10 04:36:56 2005
@@ -402,7 +402,7 @@
stage_begin "$STAGE_NAME" || {
(
cd "$S_PKG_DIR" && \
- dpkg-buildpackage -us -uc -rfakeroot
+ dpkg-buildpackage -us -uc -rfakeroot $DEBBUILDOPTS
) >& "$LOG.$STAGE"
stage_end $?
}
Modified: people/horms/test_kernel_build/test_kernel_build.powerpc
==============================================================================
--- people/horms/test_kernel_build/test_kernel_build.powerpc (original)
+++ people/horms/test_kernel_build/test_kernel_build.powerpc Thu Nov 10 04:36:56 2005
@@ -107,7 +107,7 @@
stage_begin "$STAGE_NAME" || {
(
cd $B_PKG_DIR && \
- time dpkg-buildpackage -rfakeroot -us -uc
+ time dpkg-buildpackage -rfakeroot -us -uc $DEBBUILDOPTS
) >& "$LOG.$STAGE"
stage_end $?
}
Modified: people/horms/test_kernel_build/test_kernel_build.source
==============================================================================
--- people/horms/test_kernel_build/test_kernel_build.source (original)
+++ people/horms/test_kernel_build/test_kernel_build.source Thu Nov 10 04:36:56 2005
@@ -94,7 +94,7 @@
stage_begin "$STAGE_NAME" || {
(
cd "$S_PKG_DIR" && \
- dpkg-buildpackage -us -uc -rfakeroot
+ dpkg-buildpackage -us -uc -rfakeroot $DEBBUILDOPTS
) >& "$LOG.$STAGE"
stage_end $?
}
Modified: people/horms/test_kernel_build/test_kernel_build.unified
==============================================================================
--- people/horms/test_kernel_build/test_kernel_build.unified (original)
+++ people/horms/test_kernel_build/test_kernel_build.unified Thu Nov 10 04:36:56 2005
@@ -20,6 +20,15 @@
post_conf_setup_source
S_PKG_DIR="$S_DST_DIR/linux-2.6-$S_UPSTREAM_VERSION"
+gen_control ()
+{
+ ( cd "$S_PKG_DIR" && \
+ rm -f debian/control.md5sum debian/control debian/rules.gen && \
+ debian/rules debian/control debian/rules.gen || \
+ debian/rules debian/control debian/rules.gen || \
+ debian/rules debian/control debian/rules.gen; )
+}
+
LOG="$S_LOG"
purgelog
DST_DIR="$S_DST_DIR"
@@ -60,9 +69,7 @@
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 || \
- debian/rules debian/control; ) && \
+ gen_control && \
echo "Do not remove this line. " > "$S_PKG_DIR/debian/official"
} >& "$LOG.$STAGE"
stage_end $?
@@ -72,7 +79,7 @@
fi | tee -a "$LOG.$STAGE"
}
-STAGE_NAME="Mangling linux-2.6 debian/{control,patches/series/}"
+STAGE_NAME="Mangling linux-2.6 debian/{changelog,patches/series/}"
stage_begin "$STAGE_NAME" || {
{
if [ -n "$RELEASE" ]; then
@@ -85,7 +92,8 @@
"$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-debian/series/$S_TAG_VERSION"
+ "$S_PKG_DIR/debian/patches-debian/series/$S_TAG_VERSION" && \
+ gen_control
fi
} >& "$LOG.$STAGE"
stage_end $?
@@ -95,9 +103,17 @@
STAGE_NAME="Patching linux-2.6 tree"
stage_begin "$STAGE_NAME" || {
(
+ # Make sure the contol file is up to date,
+ # else the build falls over
+ gen_control && \
+ cd "$S_PKG_DIR/debian/patches-debian/series" && \
+ REV=""; for i in $S_UPSTREAM_VERSION-*; do \
+ REV="$REV ${i#$S_UPSTREAM_VERSION-}" || break; \
+ done &&
cd "$S_PKG_DIR" && \
- home="$S_PKG_DIR/debian/patches-debian" \
- override_version=$S_TAG_VERSION \
+ home="$S_PKG_DIR/debian/patches-debian" \
+ override_version="$S_TAG_VERSION" \
+ override_revisions="$REV" \
sh ./debian/bin/apply
) >& "$LOG.$STAGE"
stage_end $?
@@ -107,36 +123,45 @@
stage_begin "$STAGE_NAME" || {
(
# have to unpatch first, else the build falls over
+ cd "$S_PKG_DIR/debian/patches-debian/series" && \
+ REV=""; for i in $S_UPSTREAM_VERSION-*; do \
+ REV="$REV ${i#$S_UPSTREAM_VERSION-}" || break; \
+ done &&
cd "$S_PKG_DIR" && \
home="$S_PKG_DIR/debian/patches-debian" \
- override_version=$S_UPSTREAM_VERSION \
- sh ./debian/bin/apply && \
- dpkg-buildpackage -us -uc -rfakeroot
+ override_version=$S_TAG_VERSION \
+ override_revisions="$REV" \
+ sh ./debian/bin/apply $S_UPSTREAM_VERSION-0 && \
+ dpkg-buildpackage -us -uc -rfakeroot $DEBBUILDOPTS
) >& "$LOG.$STAGE"
stage_end $?
}
STAGE_NAME="Uploading Kernel Source"
stage_begin "$STAGE_NAME" || {
- (
- mkdir -p "$S_UPLOAD_DIR"
+ {
+ UDIR="${S_UPLOAD_DIR}_$S_TAG_VERSION"
+ mkdir -p "$UDIR"
cp -vp "$S_DST_DIR"/linux-*_"${S_TAG_VERSION}"*.{deb,dsc,changes,diff.gz} \
+ "$S_DST_DIR"/kernel-*-2.6*_"${S_TAG_VERSION}"*.deb \
"$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"
+ "$UDIR"
+ UP_LOG_DIR="$UDIR/linux-2.6_${S_UPSTREAM_VERSION}-${S_TAG_VERSION}.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 | \
+ (cd "$UDIR" && dpkg-scansources . /dev/null | \
gzip --best > Sources.gz ; )
- (cd "$S_UPLOAD_DIR" && dpkg-scanpackages . /dev/null | \
+ (cd "$UDIR" && 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"
+ print_readme_html "$UDIR" > "$UDIR/README.html"
+ (cd "$UDIR/.." && rm -f linux-2.6-snapshot && \
+ ln -s ${UDIR##*/} linux-2.6-snapshot; )
+ chmod -R a+rX "$UDIR" "$UDIR/../linux-2.6-snapshot"
+ } >& "$LOG.$STAGE"
stage_end $?
}
STAGE_STATUS="ok"
-exit
+&& exit
Modified: people/horms/test_kernel_build/test_kernel_build_all
==============================================================================
--- people/horms/test_kernel_build/test_kernel_build_all (original)
+++ people/horms/test_kernel_build/test_kernel_build_all Thu Nov 10 04:36:56 2005
@@ -1,8 +1,20 @@
#!/bin/bash
BASE="/home/horms/work/debian-kernel/test_kernel_build"
-
TAG_VERSION="SOURCE"
-for i in 2.6.8 2.4.27 2.6.11; do
- cd $BASE && TAG_VERSION=SOURCE ./test_kernel_build.powerpc $i
-done
+cd "$BASE"
+
+./test_kernel_build.source 2.4.27 trunk && \
+ ./test_kernel_build.i386 2.4.27 trunk
+
+./test_kernel_build.source 2.4.27 sarge-security && \
+ ./test_kernel_build.i386 2.4.27 sarge-security
+
+./test_kernel_build.source 2.6.8 sarge && \
+ ./test_kernel_build.i386 2.6.8 sarge
+
+./test_kernel_build.source 2.6.8 sarge-security && \
+ ./test_kernel_build.i386 2.6.8 sarge-security
+
+./test_kernel_build.unified experimental
+
More information about the Kernel-svn-changes
mailing list