diff options
| author | Daniel Joseph Barnhart Clark <dclark@pobox.com> | 2006-09-02 23:06:16 +0000 |
|---|---|---|
| committer | Daniel Joseph Barnhart Clark <dclark@pobox.com> | 2006-09-02 23:06:16 +0000 |
| commit | 57a3484065040d4a651187d21482ccdd4a8faac4 (patch) | |
| tree | f087d0ea0334eb816fef7a7ad8ac59795aed29e2 /encap/src/encap-profiles | |
| parent | 9a5ec9dd1783f69fc4870f72ba7dfd8035422607 (diff) | |
| download | bcfg2-57a3484065040d4a651187d21482ccdd4a8faac4.tar.gz bcfg2-57a3484065040d4a651187d21482ccdd4a8faac4.tar.bz2 bcfg2-57a3484065040d4a651187d21482ccdd4a8faac4.zip | |
EncapPackages:
* Delete VERSION and ChangeLog, just use bcfg2 version or svn release #
* Update install scripts to allow forcing replacement of local config files
* Make python build fail if "from httplib import HTTPS" fails
* Some doc updates
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2172 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'encap/src/encap-profiles')
| -rw-r--r-- | encap/src/encap-profiles/Makefile | 8 | ||||
| -rw-r--r-- | encap/src/encap-profiles/bcfg2-python-2.4.3.ep | 12 |
2 files changed, 20 insertions, 0 deletions
diff --git a/encap/src/encap-profiles/Makefile b/encap/src/encap-profiles/Makefile index f2c4d04b9..664aea619 100644 --- a/encap/src/encap-profiles/Makefile +++ b/encap/src/encap-profiles/Makefile @@ -141,6 +141,14 @@ rename : encaps fi; \ done; \ fi + for OLDNAME in `ls ./*-doc-*-encap-*.tar.gz`; do \ + NEWNAME="`printf "%s\n" "$${OLDNAME}" \ + | awk -F- '{$$NF = "OSDIST.tar.gz" ; print}' \ + | sed s:\ :-:g | sed s:OSDIST:share:g`" ; \ + if [ "$${OLDNAME}x" != "$${NEWNAME}x" ]; then \ + mv ./$${OLDNAME} ./$${NEWNAME}; \ + fi; \ + done; clean : -(rm ./*.log; rm ./*.packaged; rm ./*.gz; rm ./*~) diff --git a/encap/src/encap-profiles/bcfg2-python-2.4.3.ep b/encap/src/encap-profiles/bcfg2-python-2.4.3.ep index 454aeced1..d94aba979 100644 --- a/encap/src/encap-profiles/bcfg2-python-2.4.3.ep +++ b/encap/src/encap-profiles/bcfg2-python-2.4.3.ep @@ -83,6 +83,18 @@ PLATFORM_ENDIF --disable-ipv6 </configure> +<build type="append"><![CDATA[ +# Make sure linking to openssl worked +${builddir}/python -c "from httplib import HTTPS" || HS="no"; \ +if [ "${HS}x" = "nox" ]; then \ + printf "ERROR: HTTPS fails (usually a problem with linking against "; \ + printf "openssl), aborting...\n"; \ + exit 1; \ +else \ + printf "INFO: HTTPS works\n"; \ +fi +]]></build> + </source> <prepackage><![CDATA[ |