From patchwork Mon Jan 2 22:42:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 17513 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 3FF0CC46467 for ; Mon, 2 Jan 2023 22:42:47 +0000 (UTC) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.groups.io with SMTP id smtpd.web10.49906.1672699361408821377 for ; Mon, 02 Jan 2023 14:42:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=YCEO4XtP; spf=pass (domain: gmail.com, ip: 209.85.221.45, mailfrom: alex.kiernan@gmail.com) Received: by mail-wr1-f45.google.com with SMTP id d17so7842691wrs.2 for ; Mon, 02 Jan 2023 14:42:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=USX328d9AE0UD83SdSN8JIEAzU3zgk2ms34owhLj3Eo=; b=YCEO4XtPQGxemk0aoVYVyKJqmaKBIFfiKYrRPqImUjzuTFyFlocwIDgvP+47qPOYtQ pZBS/iCUvuBXO9JvKzvadPkl009mbpdBfyAep4Rv/TWbfH4FTid1ADcb4lvBENV/qD3k 3GgwcvoecbQ7SFtBfJUi+8HoEwZB2umbBCCBDjC+wQdW0g6tp5vMl1dG8wni16Dmd5UF DilN2Majdsgj8XlMKHaHKHmpgsIWIb3XqypfyszMcAdkdJg2Fh5GVkh1Yf3Mtb34+n3J SHdNgfiGe4eZwEy4QUdRKSoybhZxfVf9MZdP6cN25nqSIc4CfR8wMoNIh808Ghw5f42G 3T9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=USX328d9AE0UD83SdSN8JIEAzU3zgk2ms34owhLj3Eo=; b=hWYuMg/UDddr8DYXfUsgcSYpg3QaHNEs/swrMDOuS+BNeGruyPODVmAiSbg9myMZOX xfg1Z5jww6oAxyn8Exn/0Z6+Qk0E2sK6qmRls0koMhtPCV5lmcV8jNvm42GPZlBzWoLj xv3mj7FQAJQaWzFZP4GwA+oDhkTdyKICLonhrNEZgarC1Up7ux25XLlVZchCCzGtUp6h 1dzipcR/4n2aE0IkNuqDDcGdXA5JCogUw78vs6YKkmli9x3Vq/uNVxTo0zy1YG83mNUp ErJVyvMa7XP7RhTnFjGwoTmq/Ol6MItw7s3cCaGiciebgVF7zeyYn3VkiqsYfu2XlGjm nYGg== X-Gm-Message-State: AFqh2kodXZVZNPc6U1Fr9GlHDye2pgKpW8RkM9TbkQr6NaJe1awueI4A VkuMGZqZKEoghOFA7SdEGjeVngHhq9k= X-Google-Smtp-Source: AMrXdXuANsbweVlyTt/woa/+y2KeL77d8Sr9bNyeu2Bn8yuWPmpclQ8WXcS42eZ9J39m/ezOlaK4ow== X-Received: by 2002:a05:6000:18f:b0:29c:63ac:ec34 with SMTP id p15-20020a056000018f00b0029c63acec34mr1709885wrx.4.1672699359483; Mon, 02 Jan 2023 14:42:39 -0800 (PST) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id f8-20020adff8c8000000b00282194eaf7bsm19605859wrq.71.2023.01.02.14.42.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Jan 2023 14:42:38 -0800 (PST) From: Alex Kiernan To: openembedded-devel@lists.openembedded.org Cc: Alex Kiernan Subject: [meta-oe][PATCH 1/4] ostree: Use systemd_system_unitdir for systemd units Date: Mon, 2 Jan 2023 22:42:31 +0000 Message-Id: <20230102224234.287772-1-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.39.0 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 ; Mon, 02 Jan 2023 22:42:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100339 Signed-off-by: Alex Kiernan --- meta-oe/recipes-extended/ostree/ostree_2022.7.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-extended/ostree/ostree_2022.7.bb b/meta-oe/recipes-extended/ostree/ostree_2022.7.bb index 771b17b34b35..0a56ad7c8369 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2022.7.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2022.7.bb @@ -84,7 +84,7 @@ PACKAGECONFIG[selinux] = "--with-selinux, --without-selinux, libselinux, bubblew PACKAGECONFIG[smack] = "--with-smack, --without-smack, smack" PACKAGECONFIG[soup] = "--with-soup, --without-soup --disable-glibtest, libsoup-2.4" PACKAGECONFIG[static] = "" -PACKAGECONFIG[systemd] = "--with-libsystemd --with-systemdsystemunitdir=${systemd_unitdir}/system, --without-libsystemd, systemd" +PACKAGECONFIG[systemd] = "--with-libsystemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-libsystemd, systemd" PACKAGECONFIG[trivial-httpd-cmdline] = "--enable-trivial-httpd-cmdline, --disable-trivial-httpd-cmdline" EXTRA_OECONF = " \ @@ -139,7 +139,7 @@ PACKAGE_BEFORE_PN = " \ FILES:${PN} += " \ ${nonarch_libdir}/${BPN} \ ${nonarch_libdir}/tmpfiles.d \ - ${systemd_unitdir}/system \ + ${systemd_system_unitdir} \ ${systemd_unitdir}/system-generators \ " FILES:${PN}-dracut = " \ @@ -156,7 +156,7 @@ FILES:${PN}-mkinitcpio = " \ " FILES:${PN}-switchroot = " \ ${nonarch_libdir}/${BPN}/ostree-prepare-root \ - ${systemd_unitdir}/system/ostree-prepare-root.service \ + ${systemd_system_unitdir}/ostree-prepare-root.service \ " FILES:${PN}-trivial-httpd = " \ ${libexecdir}/libostree/ostree-trivial-httpd \ From patchwork Mon Jan 2 22:42:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 17514 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 5F9DFC54EBC for ; Mon, 2 Jan 2023 22:42:47 +0000 (UTC) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.groups.io with SMTP id smtpd.web11.49398.1672699363077488238 for ; Mon, 02 Jan 2023 14:42:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=dMP4JdWG; spf=pass (domain: gmail.com, ip: 209.85.128.50, mailfrom: alex.kiernan@gmail.com) Received: by mail-wm1-f50.google.com with SMTP id g10so7666433wmo.1 for ; Mon, 02 Jan 2023 14:42:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=EETl6cH/FyLoLcZmpUH7KV/N/Mp4C+GTpY1p26qTmbs=; b=dMP4JdWG7TCRzUwn9l5Wp1791O+w9T/poOgWFlGvUV3y//kr9UGwQkljd3oc2NwKtE 6h+g+gzN2BcoKsGMkkRDmSeKxElcGOysE4+vt6cPEE/3ifYuFVl47X2uPPWfoTlSH+Ef 5BCQr9eUAq0TxIlqisLej/jKBWVSy+GPkOYS1C0Ijxeifzq1eTlCBZrf1/qU10K7imBT SrKzaYa7h+vlumANFyhvvAmzoHRv2aqwBNcvbeKfi4szceuRp0oFbkIEhcc3BWavw+F8 vMwfkYp7BK6tC3AAs590wkP/QrY5ASi8vJ5Rl+snSq7vuNfAkacnC97XMAGHvsmCwU10 JHIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EETl6cH/FyLoLcZmpUH7KV/N/Mp4C+GTpY1p26qTmbs=; b=KCKPK1k5+Ng1f4DidKshYGiJ4rzDRc9+NGR/BjLQtfE99InXY7I3FCoTaHBTnx3IrX s2uGENyFQSqyBt1WeByr5xGaz0TVYbIe2Ik/GQwG4D4j1q4BvBhNikXulXhet4LfWOjA ox6PGp4Vsa2cvoIlGu+Th5NlopTGRoCaiixJbNRRvsdgfvJa7gshRQJrHKBYKbbVilXG Nxka9B0sCtqMe+3/DmFKAXadLvLLEctyBnAPnVIBOmiP+VO6+9EjnJfyrQr5d6L25sqz xeLM9rIwi43Hgea/kHEI/Nz/a5XmhqfAqjoUI24jyb4rtQsZLMUIEPEQqfotoHjqIaYF dinA== X-Gm-Message-State: AFqh2kq7YvZ0EgUB9GbCXQAzlokgNRTkvzCr3k0BFlI/CkhsFUucdgrx 55PIOSpSG+HR5GQ1nnjTKrxF9kKv87s= X-Google-Smtp-Source: AMrXdXvYr7b6gbGfzg6/rJgl3IK52A1kAxes3xkr7WUbEvmSkxP6zwT3yACKv3SEA9zXgScy+t/d6Q== X-Received: by 2002:a05:600c:3ac3:b0:3d1:cfcb:7d19 with SMTP id d3-20020a05600c3ac300b003d1cfcb7d19mr36198634wms.32.1672699361231; Mon, 02 Jan 2023 14:42:41 -0800 (PST) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id f8-20020adff8c8000000b00282194eaf7bsm19605859wrq.71.2023.01.02.14.42.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Jan 2023 14:42:40 -0800 (PST) From: Alex Kiernan To: openembedded-devel@lists.openembedded.org Cc: Alex Kiernan Subject: [meta-oe][PATCH 2/4] ostree: Switch to fuse3 which is supported in ostree now Date: Mon, 2 Jan 2023 22:42:32 +0000 Message-Id: <20230102224234.287772-2-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230102224234.287772-1-alex.kiernan@gmail.com> References: <20230102224234.287772-1-alex.kiernan@gmail.com> 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 ; Mon, 02 Jan 2023 22:42:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100340 Signed-off-by: Alex Kiernan --- meta-oe/recipes-extended/ostree/ostree_2022.7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/ostree/ostree_2022.7.bb b/meta-oe/recipes-extended/ostree/ostree_2022.7.bb index 0a56ad7c8369..9cc1bd80187c 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2022.7.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2022.7.bb @@ -79,7 +79,7 @@ PACKAGECONFIG[manpages] = "--enable-man, --disable-man, libxslt-native docbook-x PACKAGECONFIG[mkinitcpio] = "--with-mkinitcpio, --without-mkinitcpio" PACKAGECONFIG[no-http2] = "--disable-http2, --enable-http2" PACKAGECONFIG[openssl] = "--with-crypto=openssl, , openssl, , , glib gnutls" -PACKAGECONFIG[rofiles-fuse] = "--enable-rofiles-fuse, --disable-rofiles-fuse, fuse" +PACKAGECONFIG[rofiles-fuse] = "--enable-rofiles-fuse, --disable-rofiles-fuse, fuse3" PACKAGECONFIG[selinux] = "--with-selinux, --without-selinux, libselinux, bubblewrap" PACKAGECONFIG[smack] = "--with-smack, --without-smack, smack" PACKAGECONFIG[soup] = "--with-soup, --without-soup --disable-glibtest, libsoup-2.4" From patchwork Mon Jan 2 22:42:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 17512 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 42936C4708E for ; Mon, 2 Jan 2023 22:42:47 +0000 (UTC) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.groups.io with SMTP id smtpd.web10.49908.1672699364140808346 for ; Mon, 02 Jan 2023 14:42:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=CBfxM7tP; spf=pass (domain: gmail.com, ip: 209.85.128.42, mailfrom: alex.kiernan@gmail.com) Received: by mail-wm1-f42.google.com with SMTP id l26so19883864wme.5 for ; Mon, 02 Jan 2023 14:42:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=59uJUF9Kfww/9w7uUnFZ1R/l7uCmxWL+7VL3CR/AtNI=; b=CBfxM7tPx1VZjIUdL4nfxEMA0x9f5ckCBa0EcgP1OzXtEzV69VkBp8Xxfjyt8Wvi8y GqOxGEkaY6s/dx81udbKJ9OFNKZan4NJz7CUg8PdgAEhw43DWmSbPKu6zEwmZG0A0fzN N7Cry8lgMH54i2AbmjvITjttEVCvqiuOSsjwWRuXDiv0hqrWsXuyku3CLloWg09QutBj K06rJu3r3MLDhhtUxywO1G+tU0UI59bqUJdZd17p5JyzJ5n+EJC8F+cHo3G/WwzwLUO1 JIuMU2rnXbqLrTDKL7VCvuW91iRtDNROxVBnvDdp1Xl/wGXxG878O+65QSktu7C+rYJi Id0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=59uJUF9Kfww/9w7uUnFZ1R/l7uCmxWL+7VL3CR/AtNI=; b=sF2riGRPeLI4GFa4KQRF8zsopQz7roBrv7dPyfqbbCPcWU10On9FHzKlO8je52ptEE dMa533cj77vLDfK28BHPMjDTQNO6VUpmAWbogNE6sGctPe92IObFM92mxKwjltjQ+zNp NeqlV3lyAP62v8ukfefGvr8HV3WyHXOkxC0+aaAiBlfdtcyj38lViC2mS4YvkPY3XO8B 4uuDtlI1Ck/4n/6BBxre3AK7x/vgXrFCZ8T2QodjY3Puh6aG323l4HGgYwSeZGbgMK16 es3GvaT0iJzFEq3k8LhfUN5ST2fqqooYLrt7Q/NNk14oO0ETFaEjFU2kMmV6+HsZJpi1 ylQA== X-Gm-Message-State: AFqh2kpoFCXslcKYeWLSZpOh3m8iHq1R0Dmj8gmYrsOtDZT8xXPNN3nG Rhizxs/gd92xA6etOx9K9Hh4wjCD4Pg= X-Google-Smtp-Source: AMrXdXv9mZb3A918vzisHOoFuvuI69KUWDTl+D6yvi0F+Nl6B8HWF8SBr+bXkVbM07AxRbAVXtcVHA== X-Received: by 2002:a05:600c:21c1:b0:3d3:45c6:b641 with SMTP id x1-20020a05600c21c100b003d345c6b641mr30351528wmj.22.1672699362215; Mon, 02 Jan 2023 14:42:42 -0800 (PST) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id f8-20020adff8c8000000b00282194eaf7bsm19605859wrq.71.2023.01.02.14.42.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Jan 2023 14:42:41 -0800 (PST) From: Alex Kiernan To: openembedded-devel@lists.openembedded.org Cc: Alex Kiernan Subject: [meta-oe][PATCH 3/4] ostree: Fix comments for configuration/ptest Date: Mon, 2 Jan 2023 22:42:33 +0000 Message-Id: <20230102224234.287772-3-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230102224234.287772-1-alex.kiernan@gmail.com> References: <20230102224234.287772-1-alex.kiernan@gmail.com> 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 ; Mon, 02 Jan 2023 22:42:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100341 The comments and recipe had diverged, bring them back into line. Update the instructions on how to get ptest to pass. Signed-off-by: Alex Kiernan --- .../recipes-extended/ostree/ostree_2022.7.bb | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/meta-oe/recipes-extended/ostree/ostree_2022.7.bb b/meta-oe/recipes-extended/ostree/ostree_2022.7.bb index 9cc1bd80187c..2683c4f24558 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2022.7.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2022.7.bb @@ -39,7 +39,9 @@ BUILD_OPTIMIZATION:remove = "-Og" BUILD_OPTIMIZATION:append = " -O2" # Package configuration - match ostree defaults, but without rofiles-fuse -# otherwise we introduce a dependendency on meta-filesystems +# otherwise we introduce a dependendency on meta-filesystems and swap +# soup for curl to avoid bringing in deprecated libsoup2 (though +# to run ptest requires that you have soup). PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \ @@ -48,7 +50,7 @@ PACKAGECONFIG ??= " \ curl \ " -# We include soup because ostree can't (currently) be built without +# We include curl because ostree can't (currently) be built without # soup or curl - https://github.com/ostreedev/ostree/issues/1897 PACKAGECONFIG:class-native ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ @@ -175,13 +177,20 @@ RDEPENDS:${PN}:class-target = " \ # # Note that to get ptest to pass you also need: # -# xattr in DISTRO_FEATURES -# static ostree-prepare-root (PACKAGECONFIG:append:pn-ostree = " static") -# meta-python in your layers -# overlayfs in your kernel (KERNEL_EXTRA_FEATURES += "features/overlayfs/overlayfs.scc") +# xattr in DISTRO_FEATURES (default) +# static ostree-prepare-root +# ostree-trivial-httpd (requires soup - note soup and curl can coexist) +# overlayfs in your kernel # busybox built statically -# /var/tmp as a real filesystem (not a tmpfs) -# Sufficient disk space (IMAGE_ROOTFS_SIZE = "524288") and RAM (QB_MEM = "-m 1024") +# C.UTF-8 locale available +# Sufficient disk space/RAM (e.g. core-image-sato-sdk) +# +# Something like this in your local.conf: +# +# PACKAGECONFIG:append:pn-ostree = " static soup" +# KERNEL_EXTRA_FEATURES:append = " features/overlayfs/overlayfs.scc" +# TARGET_CFLAGS:append:pn-busybox = " -static" +# IMAGE_LINGUAS:append:libc-glibc = " c" # RDEPENDS:${PN}-ptest += " \ attr \ From patchwork Mon Jan 2 22:42:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 17511 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 3D3C2C3DA7A for ; Mon, 2 Jan 2023 22:42:47 +0000 (UTC) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.groups.io with SMTP id smtpd.web11.49399.1672699365071498192 for ; Mon, 02 Jan 2023 14:42:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=iYMakSBU; spf=pass (domain: gmail.com, ip: 209.85.221.44, mailfrom: alex.kiernan@gmail.com) Received: by mail-wr1-f44.google.com with SMTP id z16so11128615wrw.1 for ; Mon, 02 Jan 2023 14:42:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=8ICckW4lzs35hf20mz25KMOsFr0HIJcXeLMqGtvQyM4=; b=iYMakSBU2VPpKyYsCpX9pOHHYPTNHglAXMMDMI7GU6vqO6guIjZ5DgppGgf/E3PKtg Z7LxfwcB6WTfNOaYUgXPdIRte52F1Gq/U+e+YVqilH+QVSksW+pnWw7D35VXmdOceB7L KEvJHA2+bcAafZAFNmc3XwLr8Uv8GBCMoR+50tqH+kgVcgtFczvuhR2p0W9YsXo6n6Y1 DFnMsE/Tbw8SHmosfpTNpsd99Mr+xprkTUNxgtBWR9kjMMQacXjarbPj7dNQiZ2WTl5G VK8s9YUbPjHzMdnbcFHki/xZeKd4DIt5yI6edfMF5zDXLX660tR6KG5nfHFzFj4XjxQY hm6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8ICckW4lzs35hf20mz25KMOsFr0HIJcXeLMqGtvQyM4=; b=j1oqqI1mIohw1uwN5MB9HvVLe/HLlgVRceoJ98Ou8MAuxMlireNBxZXTOlHV4in5lM SLMFXuVDS8A0FbAINOz0+c4YaZB3c1/h0LdPpcYW+R40Sp8xHix5SeUdqOGr3wtmJ+a+ QMdjv/8JhuQjaJJigEGOZm01D+pzMYspRCtNgdnuk9nV2/bcct/FjSXYECgt+p1pN/gd tQpbdmzbnK6DCH9Jcj3nib1/UpesQd9uyT2JP3bcrGOfWCtQoRSp0zffU01DWXAh/XTq PGgzuWGWl3p3i1HysNKeG2rzU00dwsgQu1CJYB4Y63YWtzMbXXpSlElDIBpMZZGdGWBo V8Hw== X-Gm-Message-State: AFqh2kpygp/1eHS1ngLo732pLAamQtYcIUjCSy8GGxbHMqHyEiXV7KWu wdatHeXpbExSJV+SBeQG2xdwfuhMh5k= X-Google-Smtp-Source: AMrXdXvyDJqpsDgDKUwPaTvbWirxj3IZWpdgOcnjroOPThFnePDdoyIKiw5JPQrnp+vkeuVkKgG66A== X-Received: by 2002:adf:f387:0:b0:28e:f7a:9fe8 with SMTP id m7-20020adff387000000b0028e0f7a9fe8mr8718860wro.71.1672699363270; Mon, 02 Jan 2023 14:42:43 -0800 (PST) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id f8-20020adff8c8000000b00282194eaf7bsm19605859wrq.71.2023.01.02.14.42.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Jan 2023 14:42:42 -0800 (PST) From: Alex Kiernan To: openembedded-devel@lists.openembedded.org Cc: Alex Kiernan Subject: [meta-oe][PATCH 4/4] ostree: Handle musl's ERANGE mapping Date: Mon, 2 Jan 2023 22:42:34 +0000 Message-Id: <20230102224234.287772-4-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230102224234.287772-1-alex.kiernan@gmail.com> References: <20230102224234.287772-1-alex.kiernan@gmail.com> 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 ; Mon, 02 Jan 2023 22:42:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100342 Signed-off-by: Alex Kiernan --- ...1-tests-Handle-musl-s-ERANGE-mapping.patch | 29 +++++++++++++++++++ .../recipes-extended/ostree/ostree_2022.7.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-musl-s-ERANGE-mapping.patch diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-musl-s-ERANGE-mapping.patch b/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-musl-s-ERANGE-mapping.patch new file mode 100644 index 000000000000..d0a8447e3da4 --- /dev/null +++ b/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-musl-s-ERANGE-mapping.patch @@ -0,0 +1,29 @@ +From bd182584a1e2f820493d9db689598a20c5700ba5 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Mon, 2 Jan 2023 10:37:49 +0000 +Subject: [PATCH] tests: Handle musl's ERANGE mapping + +musl uses "Result not representable" for ERANGE, support this in +addition to glibc's "Numerical result out of range". + +Upstream-Status: Backport [https://github.com/ostreedev/ostree/commit/2d4ee168d7eae0afcce356a3f8135294e6d7fe6f] +Signed-off-by: Alex Kiernan +--- + tests/test-commit-timestamp.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/test-commit-timestamp.sh b/tests/test-commit-timestamp.sh +index 0688c63a4bdb..de105b768a9c 100755 +--- a/tests/test-commit-timestamp.sh ++++ b/tests/test-commit-timestamp.sh +@@ -40,6 +40,6 @@ fi + ${CMD_PREFIX} ostree --repo=./testrepo show env > show-env.txt + rm -rf testrepo testrepo-files + assert_file_has_content_literal commit-invalid.txt 'Failed to convert SOURCE_DATE_EPOCH' +-assert_file_has_content_literal commit-overflowing.txt 'Parsing SOURCE_DATE_EPOCH: Numerical result out of range' ++assert_file_has_content commit-overflowing.txt 'Parsing SOURCE_DATE_EPOCH: \(Numerical result out of range\|Result not representable\)' + assert_file_has_content_literal show-env.txt 'Date: 2009-02-13 23:31:30 +0000' + echo "ok commit with env timestamp" +-- +2.39.0 + diff --git a/meta-oe/recipes-extended/ostree/ostree_2022.7.bb b/meta-oe/recipes-extended/ostree/ostree_2022.7.bb index 2683c4f24558..61e208b3b718 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2022.7.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2022.7.bb @@ -20,6 +20,7 @@ DEPENDS = " \ SRC_URI = " \ https://github.com/ostreedev/ostree/releases/download/v${PV}/libostree-${PV}.tar.xz \ file://0001-lib-repo-checkout-Add-ALLPERMS-for-musl.patch \ + file://0001-tests-Handle-musl-s-ERANGE-mapping.patch \ file://run-ptest \ " SRC_URI[sha256sum] = "8be2a9261c94e8b9ec4113380ffc480f8598245fb321a009bad4fae4b822411f"