Run oe-stylize on our files
In all of our recipes, we should be following yoctos lead on formatting,
order, and other things, for consistency in our meta layers.
This commit runs oe-stylize.py on all of our files. The types of
changes being made can be seen in the commit, but amount to:
1. Setting an explicit key ordering
2. Sectioning the files appropriately
3. Applying rules checking to our files
At some point in the near future, we would turn this on as part of
repotest, but some minor changes need to be upstreamed to meta-oe (WIP)
to make that happen.
Looking for input on whether this is something we'd like to do, and
whether the diffs below look reasonable to folks.
Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: I489dd21d38a9fe4f3ece89cc7a5e1d0463224abf
diff --git a/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb
index cc92695..92979b9 100644
--- a/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb
+++ b/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb
@@ -1,8 +1,12 @@
SUMMARY = "Phosphor OpenBMC machine readable workbook API modules"
DESCRIPTION = "The API for the MRW XML generated by the Serverwiz tool"
-PR = "r1"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
+DEPENDS += "libxml-simple-perl-native libjson-perl-native"
+SRCREV = "${MRW_API_SRCREV}"
+PR = "r1"
+
+SRC_URI += "${MRW_API_SRC_URI}"
S = "${WORKDIR}/git"
@@ -11,11 +15,6 @@
inherit cpan-base
inherit mrw-rev
-DEPENDS += "libxml-simple-perl-native libjson-perl-native"
-
-SRC_URI += "${MRW_API_SRC_URI}"
-SRCREV = "${MRW_API_SRCREV}"
-
do_install() {
install -d ${D}${PERLLIBDIRS:class-native}/site_perl/${PERLVERSION}/mrw
install -m 0755 scripts/Targets.pm ${D}${PERLLIBDIRS:class-native}/site_perl/${PERLVERSION}/mrw/Targets.pm
diff --git a/meta-phosphor/recipes-phosphor/mrw/mrw-native_git.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-native_git.bb
index d977602..4f98c4d 100644
--- a/meta-phosphor/recipes-phosphor/mrw/mrw-native_git.bb
+++ b/meta-phosphor/recipes-phosphor/mrw/mrw-native_git.bb
@@ -1,7 +1,12 @@
SUMMARY = "Phosphor OpenBMC machine readable workbook"
DESCRIPTION = "Pulls down system specific data"
-PR = "r1"
+LICENSE = "${PHOSPHOR_MRW_LICENSE}"
+LIC_FILES_CHKSUM = "${PHOSPHOR_MRW_LIC_FILES_CHKSUM}"
+SRCREV = "${PHOSPHOR_MRW_REV}"
PV = "1.0+git${SRCPV}"
+PR = "r1"
+
+SRC_URI += "${PHOSPHOR_MRW_URI}"
S = "${WORKDIR}/git"
@@ -9,17 +14,11 @@
inherit mrw-xml
inherit native
-PHOSPHOR_MRW_LICENSE ?= "Apache-2.0"
-PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-PHOSPHOR_MRW_URI ?= "http://missing-mrw-uri"
-
-LICENSE = "${PHOSPHOR_MRW_LICENSE}"
-LIC_FILES_CHKSUM = "${PHOSPHOR_MRW_LIC_FILES_CHKSUM}"
-SRC_URI += "${PHOSPHOR_MRW_URI}"
-SRCREV = "${PHOSPHOR_MRW_REV}"
-
do_install() {
install -d ${D}/${mrw_datadir}
install -m 0644 ${MRW_XML} ${D}/${mrw_datadir}
}
+PHOSPHOR_MRW_LICENSE ?= "Apache-2.0"
+PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
+PHOSPHOR_MRW_URI ?= "http://missing-mrw-uri"
diff --git a/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb
index c507894..95bc063 100644
--- a/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb
+++ b/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb
@@ -1,20 +1,19 @@
SUMMARY = "Phosphor machine readable workbook patching script"
DESCRIPTION = "Retrieve the script that can patch the MRW XML"
-PR = "r1"
-PV = "1.0+git${SRCPV}"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
+DEPENDS += "python3-native python3-lxml-native"
+SRCREV = "${MRW_TOOLS_SRCREV}"
+PV = "1.0+git${SRCPV}"
+PR = "r1"
+
+SRC_URI += "${MRW_TOOLS_SRC_URI}"
S = "${WORKDIR}/git"
inherit mrw-rev
inherit native
-DEPENDS += "python3-native python3-lxml-native"
-
-SRC_URI += "${MRW_TOOLS_SRC_URI}"
-SRCREV = "${MRW_TOOLS_SRCREV}"
-
do_install() {
install -d ${D}${bindir}/obmc-mrw
install -m 0755 patchxml.py ${D}${bindir}/obmc-mrw
diff --git a/meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native_git.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native_git.bb
index 95ce05c..4d1ae25 100644
--- a/meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native_git.bb
+++ b/meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native_git.bb
@@ -1,16 +1,16 @@
SUMMARY = "OpenBMC MRW Perl Tools"
DESCRIPTION = "OpenBMC Perl tools for the machine readable workbook"
-PR = "r1"
-PV = "1.0+git${SRCPV}"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
+DEPENDS += "libmodule-build-perl-native mrw-api-native yaml-tiny-native"
+SRCREV = "${MRW_TOOLS_SRCREV}"
+PV = "1.0+git${SRCPV}"
+PR = "r1"
+
+SRC_URI += "${MRW_TOOLS_SRC_URI}"
+
S = "${WORKDIR}/git"
inherit cpan_build
inherit mrw-rev
inherit native
-
-DEPENDS += "libmodule-build-perl-native mrw-api-native yaml-tiny-native"
-
-SRC_URI += "${MRW_TOOLS_SRC_URI}"
-SRCREV = "${MRW_TOOLS_SRCREV}"