| commit | 796196a605a2179023b397a276f90c735a371e0d | [log] [tgz] |
|---|---|---|
| author | Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com> | Tue Jun 27 13:48:55 2023 +0800 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Sun Aug 06 16:14:13 2023 -0500 |
| tree | 1d560d96d259d026068359e2b476dc320b5b41b3 | |
| parent | 454ea369f06541c95a41fef9f5f4bb53bf665434 [diff] |
meta-facebook: move nvme_config.json into project layer Description: Very few machines use phosphor-nvme and the current common meta-facebook bbappend forces every machine to create a bogus empty JSON file in order to prevent bitbake missing SRC_URI errors. Move these configs out of the common layer and into the machine-specific layer. Change-Id: Ie8558db2ed394a414e9dce70f73d2eb8693448f9 Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com> Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-nvme/bletchley/nvme_config.json b/meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json similarity index 100% rename from meta-facebook/recipes-phosphor/sensors/phosphor-nvme/bletchley/nvme_config.json rename to meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-nvme_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-nvme_%.bbappend index d495c8d..84df1a1 100644 --- a/meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-nvme_%.bbappend +++ b/meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-nvme_%.bbappend
@@ -5,6 +5,7 @@ SRC_URI:append:bletchley = " \ file://nvme-json-rewrite \ file://nvme-json-rewrite.conf \ + file://nvme_config.json \ " RDEPENDS:${PN}:bletchley += "bash" @@ -12,6 +13,9 @@ do_install:append:bletchley() { install -d ${D}${libexecdir}/${PN}/ install -m 0755 ${WORKDIR}/nvme-json-rewrite ${D}${libexecdir}/${PN}/ + + install -d ${D}${sysconfdir}/nvme + install -m 0644 -D ${WORKDIR}/nvme_config.json ${D}${sysconfdir}/nvme } SYSTEMD_OVERRIDE:${PN}:append:bletchley = " \
diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-nvme/tiogapass/nvme_config.json b/meta-facebook/meta-tiogapass/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json similarity index 100% rename from meta-facebook/recipes-phosphor/sensors/phosphor-nvme/tiogapass/nvme_config.json rename to meta-facebook/meta-tiogapass/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json
diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/sensors/phosphor-nvme_%.bbappend b/meta-facebook/meta-tiogapass/recipes-phosphor/sensors/phosphor-nvme_%.bbappend new file mode 100644 index 0000000..5fe8b97 --- /dev/null +++ b/meta-facebook/meta-tiogapass/recipes-phosphor/sensors/phosphor-nvme_%.bbappend
@@ -0,0 +1,8 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI:append:tiogapass = " file://nvme_config.json" + +do_install:append:tiogapass() { + install -d ${D}${sysconfdir}/nvme + install -m 0644 -D ${WORKDIR}/nvme_config.json ${D}/${sysconfdir}/nvme +}
diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-nvme/greatlakes/nvme_config.json b/meta-facebook/recipes-phosphor/sensors/phosphor-nvme/greatlakes/nvme_config.json deleted file mode 100644 index e69de29..0000000 --- a/meta-facebook/recipes-phosphor/sensors/phosphor-nvme/greatlakes/nvme_config.json +++ /dev/null
diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-nvme/yosemitev2/nvme_config.json b/meta-facebook/recipes-phosphor/sensors/phosphor-nvme/yosemitev2/nvme_config.json deleted file mode 100644 index e69de29..0000000 --- a/meta-facebook/recipes-phosphor/sensors/phosphor-nvme/yosemitev2/nvme_config.json +++ /dev/null
diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-nvme_%.bbappend b/meta-facebook/recipes-phosphor/sensors/phosphor-nvme_%.bbappend deleted file mode 100644 index 94db23f..0000000 --- a/meta-facebook/recipes-phosphor/sensors/phosphor-nvme_%.bbappend +++ /dev/null
@@ -1,8 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:" - -SRC_URI:append = " file://nvme_config.json" - -do_install:append() { - install -m 0644 -D ${WORKDIR}/nvme_config.json \ - ${D}/etc/nvme -}