9:19 a.m.
This commit is designed to "elevate" the RPM creation logic to a single
toplevel Makefile. The new model is intended to work as follows:
1) each subproject should maintain a Makefile that takes care of its
content assembly/transformation
2) this Makefile should place into each subproject's
dist/ directory the files intended for installation into users' systems
3) the %install section in the main specfile should then specify how to move those
files into the host's filesystem
4) the "clean" Make target and .gitignore files should be employed to keep
generated files out of the repository
Also, the Makefile and specfile now treat the components of SCAP content more like
source files, placing the actual source files (used by content developers) into
the source RPM.
As SCAP content for JBoss or other products (but only when they are not
feasibly expressed as a profile for RHEL itself) enters the project, this
should enable them to be added to the RPM for distribution.
Jeffrey Blank (1):
refactoring of Makefile, installation procedure
.gitignore | 1 +
Makefile | 60 +++++++++++++
rhel6/src/.gitignore | 5 +-
rhel6/src/Makefile | 90 ++-----------------
rhel6/src/dist/README | 69 +++++++++++++++
rhel6/src/input/dist_template/README | 69 ---------------
.../src/input/dist_template/STIG-draft/.gitignore | 1 -
rhel6/src/input/dist_template/STIG-draft/README | 3 -
.../dist_template/USGCB-submission/.gitignore | 1 -
.../input/dist_template/USGCB-submission/README | 3 -
rhel6/src/input/dist_template/content/.gitignore | 1 -
rhel6/src/input/dist_template/guide/.gitignore | 3 -
.../input/dist_template/policytables/.gitignore | 2 -
rhel6/src/input/dist_template/policytables/README | 2 -
.../input/rpmbuild/scap-security-guide-alpha.spec | 67 ---------------
scap-security-guide.spec | 57 ++++++++++++
16 files changed, 199 insertions(+), 235 deletions(-)
create mode 100644 .gitignore
create mode 100644 Makefile
create mode 100644 rhel6/src/dist/README
delete mode 100644 rhel6/src/input/dist_template/README
delete mode 100644 rhel6/src/input/dist_template/STIG-draft/.gitignore
delete mode 100644 rhel6/src/input/dist_template/STIG-draft/README
delete mode 100644 rhel6/src/input/dist_template/USGCB-submission/.gitignore
delete mode 100644 rhel6/src/input/dist_template/USGCB-submission/README
delete mode 100644 rhel6/src/input/dist_template/content/.gitignore
delete mode 100644 rhel6/src/input/dist_template/guide/.gitignore
delete mode 100644 rhel6/src/input/dist_template/policytables/.gitignore
delete mode 100644 rhel6/src/input/dist_template/policytables/README
delete mode 100644 rhel6/src/input/rpmbuild/scap-security-guide-alpha.spec
create mode 100644 scap-security-guide.spec