From patchwork Mon Mar 9 22:13:51 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Tyagi X-Patchwork-Id: 82944 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 B629CFCA19A for ; Mon, 9 Mar 2026 22:14:09 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.26996.1773094446313943622 for ; Mon, 09 Mar 2026 15:14:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=b4PP8Ysm; spf=pass (domain: gmail.com, ip: 209.85.216.41, mailfrom: ankur.tyagi85@gmail.com) Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-35983877dc5so3946361a91.2 for ; Mon, 09 Mar 2026 15:14:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773094445; x=1773699245; 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=SVooxmFBL4p+/lT/I0y8DQXOlVSBPW1yrx32LLiHUD4=; b=b4PP8Ysmkkp03V+RvdJMl4PRCuinD1p1upPJNPocl31LVfcH9S6GsnbjYF//+v7W+w 5paEiCAxkBBP8nZ3/R5B0aOHcrwbg4CD3Tc2bSOuDqzK7kUluJ8tD9/IzFfLf2Di6KOr /PlWlfK7dc2CejCtCTLAmghBbO5BDJ+WfRt8Mrbosu7+opqmaETxNc+XgwM9elU0NO0r 7Gk1g+tGA7wH3K2eOE4EoFes6VNjW66HlZNHAMKRbC2IzPUwU8/icbF40fg8pppUpN5C nmDJG/LeNk/WOPLMynKuqmAxCzXgv3Eelgj851/y/vrdhlsD3anPo9HyoWSXAOH17jOU eAXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773094445; x=1773699245; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=SVooxmFBL4p+/lT/I0y8DQXOlVSBPW1yrx32LLiHUD4=; b=fIv8oHBc2x2sojJF6KeTgOqCv/tojyDhrFVWW0qHFbxoNKr2Qq66uL6Egz/pEPedX6 mH30k6jH3yLHooKUDeHQ/giq85zITaK5sT73h6bTQKzpllfJV1eJU5b4r1NZO5bYH7u9 P/vngbq+WkrZ+4GN4IW300vvIIk1eJYoqIQ4EIf+arHUsSE2BpQ3iKn8TjF61lriB0Lk ufMb6iQrTKkd2YJknqzoqLlMsmEQka2YDjkLS1wUmMPDue5XozNNISO4+QaWPx+DWn2s 0yksxYkpmDJaeZAv/Fdt5sD2R2VFHAxNvbr4IgBrn8vQFicT2hqJLz7nIc8x+bs3ynzh AnZw== X-Gm-Message-State: AOJu0Yx9rhjG4tSxam7iW1gZoaS+N1CHT6JPBzz38Jhe6AEYHqyMqpBd UfQFCbpLZfKDEDyVdVz2ZYFCyAUmhcTH1pa8DNRLEYW4JRFR6rVsQUw5F9/szw== X-Gm-Gg: ATEYQzwE7oCEggv/WPvF909UCnmDMHDd/g3nuLOH2bxKsQQiMTBOIoZ0VKoA3h/qPNT PJpr3JaE19t6nYTFmTBZtzxhKsP+okUeDjAKApE919tNMj94VV9tyRnxZSiT8FL/WjwjBmoFKbF ykDYNz/JLHoFdGPCkbAmFhi3NsWNiyCvzSo5Ymg0z28tcnuvGtRKHvWfp8PTze3Kr58cN3LDPHN oLyTP4bjqsJIhEoOhhlMi6YBWPvBbFYuy8+Tl/OVGBPW7B7Vq0pE0ynqQfyQiv7nGg8fxBoYg5U NF8269cMDS3kzp06B0EVYwYG/MFKJxOdZWJXc92Kj4pkKmdhi2fo4b7OadaWr5zIl4rT2ZQE1Xw YM9azA3Kg1t+l3lZwDJL5JDKnEyQT4exebFAJrczg4T6yn4ecQ2AzXEpST0Xdkd9uOuRfxoLwdF k1UkiHlOCHcZbsny0v7tveQd777niKulT7HcQ= X-Received: by 2002:a17:90b:39cc:b0:359:8888:6519 with SMTP id 98e67ed59e1d1-359be119427mr11562908a91.0.1773094445369; Mon, 09 Mar 2026 15:14:05 -0700 (PDT) Received: from NVAPF55DW0D-IPD.. ([167.103.127.26]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-359bbc060d7sm5991413a91.2.2026.03.09.15.14.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 15:14:04 -0700 (PDT) From: ankur.tyagi85@gmail.com To: openembedded-devel@lists.openembedded.org Cc: Liu Yiding , Khem Raj , Ankur Tyagi Subject: [oe][meta-filesystem][whinlatter][PATCH 1/4] btrfsmaintenance: upgrade 0.5 -> 0.5.2 Date: Tue, 10 Mar 2026 11:13:51 +1300 Message-ID: <20260309221354.1058134-1-ankur.tyagi85@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 09 Mar 2026 22:14:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/125008 From: Liu Yiding 1.Changelog: fix syntax error in run_task, preventing jobs to start start scrub jobs sequentially if RAID5 or RAID6 data profile is found fix btrfsmaintenance-refresh.service description 2.Update 0001-change-sysconfig-path-to-etc-default.patch for 0.5.2 Signed-off-by: Liu Yiding Signed-off-by: Khem Raj (cherry picked from commit 7adb1a61d26d14132f98c5373d2cee2e91b84361) Signed-off-by: Ankur Tyagi --- ...enance_0.5.bb => btrfsmaintenance_0.5.2.bb} | 4 ++-- ...-change-sysconfig-path-to-etc-default.patch | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) rename meta-filesystems/recipes-utils/btrfsmaintenance/{btrfsmaintenance_0.5.bb => btrfsmaintenance_0.5.2.bb} (96%) diff --git a/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb b/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.2.bb similarity index 96% rename from meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb rename to meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.2.bb index 645e38ca49..6722b63c10 100644 --- a/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb +++ b/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.2.bb @@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" SECTION = "base" -SRC_URI = "git://github.com/kdave/${BPN};branch=master;protocol=https \ +SRC_URI = "git://github.com/kdave/${BPN};branch=master;protocol=https;tag=v${PV} \ file://0001-change-sysconfig-path-to-etc-default.patch \ file://0002-add-WantedBy-directive-to-btrfsmaintenance-refresh.s.patch \ " -SRCREV = "be42cb6267055d125994abd6927cf3a26deab74c" +SRCREV = "beb9e2d166cbd856297fe8d28e89e8b36961a723" UPSTREAM_CHECK_URI = "https://github.com/kdave/${BPN}/tags" UPSTREAM_CHECK_REGEX = "${BPN}/releases/tag/v(?P\d+(?:\.\d+)*)" diff --git a/meta-filesystems/recipes-utils/btrfsmaintenance/files/0001-change-sysconfig-path-to-etc-default.patch b/meta-filesystems/recipes-utils/btrfsmaintenance/files/0001-change-sysconfig-path-to-etc-default.patch index d425206f0e..b064adcc86 100644 --- a/meta-filesystems/recipes-utils/btrfsmaintenance/files/0001-change-sysconfig-path-to-etc-default.patch +++ b/meta-filesystems/recipes-utils/btrfsmaintenance/files/0001-change-sysconfig-path-to-etc-default.patch @@ -1,6 +1,3 @@ -From b49dbe17e0d9ae463e5a34e6991aa2d3c70d2fb1 Mon Sep 17 00:00:00 2001 -From: Claudius Heine -Date: Wed, 11 May 2022 14:33:13 +0200 Subject: [PATCH] change sysconfig path to /etc/default OE uses /etc/default for service configuration, not /etc/sysconfig which @@ -11,6 +8,9 @@ Change the files accordingly Upstream-Status: Inappropriate [OE specific] Signed-off-by: Claudius Heine + +Update for 0.5.2 +Signed-off-by: Liu Yiding --- btrfsmaintenance-refresh.path | 4 ++-- btrfsmaintenance-refresh.service | 2 +- @@ -32,16 +32,16 @@ index d56ad11..f0b4132 100644 [Install] WantedBy=multi-user.target diff --git a/btrfsmaintenance-refresh.service b/btrfsmaintenance-refresh.service -index 4ed1eb4..d6225a6 100644 +index 19e51c0..223fca9 100644 --- a/btrfsmaintenance-refresh.service +++ b/btrfsmaintenance-refresh.service @@ -1,5 +1,5 @@ [Unit] --Description=Update cron periods from /etc/sysconfig/btrfsmaintenance -+Description=Update cron periods from /etc/default/btrfsmaintenance +-Description=Configure systemd timer schedule according to /etc/sysconfig/btrfsmaintenance ++Description=Configure systemd timer schedule according to /etc/default/btrfsmaintenance + Documentation="file:/usr/share/doc/btrfsmaintenance/README.man" + Documentation="file:/usr/share/doc/packages/btrfsmaintenance/README.man" - [Service] - ExecStart=/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer -- -2.33.3 +2.43.0 From patchwork Mon Mar 9 22:13:52 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Tyagi X-Patchwork-Id: 82946 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 A2590FCA19A for ; Mon, 9 Mar 2026 22:14:19 +0000 (UTC) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.26892.1773094450094815322 for ; Mon, 09 Mar 2026 15:14:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=HlupkDiL; spf=pass (domain: gmail.com, ip: 209.85.216.43, mailfrom: ankur.tyagi85@gmail.com) Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-3597df496f6so5335227a91.1 for ; Mon, 09 Mar 2026 15:14:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773094449; x=1773699249; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=p/GZ2Q0XvKVVysiUAE9KgAXXmIffSGGtI25IMOPzevE=; b=HlupkDiLRtoNvpzSpaCebwH5hXZCJsC+JMOBThw+bmFkIQQ2d8WTxcNphYe4c1Eg03 Y00LmmHL0f8tBbmF6DgCBRVKe6zNYjsOwl08w/0wFNZ6OYt4m/y4rA4Fq6G3VYRDYPNl EuS56byn+Ahmvn+Nrm8h7+eF/12O/Yvq3zxKvHC/PSfyy/s/Fr9fwyKoDrIPV97DiAZJ aEhIbvlffK3ZqrJ69Km7igEjmxvQch/RYze1zv9gkQw31l2/FxQupaOio0oHxia38Uj1 /R00SRuCZgkFJIwjxNU0QF7gDxVKrwAU3ecCDE+5FwiIbdL4xA6oMOdsB2eZzS7ne1qr cXNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773094449; x=1773699249; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=p/GZ2Q0XvKVVysiUAE9KgAXXmIffSGGtI25IMOPzevE=; b=Y10hm9XCScD8z55lNgXCyxWFXvQwdW8QvD325C2uTMp48Xl0eeyktdEPejjPZzEAAW pSQWnl7uyq5/d9DR5WHOo0x9QEe4s4t5jEHBYHX/8+BSMyvYx96iSn6vuDBs3RUVlHJ2 1QLOBqnQv28SEr1IFsqLi+j/Ou4Qo3vS/FjVVTurUy9XzY5oHpnvWPpwfBCL9aT8CtKn Su6MI+R9z4VsdbwSWKwFtic4VvHJcrsAVm2rn6hmcevkRoaJOGHmTqD+sfiHG+qTL464 HfDSHxBZ9S0ioTfXcYQib9fUd/w0HI7y4iaRfMlUd0hdrLtPdDjvHMZzfatD4nYWhzFV zCXw== X-Gm-Message-State: AOJu0Yw6GQjZ+yoLQYGH2/Gb5vvswyOS/qdfsTzHrzcP/FBYdXtsxeFr lshJgUDEe5t6nwfeDpkL01kbq1ir5AsQ4tJHdz9MaxW4G6rIhnvQwlb697Lsbg== X-Gm-Gg: ATEYQzxg11Fgf1T7IyBL+x+bgMmTx727YdzVjnM75QNjIkfDhFkYS+JytethSH0vgGQ H47T8XBXW64M3hkrM6p7qAr+RzQWqLQIhRelg1yUrc1L1RoYpZUTX4q6E5E6KrWMjNpLxN3QtdX 9MAQraC5hiIffaOG01V+JpJS6N6As9FT96Nc+BDGJssvGzbxmh0apjnDn8xFMMAqlMwQGCstMlC /iVsgzzp3wuIJwSKpogozSimCH5MP+3M0MTDO2td1QjmSraEghLnqW1EkGL583StRR6dg4WMxli oqOjpg34jvS7Qdc3jMETUmG2WmULdFH1rIw7fjR2VVMglBH7L+qrfjTwcTa2LY6Oriz3Mw7+7U1 gRjdmArBUYcO7ZGoW0Rcg1qBVqkskhc1OGSQOYZRk35eqxOrimrVSXcZ4MXTa+rojlQ0EAC7OTP nvt50rLzALmSorIeA3aZLV3DEbnguYi74z7pYzhVy7FokAOw== X-Received: by 2002:a17:90b:2d0d:b0:359:8988:38d3 with SMTP id 98e67ed59e1d1-359be21d4b1mr12162075a91.7.1773094449246; Mon, 09 Mar 2026 15:14:09 -0700 (PDT) Received: from NVAPF55DW0D-IPD.. ([167.103.127.26]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-359bbc060d7sm5991413a91.2.2026.03.09.15.14.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 15:14:08 -0700 (PDT) From: ankur.tyagi85@gmail.com To: openembedded-devel@lists.openembedded.org Cc: Gyorgy Sarvari , Khem Raj , Ankur Tyagi Subject: [oe][meta-filesystem][whinlatter][PATCH 2/4] packagegroups: fix foldername Date: Tue, 10 Mar 2026 11:13:52 +1300 Message-ID: <20260309221354.1058134-2-ankur.tyagi85@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260309221354.1058134-1-ankur.tyagi85@gmail.com> References: <20260309221354.1058134-1-ankur.tyagi85@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 09 Mar 2026 22:14:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/125009 From: Gyorgy Sarvari The correct folder name is "packagegroups", not "packageconfigs". Signed-off-by: Gyorgy Sarvari Signed-off-by: Khem Raj (cherry picked from commit 93e33ae8090ad30bb1a145e0fbb677e3e51a0ca4) Signed-off-by: Ankur Tyagi --- .../packagegroup-meta-filesystems.bb | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename meta-filesystems/recipes-filesystems/{packageconfigs => packagegroups}/packagegroup-meta-filesystems.bb (100%) diff --git a/meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb b/meta-filesystems/recipes-filesystems/packagegroups/packagegroup-meta-filesystems.bb similarity index 100% rename from meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb rename to meta-filesystems/recipes-filesystems/packagegroups/packagegroup-meta-filesystems.bb From patchwork Mon Mar 9 22:13:53 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Tyagi X-Patchwork-Id: 82945 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 B24E5FCA19C for ; Mon, 9 Mar 2026 22:14:19 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.26895.1773094453598969197 for ; Mon, 09 Mar 2026 15:14:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=O1PViBJI; spf=pass (domain: gmail.com, ip: 209.85.216.48, mailfrom: ankur.tyagi85@gmail.com) Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-358d80f60ccso6569301a91.3 for ; Mon, 09 Mar 2026 15:14:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773094453; x=1773699253; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7HYjFNn4MHHbo7k1/8AXiFyizfjEbO9WglKCP/JCirE=; b=O1PViBJIS6WYvw/j7SKB62lww1f4be+8VrQQLyf7FipPABYVgpDBQxX/89qbkJJclX YNJ/gwm1AoNu9O9N2Y6wxS2juSnsDAlyM8W23WjX/G5koNphlYOFtprLymIncwgDRDMB TtGuv2qIATjoFAVd32kZ9+38jeZE0qGM086NPYfO2CihQAbDHac439pmD4tqUaYXWLF1 RiSd4NcpeFNpckZ4HcKS3yKd7iu6eySQmdQa3Nqa25EaVGz/KEvJpZhAFkM2DU2y9BKu Tn3JUBf7S85v7zmObiKoygaE4pGv5+Pp+//DeneG37rdIs161P8FEtQL/hCs0Jpv9Znq R48w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773094453; x=1773699253; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=7HYjFNn4MHHbo7k1/8AXiFyizfjEbO9WglKCP/JCirE=; b=CsWHkQ8iHi5iaItjsayTLwWKyRNj1tCSfDhXS1lv33/LeFMrWNShBXHn18b0YEzIW8 X7sPbQWl8umhc5GaF1yXhpiuS6F+IDjhsGX71f39d13Sdo3RXcbeyW5tXYsrQuLU7vay fSHAZIc8lpC+xncDnbbloZGjgrNAHz1hqGlsvg/NVPUJoJDwuxT2gCWO1X6tpQ6Zk3oQ SSl9sGfi0O0QXS9WKqrcMJ/32ijK4L48kWSjk5ijc/PYzdrAsX47D+paV134Wq0rtcMP OWzqYJV5EP+fs+YNSRKMqM4KCmTPlTat5YMz78GtdSICKTlMn2JoqlWnYP7AXmTkDTWL JEDg== X-Gm-Message-State: AOJu0YyyiKxQe5N1Y6vs8sAre54B48C6Ir45O2sEwXM3ymoAkOs2P8KA aRrCg2qbIqx11G0TDjYZwL63a7AMsbTKpZ4X7JFsoQveiMYjCUIk1Oz0elilVw== X-Gm-Gg: ATEYQzya2DxC00YTMkBw+kJy/WqXVSaNyUnC7vNGtNWQ8RG78RJE2xKmBVo1kuKPHyp J4CY26nJ+a08Dgkk+o4YL02G3ohtg+gzBgJEW/vir+VXl+YuToq64VbuRRYnNrs7uo5yLhlBoQS PE9kNyjp5qIJMd07ymOCxXVflzqOs01mq+U2tFUHRBBEFvCVbNoS5f5y8vT/k4aPWN9OBaRTL8q GuoqAXBLwIievgS4qwXjfwHLuaoVjTn4ekoJYCtdkcqyAXmX0ngzy711Fvjixui22/W+2h+2ibJ qsHY/zVAQT4ICad6/vHXxQzhFDhK1BFXFT5OYfW9Cdry8tN35F8GdTCdtKdbAFqiZa4vwJBeoeP c6BEupXGUOvm5kK9oh4hqvbKlybRHKEiY3+zOh1nU0vU4Hfa6AzmyNXGJPplbQ39rWpXAsyzybo C6mURMptV7jQe0aE/aCPNuXegc115moI7PLu0= X-Received: by 2002:a17:90b:3e45:b0:354:9b3f:710b with SMTP id 98e67ed59e1d1-359be32bc30mr10862534a91.19.1773094452790; Mon, 09 Mar 2026 15:14:12 -0700 (PDT) Received: from NVAPF55DW0D-IPD.. ([167.103.127.26]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-359bbc060d7sm5991413a91.2.2026.03.09.15.14.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 15:14:12 -0700 (PDT) From: ankur.tyagi85@gmail.com To: openembedded-devel@lists.openembedded.org Cc: Gyorgy Sarvari , Khem Raj , Ankur Tyagi Subject: [oe][meta-filesystem][whinlatter][PATCH 3/4] owfs: upgrade 3.2p3 -> 3.2p4 Date: Tue, 10 Mar 2026 11:13:53 +1300 Message-ID: <20260309221354.1058134-3-ankur.tyagi85@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260309221354.1058134-1-ankur.tyagi85@gmail.com> References: <20260309221354.1058134-1-ankur.tyagi85@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 09 Mar 2026 22:14:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/125010 From: Gyorgy Sarvari Drop patch that's included in this release. Changelog: v3.2p4 is mainly a bugfix & cleanup release. Enhancements Add support for InfernoEmbedded soft-devices (GH-21) Bug fixes Fix bug (GH-55) related to split packet (GH-64) Fix copy paste bug (474f06d) Add \r to Http header to satisfy RFC2616 specification (GH-20) Maintenance build system cleanup (GH-72, GH-27, GH-16) Fix missing files in source distribution (GH-70, GH-69) Fix compilation with GCC10 (GH-62) Minor fixes Fix typos (GH-43 GH-23) Signed-off-by: Gyorgy Sarvari Signed-off-by: Khem Raj (cherry picked from commit 58259850fe6302a752548e910198fa080b49ea66) Signed-off-by: Ankur Tyagi --- .../owfs/0001-Add-build-rule-for-README.patch | 6 +-- .../0001-Fix-compilation-with-GCC10.patch | 44 ------------------- .../owfs/{owfs_3.2p3.bb => owfs_3.2p4.bb} | 7 ++- 3 files changed, 6 insertions(+), 51 deletions(-) delete mode 100644 meta-filesystems/recipes-filesystems/owfs/owfs/0001-Fix-compilation-with-GCC10.patch rename meta-filesystems/recipes-filesystems/owfs/{owfs_3.2p3.bb => owfs_3.2p4.bb} (96%) diff --git a/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch b/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch index 870d0ef056..229c58f1d0 100644 --- a/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch +++ b/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch @@ -17,11 +17,11 @@ diff --git a/Makefile.am b/Makefile.am index e0c4ad6..0449321 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -35,3 +35,4 @@ rpmcvs: preparerpm +@@ -30,3 +30,5 @@ rpm: preparerpm + rpmcvs: preparerpm @LN_S@ -f `pwd`/@PACKAGE@-@VERSION@.tar.gz ${RPMDIR}/SOURCES/@PACKAGE@-@VERSION@_cvs_`date +"%Y%m%d"`.tar.gz cd ${RPMDIR}/SPECS && @RPMBUILD@ -ba @PACKAGE@.spec --define 'cvs 1' - ++ +README: README.md -- 2.7.4 - diff --git a/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Fix-compilation-with-GCC10.patch b/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Fix-compilation-with-GCC10.patch deleted file mode 100644 index 6426ecb247..0000000000 --- a/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Fix-compilation-with-GCC10.patch +++ /dev/null @@ -1,44 +0,0 @@ -From a812202d22a2861318b8e39f1cd74cd222f8e76f Mon Sep 17 00:00:00 2001 -From: "Azamat H. Hackimov" -Date: Tue, 9 Jun 2020 11:30:38 +0300 -Subject: [PATCH] Fix compilation with GCC10 - -Fixed compilation with -fno-common, which enabled in GCC 10 by default. -See https://bugs.gentoo.org/707438. - -Upstream-Status: Backport [https://github.com/owfs/owfs/pull/62] -Signed-off-by: Khem Raj ---- - module/owserver/src/c/owserver.c | 2 ++ - module/owserver/src/include/owserver.h | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/module/owserver/src/c/owserver.c b/module/owserver/src/c/owserver.c -index db29988e..2ed29161 100644 ---- a/module/owserver/src/c/owserver.c -+++ b/module/owserver/src/c/owserver.c -@@ -36,6 +36,8 @@ - - #include "owserver.h" - -+pthread_mutex_t persistence_mutex ; -+ - /* --- Prototypes ------------ */ - static void SetupAntiloop(int argc, char **argv); - -diff --git a/module/owserver/src/include/owserver.h b/module/owserver/src/include/owserver.h -index 8be582f0..a257ed02 100644 ---- a/module/owserver/src/include/owserver.h -+++ b/module/owserver/src/include/owserver.h -@@ -18,7 +18,7 @@ - #include "ow.h" - #include "ow_connection.h" - --pthread_mutex_t persistence_mutex ; -+extern pthread_mutex_t persistence_mutex ; - #define PERSISTENCELOCK _MUTEX_LOCK( persistence_mutex ) ; - #define PERSISTENCEUNLOCK _MUTEX_UNLOCK( persistence_mutex ) ; - --- -2.28.0 - diff --git a/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb b/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p4.bb similarity index 96% rename from meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb rename to meta-filesystems/recipes-filesystems/owfs/owfs_3.2p4.bb index 890c8aecc0..94379939de 100644 --- a/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb +++ b/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p4.bb @@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=628b867016631792781a8735a04760e5 \ file://COPYING.LIB;md5=9021b7435efdd9fb22beef8291134099" DEPENDS = "fuse virtual/libusb0" -# v3.2p3 -SRCREV = "3744375dfaa350e31c9b360eb1e1a517bbeb5c47" -SRC_URI = "git://github.com/owfs/owfs;branch=master;protocol=https \ + +SRCREV = "c68deb1fc6d30fcc5eabe0a0d9c9dc2ca54e455a" +SRC_URI = "git://github.com/owfs/owfs;branch=master;protocol=https;tag=v${PV} \ file://0001-Add-build-rule-for-README.patch \ - file://0001-Fix-compilation-with-GCC10.patch \ file://owhttpd \ file://owserver \ " From patchwork Mon Mar 9 22:13:54 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Tyagi X-Patchwork-Id: 82947 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 C788AFCA19E for ; Mon, 9 Mar 2026 22:14:19 +0000 (UTC) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.26998.1773094456437833749 for ; Mon, 09 Mar 2026 15:14:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=OnUlRaGq; spf=pass (domain: gmail.com, ip: 209.85.216.43, mailfrom: ankur.tyagi85@gmail.com) Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-3599126be32so5132718a91.1 for ; Mon, 09 Mar 2026 15:14:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773094456; x=1773699256; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iU9GT40K24v00OLe+5rZ1JfH5PkQd7RsMEU52UYutCA=; b=OnUlRaGqHychonbhg+3iMo7RgK5jZ7DxmkibZBKoj6mjZu/zOlYrT6JJkWVKPLNY2Z RpQj3CoBaWeVKmMzUgXESYjZ1Iczl9moOzfdJ6Z3ojluGGIX/ZotS4F57tHqqc8tHtI7 CVV2zUPMCipHCTBF+95fHwjO+PO5NZWDcDN5puUHF6gApUzjIL4qBd0Z+8gx77gViIri U98oRJMjxjMv/ZtixEEl1hq2I0Tn6OjbpreO8Px8HPbj68FrfdQwdR9ZGTyqN8PdjqJc wwmD13mRG49NM0VDRudmiXzL/MKGMq2+/xl/5AcaoHO3ygEZdjIHtX750EO9U3uMaCv1 /OmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773094456; x=1773699256; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=iU9GT40K24v00OLe+5rZ1JfH5PkQd7RsMEU52UYutCA=; b=QTfN6GxcJK172i9t018+MqiCB/tuH8FcVNMZVxdpubW/T6XiTyynkQc9WQ6XQn1E7i jX2KLyWQjyySvIO+CR4a7fehkClwzeUPcXEuRkzTd7/NZ6squWtxV4lukccpRDse2HuA ygHkXD3M1aTkbJ7NKC7OwJoS5nU462l1w9hTkUVjC5uNpj6QVNGqiUCBkfeDG1L6MXZH mwbz2uPBL4qw5S13Y5I+GqERqma3xWTrV+hG34pMPIg/zK54umxxvJNsNBTV9SWRGrEG O89S8YzJc9TqxIvuMDTtgK9Ji9rG4mgVyHZinIKnXMK2aV2yny4RgpXs5ZzuJE8nUsGc Rm2w== X-Gm-Message-State: AOJu0Yx4FmjXoPbtrd3CY+BFIyd94oLhnnOSoZ1mgDbUU1GHbBQ7xtVK PtvhRDwXxrAeSefE2fR5Tsqm+/9rxy4Llv8KtyrkjSyH7cLNjhpXk/yGbL91FA== X-Gm-Gg: ATEYQzxUJtywsaOy56n84x8vxOXiwW7VLJGIL2liCAURQn1Adwj66YhN//FF71RsiQE HeLl048RNe8Aka5vyheq2TU62MMkUtwc9TXuWPGi6cS3cz/Mcd57vnHlXge2tHzIfRIiwWgDz0V 4lJCxszNpI0FQh2Kxk9zgQ8ubvB2IopZQvkE3sUSGjEFyxV9K57F0TULonm77OoRhHXUobdkf6R YLOZsRb8+SclOSjjYSenxtafSsQM5XHnHjFgYu+v176ZRXYZ3HNT7d/u+VU6Cpou2M+oDEpYDqT B4Os2L88vlxSKTFyd2G2WYiwGGBWqgYimFlSpjUSSoZtmtG/uVR2xzW+YjmO7cIwBAf9v2w+ia7 etl8bat4zCXyQPwQr490eoiUeNSw1Uoe9MSLfk83qF5PiwzdCz7O6S6qkU8fkUGCSwXkEweMaQP nxNMX04ayoUS34jMEf90AAlEW83GwKd9+AH40= X-Received: by 2002:a17:90b:4fcc:b0:354:a1b8:24a6 with SMTP id 98e67ed59e1d1-359be396481mr11496203a91.31.1773094455574; Mon, 09 Mar 2026 15:14:15 -0700 (PDT) Received: from NVAPF55DW0D-IPD.. ([167.103.127.26]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-359bbc060d7sm5991413a91.2.2026.03.09.15.14.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 15:14:15 -0700 (PDT) From: ankur.tyagi85@gmail.com To: openembedded-devel@lists.openembedded.org Cc: Ankur Tyagi Subject: [oe][meta-filesystem][whinlatter][PATCH 4/4] zfs: upgrade 2.2.8 -> 2.2.9 Date: Tue, 10 Mar 2026 11:13:54 +1300 Message-ID: <20260309221354.1058134-4-ankur.tyagi85@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260309221354.1058134-1-ankur.tyagi85@gmail.com> References: <20260309221354.1058134-1-ankur.tyagi85@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 09 Mar 2026 22:14:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/125011 From: Ankur Tyagi Also include tag in the SRC_URI and refreshed patches. Backported patch 0004-linux-use-sys-stat.h-instead-of-linux-stat.h.patch to resolve build failure with musl. Release Notes: https://github.com/openzfs/zfs/releases/tag/zfs-2.2.9 Signed-off-by: Ankur Tyagi --- ...Define-strndupa-if-it-does-not-exist.patch | 5 +- ...arch64-inline-assembly-for-gcc-13.1.patch} | 6 +- ...admmap-Replace-uint_t-with-uint32_t.patch} | 11 +-- ...e-sys-stat.h-instead-of-linux-stat.h.patch | 83 +++++++++++++++++++ .../zfs/{zfs_2.2.8.bb => zfs_2.2.9.bb} | 9 +- 5 files changed, 98 insertions(+), 16 deletions(-) rename meta-filesystems/recipes-filesystems/zfs/zfs/{aaf28a4630af60496c9d33db1d06a7d7d8983422.patch => 0002-fixes-broken-aarch64-inline-assembly-for-gcc-13.1.patch} (94%) rename meta-filesystems/recipes-filesystems/zfs/zfs/{0001-fs-tests-cmd-readmmap-Replace-uint_t-with-uint32_t.patch => 0003-fs-tests-cmd-readmmap-Replace-uint_t-with-uint32_t.patch} (83%) create mode 100644 meta-filesystems/recipes-filesystems/zfs/zfs/0004-linux-use-sys-stat.h-instead-of-linux-stat.h.patch rename meta-filesystems/recipes-filesystems/zfs/{zfs_2.2.8.bb => zfs_2.2.9.bb} (91%) diff --git a/meta-filesystems/recipes-filesystems/zfs/zfs/0001-Define-strndupa-if-it-does-not-exist.patch b/meta-filesystems/recipes-filesystems/zfs/zfs/0001-Define-strndupa-if-it-does-not-exist.patch index 80955b3ca0..c607936e28 100644 --- a/meta-filesystems/recipes-filesystems/zfs/zfs/0001-Define-strndupa-if-it-does-not-exist.patch +++ b/meta-filesystems/recipes-filesystems/zfs/zfs/0001-Define-strndupa-if-it-does-not-exist.patch @@ -1,4 +1,4 @@ -From cc0cd6f71f6ef96fca2d7b730a3f0f6722fec696 Mon Sep 17 00:00:00 2001 +From 339359b9af5f24dedebe7234edd586e3fcacd436 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 7 May 2022 12:15:22 -0700 Subject: [PATCH] Define strndupa if it does not exist @@ -7,13 +7,12 @@ musl e.g. does not supply strndupa, unlike glibc Upstream-Status: Pending Signed-off-by: Khem Raj - --- etc/systemd/system-generators/zfs-mount-generator.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/etc/systemd/system-generators/zfs-mount-generator.c b/etc/systemd/system-generators/zfs-mount-generator.c -index f4c6c26..255bee4 100644 +index ab5dc4d78..d70cd2617 100644 --- a/etc/systemd/system-generators/zfs-mount-generator.c +++ b/etc/systemd/system-generators/zfs-mount-generator.c @@ -193,6 +193,15 @@ fopenat(int dirfd, const char *pathname, int flags, diff --git a/meta-filesystems/recipes-filesystems/zfs/zfs/aaf28a4630af60496c9d33db1d06a7d7d8983422.patch b/meta-filesystems/recipes-filesystems/zfs/zfs/0002-fixes-broken-aarch64-inline-assembly-for-gcc-13.1.patch similarity index 94% rename from meta-filesystems/recipes-filesystems/zfs/zfs/aaf28a4630af60496c9d33db1d06a7d7d8983422.patch rename to meta-filesystems/recipes-filesystems/zfs/zfs/0002-fixes-broken-aarch64-inline-assembly-for-gcc-13.1.patch index f5504b389d..63dc71555a 100644 --- a/meta-filesystems/recipes-filesystems/zfs/zfs/aaf28a4630af60496c9d33db1d06a7d7d8983422.patch +++ b/meta-filesystems/recipes-filesystems/zfs/zfs/0002-fixes-broken-aarch64-inline-assembly-for-gcc-13.1.patch @@ -1,4 +1,4 @@ -From aaf28a4630af60496c9d33db1d06a7d7d8983422 Mon Sep 17 00:00:00 2001 +From d05d2583ae1807e380492ea8570106c1f0a9effb Mon Sep 17 00:00:00 2001 From: Sebastian Gottschall Date: Tue, 23 May 2023 13:50:24 +0600 Subject: [PATCH] fixes broken aarch64 inline assembly for gcc 13.1 @@ -39,9 +39,11 @@ Signed-off-by: Khem Raj module/Kbuild.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) +diff --git a/module/Kbuild.in b/module/Kbuild.in +index a72d2a4cc..c6134baec 100644 --- a/module/Kbuild.in +++ b/module/Kbuild.in -@@ -57,9 +57,9 @@ asflags-y := $(ZFS_MODULE_CFLAGS) $(ZFS_ +@@ -57,9 +57,9 @@ asflags-y := $(ZFS_MODULE_CFLAGS) $(ZFS_MODULE_CPPFLAGS) ccflags-y := $(ZFS_MODULE_CFLAGS) $(ZFS_MODULE_CPPFLAGS) ifeq ($(CONFIG_ARM64),y) diff --git a/meta-filesystems/recipes-filesystems/zfs/zfs/0001-fs-tests-cmd-readmmap-Replace-uint_t-with-uint32_t.patch b/meta-filesystems/recipes-filesystems/zfs/zfs/0003-fs-tests-cmd-readmmap-Replace-uint_t-with-uint32_t.patch similarity index 83% rename from meta-filesystems/recipes-filesystems/zfs/zfs/0001-fs-tests-cmd-readmmap-Replace-uint_t-with-uint32_t.patch rename to meta-filesystems/recipes-filesystems/zfs/zfs/0003-fs-tests-cmd-readmmap-Replace-uint_t-with-uint32_t.patch index f1cfab4daf..d106bc0cdd 100644 --- a/meta-filesystems/recipes-filesystems/zfs/zfs/0001-fs-tests-cmd-readmmap-Replace-uint_t-with-uint32_t.patch +++ b/meta-filesystems/recipes-filesystems/zfs/zfs/0003-fs-tests-cmd-readmmap-Replace-uint_t-with-uint32_t.patch @@ -1,4 +1,4 @@ -From 1f9a5cb860b3509791e59a8cae9d5f265e832ed0 Mon Sep 17 00:00:00 2001 +From b37f4e0f11186206863f41e1a638ca4e57c3dc53 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 28 May 2023 16:33:15 -0700 Subject: [PATCH] fs-tests/cmd/readmmap: Replace uint_t with uint32_t @@ -12,7 +12,7 @@ Signed-off-by: Khem Raj 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/zfs-tests/cmd/readmmap.c b/tests/zfs-tests/cmd/readmmap.c -index 704ffd55c8..a2590e0e8d 100644 +index a5c8079d0..c22b58e9d 100644 --- a/tests/zfs-tests/cmd/readmmap.c +++ b/tests/zfs-tests/cmd/readmmap.c @@ -38,6 +38,7 @@ @@ -23,7 +23,7 @@ index 704ffd55c8..a2590e0e8d 100644 #include #include #include -@@ -55,7 +56,7 @@ main(int argc, char **argv) +@@ -56,7 +57,7 @@ main(int argc, char **argv) char *buf = NULL; char *map = NULL; int fd = -1, bytes, retval = 0; @@ -32,7 +32,7 @@ index 704ffd55c8..a2590e0e8d 100644 if (argc < 2 || optind == argc) { (void) fprintf(stderr, -@@ -92,7 +93,7 @@ main(int argc, char **argv) +@@ -93,7 +94,7 @@ main(int argc, char **argv) retval = 1; goto end; } @@ -41,6 +41,3 @@ index 704ffd55c8..a2590e0e8d 100644 srandom(seed); idx = random() % size; --- -2.40.1 - diff --git a/meta-filesystems/recipes-filesystems/zfs/zfs/0004-linux-use-sys-stat.h-instead-of-linux-stat.h.patch b/meta-filesystems/recipes-filesystems/zfs/zfs/0004-linux-use-sys-stat.h-instead-of-linux-stat.h.patch new file mode 100644 index 0000000000..53fa5d9b5c --- /dev/null +++ b/meta-filesystems/recipes-filesystems/zfs/zfs/0004-linux-use-sys-stat.h-instead-of-linux-stat.h.patch @@ -0,0 +1,83 @@ +From a4d9aadf0094392e5e477dbc8c43f973692dab00 Mon Sep 17 00:00:00 2001 +From: classabbyamp <5366828+classabbyamp@users.noreply.github.com> +Date: Wed, 27 Aug 2025 17:42:32 -0400 +Subject: [PATCH] linux: use sys/stat.h instead of linux/stat.h + +glibc includes linux/stat.h for statx, but musl defines its own statx +struct and associated constants, which does not include STATX_MNT_ID +yet. Thus, including linux/stat.h directly should be avoided for +maximum libc compatibility. + +Tested on: + - glibc: x86_64, i686, aarch64, armv7l, armv6l + - musl: x86_64, aarch64, armv7l, armv6l + +Reviewed-by: Brian Behlendorf +Tested-By: Achill Gilgenast +Signed-off-by: classabbyamp +Closes #17675 +(cherry picked from commit ccf5a8a6fcfdfbdaa2f0fdca5d787958224bf06d) + +Upstream-Status: Backport [https://github.com/openzfs/zfs/commit/ccf5a8a6fcfdfbdaa2f0fdca5d787958224bf06d] +Signed-off-by: Ankur Tyagi +--- + config/user-statx.m4 | 6 +++--- + include/os/linux/spl/sys/stat.h | 2 +- + lib/libspl/include/os/linux/sys/stat.h | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/config/user-statx.m4 b/config/user-statx.m4 +index 0315f93e0..1ba74a40e 100644 +--- a/config/user-statx.m4 ++++ b/config/user-statx.m4 +@@ -2,7 +2,7 @@ dnl # + dnl # Check for statx() function and STATX_MNT_ID availability + dnl # + AC_DEFUN([ZFS_AC_CONFIG_USER_STATX], [ +- AC_CHECK_HEADERS([linux/stat.h], ++ AC_CHECK_HEADERS([sys/stat.h], + [have_stat_headers=yes], + [have_stat_headers=no]) + +@@ -14,7 +14,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_STATX], [ + AC_MSG_CHECKING([for STATX_MNT_ID]) + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[ +- #include ++ #include + ]], [[ + struct statx stx; + int mask = STATX_MNT_ID; +@@ -29,6 +29,6 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_STATX], [ + ]) + ]) + ], [ +- AC_MSG_WARN([linux/stat.h not found; skipping statx support]) ++ AC_MSG_WARN([sys/stat.h not found; skipping statx support]) + ]) + ]) dnl end AC_DEFUN +diff --git a/include/os/linux/spl/sys/stat.h b/include/os/linux/spl/sys/stat.h +index 598784964..5c8cff72e 100644 +--- a/include/os/linux/spl/sys/stat.h ++++ b/include/os/linux/spl/sys/stat.h +@@ -24,6 +24,6 @@ + #ifndef _SPL_STAT_H + #define _SPL_STAT_H + +-#include ++#include + + #endif /* SPL_STAT_H */ +diff --git a/lib/libspl/include/os/linux/sys/stat.h b/lib/libspl/include/os/linux/sys/stat.h +index 5fbe892ee..ef8738fa8 100644 +--- a/lib/libspl/include/os/linux/sys/stat.h ++++ b/lib/libspl/include/os/linux/sys/stat.h +@@ -32,7 +32,7 @@ + + #ifdef HAVE_STATX + #include +-#include ++#include + #endif + + /* diff --git a/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.8.bb b/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.9.bb similarity index 91% rename from meta-filesystems/recipes-filesystems/zfs/zfs_2.2.8.bb rename to meta-filesystems/recipes-filesystems/zfs/zfs_2.2.9.bb index 1fc1457b19..22d35516e7 100644 --- a/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.8.bb +++ b/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.9.bb @@ -4,11 +4,12 @@ LICENSE = "CDDL-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7087caaf1dc8a2856585619f4a787faa" HOMEPAGE = "https://github.com/openzfs/zfs" -SRCREV = "3e4a3e161c00273303cd9fa9e0dc09ead3499a8a" -SRC_URI = "git://github.com/openzfs/zfs;protocol=https;branch=zfs-2.2-release \ +SRCREV = "079ba86d71571bf997ff688da061d8c4aa2fd052" +SRC_URI = "git://github.com/openzfs/zfs;protocol=https;branch=zfs-2.2-release;tag=${BP} \ file://0001-Define-strndupa-if-it-does-not-exist.patch \ - file://aaf28a4630af60496c9d33db1d06a7d7d8983422.patch \ - file://0001-fs-tests-cmd-readmmap-Replace-uint_t-with-uint32_t.patch \ + file://0002-fixes-broken-aarch64-inline-assembly-for-gcc-13.1.patch \ + file://0003-fs-tests-cmd-readmmap-Replace-uint_t-with-uint32_t.patch \ + file://0004-linux-use-sys-stat.h-instead-of-linux-stat.h.patch \ "