diff options
| -rw-r--r-- | meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch | 14 | ||||
| -rw-r--r-- | meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb (renamed from meta-oe/recipes-core/mm-common/mm-common_1.0.3.bb) | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch b/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch index 6031eaa782..7d1dbc6ee4 100644 --- a/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch +++ b/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch | |||
| @@ -14,19 +14,23 @@ just ask for python3 executable. | |||
| 14 | Upstream-Status: Inappropriate [OE specific] | 14 | Upstream-Status: Inappropriate [OE specific] |
| 15 | 15 | ||
| 16 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | 16 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> |
| 17 | |||
| 18 | rebase for 1.0.4 | ||
| 19 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | ||
| 20 | |||
| 17 | --- | 21 | --- |
| 18 | meson.build | 7 +------ | 22 | meson.build | 7 +------ |
| 19 | 1 file changed, 1 insertion(+), 6 deletions(-) | 23 | 1 file changed, 1 insertion(+), 6 deletions(-) |
| 20 | 24 | ||
| 21 | diff --git a/meson.build b/meson.build | 25 | diff --git a/meson.build b/meson.build |
| 22 | index 3255328..7a6094c 100644 | 26 | index 8a18c36..34fd546 100644 |
| 23 | --- a/meson.build | 27 | --- a/meson.build |
| 24 | +++ b/meson.build | 28 | +++ b/meson.build |
| 25 | @@ -6,12 +6,7 @@ project('mm-common', | 29 | @@ -7,12 +7,7 @@ project('mm-common', |
| 26 | license: 'GPLv2+' | 30 | # and meson.add_install_script(python3, ...) |
| 27 | ) | 31 | ) |
| 28 | 32 | ||
| 29 | -python3 = import('python').find_installation('python3') | 33 | -python3 = import('python').find_installation() |
| 30 | -python_version = python3.language_version() | 34 | -python_version = python3.language_version() |
| 31 | -python_version_req = '>= 3.5' | 35 | -python_version_req = '>= 3.5' |
| 32 | -if not python_version.version_compare(python_version_req) | 36 | -if not python_version.version_compare(python_version_req) |
| @@ -37,5 +41,5 @@ index 3255328..7a6094c 100644 | |||
| 37 | # Use these instead of meson.source_root() and meson.build_root(). | 41 | # Use these instead of meson.source_root() and meson.build_root(). |
| 38 | # source_root() and build_root() are not useful, if this is a subproject. | 42 | # source_root() and build_root() are not useful, if this is a subproject. |
| 39 | -- | 43 | -- |
| 40 | 2.21.0 | 44 | 2.25.1 |
| 41 | 45 | ||
diff --git a/meta-oe/recipes-core/mm-common/mm-common_1.0.3.bb b/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb index ae2bf2d02d..cee56fd55a 100644 --- a/meta-oe/recipes-core/mm-common/mm-common_1.0.3.bb +++ b/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb | |||
| @@ -6,7 +6,7 @@ GNOMEBASEBUILDCLASS = "meson" | |||
| 6 | 6 | ||
| 7 | inherit gnomebase | 7 | inherit gnomebase |
| 8 | 8 | ||
| 9 | SRC_URI[archive.sha256sum] = "e81596625899aacf1d0bf27ccc2fcc7f373405ec48735ca1c7273c0fbcdc1ef5" | 9 | SRC_URI[archive.sha256sum] = "e954c09b4309a7ef93e13b69260acdc5738c907477eb381b78bb1e414ee6dbd8" |
| 10 | SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch" | 10 | SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch" |
| 11 | 11 | ||
| 12 | BBCLASSEXTEND = "native" | 12 | BBCLASSEXTEND = "native" |
