diff options
| author | Michael E Brown <michael_e_brown@dell.com> | 2008-01-07 13:25:05 -0600 |
|---|---|---|
| committer | Michael E Brown <michael_e_brown@dell.com> | 2008-01-07 13:25:05 -0600 |
| commit | 5962b8ac964d56a15586e6c9e069670a5a896b6a (patch) | |
| tree | 6c19a63d62ec2f98491157dea681693a31fe7608 | |
| parent | bdf34de8bbc25eeda69aa873e67c9fc55a7223c0 (diff) | |
| parent | 552c3bbe3331f5a7727010a0420d11159777ea90 (diff) | |
| download | mock-5962b8ac964d56a15586e6c9e069670a5a896b6a.tar.gz mock-5962b8ac964d56a15586e6c9e069670a5a896b6a.tar.xz mock-5962b8ac964d56a15586e6c9e069670a5a896b6a.zip | |
Merge branch 'master' of /var/ftp/pub/Applications/git/mock
* 'master' of /var/ftp/pub/Applications/git/mock:
fix 'make srpm' to only build srpm and not also binary rpm.
update docs for --arch and --target.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | docs/mock.1 | 7 | ||||
| -rwxr-xr-x | py/mock.py | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 89bbb72..aefcad8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -98,7 +98,7 @@ rpm: dist srpm: dist mkdir -p $(BUILDDIR) - rpmbuild $(RPM_DEFINES) -ba --nodeps $(PACKAGE_NAME).spec + rpmbuild $(RPM_DEFINES) -bs --nodeps $(PACKAGE_NAME).spec rm -rf $(BUILDDIR) diff --git a/docs/mock.1 b/docs/mock.1 index a71c8c8..9bcc94a 100644 --- a/docs/mock.1 +++ b/docs/mock.1 @@ -61,8 +61,11 @@ Clean chroot after building. Use with \-\-resultdir. Only active for '\-\-rebuil \fB\-\-no\-cleanup\-after\fR Don't clean chroot after building. If automatic cleanup is enabled, use this to disable. .TP -\fB\-\-target=\fR\fIARCH\fP, \fB\-\-arch=\fR\fIARCH\fP -Specify target build arch. +\fB\-\-target=\fR\fIARCH\fP +This argument is passed to rpmbuild to specify the target arch to build. It defaults to whatever is specified for --arch, or whatever is specified in the config file as config_opts['target_arch']. +.TP +\fB\-\-arch=\fR\fIARCH\fP +Calls the linux personality() syscall to tell the kernel to emulate a secondary architecture. For example, building i386 packages on an x86_64 buildhost. .TP \fB\-D \fR"\fIMACRO EXPR\fP", \fB\-\-define=\fR"\fIMACRO EXPR\fP" Specify macro definitions used for the build. This option may be used multiple times, just as the rpmbuild \-\-define option can be. For example: @@ -125,7 +125,7 @@ def command_parse(config_opts): help="Dont clean chroot after building. If automatic" " cleanup is enabled, use this to disable.", ) parser.add_option("--arch", action ="store", dest="arch", - default=None, help="Use to set kernel personality() to use to build.") + default=None, help="Sets kernel personality().") parser.add_option("--target", action ="store", dest="rpmbuild_arch", default=None, help="passed to rpmbuild as --target") parser.add_option("-D", "--define", action="append", dest="rpmmacros", |