[openib-commits] r4837 - trunk/contrib/mellanox/scripts
vlad at openib.org
Mon Jan 9 05:29:37 PST 2006
- Previous message: [openib-commits] r4836 - trunk/contrib/mellanox/gen2/scripts
- Next message: [openib-commits] r4838 - trunk/contrib/mellanox/scripts
-
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: vlad
Date: 2006-01-09 05:29:35 -0800 (Mon, 09 Jan 2006)
New Revision: 4837
Modified:
trunk/contrib/mellanox/scripts/configure
Log:
Updated quilt and patch parameters to ignore spaces
Modified: trunk/contrib/mellanox/scripts/configure
===================================================================
--- trunk/contrib/mellanox/scripts/configure 2006-01-09 13:17:43 UTC (rev 4836)
+++ trunk/contrib/mellanox/scripts/configure 2006-01-09 13:29:35 UTC (rev 4837)
@@ -130,6 +130,16 @@
# Apply patches
apply_patch()
{
+ quiltrc=${CWD}/patches/quiltrc
+ ex touch ${quiltrc}
+
+ cat << EOF >> ${quiltrc}
+QUILT_DIFF_OPTS='-x .svn -p --ignore-matching-lines=\$Id'
+QUILT_PATCH_OPTS='-l'
+EOF
+
+ QUILT="${QUILT} --quiltrc ${quiltrc}"
+
if [ -n "${PATCH_DIR}" ]; then
# Apply user's patches
for patch in ${PATCH_DIR}/*
@@ -140,7 +150,7 @@
ex $QUILT import ${patch}
ex $QUILT push patches/${patch##*/}
else
- if ! (patch -p1 < ${patch} ); then
+ if ! (patch -p1 -l < ${patch} ); then
echo "Failed to apply patch: ${patch}"
exit 1
fi
@@ -156,7 +166,7 @@
ex $QUILT import ${patch}
ex $QUILT push patches/${patch##*/}
else
- if ! ( patch -p1 < ${patch} ); then
+ if ! ( patch -p1 -l < ${patch} ); then
echo "Failed to apply patch: ${patch}"
exit 1
fi
@@ -172,7 +182,7 @@
ex $QUILT import ${patch}
ex $QUILT push patches/${patch##*/}
else
- if ! (patch -p1 < ${patch} ); then
+ if ! (patch -p1 -l < ${patch} ); then
echo "Failed to apply patch: ${patch}"
exit 1
fi
@@ -192,7 +202,7 @@
ex $QUILT import ${patch}
ex $QUILT push patches/${patch##*/}
else
- if ! (patch -p1 < ${patch} ); then
+ if ! (patch -p1 -l < ${patch} ); then
echo "Failed to apply patch: ${patch}"
exit 1
fi
@@ -216,7 +226,7 @@
ex $QUILT import ${patch}
ex $QUILT push patches/${patch##*/}
else
- if ! (patch -p1 < ${patch} ); then
+ if ! (patch -p1 -l < ${patch} ); then
echo "Failed to apply patch: ${patch}"
exit 1
fi
@@ -235,7 +245,7 @@
ex $QUILT import ${patch}
ex $QUILT push patches/${patch##*/}
else
- if ! (patch -p1 < ${patch} ); then
+ if ! (patch -p1 -l < ${patch} ); then
echo "Failed to apply patch: ${patch}"
exit 1
fi
@@ -256,7 +266,7 @@
ex $QUILT import ${patch}
ex $QUILT push patches/${patch##*/}
else
- if ! (patch -p1 < ${patch} ); then
+ if ! (patch -p1 -l < ${patch} ); then
echo "Failed to apply patch: ${patch}"
exit 1
fi
@@ -276,7 +286,7 @@
ex $QUILT import ${patch}
ex $QUILT push patches/${patch##*/}
else
- if ! (patch -p1 < ${patch} ); then
+ if ! (patch -p1 -l < ${patch} ); then
echo "Failed to apply patch: ${patch}"
exit 1
fi
- Previous message: [openib-commits] r4836 - trunk/contrib/mellanox/gen2/scripts
- Next message: [openib-commits] r4838 - trunk/contrib/mellanox/scripts
-
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the openib-commits mailing list