[Pkg-lustre-svn-commit] r444 - /trunk/debian/patches/ /trunk/ldiskfs/kernel_patches/patches/ /trunk/lustre/kernel_patches/patches/ /utils/
goswin-guest at users.alioth.debian.org
goswin-guest at users.alioth.debian.org
Thu Feb 14 14:53:26 UTC 2008
Author: goswin-guest
Date: Thu Feb 14 14:53:26 2008
New Revision: 444
URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=444
Log:
Add parentage header into forked patches.
Add script to check for changes in parent patches.
Added:
utils/check-patch (with props)
utils/check-patches (with props)
Modified:
trunk/debian/patches/libsysio.dpatch
trunk/ldiskfs/kernel_patches/patches/ext3-extents-2.6.22-vanilla_from_l1642.patch
trunk/ldiskfs/kernel_patches/patches/ext3-ialloc-2.6.22_from_l1642_1.6.patch
trunk/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.22-vanilla_from_l1642.patch
trunk/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6.22-vanilla_from_l1642.patch
trunk/ldiskfs/kernel_patches/patches/ext3-nlinks-2.6.21_from_l1642_1.6.9.patch
trunk/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.22_from_l16422.patch
trunk/lustre/kernel_patches/patches/jbd-stats-2.6.22-vanilla-from-l1642_2.6-rhel5.patch
Modified: trunk/debian/patches/libsysio.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/libsysio.dpatch?rev=444&op=diff
==============================================================================
--- trunk/debian/patches/libsysio.dpatch (original)
+++ trunk/debian/patches/libsysio.dpatch Thu Feb 14 14:53:26 2008
@@ -1,4 +1,4 @@
-^#! /bin/sh /usr/share/dpatch/dpatch-run
+#! /bin/sh /usr/share/dpatch/dpatch-run
## libsysio.dpatch by Goswin von Brederlow <goswin-v-b at web.de>
##
## All lines beginning with `## DP:' are a description of the patch.
Modified: trunk/ldiskfs/kernel_patches/patches/ext3-extents-2.6.22-vanilla_from_l1642.patch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/ldiskfs/kernel_patches/patches/ext3-extents-2.6.22-vanilla_from_l1642.patch?rev=444&op=diff
==============================================================================
--- trunk/ldiskfs/kernel_patches/patches/ext3-extents-2.6.22-vanilla_from_l1642.patch (original)
+++ trunk/ldiskfs/kernel_patches/patches/ext3-extents-2.6.22-vanilla_from_l1642.patch Thu Feb 14 14:53:26 2008
@@ -1,3 +1,9 @@
+## Name: ext3-extents
+## Author: Goswin von Brederlow <goswin-v-b at web.de>
+## Parent-Name: ext3-extents-2.6.18-vanilla.patch
+## Parent-Version: 1.6.4.2
+## Parent-MD5: d65044cba22cafe745cc0c573989feb0
+
Index: linux-stage/fs/ext3/dir.c
===================================================================
--- linux-stage.orig/fs/ext3/dir.c 2008-02-13 16:07:38.000000000 +0100
Modified: trunk/ldiskfs/kernel_patches/patches/ext3-ialloc-2.6.22_from_l1642_1.6.patch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/ldiskfs/kernel_patches/patches/ext3-ialloc-2.6.22_from_l1642_1.6.patch?rev=444&op=diff
==============================================================================
--- trunk/ldiskfs/kernel_patches/patches/ext3-ialloc-2.6.22_from_l1642_1.6.patch (original)
+++ trunk/ldiskfs/kernel_patches/patches/ext3-ialloc-2.6.22_from_l1642_1.6.patch Thu Feb 14 14:53:26 2008
@@ -1,3 +1,9 @@
+## Name: ext3-ialloc
+## Author: Goswin von Brederlow <goswin-v-b at web.de>
+## Parent-Name: ext3-ialloc-2.6.patch
+## Parent-Version: 1.6.4.2
+## Parent-MD5: 4f288bce52d2136482956a93c64bb911
+
Index: linux-stage/fs/ext3/ialloc.c
===================================================================
--- linux-stage.orig/fs/ext3/ialloc.c 2008-02-11 20:01:59.000000000 +0100
Modified: trunk/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.22-vanilla_from_l1642.patch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.22-vanilla_from_l1642.patch?rev=444&op=diff
==============================================================================
--- trunk/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.22-vanilla_from_l1642.patch (original)
+++ trunk/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.22-vanilla_from_l1642.patch Thu Feb 14 14:53:26 2008
@@ -1,3 +1,9 @@
+## Name: ext3-mmp
+## Author: Goswin von Brederlow <goswin-v-b at web.de>
+## Parent-Name: ext3-mmp-2.6.18-vanilla.patch
+## Parent-Version: 1.6.4.2
+## Parent-MD5: 77e56969d4bc1ccb2a5322679506d98a
+
Index: linux-stage/fs/ext3/super.c
===================================================================
--- linux-stage.orig/fs/ext3/super.c 2008-02-12 17:21:07.000000000 +0100
Modified: trunk/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6.22-vanilla_from_l1642.patch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6.22-vanilla_from_l1642.patch?rev=444&op=diff
==============================================================================
--- trunk/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6.22-vanilla_from_l1642.patch (original)
+++ trunk/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6.22-vanilla_from_l1642.patch Thu Feb 14 14:53:26 2008
@@ -1,3 +1,9 @@
+## Name: ext3-nanosecond
+## Author: Goswin von Brederlow <goswin-v-b at web.de>
+## Parent-Name: ext3-nanosecond-2.6.18-vanilla.patch
+## Parent-Version: 1.6.4.2
+## Parent-MD5: de8bb21f71140eb336b2a238455e6ff4
+
Index: linux-stage/fs/ext3/ialloc.c
===================================================================
--- linux-stage.orig/fs/ext3/ialloc.c 2008-02-11 19:48:51.000000000 +0100
Modified: trunk/ldiskfs/kernel_patches/patches/ext3-nlinks-2.6.21_from_l1642_1.6.9.patch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/ldiskfs/kernel_patches/patches/ext3-nlinks-2.6.21_from_l1642_1.6.9.patch?rev=444&op=diff
==============================================================================
--- trunk/ldiskfs/kernel_patches/patches/ext3-nlinks-2.6.21_from_l1642_1.6.9.patch (original)
+++ trunk/ldiskfs/kernel_patches/patches/ext3-nlinks-2.6.21_from_l1642_1.6.9.patch Thu Feb 14 14:53:26 2008
@@ -1,3 +1,9 @@
+## Name: ext3-nlinks
+## Author: Goswin von Brederlow <goswin-v-b at web.de>
+## Parent-Name: ext3-nlinks-2.6.9.patch
+## Parent-Version: 1.6.4.2
+## Parent-MD5: e3b399570ddd5d9eac9f3f09f321d7d0
+
Index: linux-stage/fs/ext3/namei.c
===================================================================
--- linux-stage.orig/fs/ext3/namei.c 2008-02-11 19:42:33.000000000 +0100
Modified: trunk/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.22_from_l16422.patch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.22_from_l16422.patch?rev=444&op=diff
==============================================================================
--- trunk/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.22_from_l16422.patch (original)
+++ trunk/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.22_from_l16422.patch Thu Feb 14 14:53:26 2008
@@ -1,3 +1,9 @@
+## Name: ext3-uninit
+## Author: Goswin von Brederlow <goswin-v-b at web.de>
+## Parent-Name: ext3-uninit-2.6.18.patch
+## Parent-Version: 1.6.4.2
+## Parent-MD5: 8a457bebe1068f63ab58863f6c8d377a
+
Add support for the uninit_groups feature to the kernel.
Keep a high water mark of used inodes for each group to improve e2fsck time.
Modified: trunk/lustre/kernel_patches/patches/jbd-stats-2.6.22-vanilla-from-l1642_2.6-rhel5.patch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/lustre/kernel_patches/patches/jbd-stats-2.6.22-vanilla-from-l1642_2.6-rhel5.patch?rev=444&op=diff
==============================================================================
--- trunk/lustre/kernel_patches/patches/jbd-stats-2.6.22-vanilla-from-l1642_2.6-rhel5.patch (original)
+++ trunk/lustre/kernel_patches/patches/jbd-stats-2.6.22-vanilla-from-l1642_2.6-rhel5.patch Thu Feb 14 14:53:26 2008
@@ -1,3 +1,9 @@
+## Name: jdb-stats-2.6.22-vanilla.patch
+## Author: Goswin von Brederlow <goswin-v-b at web.de>
+## Parent-Name: jbd-stats-2.6-rhel5.patch
+## Parent-Version: 1.6.4.2
+## Parent-MD5: 82be0fb099d5e37b4f9494730016327b
+
Index: linux-2.6.22.18.patch.lustre.1.6/include/linux/jbd.h
===================================================================
--- linux-2.6.22.18.patch.lustre.1.6.orig/include/linux/jbd.h 2008-02-12 19:08:14.000000000 +0100
Added: utils/check-patch
URL: http://svn.debian.org/wsvn/pkg-lustre/utils/check-patch?rev=444&op=file
==============================================================================
--- utils/check-patch (added)
+++ utils/check-patch Thu Feb 14 14:53:26 2008
@@ -1,0 +1,39 @@
+#!/bin/sh
+#
+# check-patch [-v] <patch>
+#
+# Check a patch for updates in its parent
+
+set -e
+
+if [ "$1" = "-v" ]; then
+ VERBOSE="echo"
+ shift
+else
+ VERBOSE=":"
+fi
+
+if [ "$#" -ne 1 ]; then
+ echo "Usage: check-patch [-v] <patch>"
+ exit 1
+fi
+
+PATCHDIR="$(dirname "$1")"
+PATCHNAME="$(basename "$1")"
+
+PARENTNAME="$(grep "^## Parent-Name:" $PATCHDIR/$PATCHNAME | cut -d: -f2- | xargs)"
+PARENTVERSION="$(grep "^## Parent-Version:" $PATCHDIR/$PATCHNAME | cut -d: -f2- | xargs)"
+PARENTMD5="$(grep "^## Parent-MD5:" $PATCHDIR/$PATCHNAME | cut -d: -f2- | xargs)"
+
+NOWMD5="$(md5sum "$PATCHDIR/$PARENTNAME" | cut -b-32)"
+
+if ! [ "$PARENTMD5" = "$NOWMD5" ]; then
+ echo "$PATCHDIR/$PATCHNAME needs updating"
+ echo " Parent-Name: $PARENTNAME"
+ echo " Parent-Version: $PARENTVERSION"
+ echo " Parent-MD5: $PARENTMD5"
+ echo " MD5 is now: $NOWMD5"
+ exit 1
+fi
+
+$VERBOSE "$PATCHDIR/$PATCHNAME is current"
Propchange: utils/check-patch
------------------------------------------------------------------------------
svn:executable = *
Added: utils/check-patches
URL: http://svn.debian.org/wsvn/pkg-lustre/utils/check-patches?rev=444&op=file
==============================================================================
--- utils/check-patches (added)
+++ utils/check-patches Thu Feb 14 14:53:26 2008
@@ -1,0 +1,43 @@
+#!/bin/sh
+#
+# check-patches [-v]
+#
+# Check all patches in lustre/kernel_patches and
+# ldiskfs/kernel_patches for updated parents
+
+set -e
+
+if [ "$1" = "-v" ]; then
+ VERBOSE="-v"
+ shift
+fi
+
+if [ "$#" -ne 0 ]; then
+ echo "Usage: check-patches [-v]"
+ exit 1
+fi
+
+CHECK="$(dirname "$0")/check-patch"
+ERRORS=0
+CHECKED=0
+UNKNOWN=0
+
+for PATCH in lustre/kernel_patches/patches/* ldiskfs/kernel_patches/patches/*; do
+ if grep -q "^## Parent-Name:" "$PATCH"; then
+ CHECKED=$(($CHECKED+1))
+ if ! "$CHECK" $VERBOSE "$PATCH"; then
+ ERRORS=$(($ERRORS+1))
+ fi
+ else
+ UNKNOWN=$(($UNKNOWN+1))
+ fi
+done
+
+if [ "$ERRORS" -ne "0" ]; then
+ echo "$ERRORS patches need updating"
+ exit 1
+fi
+
+if [ -n "$VERBOSE" ]; then
+ echo "$CHECKED patches checked, $UNKNOWN unknown patches"
+fi
Propchange: utils/check-patches
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-lustre-svn-commit
mailing list