| commit | 7762a04be00686ccafe1aaa5f7dd014cf9529347 | [log] [tgz] |
|---|---|---|
| author | George Liu <liuxiwei@inspur.com> | Tue Jul 05 08:55:31 2022 +0800 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Fri Jul 08 12:18:56 2022 +0000 |
| tree | 434ab57b17c83914877bd9b3e746666582c84aeb | |
| parent | 6c1b24269ca576d8683306b2109bac4fe7deefa8 [diff] |
obmc-phosphor-button: switch to meson build
George Liu (5):
meson: Add subprojects file
meson: Add meson build
logging: switch to lg2
meson: Update LONG_PRESS_TIME_MS
Fix meson build
Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: I4facd30b1c25e3b1bf60190ed5477ea75ee0c2b5
diff --git a/meta-ampere/meta-common/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend index 42ae8fa..b2ce6ef 100644 --- a/meta-ampere/meta-common/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend +++ b/meta-ampere/meta-common/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend
@@ -1 +1 @@ -EXTRA_OECMAKE += "-DLONG_PRESS_TIME_MS=5000" +EXTRA_OEMESON:append = "-Dlong-press-time-ms=5000"
diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb index 74eddc0..82e4d23 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb
@@ -7,9 +7,9 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/phosphor-buttons.git;branch=master;protocol=https" -SRCREV = "1efa3e2969262594457441acc612216dd1e2e7e7" +SRCREV = "ba33275d9fbf89bdaa75c241b87b5520bb54c440" -inherit cmake pkgconfig systemd +inherit meson pkgconfig systemd BUTTON_PACKAGES="${PN}-signals ${PN}-handler"