Skip to content

Conversation

@jsquyres
Copy link
Member

  • Default all 3rd-party packages to be "external". It is strognly
    recomended that the RPM only contain Open MPI, not the embedded
    3rd-party packages. This behavior can be overridden via the
    configure_options rpmbuild macros.
  • Copy all the Sphinx-generated HTML files to pkgdocdir/html. These
    are not normally installed, but it's probably worth it for the RPM.
  • Remove no-longer-existing INSTALL file. This file was removed as
    part of the conversion to RST-based documentation.
  • Tighten up files listings for the individual RPMs.
  • Convert -docs sub-package to exclusively use mandir and pkgdocdir
    (instead of docs.files). We already excluded mandir because
    rpmbuild may have renamed all the man pages after compressing them
    (so we didn't necessarily know the correct filenames). We also
    explicitly list pkgdocdir so that it picks up the entire tree of
    files and also removes the entire tree (including directories) when
    the RPM is removed.
  • Remove some stale F77 and VT references.
  • Fix some minor typos.
  • Fix a few "file listed twice" warnings and clean up lists of files
    included in the runtime and devel sub-project RPMs.

Signed-off-by: Jeff Squyres [email protected]
(cherry picked from commit 64a0337)

- Default all 3rd-party packages to be "external".  It is strognly
  recomended that the RPM only contain Open MPI, not the embedded
  3rd-party packages.  This behavior can be overridden via the
  configure_options rpmbuild macros.
- Copy all the Sphinx-generated HTML files to pkgdocdir/html.  These
  are not normally installed, but it's probably worth it for the RPM.
- Remove no-longer-existing INSTALL file.  This file was removed as
  part of the conversion to RST-based documentation.
- Tighten up files listings for the individual RPMs.
- Convert -docs sub-package to exclusively use mandir and pkgdocdir
  (instead of docs.files).  We already excluded mandir because
  rpmbuild may have renamed all the man pages after compressing them
  (so we didn't necessarily know the correct filenames).  We also
  explicitly list pkgdocdir so that it picks up the entire tree of
  files and also removes the entire tree (including directories) when
  the RPM is removed.
- Remove some stale F77 and VT references.
- Fix some minor typos.
- Fix a few "file listed twice" warnings and clean up lists of files
  included in the runtime and devel sub-project RPMs.

Signed-off-by: Jeff Squyres <[email protected]>
(cherry picked from commit 64a0337)
Adding "-j12" to the mflags was intended as a debuggin aid; it
accidentally slipped through and was merged as part of
open-mpi#10224.

Signed-off-by: Jeff Squyres <[email protected]>
(cherry picked from commit d034ed6)
@jsquyres jsquyres added this to the v5.0.0 milestone Apr 13, 2022
@jsquyres
Copy link
Member Author

jsquyres commented Apr 13, 2022

Marking this PR as "draft" because it's going to fail the git commit checker: it includes a cherry pick of the commit from #10269, which isn't yet merged to main. #10269 was created when I was visually checking this PR before creating it, and found an issue that required another main commit to fix. Grumble.

Copy link
Member

@gpaulsen gpaulsen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Not sure if the "all in one package" is worth maintaining, but it looks like you updated it correctly.

@jsquyres
Copy link
Member Author

Looks good. Not sure if the "all in one package" is worth maintaining, but it looks like you updated it correctly.

It sounds like both @acgoldma and @shijin-aws use the "all in one package".

@jsquyres jsquyres marked this pull request as ready for review April 13, 2022 13:37
@awlauria awlauria merged commit 785cae8 into open-mpi:v5.0.x Apr 14, 2022
@jsquyres jsquyres deleted the pr/v5.0.x/specfile-updates branch April 14, 2022 15:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants