From b103a33112cd06ebb03c74808abee28b1f887b65 Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Thu, 15 Sep 2016 10:39:43 -0500 Subject: Store MRW URIs and REVs in common file Change-Id: Ibc759639706583d6368740f1b2ecbf8adf2ae2c1 Signed-off-by: Matt Spinler --- meta-phosphor/classes/mrw-rev.bbclass | 5 +++++ meta-phosphor/common/recipes-phosphor/mrw/mrw-api-native.bb | 5 +++-- meta-phosphor/common/recipes-phosphor/mrw/mrw-patch-native.bb | 5 +++-- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 meta-phosphor/classes/mrw-rev.bbclass diff --git a/meta-phosphor/classes/mrw-rev.bbclass b/meta-phosphor/classes/mrw-rev.bbclass new file mode 100644 index 000000000..2998314dc --- /dev/null +++ b/meta-phosphor/classes/mrw-rev.bbclass @@ -0,0 +1,5 @@ +MRW_API_SRC_URI ?= "git://github.com/open-power/serverwiz.git;subpath=scripts" +MRW_API_SRCREV ?= "04f15f37e9ab6c09412a0abcffb87e9aefcc5368" + +MRW_PATCH_SRC_URI ?= "git://github.com/openbmc/phosphor-mrw-tools" +MRW_PATCH_SRCREV ?= "7a68567af7bf121143ef135152a39723518b6e06" diff --git a/meta-phosphor/common/recipes-phosphor/mrw/mrw-api-native.bb b/meta-phosphor/common/recipes-phosphor/mrw/mrw-api-native.bb index 01bff6186..1930388ed 100644 --- a/meta-phosphor/common/recipes-phosphor/mrw/mrw-api-native.bb +++ b/meta-phosphor/common/recipes-phosphor/mrw/mrw-api-native.bb @@ -8,11 +8,12 @@ inherit obmc-phosphor-license inherit native inherit perlnative inherit cpan-base +inherit mrw-rev DEPENDS += "libxml-simple-perl-native json-perl-native" -SRC_URI += "git://github.com/open-power/serverwiz.git;subpath=scripts" -SRCREV = "04f15f37e9ab6c09412a0abcffb87e9aefcc5368" +SRC_URI += "${MRW_API_SRC_URI}" +SRCREV = "${MRW_API_SRCREV}" do_install() { install -d ${D}${PERLLIBDIRS_class-native}/perl/site_perl/${PERLVERSION}/mrw diff --git a/meta-phosphor/common/recipes-phosphor/mrw/mrw-patch-native.bb b/meta-phosphor/common/recipes-phosphor/mrw/mrw-patch-native.bb index 05d5baa95..b67b26241 100644 --- a/meta-phosphor/common/recipes-phosphor/mrw/mrw-patch-native.bb +++ b/meta-phosphor/common/recipes-phosphor/mrw/mrw-patch-native.bb @@ -6,11 +6,12 @@ S = "${WORKDIR}/git" inherit obmc-phosphor-license inherit native +inherit mrw-rev DEPENDS += "python-native python-lxml-native" -SRC_URI += "git://github.com/openbmc/phosphor-mrw-tools" -SRCREV = "7a68567af7bf121143ef135152a39723518b6e06" +SRC_URI += "${MRW_PATCH_SRC_URI}" +SRCREV = "${MRW_PATCH_SRCREV}" do_install() { install -d ${D}${bindir}/obmc-mrw -- cgit v1.2.1