rename

diff --git a/meta b/meta
index 5c04663dac35124baf9a34140d2fa48c9790876e..0a84d54ec06160cf0b0f173c199298231a9839ad 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: 26cdd57e160c40473597e7014ee72c5d990107c9
+Previous: 5c704a79dcedec434c2aa0697f8cbdb3f4bd066e
 Head: d6d2302f2d258fa2c07e55a2e124a9bdd75367a0
 Applied:
   rm-build: d6d2302f2d258fa2c07e55a2e124a9bdd75367a0
 Unapplied:
-  bld-32: bd1bd1d366e3927b7646da33e243213a5d59c235
+  old-bld-32: bd1bd1d366e3927b7646da33e243213a5d59c235
   apphang: 7a6f7ff02c6035e54fc262414eb9484ea98018b9
   cm_send_cb: 70dceed7518c8429e4c9e0646c7ec035f1cf53cb
   queue_mads: a9c572c34ae693764a33e87173125d3065a6d1c5

diff --git a/patches/bld-32 b/patches/bld-32
deleted file mode 100644 (file)
index 76e88a7..0000000
--- a/patches/bld-32
+++ /dev/null
@@ -1,40 +0,0 @@
-Bottom: 2be5e93c1ed1bcc87525c64e02df6a1acd16a800
-Top:    6a0d87b4622bc7319d396436b319ad51c6ae3636
-Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
-Date:   2009-12-16 12:00:20 -0800
-
-etc/bld: allow specifying x32 for x86 builds
-
-To make it easier on the user, allow specifying a 32-bit build
-using x32 or x86.  x32 is more natural with x64 being the
-64-bit build.
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/trunk/etc/bldwo.bat b/trunk/etc/bldwo.bat
-index ba5cf1b..8f8b029 100644
---- a/trunk/etc/bldwo.bat
-+++ b/trunk/etc/bldwo.bat
-@@ -20,6 +20,10 @@ if "%2"=="x86" (
-       set wo_arch=x86\r
-       goto set_os\r
- )\r
-+if "%2"=="x32" (\r
-+      set wo_arch=x86\r
-+      goto set_os\r
-+)\r
- if "%2"=="x64" (\r
-       set wo_arch=x64\r
-       goto set_os\r
-@@ -44,7 +48,7 @@ if "%3"=="2008" (
-       goto set_bld\r
- )\r
- if "%3"=="xp" (\r
--      if not "%2"=="x86" goto use\r
-+      if not "%2"=="x86" if not "%2"=="x32" goto use\r
-       set wo_os=WXP\r
-       set wo_arch=\r
-       goto set_bld

diff --git a/patches/old-bld-32 b/patches/old-bld-32
new file mode 100644 (file)
index 0000000..76e88a7
--- /dev/null
+++ b/patches/old-bld-32
@@ -0,0 +1,40 @@
+Bottom: 2be5e93c1ed1bcc87525c64e02df6a1acd16a800
+Top:    6a0d87b4622bc7319d396436b319ad51c6ae3636
+Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
+Date:   2009-12-16 12:00:20 -0800
+
+etc/bld: allow specifying x32 for x86 builds
+
+To make it easier on the user, allow specifying a 32-bit build
+using x32 or x86.  x32 is more natural with x64 being the
+64-bit build.
+
+Signed-off-by: Sean Hefty <sean.hefty@intel.com>
+
+
+---
+
+diff --git a/trunk/etc/bldwo.bat b/trunk/etc/bldwo.bat
+index ba5cf1b..8f8b029 100644
+--- a/trunk/etc/bldwo.bat
++++ b/trunk/etc/bldwo.bat
+@@ -20,6 +20,10 @@ if "%2"=="x86" (
+       set wo_arch=x86\r
+       goto set_os\r
+ )\r
++if "%2"=="x32" (\r
++      set wo_arch=x86\r
++      goto set_os\r
++)\r
+ if "%2"=="x64" (\r
+       set wo_arch=x64\r
+       goto set_os\r
+@@ -44,7 +48,7 @@ if "%3"=="2008" (
+       goto set_bld\r
+ )\r
+ if "%3"=="xp" (\r
+-      if not "%2"=="x86" goto use\r
++      if not "%2"=="x86" if not "%2"=="x32" goto use\r
+       set wo_os=WXP\r
+       set wo_arch=\r
+       goto set_bld