[PATCH] RHEL6/Makefile target shorthand2xccdf requires target shorthand-guide to be complete
To test:
cd RHEL6 make clean make shorthand2xccdf
This will fail because the required prerequisite tasks were not run.
Fix:
--- a/RHEL6/Makefile +++ b/RHEL6/Makefile @@ -11,7 +11,7 @@ shorthand-guide: xsltproc -o $(OUT)/rhel6-shorthand.xml $(IN)/guide.xslt $(IN)/guide.xml xmllint --format --output $(OUT)/rhel6-shorthand.xml $(OUT)/rhel6-shorthand.xml
-shorthand2xccdf: +shorthand2xccdf: shorthand-guide xsltproc -o $(OUT)/rhel6-xccdf-noprofiles.xml $(TRANS)/shorthand2xccdf.xslt $(OUT)/rhel6-shorthand.xml xsltproc -stringparam profile "allprofiles" -o $(OUT)/rhel6-xccdf.xml $(TRANS)/xccdf-addprofiles.xslt $(OUT)/rhel6-xccdf-noprofiles.xml xsltproc -stringparam fixes "../$(IN)/fixes/bash-ks.xml" -o $(OUT)/rhel6-xccdf.xml $(TRANS)/xccdf-addfixes.xslt $(OUT)/rhel6-xccdf.xml
On 8/31/12 2:53 PM, Kenneth Stailey wrote:
To test:
cd RHEL6 make clean make shorthand2xccdf
This will fail because the required prerequisite tasks were not run.
Fix:
--- a/RHEL6/Makefile +++ b/RHEL6/Makefile @@ -11,7 +11,7 @@ shorthand-guide: xsltproc -o $(OUT)/rhel6-shorthand.xml $(IN)/guide.xslt $(IN)/guide.xml xmllint --format --output $(OUT)/rhel6-shorthand.xml $(OUT)/rhel6-shorthand.xml
-shorthand2xccdf: +shorthand2xccdf: shorthand-guide xsltproc -o $(OUT)/rhel6-xccdf-noprofiles.xml $(TRANS)/shorthand2xccdf.xslt $(OUT)/rhel6-shorthand.xml xsltproc -stringparam profile "allprofiles" -o $(OUT)/rhel6-xccdf.xml $(TRANS)/xccdf-addprofiles.xslt $(OUT)/rhel6-xccdf-noprofiles.xml xsltproc -stringparam fixes "../$(IN)/fixes/bash-ks.xml" -o $(OUT)/rhel6-xccdf.xml $(TRANS)/xccdf-addfixes.xslt $(OUT)/rhel6-xccdf.xml
Before:
[shawn@rhel6 scap-security-guide]$ cd RHEL6/ [shawn@rhel6 RHEL6]$ make clean rm -f output/*.xml output/*.html output/*.pdf output/*.spec output/*.tar output/*.gz output/*.ini rm -rf dist/content dist/policytables dist/guide [shawn@rhel6 RHEL6]$ make shorthand2xccdf xsltproc -o output/rhel6-xccdf-noprofiles.xml transforms/shorthand2xccdf.xslt output/rhel6-shorthand.xml warning: failed to load external entity "output/rhel6-shorthand.xml" unable to parse output/rhel6-shorthand.xml
After: [shawn@rhel6 RHEL6]$ make clean rm -f output/*.xml output/*.html output/*.pdf output/*.spec output/*.tar output/*.gz output/*.ini rm -rf dist/content dist/policytables dist/guide [shawn@rhel6 RHEL6]$ make shorthand2xccdf xsltproc -o output/rhel6-shorthand.xml input/guide.xslt input/guide.xml xmllint --format --output output/rhel6-shorthand.xml output/rhel6-shorthand.xml xsltproc -o output/rhel6-xccdf-noprofiles.xml transforms/shorthand2xccdf.xslt output/rhel6-shorthand.xml xsltproc -stringparam profile "allprofiles" -o output/rhel6-xccdf.xml transforms/xccdf-addprofiles.xslt output/rhel6-xccdf-noprofiles.xml xsltproc -stringparam fixes "../input/fixes/bash-ks.xml" -o output/rhel6-xccdf.xml transforms/xccdf-addfixes.xslt output/rhel6-xccdf.xml xmllint --format --output output/rhel6-xccdf.xml output/rhel6-xccdf.xml
Ack
On 8/31/12 3:26 PM, Shawn Wells wrote:
On 8/31/12 2:53 PM, Kenneth Stailey wrote:
To test:
cd RHEL6 make clean make shorthand2xccdf
This will fail because the required prerequisite tasks were not run.
Fix:
--- a/RHEL6/Makefile +++ b/RHEL6/Makefile @@ -11,7 +11,7 @@ shorthand-guide: xsltproc -o $(OUT)/rhel6-shorthand.xml $(IN)/guide.xslt $(IN)/guide.xml xmllint --format --output $(OUT)/rhel6-shorthand.xml $(OUT)/rhel6-shorthand.xml
-shorthand2xccdf: +shorthand2xccdf: shorthand-guide xsltproc -o $(OUT)/rhel6-xccdf-noprofiles.xml $(TRANS)/shorthand2xccdf.xslt $(OUT)/rhel6-shorthand.xml xsltproc -stringparam profile "allprofiles" -o $(OUT)/rhel6-xccdf.xml $(TRANS)/xccdf-addprofiles.xslt $(OUT)/rhel6-xccdf-noprofiles.xml xsltproc -stringparam fixes "../$(IN)/fixes/bash-ks.xml" -o $(OUT)/rhel6-xccdf.xml $(TRANS)/xccdf-addfixes.xslt $(OUT)/rhel6-xccdf.xml
Before:
[shawn@rhel6 scap-security-guide]$ cd RHEL6/ [shawn@rhel6 RHEL6]$ make clean rm -f output/*.xml output/*.html output/*.pdf output/*.spec output/*.tar output/*.gz output/*.ini rm -rf dist/content dist/policytables dist/guide [shawn@rhel6 RHEL6]$ make shorthand2xccdf xsltproc -o output/rhel6-xccdf-noprofiles.xml transforms/shorthand2xccdf.xslt output/rhel6-shorthand.xml warning: failed to load external entity "output/rhel6-shorthand.xml" unable to parse output/rhel6-shorthand.xml
After: [shawn@rhel6 RHEL6]$ make clean rm -f output/*.xml output/*.html output/*.pdf output/*.spec output/*.tar output/*.gz output/*.ini rm -rf dist/content dist/policytables dist/guide [shawn@rhel6 RHEL6]$ make shorthand2xccdf xsltproc -o output/rhel6-shorthand.xml input/guide.xslt input/guide.xml xmllint --format --output output/rhel6-shorthand.xml output/rhel6-shorthand.xml xsltproc -o output/rhel6-xccdf-noprofiles.xml transforms/shorthand2xccdf.xslt output/rhel6-shorthand.xml xsltproc -stringparam profile "allprofiles" -o output/rhel6-xccdf.xml transforms/xccdf-addprofiles.xslt output/rhel6-xccdf-noprofiles.xml xsltproc -stringparam fixes "../input/fixes/bash-ks.xml" -o output/rhel6-xccdf.xml transforms/xccdf-addfixes.xslt output/rhel6-xccdf.xml xmllint --format --output output/rhel6-xccdf.xml output/rhel6-xccdf.xml
Ack
P.S. - Let me know if you want me to push these for you. Noticed they were in diff format vs patch. I'll be happy to do so.
On Fri, Aug 31, 2012 at 3:27 PM, Shawn Wells shawn@redhat.com wrote:
P.S. - Let me know if you want me to push these for you. Noticed they were in diff format vs patch. I'll be happy to do so.
Please do, I only have git 1.7.1 installed. Thanks
On 8/31/12 3:57 PM, Kenneth Stailey wrote:
On Fri, Aug 31, 2012 at 3:27 PM, Shawn Wellsshawn@redhat.com wrote:
P.S. - Let me know if you want me to push these for you. Noticed they were in diff format vs patch. I'll be happy to do so.
Please do, I only have git 1.7.1 installed. Thanks
Not a problem. Pushed.
scap-security-guide@lists.fedorahosted.org
-
Kenneth Stailey -
Shawn Wells