diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-core/mm-common')
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch | 14 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb (renamed from meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.3.bb) | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch b/meta-openembedded/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-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch +++ b/meta-openembedded/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. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> + +rebase for 1.0.4 +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> + --- meson.build | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/meson.build b/meson.build -index 3255328..7a6094c 100644 +index 8a18c36..34fd546 100644 --- a/meson.build +++ b/meson.build -@@ -6,12 +6,7 @@ project('mm-common', - license: 'GPLv2+' +@@ -7,12 +7,7 @@ project('mm-common', + # and meson.add_install_script(python3, ...) ) --python3 = import('python').find_installation('python3') +-python3 = import('python').find_installation() -python_version = python3.language_version() -python_version_req = '>= 3.5' -if not python_version.version_compare(python_version_req) @@ -37,5 +41,5 @@ index 3255328..7a6094c 100644 # Use these instead of meson.source_root() and meson.build_root(). # source_root() and build_root() are not useful, if this is a subproject. -- -2.21.0 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.3.bb b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb index ae2bf2d02d..cee56fd55a 100644 --- a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.3.bb +++ b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb @@ -6,7 +6,7 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase -SRC_URI[archive.sha256sum] = "e81596625899aacf1d0bf27ccc2fcc7f373405ec48735ca1c7273c0fbcdc1ef5" +SRC_URI[archive.sha256sum] = "e954c09b4309a7ef93e13b69260acdc5738c907477eb381b78bb1e414ee6dbd8" SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch" BBCLASSEXTEND = "native" |