| commit | c7d880245bd260333a9f7eebbaec56a2a24ab53c | [log] [tgz] |
|---|---|---|
| author | Patrick Williams <patrick@stwcx.xyz> | Fri Mar 24 09:39:28 2023 -0500 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Mon Mar 27 15:00:06 2023 +0000 |
| tree | 33e9683043f01697826323b67a89c982e5213157 | |
| parent | edf8fe5c16e77003bca92fa61df2792dcbff1572 [diff] |
meta-phosphor: switch '/usr/share' to datadir Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I5cd3cf7cbec87b32ee07f08cae27b534c3cf7bd2
diff --git a/meta-phosphor/classes/license_static.bbclass b/meta-phosphor/classes/license_static.bbclass index dd73017..8666666 100644 --- a/meta-phosphor/classes/license_static.bbclass +++ b/meta-phosphor/classes/license_static.bbclass
@@ -15,7 +15,7 @@ # inherit license_static #### -STATIC_LICENSE_DIR = "${IMAGE_ROOTFS}/usr/share/www/common-licenses" +STATIC_LICENSE_DIR = "${IMAGE_ROOTFS}${datadir}/www/common-licenses" def add_index_html_header(f):
diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend b/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend index f7b0a47..f4a258f 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend
@@ -30,4 +30,4 @@ } # make sure that the enterprise-numbers file gets installed in the root FS -FILES:${PN} += "/usr/share/misc/enterprise-numbers" +FILES:${PN} += "${datadir}/misc/enterprise-numbers"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb index e0daa4b..3319b00 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb
@@ -18,4 +18,4 @@ inherit cmake pkgconfig systemd -FILES:${PN} += "/usr/share/ipmbbridge/ipmb-channels.json" +FILES:${PN} += "${datadir}/ipmbbridge/ipmb-channels.json"