diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-networking/recipes-support/cim-schema | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-support/cim-schema')
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-docs_2.40.0.bb | 7 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-docs_2.40.0.bb b/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-docs_2.40.0.bb index 31875ea50..4ecaabd7e 100644 --- a/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-docs_2.40.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-docs_2.40.0.bb @@ -4,18 +4,13 @@ SECTION = "doc" LICENSE = "DMTF" -SRC_URI = "http://dmtf.org/sites/default/files/cim/cim_schema_v2400/cim_schema_${PV}Final-Doc.zip \ +SRC_URI = "http://dmtf.org/sites/default/files/cim/cim_schema_v2400/cim_schema_${PV}Final-Doc.zip;subdir=${BP} \ file://LICENSE \ " SRC_URI[md5sum] = "3d01940bc1085c6c42184c25fb61f739" SRC_URI[sha256sum] = "3174cf0f8657b19d80dc59e184778d8e553da424728cb2966fe9d5428dd84267" LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4" -do_unpack() { - unzip -q ${DL_DIR}/cim_schema_${PV}Final-Doc.zip -d ${S} - cp -f ${FILE_DIRNAME}/files/LICENSE ${WORKDIR}/ -} - do_install() { install -d -m 0755 ${D}${datadir}/doc/cim-schema-${PV}-docs cp -R --no-dereference --preserve=mode,links -v ${S}/* ${D}${datadir}/doc/cim-schema-${PV}-docs diff --git a/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb b/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb index a14de46db..67d1db222 100644 --- a/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb @@ -4,18 +4,13 @@ LICENSE = "DMTF" RCONFLICTS_${PN} = "cim-schema-exper" -SRC_URI = "http://dmtf.org/sites/default/files/cim/cim_schema_v2400/cim_schema_${PV}Final-MOFs.zip \ +SRC_URI = "http://dmtf.org/sites/default/files/cim/cim_schema_v2400/cim_schema_${PV}Final-MOFs.zip;subdir=${BP} \ file://LICENSE \ " SRC_URI[md5sum] = "a9bdf17c7374e3b5b7adeaac4842c4ad" SRC_URI[sha256sum] = "dbfa3064ea427acd71a4bebbc172ca2dc44b0b09a6d83b0945b9ffa988a9058a" LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4" -do_unpack() { - unzip -q ${DL_DIR}/cim_schema_${PV}Final-MOFs.zip -d ${S} - cp -f ${FILE_DIRNAME}/files/LICENSE ${WORKDIR}/ -} - do_install() { install -d -m 0755 ${D}${datadir}/mof/cimv${PV}/ install -d -m 0755 ${D}${datadir}/doc/cim-schema-${PV} |