# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1242225647 25200 # Node ID 9e56460627520ce02a57b854fb440eb26ba6aaff # Parent f1b8c4c8e95b1e74e77a0b2930215bb18efd0aaa Use 2.21 schema instead of 2.16 Instead of pulling 2.16 from the DMTF site, pull down 2.21. Also, the format of the DMTF zip file has changed slightly. These are the necessary formatting changes. Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r f1b8c4c8e95b -r 9e5646062752 base_schema/Makefile.am --- a/base_schema/Makefile.am Fri May 08 10:53:01 2009 -0700 +++ b/base_schema/Makefile.am Wed May 13 07:40:47 2009 -0700 @@ -1,12 +1,13 @@ -CIM_SCHEMA_VER = 216 +CIM_SCHEMA_VER = 2.21.0 +CIM_SCHEMA_DIR = 2210 CIM_SCHEMA_REL = $(CIM_SCHEMA_VER)Experimental -CIM_SCHEMA_ZIP = cimv$(CIM_SCHEMA_REL)-MOFs.zip +CIM_SCHEMA_ZIP = cim_schema_$(CIM_SCHEMA_REL)-MOFs.zip -dist_pkgdata_DATA = $(CIM_SCHEMA_ZIP) fix_schema.patch cimv216-interop_mof \ - cimv216-cimv2_mof +dist_pkgdata_DATA = $(CIM_SCHEMA_ZIP) cimv2.21.0-interop_mof \ + cimv2.21.0-cimv2_mof dist_pkgdata_SCRIPTS = install_base_schema.sh $(CIM_SCHEMA_ZIP): - wget http://www.dmtf.org/standards/cim/cim_schema_v$(CIM_SCHEMA_VER)/$(CIM_SCHEMA...) + wget http://www.dmtf.org/standards/cim/cim_schema_v$(CIM_SCHEMA_DIR)/$(CIM_SCHEMA...) EXTRA_DIST = README.DMTF diff -r f1b8c4c8e95b -r 9e5646062752 base_schema/install_base_schema.sh.in --- a/base_schema/install_base_schema.sh.in Fri May 08 10:53:01 2009 -0700 +++ b/base_schema/install_base_schema.sh.in Wed May 13 07:40:47 2009 -0700 @@ -3,7 +3,7 @@ DATA="$1" NS=@CIM_VIRT_NS@ CIMOM=@CIMSERVER@ -SCHEMA_VERSION="2.16" +SCHEMA_VERSION="2.21.0" TMPDIR=$(mktemp -d /tmp/cim_schema.XXXXX) chmod a+x $TMPDIR @@ -16,13 +16,12 @@ fi unpack_schema() { - cd ${TMPDIR} && unzip ${DATA}/cimv*-MOFs.zip + cd ${TMPDIR} && unzip ${DATA}/cim_schema_*-MOFs.zip } fix_schema() { - (cd ${TMPDIR} && patch -p0 < ${DATA}/fix_schema.patch) - cp -a ${DATA}/cimv216-interop_mof ${TMPDIR}/cimv216-interop.mof - cp -a ${DATA}/cimv216-cimv2_mof ${TMPDIR}/cimv216-cimv2.mof + cp -a ${DATA}/cimv2.21.0-interop_mof ${TMPDIR}/cimv2.21.0-interop.mof + cp -a ${DATA}/cimv2.21.0-cimv2_mof ${TMPDIR}/cimv2.21.0-cimv2.mof } @@ -70,11 +69,11 @@ cd ${TMPDIR} - cimmofl -uc -aEV -R$repo -n $NS cimv???.mof + cimmofl -uc -aEV -R$repo -n $NS cim_schema_?.??.?.mof cimmofl -uc -aEV -R$repo -n $NS qualifiers.mof cimmofl -uc -aEV -R$repo -n $NS qualifiers_optional.mof - cimmofl -uc -aEV -R$repo -n /root/interop cimv???-interop.mof - cimmofl -uc -aEV -R$repo -n /root/cimv2 cimv???-cimv2.mof + cimmofl -uc -aEV -R$repo -n /root/interop cimv?.??.?-interop.mof + cimmofl -uc -aEV -R$repo -n /root/cimv2 cimv?.??.?-cimv2.mof } install_schema_sfcb() { @@ -87,7 +86,7 @@ return fi - mv ${TMPDIR}/cimv???.mof ${TMPDIR}/CIM_Schema.mof + mv ${TMPDIR}/cim_schema_?.??.?.mof ${TMPDIR}/CIM_Schema.mof cp -ra ${TMPDIR}/* ${dir}/CIM sfcbrepos -f }