Re: [OE-core] [PATCH 34/42] lttng-modules: update to 2.12.1

["Peter Kjellerstedt" <peter.kjellerstedt@axis.com>]

> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-
> core@lists.openembedded.org> On Behalf Of Alexander Kanavin
> Sent: den 8 juni 2020 09:47
> To: openembedded-core@lists.openembedded.org
> Cc: Alexander Kanavin <alex.kanavin@gmail.com>
> Subject: [OE-core] [PATCH 34/42] lttng-modules: update to 2.12.1
> 
> Drop backports.
> 
> devupstream variant was incorrectly updated in a059fc67da4
> (changed to 2.12, but without updating SRCREV), so revert it back
> to 2.11.2.

I don't understand this. If you update the recipe to 2.12.1, why do 
you not update the devupstream variant to match?

> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>  ...l-5.7-use-vmalloc_sync_mappings-on-k.patch | 853 ------------------
>  ...per-rename-to-wrapper_vmalloc_sync_m.patch |  32 -
>  ..._sync_mappings-on-kernel-5.6-as-well.patch |  88 --
>  ...loc_sync_mappings-for-stable-kernels.patch |  67 --
>  ...ules_2.12.0.bb => lttng-modules_2.12.1.bb} |  11 +-
>  5 files changed, 3 insertions(+), 1048 deletions(-)
>  delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-Update-
> for-kernel-5.7-use-vmalloc_sync_mappings-on-k.patch
>  delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0002-Fix-
> missing-wrapper-rename-to-wrapper_vmalloc_sync_m.patch
>  delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0003-Fix-Use-
> vmalloc_sync_mappings-on-kernel-5.6-as-well.patch
>  delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0004-Update-
> Use-vmalloc_sync_mappings-for-stable-kernels.patch
>  rename meta/recipes-kernel/lttng/{lttng-modules_2.12.0.bb => lttng-
> modules_2.12.1.bb} (75%)

[snip]

> diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.12.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.12.1.bb
> similarity index 75%
> rename from meta/recipes-kernel/lttng/lttng-modules_2.12.0.bb
> rename to meta/recipes-kernel/lttng/lttng-modules_2.12.1.bb
> index 4a6c42e3bf..8d3fb475c0 100644
> --- a/meta/recipes-kernel/lttng/lttng-modules_2.12.0.bb
> +++ b/meta/recipes-kernel/lttng/lttng-modules_2.12.1.bb
> @@ -11,14 +11,9 @@ COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm|riscv).*-linux'
>  SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
>             file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \
>             file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
> -           file://0001-Update-for-kernel-5.7-use-vmalloc_sync_mappings-on-k.patch \
> -           file://0002-Fix-missing-wrapper-rename-to-wrapper_vmalloc_sync_m.patch \
> -           file://0003-Fix-Use-vmalloc_sync_mappings-on-kernel-5.6-as-well.patch \
> -           file://0004-Update-Use-vmalloc_sync_mappings-for-stable-kernels.patch \
>             "
> 
> -SRC_URI[md5sum] = "be252df5013ea03894921d0b493c7b6c"
> -SRC_URI[sha256sum] = "efeb2ae60e96dbe9a9b342d3a80dfc7642f06a8c09686089d491ad696bb98f4d"
> +SRC_URI[sha256sum] = "639c03bf8f0e920567f45c96cc7ef749a8fc29ff7fb3fb97263d67f66fb71aef"
> 
>  export INSTALL_MOD_DIR="kernel/lttng-modules"
> 
> @@ -37,11 +32,11 @@ python do_package_prepend() {
>  BBCLASSEXTEND = "devupstream:target"
>  LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=3f882d431dc0f32f1f44c0707aa41128"
>  DEFAULT_PREFERENCE_class-devupstream = "-1"
> -SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.12 \
> +SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.11 \
>             file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \
>             file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
>             "
>  SRCREV_class-devupstream = "17c413953603f063f2a9d6c3788bec914ce6f955"
> -PV_class-devupstream = "2.12.0+git${SRCPV}"
> +PV_class-devupstream = "2.11.2+git${SRCPV}"
>  S_class-devupstream = "${WORKDIR}/git"
>  SRCREV_FORMAT ?= "lttng_git"
> --
> 2.26.2

//Peter