This gets rid of all the basic rpm options for --buildarch and --buildos.

CVS patchset: 2236
CVS date: 1998/08/06 21:53:07

diff --git a/rpm.8 b/rpm.8
index 86d1412..93a5e5f 100644 (file)
--- a/rpm.8
+++ b/rpm.8
@@ -1,5 +1,5 @@
 .\" rpm - Red Hat Package Manager
-.TH rpm 8 "19 August 1997" "Red Hat Software" "Red Hat Linux"
+.TH rpm 8 "06 August 1998" "Red Hat Software" "Red Hat Linux"
 .SH NAME
 rpm \- Red Hat Package Manager
 .SH SYNOPSIS
@@ -351,6 +351,11 @@ Useful for testing out spec files.
 Embed a PGP signature in the package.  This signature can be used
 to verify the integrity and the origin of the package.  See the
 section on PGP SIGNATURES for /etc/rpmrc details.
+.IP "\fB\-\-buildplatform=[platform1[,platform2,...platformN]\fP"
+This will build the package for platforms 1 to N.  This is meant for cross
+compiling.  It requires that you have the platform specific rpmrc files
+referenced in existing rpmrc files, and a complete cross compiling build
+environment. 
 
 .SH REBUILD AND RECOMPILE OPTIONS
 

diff --git a/rpm.c b/rpm.c
index 378dca7..4c6cc9b 100755 (executable)
--- a/rpm.c
+++ b/rpm.c
@@ -223,8 +223,9 @@ static void printUsage(void) {
     puts(_("                        [--dbpath <dir>] [--nodeps] [--allmatches]"));
     puts(_("                        [--justdb] [--notriggers] rpackage1 ... packageN"));
     puts(_("       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <file>]"));
-    puts(_("                        [--sign] [--test] [--timecheck <s>] [--buildos <os>]"));
-    puts(_("                        [--buildarch <arch>] [--rmsource] specfile"));
+    puts(_("                        [--sign] [--test] [--timecheck <s>] ]"));
+    puts(_("                        [--buildplatform=platform1[,platform2...]]"));
+    puts(_("                        [--rmsource] specfile"));
     puts(_("       rpm {--rmsource} [--rcfile <file>] [-v] specfile"));
     puts(_("       rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"));
     puts(_("       rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"));
@@ -451,10 +452,8 @@ static void printHelp(void) {
                  _("generate PGP signature"));
     printHelpLine("      --buildroot <dir>     ",
                  _("use <dir> as the build root"));
-    printHelpLine("      --buildarch <arch>  ",
-                 _("build the packages for architecture <arch>"));
-    printHelpLine("      --buildos <os>  ",
-                 _("build the packages for ositecture <os>"));
+    printHelpLine("      --platform=platform1[,platform2,... platformN]",
+                 _("build the packages for the platform1...platformN build targets."));
     printHelpLine("      --test              ",
                  _("do not execute any stages"));
     printHelpLine("      --timecheck <s>     ",
@@ -578,9 +577,13 @@ int main(int argc, char ** argv) {
        if (!strcmp(*currarg, "--rcfile")) {
            rcfile = *(++currarg);
        } else if (!strcmp(*currarg, "--buildarch")) {
-           arch = *(++currarg);
+           fprintf(stderr, "--buildarch has been obsoleted.  Use the --buildplatform option\n"); 
+           fprintf(stderr, "with a platform specific rpmrc file with a Buildarch: tag set\n");
+           exit(1);
        } else if (!strcmp(*currarg, "--buildos")) {
-           os = *(++currarg);
+           fprintf(stderr, "--buildos has been obsoleted.  Use the --buildplatform option\n"); 
+           fprintf(stderr, "with a platform specific rpmrc file with a Buildos: tag set\n");
+           exit(1);
        } else if (!strcmp(*currarg, "--showrc")) {
            showrc = 1;
            building = 1;