From patchwork Thu Aug 1 19:42:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddharth Doshi X-Patchwork-Id: 47197 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id F05DFC3DA4A for ; Thu, 1 Aug 2024 19:42:27 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web10.77501.1722541343238047975 for ; Thu, 01 Aug 2024 12:42:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@mvista.com header.s=google header.b=BeJhMstU; spf=pass (domain: mvista.com, ip: 209.85.215.171, mailfrom: sdoshi@mvista.com) Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-70b2421471aso4707958a12.0 for ; Thu, 01 Aug 2024 12:42:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mvista.com; s=google; t=1722541342; x=1723146142; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=vxK4dig5qcoLgi3OKJT5zbMbrxU6mIkreeMHiE1bNhU=; b=BeJhMstUFR5TLVeh0E0fCBCDwyJOfgI2WmCmPDAB0SwCXbpMdSoG0+cPqQBMuK4Y7D 9KiFUX9o2GYw+JfPTDNrbtUcbg8HCwpXKSFeCcoE+TafHrDbHF4vzMO6gDsLrG/mZiKn O3dipM7Hr53bxSHDz97wBRo8fzI2tLjYtvCSs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722541342; x=1723146142; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vxK4dig5qcoLgi3OKJT5zbMbrxU6mIkreeMHiE1bNhU=; b=DXZiNG2Cs+NCNdBcTuC27I4hGbyitpO2EDWYlG60GozBxg5gFC/eU5XXVtBGx4UFG3 XL/G7K4/qMs7Mm608nP+b7fbuKkH2+InT9Uoha29fbel4tiKBBEiV++63jPp6Kb3j6BC bed7+N1sVeFe46LNcs2Xnx2gx2T7u/trCHX9yHyuM0z+KwxghBFFtWqttf3jcqwFwfZ7 kC+5j5eT2dsqSQRcHwbIVMRaIV5QGcEOA3g1tUKqcSYxw2Mi2sEHRHQvK2WfQjsLBVZO DtvNJLVkofbgeUrpIsRZFoW9xhaOhqXDcVsjvyEF8VErSjEmvjL6Z3wu9XSlYHvprGcp jFIQ== X-Gm-Message-State: AOJu0YwoMdZFG2CWDQNx3C9FclIbPsow/oF5tdj70Lr3h+TdcGS2TzqU jCezolAVY5qmKhVuEwhKIEGxlShqOU+Yp2uiXAjOvd/breVg4rt/UP17Xr8wfKs7r/p5fYXWzHY + X-Google-Smtp-Source: AGHT+IFaxphwyg3tuJAo7SHqRHnDNOJ8emCF+tumHHNIpnzzRZVfwAPpO5LcdOY32UHVBcb94uVW0w== X-Received: by 2002:a05:6a20:6a27:b0:1c4:cf0a:ee9d with SMTP id adf61e73a8af0-1c699570066mr2072043637.19.1722541342102; Thu, 01 Aug 2024 12:42:22 -0700 (PDT) Received: from siddharth-latitude-3420.mvista.com ([157.32.47.78]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ff59058d03sm2602095ad.179.2024.08.01.12.42.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Aug 2024 12:42:21 -0700 (PDT) From: Siddharth To: openembedded-core@lists.openembedded.org Cc: Siddharth Doshi , Armin Kuster Subject: [OE-core][kirkstone][PATCHv2] lttng-modules: Upgrade 2.13.9 -> 2.13.14 Date: Fri, 2 Aug 2024 01:12:09 +0530 Message-Id: <20240801194209.261057-1-sdoshi@mvista.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 01 Aug 2024 19:42:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202887 From: Siddharth Doshi License-Update: Updated LIC_FILES_CHKSUM due to License file modification Note: Upgrade lttng-modules to 2.13.14 to fix fcheck error which occurs with commit 782202de6478f68caaed4567017095ad906c4eef in kernel "file: Rename fcheck lookup_fd_rcu" which does replaces fcheck with lookup_fd_rcu. Signed-off-by: Armin Kuster Signed-off-by: Siddharth Doshi --- .../0009-Rename-genhd-wrapper-to-blkdev.patch | 19 +++++++++++-------- ...les_2.13.9.bb => lttng-modules_2.13.14.bb} | 4 ++-- 2 files changed, 13 insertions(+), 10 deletions(-) rename meta/recipes-kernel/lttng/{lttng-modules_2.13.9.bb => lttng-modules_2.13.14.bb} (89%) diff --git a/meta/recipes-kernel/lttng/lttng-modules/0009-Rename-genhd-wrapper-to-blkdev.patch b/meta/recipes-kernel/lttng/lttng-modules/0009-Rename-genhd-wrapper-to-blkdev.patch index 90fec9dc58..874e076675 100644 --- a/meta/recipes-kernel/lttng/lttng-modules/0009-Rename-genhd-wrapper-to-blkdev.patch +++ b/meta/recipes-kernel/lttng/lttng-modules/0009-Rename-genhd-wrapper-to-blkdev.patch @@ -8,9 +8,12 @@ to follow upstream. Upstream-Status: Backport +Note: Updated patch to cleanly apply to 2.13.14 + Change-Id: I4ec94fb94d11712dd20f0680aea1de77fbfa9d17 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers +Signed-off-by: Siddharth Doshi --- include/wrapper/{genhd.h => blkdev.h} | 10 +++++----- src/lttng-statedump-impl.c | 2 +- @@ -21,7 +24,7 @@ diff --git a/include/wrapper/genhd.h b/include/wrapper/blkdev.h similarity index 93% rename from include/wrapper/genhd.h rename to include/wrapper/blkdev.h -index 4a59b68e..0d5ad90f 100644 +index e32c7b6..76397f6 100644 --- a/include/wrapper/genhd.h +++ b/include/wrapper/blkdev.h @@ -1,6 +1,6 @@ @@ -41,9 +44,9 @@ index 4a59b68e..0d5ad90f 100644 +#ifndef _LTTNG_WRAPPER_BLKDEV_H +#define _LTTNG_WRAPPER_BLKDEV_H - #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) - #include -@@ -45,7 +45,7 @@ struct class *wrapper_get_block_class(void) + #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0) \ + || LTTNG_RHEL_KERNEL_RANGE(5,14,0,162,0,0, 5,15,0,0,0,0)) +@@ -47,7 +47,7 @@ struct class *wrapper_get_block_class(void) /* * Canary function to check for 'block_class' at compile time. * @@ -52,17 +55,17 @@ index 4a59b68e..0d5ad90f 100644 * * extern struct class block_class; */ -@@ -104,4 +104,4 @@ struct device_type *wrapper_get_disk_type(void) +@@ -106,4 +106,4 @@ struct device_type *wrapper_get_disk_type(void) #endif -#endif /* _LTTNG_WRAPPER_GENHD_H */ +#endif /* _LTTNG_WRAPPER_BLKDEV_H */ diff --git a/src/lttng-statedump-impl.c b/src/lttng-statedump-impl.c -index 4d7b2921..0e753090 100644 +index 9d197ce..229517e 100644 --- a/src/lttng-statedump-impl.c +++ b/src/lttng-statedump-impl.c -@@ -41,7 +41,7 @@ +@@ -42,7 +42,7 @@ #include #include #include @@ -72,5 +75,5 @@ index 4d7b2921..0e753090 100644 #include #include -- -2.19.1 +2.35.7 diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.9.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.14.bb similarity index 89% rename from meta/recipes-kernel/lttng/lttng-modules_2.13.9.bb rename to meta/recipes-kernel/lttng/lttng-modules_2.13.14.bb index a08386b053..a3e29ab7b7 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.13.9.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.14.bb @@ -3,7 +3,7 @@ SUMMARY = "Linux Trace Toolkit KERNEL MODULE" DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules" HOMEPAGE = "https://lttng.org/" LICENSE = "LGPL-2.1-only & GPL-2.0-only & MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0464cff101a009c403cd2ed65d01d4c4" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8d0d9f08888046474772a5d745d89d6a" inherit module @@ -16,7 +16,7 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ # Use :append here so that the patch is applied also when using devupstream SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch" -SRC_URI[sha256sum] = "bf808b113544287cfe837a6382887fa66354ef5cc8216460cebbef3d27dc3581" +SRC_URI[sha256sum] = "c6449f7ff12ab644a630692a556304e51525ca37d98aebf826796918be0f5da6" export INSTALL_MOD_DIR="kernel/lttng-modules"