summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Spinler <spinler@us.ibm.com>2017-01-18 23:22:07 +0300
committerMatt Spinler <spinler@us.ibm.com>2017-01-19 22:48:07 +0300
commit045ce8e078e638d05373391d6a259c20588a7762 (patch)
tree5e53c65434d112304550a3de3389d75f75f363c7
parent01854642b75d2587d649c61ede0a9bbc11ab6f51 (diff)
downloadopenbmc-045ce8e078e638d05373391d6a259c20588a7762.tar.xz
Create mrw-perl-tools recipe
The mrw-perl-tools recipe makes use of the Build.PL script in phosphor-mrw-tools to determine which scripts and modules to install. Build.PL is part of Perl's Module::Build installation method which is executed by the cpan_build bbclass. Change-Id: Ic5d51e8ec58b4450eeb27843b11332f556f3c35b Signed-off-by: Matt Spinler <spinler@us.ibm.com>
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/bblayers.conf.sample2
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/bblayers.conf.sample2
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample2
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample2
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample2
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample2
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample2
-rw-r--r--meta-phosphor/common/recipes-phosphor/mrw/mrw-devtree-native.bb19
-rw-r--r--meta-phosphor/common/recipes-phosphor/mrw/mrw-perl-tools-native.bb13
9 files changed, 27 insertions, 19 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/bblayers.conf.sample
index 54b2bc310..9ef4c63bf 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/bblayers.conf.sample
@@ -10,6 +10,7 @@ BBLAYERS ?= " \
##OEROOT##/meta-poky \
##OEROOT##/import-layers/meta-openembedded/meta-oe \
##OEROOT##/import-layers/meta-openembedded/meta-networking \
+ ##OEROOT##/import-layers/meta-openembedded/meta-perl \
##OEROOT##/import-layers/meta-openembedded/meta-python \
##OEROOT##/import-layers/meta-virtualization \
##OEROOT##/meta-phosphor \
@@ -24,6 +25,7 @@ BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/meta-poky \
##OEROOT##/import-layers/meta-openembedded/meta-oe \
##OEROOT##/import-layers/meta-openembedded/meta-networking \
+ ##OEROOT##/import-layers/meta-openembedded/meta-perl \
##OEROOT##/import-layers/meta-openembedded/meta-python \
##OEROOT##/import-layers/meta-virtualization \
##OEROOT##/meta-phosphor \
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/bblayers.conf.sample
index 2226fe262..63ee0c4d8 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/bblayers.conf.sample
@@ -10,6 +10,7 @@ BBLAYERS ?= " \
##OEROOT##/meta-poky \
##OEROOT##/import-layers/meta-openembedded/meta-oe \
##OEROOT##/import-layers/meta-openembedded/meta-networking \
+ ##OEROOT##/import-layers/meta-openembedded/meta-perl \
##OEROOT##/import-layers/meta-openembedded/meta-python \
##OEROOT##/import-layers/meta-virtualization \
##OEROOT##/meta-phosphor \
@@ -24,6 +25,7 @@ BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/meta-poky \
##OEROOT##/import-layers/meta-openembedded/meta-oe \
##OEROOT##/import-layers/meta-openembedded/meta-networking \
+ ##OEROOT##/import-layers/meta-openembedded/meta-perl \
##OEROOT##/import-layers/meta-openembedded/meta-python \
##OEROOT##/import-layers/meta-virtualization \
##OEROOT##/meta-phosphor \
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample
index 0f29551ad..340cad7da 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample
@@ -10,6 +10,7 @@ BBLAYERS ?= " \
##OEROOT##/meta-poky \
##OEROOT##/import-layers/meta-openembedded/meta-oe \
##OEROOT##/import-layers/meta-openembedded/meta-networking \
+ ##OEROOT##/import-layers/meta-openembedded/meta-perl \
##OEROOT##/import-layers/meta-openembedded/meta-python \
##OEROOT##/import-layers/meta-virtualization \
##OEROOT##/meta-phosphor \
@@ -24,6 +25,7 @@ BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/meta-poky \
##OEROOT##/import-layers/meta-openembedded/meta-oe \
##OEROOT##/import-layers/meta-openembedded/meta-networking \
+ ##OEROOT##/import-layers/meta-openembedded/meta-perl \
##OEROOT##/import-layers/meta-openembedded/meta-python \
##OEROOT##/import-layers/meta-virtualization \
##OEROOT##/meta-phosphor \
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample
index 14b66875d..35147ab1c 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample
@@ -10,6 +10,7 @@ BBLAYERS ?= " \
##OEROOT##/meta-poky \
##OEROOT##/import-layers/meta-openembedded/meta-oe \
##OEROOT##/import-layers/meta-openembedded/meta-networking \
+ ##OEROOT##/import-layers/meta-openembedded/meta-perl \
##OEROOT##/import-layers/meta-openembedded/meta-python \
##OEROOT##/import-layers/meta-virtualization \
##OEROOT##/meta-phosphor \
@@ -24,6 +25,7 @@ BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/meta-poky \
##OEROOT##/import-layers/meta-openembedded/meta-oe \
##OEROOT##/import-layers/meta-openembedded/meta-networking \
+ ##OEROOT##/import-layers/meta-openembedded/meta-perl \
##OEROOT##/import-layers/meta-openembedded/meta-python \
##OEROOT##/import-layers/meta-virtualization \
##OEROOT##/meta-phosphor \
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample
index f1c150b33..884963420 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample
@@ -10,6 +10,7 @@ BBLAYERS ?= " \
##OEROOT##/meta-poky \
##OEROOT##/import-layers/meta-openembedded/meta-oe \
##OEROOT##/import-layers/meta-openembedded/meta-networking \
+ ##OEROOT##/import-layers/meta-openembedded/meta-perl \
##OEROOT##/import-layers/meta-openembedded/meta-python \
##OEROOT##/import-layers/meta-virtualization \
##OEROOT##/meta-phosphor \
@@ -24,6 +25,7 @@ BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/meta-poky \
##OEROOT##/import-layers/meta-openembedded/meta-oe \
##OEROOT##/import-layers/meta-openembedded/meta-networking \
+ ##OEROOT##/import-layers/meta-openembedded/meta-perl \
##OEROOT##/import-layers/meta-openembedded/meta-python \
##OEROOT##/import-layers/meta-virtualization \
##OEROOT##/meta-phosphor \
diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample
index 75063f4f6..b00a3a153 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample
@@ -10,6 +10,7 @@ BBLAYERS ?= " \
##OEROOT##/meta-poky \
##OEROOT##/import-layers/meta-openembedded/meta-oe \
##OEROOT##/import-layers/meta-openembedded/meta-networking \
+ ##OEROOT##/import-layers/meta-openembedded/meta-perl \
##OEROOT##/import-layers/meta-openembedded/meta-python \
##OEROOT##/import-layers/meta-virtualization \
##OEROOT##/meta-phosphor \
@@ -24,6 +25,7 @@ BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/meta-poky \
##OEROOT##/import-layers/meta-openembedded/meta-oe \
##OEROOT##/import-layers/meta-openembedded/meta-networking \
+ ##OEROOT##/import-layers/meta-openembedded/meta-perl \
##OEROOT##/import-layers/meta-openembedded/meta-python \
##OEROOT##/import-layers/meta-virtualization \
##OEROOT##/meta-phosphor \
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
index aebb8c4d4..3dbec2259 100644
--- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
@@ -10,6 +10,7 @@ BBLAYERS ?= " \
##OEROOT##/meta-poky \
##OEROOT##/import-layers/meta-openembedded/meta-oe \
##OEROOT##/import-layers/meta-openembedded/meta-networking \
+ ##OEROOT##/import-layers/meta-openembedded/meta-perl \
##OEROOT##/import-layers/meta-openembedded/meta-python \
##OEROOT##/import-layers/meta-virtualization \
##OEROOT##/meta-phosphor \
@@ -24,6 +25,7 @@ BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/meta-poky \
##OEROOT##/import-layers/meta-openembedded/meta-oe \
##OEROOT##/import-layers/meta-openembedded/meta-networking \
+ ##OEROOT##/import-layers/meta-openembedded/meta-perl \
##OEROOT##/import-layers/meta-openembedded/meta-python \
##OEROOT##/import-layers/meta-virtualization \
##OEROOT##/meta-phosphor \
diff --git a/meta-phosphor/common/recipes-phosphor/mrw/mrw-devtree-native.bb b/meta-phosphor/common/recipes-phosphor/mrw/mrw-devtree-native.bb
deleted file mode 100644
index c94da304c..000000000
--- a/meta-phosphor/common/recipes-phosphor/mrw/mrw-devtree-native.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Phosphor Device Tree Generator"
-DESCRIPTION = "Script to generate the BMC device tree from the MRW XML"
-PR = "r1"
-
-S = "${WORKDIR}/git"
-
-inherit obmc-phosphor-license
-inherit native
-inherit mrw-rev
-
-DEPENDS += "yaml-tiny mrw-api-native"
-
-SRC_URI += "${MRW_TOOLS_SRC_URI}"
-SRCREV = "${MRW_TOOLS_SRCREV}"
-
-do_install() {
- install -d ${D}${STAGING_BINDIR_NATIVE}
- install -m 0755 gen_devtree.pl ${D}${STAGING_BINDIR_NATIVE}/gen_devtree.pl
-}
diff --git a/meta-phosphor/common/recipes-phosphor/mrw/mrw-perl-tools-native.bb b/meta-phosphor/common/recipes-phosphor/mrw/mrw-perl-tools-native.bb
new file mode 100644
index 000000000..f2cc50992
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/mrw/mrw-perl-tools-native.bb
@@ -0,0 +1,13 @@
+SUMMARY = "OpenBMC MRW Perl Tools"
+DESCRIPTION = "OpenBMC Perl tools for the machine readable workbook"
+S = "${WORKDIR}/git"
+
+inherit obmc-phosphor-license
+inherit native
+inherit cpan_build
+inherit mrw-rev
+
+DEPENDS += "libmodule-build-perl-native mrw-api-native yaml-tiny"
+
+SRC_URI += "${MRW_TOOLS_SRC_URI}"
+SRCREV = "${MRW_TOOLS_SRCREV}"