From patchwork Mon Jun 6 12:01:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 8877 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 319C5CCA473 for ; Mon, 6 Jun 2022 12:01:44 +0000 (UTC) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.groups.io with SMTP id smtpd.web12.30986.1654516893735839745 for ; Mon, 06 Jun 2022 05:01:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=CFmJK6C4; spf=pass (domain: gmail.com, ip: 209.85.221.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f41.google.com with SMTP id x17so19559575wrg.6 for ; Mon, 06 Jun 2022 05:01:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4wlp8GO3qhmf9t34FB67nN+np1mrReFE+aI2b9rURSw=; b=CFmJK6C4Dw/fpcFBj5JS5WLil78rBDve305tJ4+vvnsFGXUzwuozTrX3JSOnyoiI88 Cq3qfNuSYVqsci2A5MPwh7Jg0zKiKv7ERjqF9ajDJOTIGEZDC5Z13EULlKduYCkBQUyx B4cOFpP+LDMleDd56eR+rwm5TJOMXRKDNVjhgINkebRSLjv6ZmxhLspxFAJsBqtPeZSP /FqX9AgjJKTu+++dHlM8T0OTotZMsnZSfUJp6a18X5MaSNgav99xl+v44a6IVNRlRFnM uNHTNkslcbRgts+d8gKwcjhBNrlghjwaEyDKZXnxMvJoQGgmZ16Bv0FdDI64rFdlsNxO DtfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4wlp8GO3qhmf9t34FB67nN+np1mrReFE+aI2b9rURSw=; b=dO4ZqxAJxGtAr5iPr1yqA81p8ypoOxiQxlEnD3qzgLDVgZMlsK7eCM5cWWNni66+/d OEPa9Q9nOKFnfYtb42N6N9LZ7/zd6LaLtAvDnKxXPogM+/5cA1F07YgL0B/hQc8gNSL3 KrduEU2gJkGtfZ4n+ezMy14YyV84Gq5kT03dUaDTvxqjNfq2F98co5/N8vAQ24ZPux6g TN+Pn41s4nSC2R73hqXJLKO7DMV86Ml9DlVOwvLetpXNi1IprYpRfMHNERglosHKX+s0 zZ3IXYzdhKb558rndQuIB8eSIq9HHnJKh4ij/rbGDvAUrBPgN7lHk/1WHsmPBoFAYF6D 5X4g== X-Gm-Message-State: AOAM532+bChR03yCYyAJZasO9RZ/RjCNHF+27u3PlZhYO8/w97OQkp2Y HnmSl3xPJX+zwyvnke4TJY5Kodh0uvWMNQ== X-Google-Smtp-Source: ABdhPJzZY0vbW2sw7Gc1zUT6l/iEUtq4UXh4lEFJtwLiblqhGVQvXeeyn2c8e1RJ7pluMPCdI6iWDA== X-Received: by 2002:adf:f842:0:b0:213:5c4b:981d with SMTP id d2-20020adff842000000b002135c4b981dmr19863998wrq.694.1654516891955; Mon, 06 Jun 2022 05:01:31 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002100316b126sm15526455wru.6.2022.06.06.05.01.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 05:01:30 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 01/21] sato: work around missing icons in adwaita 42.0 Date: Mon, 6 Jun 2022 14:01:06 +0200 Message-Id: <20220606120126.3381438-1-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 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, 06 Jun 2022 12:01:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166594 adwaita icon theme upstream has done significant trimming around app category icons (fullcolour versions gone completely, 'symbolic' b&w versions still around but marked as legacy). Going forward, apps would need to provide their own icons. Given that sato is likely to be deprecated in favour of wayland/weston rather soon, let's use the symbolic icons for now. [YOCTO #14782] Signed-off-by: Alexander Kanavin --- .../gstreamer/gst-examples/gst-player.desktop | 2 +- ...sktop-update-icon-to-one-available-i.patch | 25 ++++++++++++++++++ .../matchbox-config-gtk_0.2.bb | 4 ++- ...ile.c-use-view-refresh-symbolic-icon.patch | 26 +++++++++++++++++++ .../matchbox-desktop/matchbox-desktop_2.2.bb | 1 + ...l.desktop-use-an-icon-available-in-a.patch | 25 ++++++++++++++++++ .../matchbox-terminal_0.2.bb | 4 ++- meta/recipes-sato/puzzles/puzzles_git.bb | 2 +- .../rxvt-unicode/rxvt-unicode/rxvt.desktop | 2 +- .../shutdown-desktop/shutdown.desktop | 2 +- 10 files changed, 87 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-sato/matchbox-config-gtk/files/0001-mb-appearance.desktop-update-icon-to-one-available-i.patch create mode 100644 meta/recipes-sato/matchbox-desktop/files/0001-taku-launcher-tile.c-use-view-refresh-symbolic-icon.patch create mode 100644 meta/recipes-sato/matchbox-terminal/matchbox-terminal/0001-matchbox-terminal.desktop-use-an-icon-available-in-a.patch diff --git a/meta/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop b/meta/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop index 7ddd456a1e..a5df5c9c84 100644 --- a/meta/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop +++ b/meta/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Media Player Comment=Basic media player -Icon=multimedia-player +Icon=multimedia-player-symbolic TryExec=gtk-play Exec=gtk-play StartupNotify=true diff --git a/meta/recipes-sato/matchbox-config-gtk/files/0001-mb-appearance.desktop-update-icon-to-one-available-i.patch b/meta/recipes-sato/matchbox-config-gtk/files/0001-mb-appearance.desktop-update-icon-to-one-available-i.patch new file mode 100644 index 0000000000..7e75fdab9a --- /dev/null +++ b/meta/recipes-sato/matchbox-config-gtk/files/0001-mb-appearance.desktop-update-icon-to-one-available-i.patch @@ -0,0 +1,25 @@ +From ab2c716bb0679a67dc6b0878ef750d3fdd29edb7 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 13 Apr 2022 22:19:11 +0200 +Subject: [PATCH] mb-appearance.desktop: update icon to one available in + adwaita 42.0 + +Upstream-Status: Inappropriate [apps need their own icons as of 42.0] +Signed-off-by: Alexander Kanavin +--- + appearance/mb-appearance.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/appearance/mb-appearance.desktop b/appearance/mb-appearance.desktop +index 4db2bbc..cfa5142 100644 +--- a/appearance/mb-appearance.desktop ++++ b/appearance/mb-appearance.desktop +@@ -2,7 +2,7 @@ + Name=Appearance + Comment=Change the appearance + Exec=matchbox-appearance +-Icon=preferences-desktop-theme ++Icon=preferences-desktop-appearance-symbolic + Terminal=false + Type=Application + Categories=GTK;Settings;DesktopSettings; diff --git a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb index d951baf361..c91f9a7cc2 100644 --- a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb +++ b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb @@ -12,7 +12,9 @@ RDEPENDS:${PN} = "settings-daemon" # SRCREV tagged 0.2 SRCREV = "ef2192ce98d9374ffdad5f78544c3f8f353c16aa" SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master \ - file://no-handed.patch" + file://no-handed.patch \ + file://0001-mb-appearance.desktop-update-icon-to-one-available-i.patch \ + " UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))" S = "${WORKDIR}/git" diff --git a/meta/recipes-sato/matchbox-desktop/files/0001-taku-launcher-tile.c-use-view-refresh-symbolic-icon.patch b/meta/recipes-sato/matchbox-desktop/files/0001-taku-launcher-tile.c-use-view-refresh-symbolic-icon.patch new file mode 100644 index 0000000000..7a4db83da2 --- /dev/null +++ b/meta/recipes-sato/matchbox-desktop/files/0001-taku-launcher-tile.c-use-view-refresh-symbolic-icon.patch @@ -0,0 +1,26 @@ +From 764201dff04a7ca1c3862357ea485a6fc624dd00 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 13 Apr 2022 22:01:30 +0200 +Subject: [PATCH] taku-launcher-tile.c: use view-refresh-symbolic icon + +Plain view-refresh is no longer provided in latest adwaita icon theme. + +Upstream-Status: Inappropriate [apps need their own icons as of 42.0] +Signed-off-by: Alexander Kanavin +--- + libtaku/taku-launcher-tile.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libtaku/taku-launcher-tile.c b/libtaku/taku-launcher-tile.c +index e7f58f3..8bbf2f7 100644 +--- a/libtaku/taku-launcher-tile.c ++++ b/libtaku/taku-launcher-tile.c +@@ -185,7 +185,7 @@ taku_launcher_tile_new_from_item (TakuMenuItem *item) + taku_icon_tile_set_secondary (TAKU_ICON_TILE (tile), + taku_menu_item_get_description (item)); + taku_icon_tile_set_pixbuf (TAKU_ICON_TILE (tile), +- get_icon ("view-refresh", size)); ++ get_icon ("view-refresh-symbolic", size)); + + /* Don't need to update the icon here, because we'll get a style-set signal + when the widget is realised which will update the icon. */ diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb index b05a9c48ad..c306aba6ec 100644 --- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb +++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb @@ -15,6 +15,7 @@ SECTION = "x11/wm" SRCREV = "6bc67d09da4147e5552fe30011a05a2c59d2f777" SRC_URI = "git://git.yoctoproject.org/${BPN}-2;branch=master \ file://vfolders/ \ + file://0001-taku-launcher-tile.c-use-view-refresh-symbolic-icon.patch \ " EXTRA_OECONF = "--enable-startup-notification --with-dbus" diff --git a/meta/recipes-sato/matchbox-terminal/matchbox-terminal/0001-matchbox-terminal.desktop-use-an-icon-available-in-a.patch b/meta/recipes-sato/matchbox-terminal/matchbox-terminal/0001-matchbox-terminal.desktop-use-an-icon-available-in-a.patch new file mode 100644 index 0000000000..48987f9d31 --- /dev/null +++ b/meta/recipes-sato/matchbox-terminal/matchbox-terminal/0001-matchbox-terminal.desktop-use-an-icon-available-in-a.patch @@ -0,0 +1,25 @@ +From ec16ba4a1cb0e4217910a1b36783f00828bb5dfc Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 13 Apr 2022 22:24:50 +0200 +Subject: [PATCH] matchbox-terminal.desktop: use an icon available in adwaita + 42.0 + +Upstream-Status: Inappropriate [apps need their own icons as of 42.0] +Signed-off-by: Alexander Kanavin +--- + matchbox-terminal.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/matchbox-terminal.desktop b/matchbox-terminal.desktop +index c84a24c..fedaf10 100644 +--- a/matchbox-terminal.desktop ++++ b/matchbox-terminal.desktop +@@ -3,7 +3,7 @@ Type=Application + Name=Terminal + Comment=When all else fails. + Exec=matchbox-terminal +-Icon=utilities-terminal ++Icon=utilities-terminal-symbolic + Terminal=false + Categories=GTK;Utility; + StartupNotify=true diff --git a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb index 802ffa971b..048e247b89 100644 --- a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb +++ b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb @@ -11,7 +11,9 @@ SECTION = "x11/utils" #SRCREV tagged 0.2 SRCREV = "161276d0f5d1be8187010fd0d9581a6feca70ea5" -SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master" +SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master \ + file://0001-matchbox-terminal.desktop-use-an-icon-available-in-a.patch \ + " UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))" S = "${WORKDIR}/git" diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb index 0104f2672a..6f038cc475 100644 --- a/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/meta/recipes-sato/puzzles/puzzles_git.bb @@ -37,7 +37,7 @@ do_install:append () { [Desktop Entry] Name=$title Exec=${bindir}/$prog -Icon=applications-games +Icon=applications-games-symbolic Terminal=false Type=Application Categories=Game; diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop b/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop index 6b7978afc9..84a8ba7dc5 100644 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop @@ -3,7 +3,7 @@ Version=1.0 Name=Terminal Comment=A unicode capable rxvt clone Exec=rxvt -Icon=utilities-terminal +Icon=utilities-terminal-symbolic Terminal=false Type=Application Categories=Utility;TerminalEmulator; diff --git a/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop b/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop index 662659afc2..bc437ca2de 100644 --- a/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop +++ b/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop @@ -4,7 +4,7 @@ Type=Application Name=Shutdown Comment=Close down the machine safely Exec=poweroff -Icon=system-shutdown +Icon=system-shutdown-symbolic Terminal=false Categories=Utility; StartupNotify=true From patchwork Mon Jun 6 12:01:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 8890 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 741A6CCA489 for ; Mon, 6 Jun 2022 12:01:44 +0000 (UTC) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.groups.io with SMTP id smtpd.web11.30980.1654516894536629628 for ; Mon, 06 Jun 2022 05:01:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=cS+GjRoQ; spf=pass (domain: gmail.com, ip: 209.85.128.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f41.google.com with SMTP id v4-20020a1cac04000000b00397001398c0so9890552wme.5 for ; Mon, 06 Jun 2022 05:01:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9OH4Y24qtv8AZjVzixNzSiwCoJkKPpzastnvATKuTbQ=; b=cS+GjRoQqT735ZvmlGWJXe6z13acKh6136LH75IGaBtCYyPeAvQCoPbzSE12+Pf2xp DQwK9Nzml/yOcMqBNYfn2U/cFAmqdOqKNhdHe1u3yAK+8tGBmMCXBoEUNnjj1HJ/GChp sLRgGLfESuGLztH4F4BKpRpsFiM6zwitPV+eNucVvOpVZSolis6+HZuC+Cvo5PyPAkcv f43+HvMTQKSJ5VRFaTFLB2LU9GL6tkew4qwU7uoEgS8WWWF3so20HhQzTLYVGRUmeh49 07J+eB49cLTOwxUzq+p+nd8mFqD9mvgPdrQM1hU89iDWGZJMBdT7kFT2oqmzqaJP+yHw VmAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9OH4Y24qtv8AZjVzixNzSiwCoJkKPpzastnvATKuTbQ=; b=aynek5EA/whHnKax91f4ZIkRjL76GrJ2YMkwoaqHxV2sL7FmoXjNrIolSt/HqBHhkA aL7+dXzgQHPQ1id6HcYAWgMl4tDkgifRkaS4vMu5gHVdGO7wcRWjDrKD6Ryzr2CgbcPQ vM5ynBz94EHU7ioe59UG3xkHVwROyGpjhO1+sdgxubxrZASnjDorpRtvmz0vypUBWbjJ SkbZoHIbHbUGTYmC1U0pybsky584NUqj0gN1eVmHamktoE2KBMSZlwyYAGyGIzxSvuEq U1Qp3wP9DhHkBYmyqsS1Uk5IOVJdr4ZuWHtf0u5sd4OeOn6OYTBXx8M/IFjGVGINE1+c Kh9g== X-Gm-Message-State: AOAM533QtKsgRV15JtgZ4DXmYAIpcVj+goqp97IpmwdUt0jrhpMBMWFd nhP2pbuHlP58V35LkPFodjYx2aSlmrIt7Q== X-Google-Smtp-Source: ABdhPJw+N+dpDZ5EmDBS01ZaLBpXynBk5m/HVeIgPHQUOjBzgETfxbDke7rRz6GsVyeb0CInyU8aQg== X-Received: by 2002:a7b:c401:0:b0:397:26fb:ebf7 with SMTP id k1-20020a7bc401000000b0039726fbebf7mr22631176wmi.90.1654516892776; Mon, 06 Jun 2022 05:01:32 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002100316b126sm15526455wru.6.2022.06.06.05.01.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 05:01:32 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 02/21] adwaita-icon-theme: upgrade 41.0 -> 42.0 Date: Mon, 6 Jun 2022 14:01:07 +0200 Message-Id: <20220606120126.3381438-2-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606120126.3381438-1-alex@linutronix.de> References: <20220606120126.3381438-1-alex@linutronix.de> 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, 06 Jun 2022 12:01:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166595 Signed-off-by: Alexander Kanavin --- .../0001-Don-t-use-AC_CANONICAL_HOST.patch | 6 +- ...-installation-commands-as-shell-jobs.patch | 84 ------------------- ...eme_41.0.bb => adwaita-icon-theme_42.0.bb} | 7 +- 3 files changed, 5 insertions(+), 92 deletions(-) delete mode 100644 meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch rename meta/recipes-gnome/gnome/{adwaita-icon-theme_41.0.bb => adwaita-icon-theme_42.0.bb} (87%) diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch index 5afba3c644..56fd3daead 100644 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch @@ -1,4 +1,4 @@ -From 63d97fefdbc90f5c68f67bdc30844776d9a1b720 Mon Sep 17 00:00:00 2001 +From 985eda68d3303112791cf6858f6fef1a99288e8a Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 30 May 2017 14:55:49 +0300 Subject: [PATCH] Don't use AC_CANONICAL_HOST @@ -14,12 +14,12 @@ Signed-off-by: Jussi Kukkonen 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac -index f2659a5..1e8b016 100644 +index 040975e..5f7b53a 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,6 @@ AC_PREREQ(2.53) - AC_INIT([adwaita-icon-theme], [41.0], + AC_INIT([adwaita-icon-theme], [42.0], [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme]) -AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch deleted file mode 100644 index a1d39cf558..0000000000 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 79da031e9811f3eef34b14cce419be93fea34319 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Tue, 13 Jun 2017 18:10:06 +0300 -Subject: [PATCH] Run installation commands as shell jobs - -This greatly speeds up installation time on multi-core systems. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/merge_requests/39] -Signed-off-by: Alexander Kanavin - ---- - src/fullcolor/Makefile.am | 5 +++-- - src/spinner/Makefile.am | 7 ++++--- - src/symbolic/Makefile.am | 11 ++++++----- - 3 files changed, 13 insertions(+), 10 deletions(-) - -diff --git a/src/fullcolor/Makefile.am b/src/fullcolor/Makefile.am -index d73529b..b7d0808 100644 ---- a/src/fullcolor/Makefile.am -+++ b/src/fullcolor/Makefile.am -@@ -9,9 +9,10 @@ install-data-local: - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size && find . -name "*.png"`; do \ - context="`dirname $$file`"; \ - $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ -- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ -+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ - done; \ -- done; -+ done; \ -+ wait - - ## FIXME we should add a way to remove links generated by icon mapping - uninstall-local: -diff --git a/src/spinner/Makefile.am b/src/spinner/Makefile.am -index c14caf6..322dc0d 100644 ---- a/src/spinner/Makefile.am -+++ b/src/spinner/Makefile.am -@@ -24,13 +24,14 @@ install-data-local: - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \ - context="`dirname $$file`"; \ - $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ -- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ -+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ - done; \ - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \ - context="`dirname $$file`"; \ - $(mkdir_p) $(DESTDIR)$(themedir)/scalable-up-to-32/$$context; \ -- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file; \ -- done -+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file & \ -+ done; \ -+ wait - - uninstall-local: - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \ -diff --git a/src/symbolic/Makefile.am b/src/symbolic/Makefile.am -index 957c0ee..e1f8818 100644 ---- a/src/symbolic/Makefile.am -+++ b/src/symbolic/Makefile.am -@@ -34,18 +34,19 @@ install-data-local: - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \ - context="`dirname $$file`"; \ - $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ -- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ -+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ - done; \ -- done -+ done; \ - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \ - context="`dirname $$file`"; \ - $(mkdir_p) $(DESTDIR)$(themedir)/scalable/$$context; \ -- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file; \ -+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file & \ - for size in $(symbolic_encode_sizes); do \ - $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ -- $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context; \ -+ $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context & \ - done \ -- done -+ done; \ -+ wait - - uninstall-local: - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \ diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb similarity index 87% rename from meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb rename to meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb index 46f9f4772c..c4f3b1c999 100644 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb @@ -12,12 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \ inherit allarch autotools pkgconfig gettext gtk-icon-cache gnomebase -SRC_URI += " \ - file://0001-Don-t-use-AC_CANONICAL_HOST.patch \ - file://0001-Run-installation-commands-as-shell-jobs.patch \ - " +SRC_URI += " file://0001-Don-t-use-AC_CANONICAL_HOST.patch" -SRC_URI[archive.sha256sum] = "ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba" +SRC_URI[archive.sha256sum] = "5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0" DEPENDS += "librsvg-native" From patchwork Mon Jun 6 12:01:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 8885 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 6EEB5CCA48A for ; Mon, 6 Jun 2022 12:01:44 +0000 (UTC) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.groups.io with SMTP id smtpd.web12.30988.1654516894928751584 for ; Mon, 06 Jun 2022 05:01:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=fLnO8Qh0; spf=pass (domain: gmail.com, ip: 209.85.128.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f43.google.com with SMTP id m39-20020a05600c3b2700b0039c511ebbacso888738wms.3 for ; Mon, 06 Jun 2022 05:01:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=k8AXKRIKzeo1fl/MlElNTfjej566/wd8cfk3tKl55SY=; b=fLnO8Qh0VNEtUqIwm60LJo/E0FBWIMC+V84BEu5Xh0ALaBQ82hMs5xrqZnu1YnRT40 PLuMf47ESady0yPXuCie/S/AjvBigYObOYiv7aofDfy0a4ep0V+4BdCWCLp5jQRpxqsh HJmTzgl3EYTpqHEqJM4v3gZSSh7hmAKD521Kv67NooxIsXIAWueki8rgpqUCkSDlbdhm HsrKvo8O3mgMGRp2NFfa7K8YCdZkfvzAg2AmSYzcLlu/czxUtiiVBZObUHrQcacP6tHM WlYF7+zMLPCLFYoNLjIA5k5aya2+dUyat6QsqGtgjOEXOQwUiYPQuRtb1pECmMxy3Rlc s3xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=k8AXKRIKzeo1fl/MlElNTfjej566/wd8cfk3tKl55SY=; b=m/60FMqmd0EYsPOa+S48otYRgalawt0bC7JFbzRNBRgoy3Mb9a3TBH0o3pduJRJmlH 90tp6thdpReOX0WQ9I83Kb4jOME0qeO9/I9F+mrlpRnjjLo6s2kAOuJvy/DaFVhWnLrr Bg5sNyqG+Jbjip/DPzZRmzwAqJuuiQh5zquMAloo29aSy4z7gLABLb/kx1GxcHAGO0vi aYQM9P0FyGtsA5nE+LzjwbptzvBJFDL7z0TGFo2obxVr+sa4ukb9rW030865roNEsJit K3msVppMeKWc9Z0ZkgyEHQqVyDBrle/zqz+G2Tk6bVa0s9GDOmfxFENHiAVuChSExYjR mbbg== X-Gm-Message-State: AOAM533XKiY/eEcmV+KCjinjiDnMzvq5MHzqgp3wRnp6T1DTkDh2FGbn 1VQNSv2nlJt9Q/elsMOzBXoo6Z2+th+4Ew== X-Google-Smtp-Source: ABdhPJwTDSPnobJwvhnXgTTLLIRlBwuLArcIq6V0mM2S5t166OJE+Q8wagVXEImfHuMdagT0hgZHfA== X-Received: by 2002:a05:600c:591:b0:39c:4544:b814 with SMTP id o17-20020a05600c059100b0039c4544b814mr12116279wmd.118.1654516893506; Mon, 06 Jun 2022 05:01:33 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002100316b126sm15526455wru.6.2022.06.06.05.01.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 05:01:33 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 03/21] less: mark upstream version as unknown Date: Mon, 6 Jun 2022 14:01:08 +0200 Message-Id: <20220606120126.3381438-3-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606120126.3381438-1-alex@linutronix.de> References: <20220606120126.3381438-1-alex@linutronix.de> 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, 06 Jun 2022 12:01:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166596 As we're ahead of the latest stable release (updated to a beta by mistake/ unclear upstream version policy), mark upstream version as unknown until a new release happens. Signed-off-by: Alexander Kanavin --- meta/recipes-extended/less/less_600.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/less/less_600.bb b/meta/recipes-extended/less/less_600.bb index 9ebe39daab..f51083e1de 100644 --- a/meta/recipes-extended/less/less_600.bb +++ b/meta/recipes-extended/less/less_600.bb @@ -31,6 +31,7 @@ SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \ SRC_URI[sha256sum] = "6633d6aa2b3cc717afb2c205778c7c42c4620f63b1d682f3d12c98af0be74d20" UPSTREAM_CHECK_URI = "http://www.greenwoodsoftware.com/less/download.html" +UPSTREAM_VERSION_UNKNOWN = "1" inherit autotools update-alternatives From patchwork Mon Jun 6 12:01:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 8883 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 4FFF7CCA481 for ; Mon, 6 Jun 2022 12:01:44 +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.31063.1654516899767587833 for ; Mon, 06 Jun 2022 05:01:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Exsal7jW; spf=pass (domain: gmail.com, ip: 209.85.128.42, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f42.google.com with SMTP id n124-20020a1c2782000000b003972dfca96cso7795300wmn.4 for ; Mon, 06 Jun 2022 05:01:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CCaqak2WZHkE/N34L4LImQQqH5b8jxTGpK7k0cDPmuA=; b=Exsal7jWL9cROW5qXdIT76oJ9541K0WhMwJPYjPVmsH2wJZUySIZeDCqT1cwEPDHAL Aaf+vzyLjxjebee5t2Bqk3TIGT+wHBKvquw6WLdA5G3Asw8jXq5RjqcdQyk0wJbxfmfM Q+qPmRMtszoUMDqqMZUgtcyPBCuGcUGKBecIpc6F8JlT3uajhmb/r9on7pC94cvSq6rO vlVdlLC6NgN2/h7Csd2S8Sub0wZCqaGR+ETxYxNKgMGazOwWOv1557guJHTkZTGqaSQl 5BEK+KaSQ+NWMSCVDM7UesN4a3ACGUZXH9MX+0nRA+TjG1urgF9Ta1Ej0n3PF6aS8RcJ UO/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CCaqak2WZHkE/N34L4LImQQqH5b8jxTGpK7k0cDPmuA=; b=rLcZr3XYnTBMJx13CnTCjqOO3etUy1wqT9ebhFFBnj3DOBWHJFYJjsI0cR7UfvM8lV PsZw9EDyLFouYDESDcLce9m25Ir95Ity4ZLcbkApfiC15b4vOvtdgLqMZPTA1VDArXhv RyTs9OkySx8sp8OCR55PC6GDBbTMmBTu2XyAskNTcffwvwYIW/JfrH6h7Fez7qZHAnxW uxJXayjmYbV0DDxOKeofIZs1uFj1lnmXPcZjB0XUI2be4X1hDAqabBOPTLgH0UWAvlwC BymFiTcFfxw3YwSC0/LNCSbNQwYCaRlANdOlqEnh+uNnK61pSCZDGHgulECgNccvSepS 8AEQ== X-Gm-Message-State: AOAM530TLmSw4bejFuHqpup0osY9c4k+yYBPglZQYh3oXXUC+AlxmAzo bH2jlcXtSpRdC2MgtPqqEZM2jh8TAWLY4A== X-Google-Smtp-Source: ABdhPJzThuSZRq1lYaErfxLTdilVLK5sJWICppH8AEwrvbFOKRMqTqltvxLHwd/3y0JR2NVsHhPdnw== X-Received: by 2002:a05:600c:4ec9:b0:397:750a:798a with SMTP id g9-20020a05600c4ec900b00397750a798amr51172043wmq.169.1654516894375; Mon, 06 Jun 2022 05:01:34 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002100316b126sm15526455wru.6.2022.06.06.05.01.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 05:01:33 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 04/21] wayland: exclude pre-releases from version check Date: Mon, 6 Jun 2022 14:01:09 +0200 Message-Id: <20220606120126.3381438-4-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606120126.3381438-1-alex@linutronix.de> References: <20220606120126.3381438-1-alex@linutronix.de> 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, 06 Jun 2022 12:01:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166602 Signed-off-by: Alexander Kanavin --- meta/recipes-graphics/wayland/wayland_1.20.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-graphics/wayland/wayland_1.20.0.bb b/meta/recipes-graphics/wayland/wayland_1.20.0.bb index bd437767b2..dd48a29dc4 100644 --- a/meta/recipes-graphics/wayland/wayland_1.20.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.20.0.bb @@ -20,6 +20,7 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ SRC_URI[sha256sum] = "b8a034154c7059772e0fdbd27dbfcda6c732df29cae56a82274f6ec5d7cd8725" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" +UPSTREAM_CHECK_REGEX = "wayland-(?P\d+\.\d+\.(?!9\d+)\d+)" inherit meson pkgconfig ptest From patchwork Mon Jun 6 12:01:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 8887 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 65540CCA487 for ; Mon, 6 Jun 2022 12:01:44 +0000 (UTC) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.groups.io with SMTP id smtpd.web08.31123.1654516896874581292 for ; Mon, 06 Jun 2022 05:01:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=LzgtroG4; spf=pass (domain: gmail.com, ip: 209.85.221.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f49.google.com with SMTP id k19so19542506wrd.8 for ; Mon, 06 Jun 2022 05:01:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BI2TnIgo8ClZt6UJZ9Rhz5wXjFl+t+3TEdiGBjwtz04=; b=LzgtroG4GYKuTaqWdY/OgUU3EBobKdvYliaRXR3Wn25H9fWCGM0t/Spxby/N+sLYJo e7mfvWbYEXirpOHgol2W8+uKrZvkhgKxLGp9Eh61+9PHVuTQmIOztFfWwSDqq3FmkRaY DLRXvHlnCCaA+UdMEdBhDzFUJN2XHrfg2vsoIBAAHWotSngwepapwCYf88I3DfJ0hxb1 mHkmkXXuthXQKmCMP16OFu0nfsRdjskOsN7rkm0GXy5iM5efZ3ve5vpw17eSnORFoZBO 7/CwqbmvoMMmgXPQRTYoNt01vcXMEeB1oURbKNWO+RLknj37A96F5J9rWzErLyXcde2Z MRTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BI2TnIgo8ClZt6UJZ9Rhz5wXjFl+t+3TEdiGBjwtz04=; b=g7uafrTfhoTFrqAxUU7ldH/eOGiSyS3dyJnA566TZqVOiGRv1ABQIdiiPA4p42qxwt Cdg+SM3OycfU75d4ZGXQ4epfwoczH2tPTctHkj6ujk/HiB1vIf9Hxxl55nHmlUxHhkYm 0VRmbG6PXrSYJ0tPMbG7HOGkBP09aIEccDeg48r1XD/fyL7eym/qf0e+NKDZeiYcX/h1 NoP51CMsErEycm3dgREEWhucbj7Ega3rgeV/pzZInW72BSMiIWEIkUAEEMCioE/sAxEH rN2+jMR8bkRuc+5nbnoblaUHdrGR1gnBa4NGU3jx1bMxpSmm+NCSCy2wVNDnomaQZ8sn EuSQ== X-Gm-Message-State: AOAM530/SDZXXtm80Im5OS9MXUf3Xr7Er+uCi7ditSo9GO/na13Td37t WOJKuUbiOjHUYyPTzpMCfTOs1UHI0ZQKbA== X-Google-Smtp-Source: ABdhPJxo2fUxeoxqO4BtLru0TNHexEsNFGFJ77OUJCPYFjsxjKwK2USOVQgpiatXCtcnS5P3OgW+AA== X-Received: by 2002:adf:f803:0:b0:217:d2cb:d6c7 with SMTP id s3-20020adff803000000b00217d2cbd6c7mr6416939wrp.215.1654516895099; Mon, 06 Jun 2022 05:01:35 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002100316b126sm15526455wru.6.2022.06.06.05.01.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 05:01:34 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 05/21] mesa-demos: update 8.4.0 -> 8.5.0 Date: Mon, 6 Jun 2022 14:01:10 +0200 Message-Id: <20220606120126.3381438-5-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606120126.3381438-1-alex@linutronix.de> References: <20220606120126.3381438-1-alex@linutronix.de> 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, 06 Jun 2022 12:01:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166597 Convert to meson, drop unsupported options. Drop autotools-specific and glew-specific patches (glew support dropped upstream). glu dependency is now x11-specific. 0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch dropped as patched files removed upstream. Signed-off-by: Alexander Kanavin --- ...to-disable-demos-which-require-GLEW-.patch | 382 ------------------ .../0007-Install-few-more-test-programs.patch | 43 -- ...w-missing-.glsl-.vert-.frag-files-to.patch | 99 ----- ...perf-Install-.glsl-.vert-.frag-files.patch | 71 ---- ...G-demos-with-single-frame-need-eglSw.patch | 44 -- .../recipes-graphics/mesa/mesa-demos_8.4.0.bb | 57 --- .../recipes-graphics/mesa/mesa-demos_8.5.0.bb | 43 ++ 7 files changed, 43 insertions(+), 696 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch delete mode 100644 meta/recipes-graphics/mesa/mesa-demos_8.4.0.bb create mode 100644 meta/recipes-graphics/mesa/mesa-demos_8.5.0.bb diff --git a/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch b/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch deleted file mode 100644 index e31827d4a3..0000000000 --- a/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch +++ /dev/null @@ -1,382 +0,0 @@ -From 779438770bedf3d53e6ad8f7cd6889b7f50daf3b Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 9 Jul 2014 14:23:41 +0200 -Subject: [PATCH] configure: Allow to disable demos which require GLEW or GLU - -* in some systems without X11 support we don't have GLEW, but - mesa-demos are still useful - -This isn't currently appropriate for upstream submission as glew has -been replaced with glad there; glu situation would need to be re-assesed -when upstream makes a new release, requested here: -https://gitlab.freedesktop.org/mesa/demos/-/issues/22 - -Upstream-Status: Inappropriate [see above] - -Signed-off-by: Martin Jansa - -Port to 8.3.0 -Signed-off-by: Jussi Kukkonen ---- - configure.ac | 49 ++++++++++++++++++++--------- - src/Makefile.am | 18 ++++++++--- - src/demos/Makefile.am | 73 ++++++++++++++++++++++++------------------- - src/egl/Makefile.am | 8 +++-- - src/egl/opengles1/Makefile.am | 10 ++++-- - src/egl/opengles2/Makefile.am | 29 ++++++++--------- - 6 files changed, 117 insertions(+), 70 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0525b09..28834cd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -93,25 +93,44 @@ AC_EGREP_HEADER([glutInitContextProfile], - [AC_DEFINE(HAVE_FREEGLUT)], - []) - --dnl Check for GLEW --PKG_CHECK_MODULES(GLEW, [glew >= 1.5.4]) --DEMO_CFLAGS="$DEMO_CFLAGS $GLEW_CFLAGS" --DEMO_LIBS="$DEMO_LIBS $GLEW_LIBS" -+AC_ARG_ENABLE([glew], -+ [AS_HELP_STRING([--enable-glew], -+ [build demos which require glew @<:@default=yes@:>@])], -+ [enable_glew="$enableval"], -+ [enable_glew=yes] -+) -+ -+if test "x$enable_glew" = xyes; then -+ dnl Check for GLEW -+ PKG_CHECK_MODULES(GLEW, [glew >= 1.5.4], [glew_enabled=yes], [glew_enabled=no]) -+ DEMO_CFLAGS="$DEMO_CFLAGS $GLEW_CFLAGS" -+ DEMO_LIBS="$DEMO_LIBS $GLEW_LIBS" -+fi - - # LIBS was set by AC_CHECK_LIB above - LIBS="" - --PKG_CHECK_MODULES(GLU, [glu], [], -- [AC_CHECK_HEADER([GL/glu.h], -- [], -- AC_MSG_ERROR([GLU not found])) -- AC_CHECK_LIB([GLU], -- [gluBeginCurve], -- [GLU_LIBS=-lGLU], -- AC_MSG_ERROR([GLU required])) ]) -+AC_ARG_ENABLE([glu], -+ [AS_HELP_STRING([--enable-glu], -+ [build demos which require glu @<:@default=yes@:>@])], -+ [enable_glu="$enableval"], -+ [enable_glu=yes] -+) - --DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS" --DEMO_LIBS="$DEMO_LIBS $GLU_LIBS" -+if test "x$enable_glu" = xyes; then -+ PKG_CHECK_MODULES(GLU, [glu], [glu_enabled=yes], -+ [AC_CHECK_HEADER([GL/glu.h], -+ [], -+ AC_MSG_ERROR([GLU not found])) -+ AC_CHECK_LIB([GLU], -+ [gluBeginCurve], -+ [GLU_LIBS=-lGLU -+ glu_enabled=yes], -+ AC_MSG_ERROR([GLU required])) ]) -+ -+ DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS" -+ DEMO_LIBS="$DEMO_LIBS $GLU_LIBS" -+fi - - AC_ARG_ENABLE([egl], - [AS_HELP_STRING([--enable-egl], -@@ -304,6 +323,8 @@ AC_SUBST([WAYLAND_CFLAGS]) - AC_SUBST([WAYLAND_LIBS]) - - -+AM_CONDITIONAL(HAVE_GLU, test "x$glu_enabled" = "xyes") -+AM_CONDITIONAL(HAVE_GLEW, test "x$glew_enabled" = "xyes") - AM_CONDITIONAL(HAVE_EGL, test "x$egl_enabled" = "xyes") - AM_CONDITIONAL(HAVE_GLESV1, test "x$glesv1_enabled" = "xyes") - AM_CONDITIONAL(HAVE_GLESV2, test "x$glesv2_enabled" = "xyes") -diff --git a/src/Makefile.am b/src/Makefile.am -index 1647d64..8b89dee 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -22,15 +22,19 @@ - # Authors: - # Eric Anholt - -+if HAVE_GLEW -+UTIL = util -+endif -+ - SUBDIRS = \ -- util \ -+ $(UTIL) \ - data \ - demos \ - egl \ - fp \ - fpglsl \ - glsl \ -- gs \ -+ gs \ - objviewer \ - osdemos \ - perf \ -@@ -40,8 +44,12 @@ SUBDIRS = \ - slang \ - tests \ - tools \ -- trivial \ -- vp \ -- vpglsl \ - wgl \ - xdemos -+ -+if HAVE_GLEW -+SUBDIRS += \ -+ vp \ -+ vpglsl \ -+ trivial -+endif -diff --git a/src/demos/Makefile.am b/src/demos/Makefile.am -index 41603fa..ab1e3ab 100644 ---- a/src/demos/Makefile.am -+++ b/src/demos/Makefile.am -@@ -30,91 +30,100 @@ AM_LDFLAGS = \ - $(DEMO_LIBS) \ - $(GLUT_LIBS) - -+bin_PROGRAMS = -+ - if HAVE_GLUT --bin_PROGRAMS = \ -+if HAVE_GLEW -+bin_PROGRAMS += \ - arbfplight \ - arbfslight \ - arbocclude \ - arbocclude2 \ -- bounce \ -- clearspd \ - copypix \ - cubemap \ - cuberender \ - dinoshade \ -- dissolve \ -- drawpix \ - engine \ - fbo_firecube \ - fbotexture \ -- fire \ - fogcoord \ - fplight \ - fslight \ -+ gloss \ -+ isosurf \ -+ multiarb \ -+ paltex \ -+ pointblast \ -+ projtex \ -+ shadowtex \ -+ spriteblast \ -+ stex3d \ -+ textures \ -+ vao_demo \ -+ winpos -+ -+copypix_LDADD = ../util/libutil.la -+cubemap_LDADD = ../util/libutil.la -+cuberender_LDADD = ../util/libutil.la -+engine_LDADD = ../util/libutil.la -+fbo_firecube_LDADD = ../util/libutil.la -+gloss_LDADD = ../util/libutil.la -+isosurf_LDADD = ../util/libutil.la -+multiarb_LDADD = ../util/libutil.la -+projtex_LDADD = ../util/libutil.la -+textures_LDADD = ../util/libutil.la -+winpos_LDADD = ../util/libutil.la -+endif -+ -+if HAVE_GLU -+bin_PROGRAMS += \ -+ bounce \ -+ clearspd \ -+ dissolve \ -+ drawpix \ -+ fire \ - gamma \ - gearbox \ - gears \ - geartrain \ - glinfo \ -- gloss \ - gltestperf \ - ipers \ -- isosurf \ - lodbias \ - morph3d \ -- multiarb \ -- paltex \ - pixeltest \ -- pointblast \ -- projtex \ - ray \ - readpix \ - reflect \ - renormal \ -- shadowtex \ - singlebuffer \ - spectex \ -- spriteblast \ -- stex3d \ - teapot \ - terrain \ - tessdemo \ - texcyl \ - texenv \ -- textures \ - trispd \ - tunnel2 \ -- tunnel \ -- vao_demo \ -- winpos --endif -+ tunnel - - tunnel_SOURCES = \ - tunnel.c \ - tunneldat.h - --copypix_LDADD = ../util/libutil.la --cubemap_LDADD = ../util/libutil.la --cuberender_LDADD = ../util/libutil.la --drawpix_LDADD = ../util/libutil.la - dissolve_LDADD = ../util/libutil.la --engine_LDADD = ../util/libutil.la --fbo_firecube_LDADD = ../util/libutil.la -+drawpix_LDADD = ../util/libutil.la - fire_LDADD = ../util/libutil.la --gloss_LDADD = ../util/libutil.la - ipers_LDADD = ../util/libutil.la --isosurf_LDADD = ../util/libutil.la - lodbias_LDADD = ../util/libutil.la --multiarb_LDADD = ../util/libutil.la --projtex_LDADD = ../util/libutil.la - readpix_LDADD = ../util/libutil.la - reflect_LDADD = ../util/libutil.la - teapot_LDADD = ../util/libutil.la - texcyl_LDADD = ../util/libutil.la --textures_LDADD = ../util/libutil.la - tunnel_LDADD = ../util/libutil.la - tunnel2_LDADD = ../util/libutil.la --winpos_LDADD = ../util/libutil.la -+endif -+endif - - EXTRA_DIST = \ - README -diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am -index d64a49e..4fe1ca8 100644 ---- a/src/egl/Makefile.am -+++ b/src/egl/Makefile.am -@@ -24,8 +24,12 @@ - - SUBDIRS = \ - eglut \ -- opengl \ -- openvg \ - opengles1 \ - opengles2 \ - oes_vg -+ -+if HAVE_GLU -+SUBDIRS += \ -+ opengl \ -+ openvg -+endif -diff --git a/src/egl/opengles1/Makefile.am b/src/egl/opengles1/Makefile.am -index fa397c2..21853e8 100644 ---- a/src/egl/opengles1/Makefile.am -+++ b/src/egl/opengles1/Makefile.am -@@ -36,9 +36,12 @@ AM_LDFLAGS = \ - $(EGL_LIBS) \ - -lm - -+noinst_PROGRAMS = -+ - if HAVE_EGL - if HAVE_GLESV1 --noinst_PROGRAMS = \ -+if HAVE_X11 -+bin_PROGRAMS = \ - bindtex \ - clear \ - drawtex_x11 \ -@@ -52,8 +55,6 @@ noinst_PROGRAMS = \ - torus_x11 \ - tri_x11 \ - two_win --endif --endif - - bindtex_LDADD = $(X11_LIBS) - es1_info_LDADD = $(X11_LIBS) -@@ -76,3 +77,6 @@ drawtex_x11_LDADD = ../eglut/libeglut_x11.la - gears_x11_LDADD = ../eglut/libeglut_x11.la - torus_x11_LDADD = ../eglut/libeglut_x11.la - tri_x11_LDADD = ../eglut/libeglut_x11.la -+endif -+endif -+endif -diff --git a/src/egl/opengles2/Makefile.am b/src/egl/opengles2/Makefile.am -index b80ba50..17f8d49 100644 ---- a/src/egl/opengles2/Makefile.am -+++ b/src/egl/opengles2/Makefile.am -@@ -33,27 +33,28 @@ AM_LDFLAGS = \ - $(EGL_LIBS) \ - -lm - -+bin_PROGRAMS = -+ - if HAVE_EGL - if HAVE_GLESV2 --bin_PROGRAMS = --if HAVE_X11 --bin_PROGRAMS += \ -- es2_info \ -- es2gears_x11 \ -- es2tri --endif - if HAVE_WAYLAND - bin_PROGRAMS += es2gears_wayland --endif --endif -+ -+es2gears_wayland_SOURCES = es2gears.c -+es2gears_wayland_LDADD = ../eglut/libeglut_wayland.la - endif - --es2_info_LDADD = $(X11_LIBS) --es2tri_LDADD = $(X11_LIBS) -+if HAVE_X11 -+bin_PROGRAMS += \ -+ es2tri \ -+ es2_info \ -+ es2gears_x11 - -+es2_info_LDADD = $(X11_LIBS) - es2gears_x11_SOURCES = es2gears.c -- - es2gears_x11_LDADD = ../eglut/libeglut_x11.la -+es2tri_LDADD = $(X11_LIBS) -+endif -+endif -+endif - --es2gears_wayland_SOURCES = es2gears.c --es2gears_wayland_LDADD = ../eglut/libeglut_wayland.la --- -2.1.4 - diff --git a/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch b/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch deleted file mode 100644 index b27d9eafa5..0000000000 --- a/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 2e0367a941445a862ab99c54ec85d1357d0f73c0 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Thu, 10 Jul 2014 14:30:52 +0200 -Subject: [PATCH] Install few more test programs - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa - -Signed-off-by: Jussi Kukkonen - ---- - src/egl/opengl/Makefile.am | 3 +-- - src/egl/openvg/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/src/egl/opengl/Makefile.am b/src/egl/opengl/Makefile.am -index 6d184ff6..ab09d028 100644 ---- a/src/egl/opengl/Makefile.am -+++ b/src/egl/opengl/Makefile.am -@@ -57,8 +57,7 @@ endif - - if HAVE_EGL - bin_PROGRAMS = \ -- eglinfo --noinst_PROGRAMS = \ -+ eglinfo \ - peglgears \ - $(EGL_DRM_DEMOS) \ - $(EGL_X11_DEMOS) \ -diff --git a/src/egl/openvg/Makefile.am b/src/egl/openvg/Makefile.am -index b0f1212f..5fd1cf83 100644 ---- a/src/egl/openvg/Makefile.am -+++ b/src/egl/openvg/Makefile.am -@@ -49,7 +49,7 @@ endif - - if HAVE_EGL - if HAVE_VG --noinst_PROGRAMS = \ -+bin_PROGRAMS = \ - $(EGL_X11_DEMOS) - endif - endif diff --git a/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch b/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch deleted file mode 100644 index a6d168175f..0000000000 --- a/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 894add34c2b5e6b4ccc78996bf681d7ec7bc9e36 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Thu, 10 Jul 2014 14:29:27 +0200 -Subject: [PATCH] glsl, perf: Add few missing .glsl, .vert, .frag files to - EXTRA_DATA - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa - ---- - src/fpglsl/Makefile.am | 2 ++ - src/glsl/Makefile.am | 10 ++++++++-- - src/perf/Makefile.am | 6 ++++++ - src/vpglsl/Makefile.am | 1 + - 4 files changed, 17 insertions(+), 2 deletions(-) - -diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am -index 47c1039f..fd43c919 100644 ---- a/src/fpglsl/Makefile.am -+++ b/src/fpglsl/Makefile.am -@@ -39,10 +39,12 @@ noinst_PROGRAMS = \ - endif - - EXTRA_DIST = \ -+ depth-read.glsl \ - dowhile2.glsl \ - dowhile.glsl \ - forbreak.glsl \ - for.glsl \ -+ infinite-loop.glsl \ - mov.glsl \ - mov-imm.glsl \ - simpleif.glsl \ -diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am -index 4faa8dbf..079a29d8 100644 ---- a/src/glsl/Makefile.am -+++ b/src/glsl/Makefile.am -@@ -37,7 +37,7 @@ AM_LDFLAGS = \ - if HAVE_GLUT - bin_PROGRAMS = \ - array \ -- bezier \ -+ bezier \ - bitmap \ - brick \ - bump \ -@@ -123,12 +123,16 @@ EXTRA_DIST = \ - CH06-brick.vert \ - CH11-bumpmap.frag \ - CH11-bumpmap.vert \ -+ CH11-bumpmaptex.frag \ - CH11-toyball.frag \ - CH11-toyball.vert \ - CH18-mandel.frag \ - CH18-mandel.vert \ -- bezier.geom \ -+ bezier.geom \ - brick.shtest \ -+ blinking-teapot.frag \ -+ blinking-teapot.vert \ -+ convolution.frag \ - convolution.vert \ - cubemap.frag \ - mandelbrot.shtest \ -@@ -138,5 +142,7 @@ EXTRA_DIST = \ - reflect.vert \ - shadowtex.frag \ - simple.vert \ -+ simplex-noise.glsl \ - skinning.frag \ -+ skinning.vert \ - toyball.shtest -diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am -index f0031fea..60069396 100644 ---- a/src/perf/Makefile.am -+++ b/src/perf/Makefile.am -@@ -59,3 +59,9 @@ endif - - glslstateschange_LDADD = libperf.la ../util/libutil.la - glsl_compile_time_LDADD = ../util/libutil.la -+ -+EXTRA_DIST = \ -+ glslstateschange1.frag \ -+ glslstateschange1.vert \ -+ glslstateschange2.frag \ -+ glslstateschange2.vert -diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am -index 4a85ed40..48b08f48 100644 ---- a/src/vpglsl/Makefile.am -+++ b/src/vpglsl/Makefile.am -@@ -44,6 +44,7 @@ EXTRA_DIST = \ - func2.glsl \ - ifelse.glsl \ - if.glsl \ -+ infinite-loop.glsl \ - mov.glsl \ - nestedifs.glsl \ - nestedswizzle.glsl \ diff --git a/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch b/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch deleted file mode 100644 index 8a98ba60d1..0000000000 --- a/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 477ab6d90a17d8e4d3935be6ce8b8e154db0e3e5 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Thu, 10 Jul 2014 14:48:12 +0200 -Subject: [PATCH] glsl, perf: Install .glsl, .vert, .frag files - -Upstream-Status: Pending -Signed-off-by: Martin Jansa - ---- - src/fpglsl/Makefile.am | 3 ++- - src/glsl/Makefile.am | 3 ++- - src/perf/Makefile.am | 3 ++- - src/vpglsl/Makefile.am | 3 ++- - 4 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am -index fd43c919..2bf51de4 100644 ---- a/src/fpglsl/Makefile.am -+++ b/src/fpglsl/Makefile.am -@@ -38,7 +38,8 @@ noinst_PROGRAMS = \ - fp-tri - endif - --EXTRA_DIST = \ -+demosdatadir=$(datadir)/$(PACKAGE)/ -+dist_demosdata_DATA= \ - depth-read.glsl \ - dowhile2.glsl \ - dowhile.glsl \ -diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am -index 079a29d8..f66ec299 100644 ---- a/src/glsl/Makefile.am -+++ b/src/glsl/Makefile.am -@@ -118,7 +118,8 @@ vert_or_frag_only_LDADD = ../util/libutil.la - vert_tex_LDADD = ../util/libutil.la - vsraytrace_LDADD = ../util/libutil.la - --EXTRA_DIST = \ -+demosdatadir=$(datadir)/$(PACKAGE)/ -+dist_demosdata_DATA= \ - CH06-brick.frag \ - CH06-brick.vert \ - CH11-bumpmap.frag \ -diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am -index 60069396..469bdf45 100644 ---- a/src/perf/Makefile.am -+++ b/src/perf/Makefile.am -@@ -60,7 +60,8 @@ endif - glslstateschange_LDADD = libperf.la ../util/libutil.la - glsl_compile_time_LDADD = ../util/libutil.la - --EXTRA_DIST = \ -+demosdatadir=$(datadir)/$(PACKAGE)/ -+dist_demosdata_DATA= \ - glslstateschange1.frag \ - glslstateschange1.vert \ - glslstateschange2.frag \ -diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am -index 48b08f48..55268675 100644 ---- a/src/vpglsl/Makefile.am -+++ b/src/vpglsl/Makefile.am -@@ -38,7 +38,8 @@ noinst_PROGRAMS = \ - vp-tris - endif - --EXTRA_DIST = \ -+demosdatadir=$(datadir)/$(PACKAGE)/ -+dist_demosdata_DATA= \ - for.glsl \ - func.glsl \ - func2.glsl \ diff --git a/meta/recipes-graphics/mesa/mesa-demos/0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch b/meta/recipes-graphics/mesa/mesa-demos/0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch deleted file mode 100644 index c687647407..0000000000 --- a/meta/recipes-graphics/mesa/mesa-demos/0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3aa84c47e88a4c38446ce1323abf6f2c77389104 Mon Sep 17 00:00:00 2001 -From: Prabhu -Date: Mon, 16 Nov 2015 17:09:32 -0600 -Subject: [PATCH] mesa-demos: OpenVG demos with single frame need eglSwapBuffer - -sp and text demos rendering single frame. to display the -single frame rendered needed a eglSwapBuffer to diplay to window. -Hence added eglutPostRedisplay to display the frame - -Upstream-Status: Pending - -Signed-off-by: Prabhu ---- - src/egl/openvg/sp.c | 1 + - src/egl/openvg/text.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/egl/openvg/sp.c b/src/egl/openvg/sp.c -index a20c0a3..468e91e 100644 ---- a/src/egl/openvg/sp.c -+++ b/src/egl/openvg/sp.c -@@ -500,6 +500,7 @@ draw(void) - } - - vgFlush(); -+ eglutPostRedisplay(); - } - - -diff --git a/src/egl/openvg/text.c b/src/egl/openvg/text.c -index f5c6de8..492581c 100644 ---- a/src/egl/openvg/text.c -+++ b/src/egl/openvg/text.c -@@ -360,6 +360,7 @@ display(void) - { - vgClear(0, 0, width, height); - glyph_string_draw(10.0, 10.0); -+ eglutPostRedisplay(); - } - - --- -2.5.1 - diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.4.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.4.0.bb deleted file mode 100644 index 01e5b35d0e..0000000000 --- a/meta/recipes-graphics/mesa/mesa-demos_8.4.0.bb +++ /dev/null @@ -1,57 +0,0 @@ -SUMMARY = "Mesa demo applications" -DESCRIPTION = "This package includes the demonstration application, such as glxgears. \ -These applications can be used for Mesa validation and benchmarking." -HOMEPAGE = "http://mesa3d.org" -BUGTRACKER = "https://bugs.freedesktop.org" -SECTION = "x11" - -LICENSE = "MIT & PD" -LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=914225785450eff644a86c871d3ae00e \ - file://src/xdemos/glxdemo.c;beginline=1;endline=8;md5=b01d5ab1aee94d35b7efaa2ef48e1a06" - -SRC_URI = "https://mesa.freedesktop.org/archive/demos/${BPN}-${PV}.tar.bz2 \ - file://0001-mesa-demos-Add-missing-data-files.patch \ - file://0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch \ - file://0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch \ - file://0007-Install-few-more-test-programs.patch \ - file://0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch \ - file://0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch \ - file://0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch \ - " -SRC_URI[md5sum] = "6b65a02622765522176d00f553086fa3" -SRC_URI[sha256sum] = "01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d" - -inherit autotools pkgconfig features_check -# depends on virtual/egl, virtual/libgl ... -REQUIRED_DISTRO_FEATURES = "opengl x11" - -PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 \ - x11 glew glu" - -# The Wayland code doesn't work with Wayland 1.0, so disable it for now -#${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" - -EXTRA_OECONF = "--with-system-data-files" - -PACKAGECONFIG[drm] = "--enable-libdrm,--disable-libdrm,libdrm" -PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" -PACKAGECONFIG[freetype2] = "--enable-freetype2,--disable-freetype2,freetype" -PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgl" -PACKAGECONFIG[gles1] = "--enable-gles1,--disable-gles1,virtual/libgles1" -PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2" -PACKAGECONFIG[glut] = "--with-glut=${STAGING_EXECPREFIXDIR},--without-glut,freeglut" -PACKAGECONFIG[osmesa] = "--enable-osmesa,--disable-osmesa," -PACKAGECONFIG[vg] = "--enable-vg,--disable-vg,virtual/libopenvg" -PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,virtual/libgl wayland" -PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11" -PACKAGECONFIG[glew] = "--enable-glew,--disable-glew,glew" -PACKAGECONFIG[glu] = "--enable-glu,--disable-glu,virtual/libgl" - -do_install:append() { - # it can be completely empty when all PACKAGECONFIG options are disabled - rmdir --ignore-fail-on-non-empty ${D}${bindir} - - if [ -f ${D}${bindir}/clear ]; then - mv ${D}${bindir}/clear ${D}${bindir}/clear.mesa-demos - fi -} diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.5.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.5.0.bb new file mode 100644 index 0000000000..6e9b95e1e2 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-demos_8.5.0.bb @@ -0,0 +1,43 @@ +SUMMARY = "Mesa demo applications" +DESCRIPTION = "This package includes the demonstration application, such as glxgears. \ +These applications can be used for Mesa validation and benchmarking." +HOMEPAGE = "http://mesa3d.org" +BUGTRACKER = "https://bugs.freedesktop.org" +SECTION = "x11" + +LICENSE = "MIT & PD" +LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=914225785450eff644a86c871d3ae00e \ + file://src/xdemos/glxdemo.c;beginline=1;endline=8;md5=b01d5ab1aee94d35b7efaa2ef48e1a06" + +SRC_URI = "https://mesa.freedesktop.org/archive/demos/${PV}/${BPN}-${PV}.tar.bz2 \ + file://0001-mesa-demos-Add-missing-data-files.patch \ + file://0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch \ + " +SRC_URI[sha256sum] = "cea2df0a80f09a30f635c4eb1a672bf90c5ddee0b8e77f4d70041668ef71aac1" + +inherit meson pkgconfig features_check +# depends on virtual/egl, virtual/libgl ... +REQUIRED_DISTRO_FEATURES = "opengl x11" + +EXTRA_OEMESON = "-Dwith-system-data-files=true" + +PACKAGECONFIG ?= "drm egl gles1 gles2 \ + ${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}" + +PACKAGECONFIG[drm] = "-Dlibdrm=enabled,-Dlibdrm=disabled,libdrm" +PACKAGECONFIG[egl] = "-Degl=enabled,-Degl=disabled,virtual/egl" +PACKAGECONFIG[gles1] = "-Dgles1=enabled,-Dgles1=disabled,virtual/libgles1" +PACKAGECONFIG[gles2] = "-Dgles2=enabled,-Dgles2=disabled,virtual/libgles2" +PACKAGECONFIG[glut] = "-Dwith-glut=${STAGING_EXECPREFIXDIR},,freeglut" +PACKAGECONFIG[osmesa] = "-Dosmesa=enabled,-Dosmesa=disabled," +PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,virtual/libgl wayland wayland-native" +PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,virtual/libx11 libglu" + +do_install:append() { + # it can be completely empty when all PACKAGECONFIG options are disabled + rmdir --ignore-fail-on-non-empty ${D}${bindir} + + if [ -f ${D}${bindir}/clear ]; then + mv ${D}${bindir}/clear ${D}${bindir}/clear.mesa-demos + fi +} From patchwork Mon Jun 6 12:01:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 8889 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 5DAFFCCA485 for ; Mon, 6 Jun 2022 12:01:44 +0000 (UTC) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.groups.io with SMTP id smtpd.web09.31131.1654516897486351375 for ; Mon, 06 Jun 2022 05:01:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Yg6HoV6n; spf=pass (domain: gmail.com, ip: 209.85.221.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f48.google.com with SMTP id m26so8128357wrb.4 for ; Mon, 06 Jun 2022 05:01:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rlcHsxVwTgOdylUAO0AC1oaAIqMX7KRnGcj/SmZjGCA=; b=Yg6HoV6n3+YNEVUJzNjnszyOq0odXDTogjDfPPvESbNSMQgONEtx4wrjWy21PhxS6+ i0GDvIDUckDNalm6pk3yme19VXWQ7HaWohLMhU1o+O30Mh3uUzS/gTt0fKD/oN6hJTbk IlHHb+Jpctz9ltiucu4ASKdTdCDfIIsgo/+8imzH/EHybh2PAo0DoePAL8pzs8nhj0jz cbR6vIolvW7DkmO9PWFz/gPZePUxMoD0ZB60MQfm+/wVUqUhX36JP3B4W4jSSTuDkqcN b2SQtk353Hnm/JbGT9XeIAI04RCtdilPwC7YPbKEM+cU2lZiPeiNvTJUihoLJIdqxHEQ ICGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rlcHsxVwTgOdylUAO0AC1oaAIqMX7KRnGcj/SmZjGCA=; b=q4Dq34x0+kd/Fq6QXNhWY7+kPGlZNfmEuSkPK9rgHkZoIkvl6rHF2OmPHwX/t0+SIO 4uX7RpYp60XWOFFO44eSqqQ36fdmBUC9xDKP7zYN/8fKvPhOIyiQXRV0Jt21hfPcS3Yo itafNSGR+xXrTcrSu+qjWcxwfFQG62uzTRK5vnG7c+g+IOl6ND9/vMHtHct2cPuX8EaH qwU7/pzTsm77GG/neMaHfsjW3KVMZIz1qyVdcm41QKXHPbo+tgARlU03WJx0vMdeg9PP ElMoHygTDFrkUnOqR8GAR3H9mPxSnX8jiZP2zy7wRo+6L4FGd9w2NlOqQXeNft9kh053 iwbg== X-Gm-Message-State: AOAM530dWqf4ZNI47scr4NjogMwVTn3exeB2St31VvFf/m4Ot2eV4QIN CtSFGnvA9gWdY4hSTDiN+tYQZiq4ZJRt6Q== X-Google-Smtp-Source: ABdhPJy01j1UwuWYvm0tz+QGWpsnb3MkGy/NjmmltnsWVAoatYokauVo9aVjzyFHBIH4NEbAQRs1bw== X-Received: by 2002:adf:f48c:0:b0:217:9a33:967d with SMTP id l12-20020adff48c000000b002179a33967dmr6826073wro.598.1654516896063; Mon, 06 Jun 2022 05:01:36 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002100316b126sm15526455wru.6.2022.06.06.05.01.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 05:01:35 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 06/21] seatd: update 0.6.4 -> 0.7.0 Date: Mon, 6 Jun 2022 14:01:11 +0200 Message-Id: <20220606120126.3381438-6-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606120126.3381438-1-alex@linutronix.de> References: <20220606120126.3381438-1-alex@linutronix.de> 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, 06 Jun 2022 12:01:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166599 Signed-off-by: Alexander Kanavin --- meta/recipes-core/seatd/{seatd_0.6.4.bb => seatd_0.7.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-core/seatd/{seatd_0.6.4.bb => seatd_0.7.0.bb} (90%) diff --git a/meta/recipes-core/seatd/seatd_0.6.4.bb b/meta/recipes-core/seatd/seatd_0.7.0.bb similarity index 90% rename from meta/recipes-core/seatd/seatd_0.6.4.bb rename to meta/recipes-core/seatd/seatd_0.7.0.bb index 601736adef..59ef6ad9c1 100644 --- a/meta/recipes-core/seatd/seatd_0.6.4.bb +++ b/meta/recipes-core/seatd/seatd_0.7.0.bb @@ -6,9 +6,9 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=715a99d2dd552e6188e74d4ed2914d5a" -SRC_URI = "git://git.sr.ht/~kennylevinsen/seatd;protocol=https;nobranch=1 \ +SRC_URI = "git://git.sr.ht/~kennylevinsen/seatd;protocol=https;branch=master \ file://init" -SRCREV = "df13d03f9cfd0dc0c2b3298cd0e5eb4e4a10835e" +SRCREV = "a803ba0502cccf147eec7fbcacd11c5b8643c0e0" S = "${WORKDIR}/git" inherit meson pkgconfig update-rc.d From patchwork Mon Jun 6 12:01:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 8886 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 6788ECCA488 for ; Mon, 6 Jun 2022 12:01:44 +0000 (UTC) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.groups.io with SMTP id smtpd.web12.30988.1654516894928751584 for ; Mon, 06 Jun 2022 05:01:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=JPZZ01Rj; spf=pass (domain: gmail.com, ip: 209.85.128.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f43.google.com with SMTP id m39-20020a05600c3b2700b0039c511ebbacso888738wms.3 for ; Mon, 06 Jun 2022 05:01:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kp2LpERuOJRz4VeT54I69sUUUwv0tZivcQ8zx/iQiQQ=; b=JPZZ01Rj2DEvTR707T+artGdsafzbNBTE5HT9ss/4LX42FshwcoSMFY9TDhYuPI3Me jxnGteZEZo06td3uRCclSJsxsDHu5XMyCTEGaFh6+tFEw/DgaBNujQmxbkbg9NLhD7Ny zLPHIWEQsiJo1YHflXgy5Ko+bIzgCDcc8TJOz7pGnr9x3g9AudtnPSZzkGyh4t1KVl6r 5L4d8RLOdQjMu3J2gcudWR7WVPiyFa4hArZjyyhTx4zD4V1JjurKvViDQSkq5+CQ8dJk xqo5M+316VrzSV0WwT+6se9WJ0ktX9T005csA4uTw7GCgQHifOJ3SLDqdd+CowI+XnZ4 Yt7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kp2LpERuOJRz4VeT54I69sUUUwv0tZivcQ8zx/iQiQQ=; b=kcMA58pE4VU/zUf1vj34wkZJda9wrnodVrfztQ+BgVhXYtzmB6Ae7+bYBjX4wGR3pg BUNSvI4iYBj94Ih2fIuTr0WSVuG4Hj3XKdEa618uNpyQtn3fZIUV+h/H7IGonuoTjwdb Q161MIPbVkbmM5GmIVTqk2rjpk9qzmdNWOL6NpgJvEE8Bhc1sWdJwPxW6xXHskr77riu Ds86mi1Idr5EkDhfhRfawsw66FohXLG6pfWJqYvhrpa+cYRTscwnapvNRNEJHyMgCho0 wdA42CYBp1kCI9TCg1B7nid4ibQHIGsODrsQ4lotjMXfAVhU2qSPIgYIcI0r/7LzSxns aRvQ== X-Gm-Message-State: AOAM530tMMnslMvilBZUq5ryRi2tbsjJyDgYO1Oz4hQlP4ilucNm4JCo XWiF2Y2Yv0iVrSII7w2lmZNYQ551seoy7g== X-Google-Smtp-Source: ABdhPJwYeMJZeN53CIZ5pEKeVKr+nfDFysE7Qs5DA4r+JFlO9i5FK60nxV15jLPlMiLxmwvXjjaXhw== X-Received: by 2002:a1c:e903:0:b0:397:36b8:795a with SMTP id q3-20020a1ce903000000b0039736b8795amr53075101wmc.98.1654516896807; Mon, 06 Jun 2022 05:01:36 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002100316b126sm15526455wru.6.2022.06.06.05.01.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 05:01:36 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 07/21] systemd: update 250.5 -> 251.2 Date: Mon, 6 Jun 2022 14:01:12 +0200 Message-Id: <20220606120126.3381438-7-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606120126.3381438-1-alex@linutronix.de> References: <20220606120126.3381438-1-alex@linutronix.de> 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, 06 Jun 2022 12:01:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166598 Signed-off-by: Alexander Kanavin --- ...md-boot_250.5.bb => systemd-boot_251.2.bb} | 0 meta/recipes-core/systemd/systemd.inc | 8 ++-- ...e-Use-sockaddr-pointer-type-for-bind.patch | 46 ------------------- ...7ca2ab96d085158485ecfc46c7cb6af0f166.patch | 41 +++++++++++++++++ .../{systemd_250.5.bb => systemd_251.2.bb} | 1 - 5 files changed, 46 insertions(+), 50 deletions(-) rename meta/recipes-core/systemd/{systemd-boot_250.5.bb => systemd-boot_251.2.bb} (100%) delete mode 100644 meta/recipes-core/systemd/systemd/0001-resolve-Use-sockaddr-pointer-type-for-bind.patch create mode 100644 meta/recipes-core/systemd/systemd/38c87ca2ab96d085158485ecfc46c7cb6af0f166.patch rename meta/recipes-core/systemd/{systemd_250.5.bb => systemd_251.2.bb} (99%) diff --git a/meta/recipes-core/systemd/systemd-boot_250.5.bb b/meta/recipes-core/systemd/systemd-boot_251.2.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_250.5.bb rename to meta/recipes-core/systemd/systemd-boot_251.2.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 309105290f..b8dbe2263a 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,8 +14,10 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "4a31fa2fb040005b73253da75cf84949b8485175" -SRCBRANCH = "v250-stable" -SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH}" +SRCREV = "253052686cbd840ac69030d31c4b186af23aba4c" +SRCBRANCH = "v251-stable" +SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ + file://38c87ca2ab96d085158485ecfc46c7cb6af0f166.patch \ +" S = "${WORKDIR}/git" diff --git a/meta/recipes-core/systemd/systemd/0001-resolve-Use-sockaddr-pointer-type-for-bind.patch b/meta/recipes-core/systemd/systemd/0001-resolve-Use-sockaddr-pointer-type-for-bind.patch deleted file mode 100644 index 8567283537..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-resolve-Use-sockaddr-pointer-type-for-bind.patch +++ /dev/null @@ -1,46 +0,0 @@ -From ad1428f29196bcc88ae382ee67ff705928e2be24 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 5 May 2022 20:25:37 -0700 -Subject: [PATCH] resolve: Use sockaddr pointer type for bind() - -bind() expects sockaddr* but SERVER_ADDRESS is sockaddr_in type struct - -Fixes errors with clang e.g. - -../git/src/resolve/test-resolved-stream.c:112:32: error: incompatible pointer types passing 'struct sockaddr_in *' to parameter of type 'const struct sockaddr *' [-Werror,-Wincompatible-pointer-types] - assert_se(bind(bindfd, &SERVER_ADDRESS, sizeof(SERVER_ADDRESS)) >= 0); - ^~~~~~~~~~~~~~~ -../git/src/resolve/test-resolved-stream.c:251:39: error: incompatible pointer types passing 'struct sockaddr_in *' to parameter of type 'const struct sockaddr *' [-Werror,-Wincompatible-pointer-types] - r = connect(clientfd, &SERVER_ADDRESS, sizeof(SERVER_ADDRESS)); - -Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/23281] -Signed-off-by: Khem Raj ---- - src/resolve/test-resolved-stream.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/resolve/test-resolved-stream.c b/src/resolve/test-resolved-stream.c -index f12c729e50..504b532002 100644 ---- a/src/resolve/test-resolved-stream.c -+++ b/src/resolve/test-resolved-stream.c -@@ -109,7 +109,7 @@ static void *tcp_dns_server(void *p) { - - assert_se((bindfd = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0)) >= 0); - assert_se(setsockopt(bindfd, SOL_SOCKET, SO_REUSEADDR, &(int){1}, sizeof(int)) >= 0); -- assert_se(bind(bindfd, &SERVER_ADDRESS, sizeof(SERVER_ADDRESS)) >= 0); -+ assert_se(bind(bindfd, (struct sockaddr*)&SERVER_ADDRESS, sizeof(SERVER_ADDRESS)) >= 0); - assert_se(listen(bindfd, 1) >= 0); - assert_se((acceptfd = accept(bindfd, NULL, NULL)) >= 0); - server_handle(acceptfd); -@@ -248,7 +248,7 @@ static void test_dns_stream(bool tls) { - assert_se((clientfd = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0)) >= 0); - - for (int i = 0; i < 100; i++) { -- r = connect(clientfd, &SERVER_ADDRESS, sizeof(SERVER_ADDRESS)); -+ r = connect(clientfd, (struct sockaddr*)&SERVER_ADDRESS, sizeof(SERVER_ADDRESS)); - if (r >= 0) - break; - usleep(EVENT_TIMEOUT_USEC / 100); --- -2.36.0 - diff --git a/meta/recipes-core/systemd/systemd/38c87ca2ab96d085158485ecfc46c7cb6af0f166.patch b/meta/recipes-core/systemd/systemd/38c87ca2ab96d085158485ecfc46c7cb6af0f166.patch new file mode 100644 index 0000000000..2449023083 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/38c87ca2ab96d085158485ecfc46c7cb6af0f166.patch @@ -0,0 +1,41 @@ +From 38c87ca2ab96d085158485ecfc46c7cb6af0f166 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Fri, 3 Jun 2022 09:32:02 +0200 +Subject: [PATCH] sha256: fix compilation on efi-ia32 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +/usr/bin/gcc -c ../src/fundamental/sha256.c -o src/boot/efi/sha256.c.o -Wno-format-signedness -Wno-missing-field-initializers -Wno-unused-parameter -Wdate-time -Wendif-labels -Werror=format=2 -Werror=implicit-function-declaration -Werror=incompatible-pointer-types -Werror=int-conversion -Werror=overflow -Werror=override-init -Werror=return-type -Werror=shift-count-overflow -Werror=shift-overflow=2 -Werror=undef -Wfloat-equal -Wimplicit-fallthrough=5 -Winit-self -Wlogical-op -Wmissing-include-dirs -Wmissing-noreturn -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-aliasing=2 -Wstrict-prototypes -Wsuggest-attribute=noreturn -Wunused-function -Wwrite-strings -Wno-unused-result -fno-stack-protector -fno-strict-aliasing -fpic -fwide-exec-charset=UCS2 -Wall -Wextra -Wsign-compare -nostdlib -std=gnu99 -ffreestanding -fshort-wchar -fvisibility=hidden -isystem /usr/include/efi -isystem /usr/include/efi/ia32 -I /builddir/build/BUILD/systemd-stable-250.7/src/fundamental -DSD_BOOT -DGNU_EFI_USE_MS_ABI -include src/boot/efi/efi_config.h -include version.h -mno-sse -mno-mmx -flto -O2 -flto=auto +../src/fundamental/sha256.c: In function ‘sha256_finish_ctx’: +../src/fundamental/sha256.c:61:25: error: ‘false’ undeclared (first use in this function) + 61 | # define UNALIGNED_P(p) false + | ^~~~~ +../src/fundamental/sha256.c:136:21: note: in expansion of macro ‘UNALIGNED_P’ + 136 | if (UNALIGNED_P(resbuf)) + | ^~~~~~~~~~~ +../src/fundamental/sha256.c:32:1: note: ‘false’ is defined in header ‘’; did you forget to ‘#include ’? + 31 | #include "sha256.h" + +++ |+#include + 32 | +... + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin +--- + src/fundamental/sha256.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/fundamental/sha256.c b/src/fundamental/sha256.c +index 67d83b5f1cd6..f08959479643 100644 +--- a/src/fundamental/sha256.c ++++ b/src/fundamental/sha256.c +@@ -60,7 +60,7 @@ + # define UNALIGNED_P(p) (((size_t) p) % sizeof(uint32_t) != 0) + # endif + #else +-# define UNALIGNED_P(p) false ++# define UNALIGNED_P(p) sd_false + #endif + + /* This array contains the bytes used to pad the buffer to the next diff --git a/meta/recipes-core/systemd/systemd_250.5.bb b/meta/recipes-core/systemd/systemd_251.2.bb similarity index 99% rename from meta/recipes-core/systemd/systemd_250.5.bb rename to meta/recipes-core/systemd/systemd_251.2.bb index 6fac27ee56..80f80849d0 100644 --- a/meta/recipes-core/systemd/systemd_250.5.bb +++ b/meta/recipes-core/systemd/systemd_251.2.bb @@ -24,7 +24,6 @@ SRC_URI += "file://touchscreen.rules \ file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ file://0003-implment-systemd-sysv-install-for-OE.patch \ file://0001-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch \ - file://0001-resolve-Use-sockaddr-pointer-type-for-bind.patch \ " # patches needed by musl From patchwork Mon Jun 6 12:01:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 8884 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 52ED1CCA486 for ; Mon, 6 Jun 2022 12:01:44 +0000 (UTC) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.groups.io with SMTP id smtpd.web10.31061.1654516898977599840 for ; Mon, 06 Jun 2022 05:01:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=S/Hz3uO0; spf=pass (domain: gmail.com, ip: 209.85.221.53, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f53.google.com with SMTP id m26so8128446wrb.4 for ; Mon, 06 Jun 2022 05:01:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FHQc3VPW0gxW8StppnEnkpB1VrU08bYdwQrYZorHlTY=; b=S/Hz3uO0IR47buwjw8KdNlTJsUJ7+Ja2S6g8C2VVCCWum4S6jDidOgCllrZmFX5jhf iGIxFXXVJVuOxgw49/sNBwBei2qS7Hnu2buFnnWGhttuNmBpYH0jHkEYQ8I3PAwajx86 uB/UqawpW5e7S/Ruw7MbljYuy5QU/+SR6X0rEj64sUNyCiMkoPtF/AvaJ0dRoUixIKH0 9aXiuiLNxT2pD6h4XNO+ZSbkkneKHjecUkL+3aV0cXBR8OL2VwJbg+TsP969pErgRXoY h6+kabuLS/KfxPmkvsQXXxmeQh2g7WzvDR5hNdxxAbM/Iw+ogMKIZwyU8gbzVrO5Lkff scAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FHQc3VPW0gxW8StppnEnkpB1VrU08bYdwQrYZorHlTY=; b=v7D8nbos4aVb4mlTvWRDfN9fFKl+1qRQalytyrRL+vBdPqzWs+p6Vgyjico3tsfCpU Q14uf40l7WpN4Z9sTne/r3TsszT5xt11CSG9x+aXVW4+kZ4h0PJfo5vvXAdd6vysmvXY Qa1RNr6WelsUr/onqLTBqD2FzwHxWAZjd/1SGV9ePjKwKlFlsiPAqtaY2fpojFmqaw7q Q3objFDmJiFPcRPb0uB8pjQydKEQxDasUKGOOPNRGV9IzP0mqBT4AP9bKk2b/GprUYcJ LkJFvz4lwafLrxg+qPVcT/MlO5kHKfRHpEKrSJh73heBUDGw35F+19jnNaBW5VylDQDc 4TIA== X-Gm-Message-State: AOAM530YugP3pTKt7oZE36Lwr+blSixpbUQmxYmKcNqOIkwCdOkgRaxi so6myKny9L7K86WvZSIVlcXd997NDBeckw== X-Google-Smtp-Source: ABdhPJzzVOpS10aXolmFylrrviLN8IsPia0zaXiDmzUrtozaMaG8CT59RdDbSF3X8W+gwJ1JvDffhQ== X-Received: by 2002:adf:e186:0:b0:213:3b79:370d with SMTP id az6-20020adfe186000000b002133b79370dmr20077530wrb.151.1654516897520; Mon, 06 Jun 2022 05:01:37 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002100316b126sm15526455wru.6.2022.06.06.05.01.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 05:01:37 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 08/21] btrfs-tools: update 5.16.2 -> 5.18 Date: Mon, 6 Jun 2022 14:01:13 +0200 Message-Id: <20220606120126.3381438-8-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606120126.3381438-1-alex@linutronix.de> References: <20220606120126.3381438-1-alex@linutronix.de> 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, 06 Jun 2022 12:01:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166600 Signed-off-by: Alexander Kanavin --- .../btrfs-tools/btrfs-tools/lzo-option.patch | 126 ------------------ ...fs-tools_5.16.2.bb => btrfs-tools_5.18.bb} | 5 +- 2 files changed, 2 insertions(+), 129 deletions(-) delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/lzo-option.patch rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_5.16.2.bb => btrfs-tools_5.18.bb} (95%) diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/lzo-option.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/lzo-option.patch deleted file mode 100644 index f4278a5c5d..0000000000 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/lzo-option.patch +++ /dev/null @@ -1,126 +0,0 @@ -Upstream-Status: Backport [https://github.com/kdave/btrfs-progs/commit/73545c1fe6304f08ab306b76d2bcacaf22a5e99a] -Signed-off-by: Ross Burton - -From 4f4eafe8ebcc86f84f6c85a5c5814c430d8f190c Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Tue, 24 May 2022 13:44:29 +0100 -Subject: [PATCH] btrfs-progs: add option to disable LZO support - -LZO as a compression format is pretty archaic these days, there are -better algorithsm in all metrics for compression and decompression, and -lzo hasn't had a new release since 2017. - -Add an option to disable LZO (defaulting to enabled), and respect it in -cmds/restore.c. - -Signed-off-by: Ross Burton ---- - Makefile | 2 +- - Makefile.inc.in | 1 + - cmds/restore.c | 7 +++++++ - configure.ac | 30 ++++++++++++++++++++---------- - 4 files changed, 29 insertions(+), 11 deletions(-) - -diff --git a/Makefile b/Makefile -index af4908f9..0e8e05f3 100644 ---- a/Makefile -+++ b/Makefile -@@ -335,7 +335,7 @@ endif - btrfs_convert_cflags = -DBTRFSCONVERT_EXT2=$(BTRFSCONVERT_EXT2) - btrfs_convert_cflags += -DBTRFSCONVERT_REISERFS=$(BTRFSCONVERT_REISERFS) - btrfs_fragments_libs = -lgd -lpng -ljpeg -lfreetype --cmds_restore_cflags = -DBTRFSRESTORE_ZSTD=$(BTRFSRESTORE_ZSTD) -+cmds_restore_cflags = -DBTRFSRESTORE_LZO=$(BTRFSRESTORE_LZO) -DBTRFSRESTORE_ZSTD=$(BTRFSRESTORE_ZSTD) - - ifeq ($(CRYPTOPROVIDER_BUILTIN),1) - CRYPTO_OBJECTS = crypto/sha224-256.o crypto/blake2b-ref.o -diff --git a/Makefile.inc.in b/Makefile.inc.in -index c995aef9..385b7ae1 100644 ---- a/Makefile.inc.in -+++ b/Makefile.inc.in -@@ -16,6 +16,7 @@ BUILD_PROGRAMS = @BUILD_PROGRAMS@ - BUILD_SHARED_LIBRARIES = @BUILD_SHARED_LIBRARIES@ - BUILD_STATIC_LIBRARIES = @BUILD_STATIC_LIBRARIES@ - BTRFSCONVERT_EXT2 = @BTRFSCONVERT_EXT2@ -+BTRFSRESTORE_LZO = @BTRFSRESTORE_LZO@ - BTRFSCONVERT_REISERFS = @BTRFSCONVERT_REISERFS@ - BTRFSRESTORE_ZSTD = @BTRFSRESTORE_ZSTD@ - PYTHON_BINDINGS = @PYTHON_BINDINGS@ -diff --git a/cmds/restore.c b/cmds/restore.c -index 5923d571..4dd79fce 100644 ---- a/cmds/restore.c -+++ b/cmds/restore.c -@@ -25,8 +25,10 @@ - #include - #include - #include -+#if BTRFSRESTORE_LZO - #include - #include -+#endif - #include - #if BTRFSRESTORE_ZSTD - #include -@@ -98,6 +100,10 @@ static inline size_t read_compress_length(unsigned char *buf) - static int decompress_lzo(struct btrfs_root *root, unsigned char *inbuf, - char *outbuf, u64 compress_len, u64 *decompress_len) - { -+#if !BTRFSRESTORE_LZO -+ error("btrfs not compiled with lzo support"); -+ return -1; -+#else - size_t new_len; - size_t in_len; - size_t out_len = 0; -@@ -156,6 +162,7 @@ static int decompress_lzo(struct btrfs_root *root, unsigned char *inbuf, - *decompress_len = out_len; - - return 0; -+#endif - } - - static int decompress_zstd(const char *inbuf, char *outbuf, u64 compress_len, -diff --git a/configure.ac b/configure.ac -index d907636b..c1ad2c22 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -372,16 +372,26 @@ if ${PKG_CONFIG} udev --atleast-version 190; then - fi - AC_SUBST(UDEVDIR) - --dnl lzo library does not provide pkg-config, let use classic way --AC_CHECK_LIB([lzo2], [lzo_version], [ -- LZO2_LIBS="-llzo2" -- LZO2_CFLAGS="" -- LZO2_LIBS_STATIC="-llzo2"],[ -- AC_MSG_ERROR([cannot find lzo2 library]) --]) --AC_SUBST([LZO2_LIBS]) --AC_SUBST([LZO2_LIBS_STATIC]) --AC_SUBST([LZO2_CFLAGS]) -+AC_ARG_ENABLE([lzo], -+ AS_HELP_STRING([--disable-lzo], [build without lzo support]), -+ [], [enable_lzo=yes] -+) -+ -+if test "x$enable_lzo" = xyes; then -+ dnl lzo library does not provide pkg-config, let use classic way -+ AC_CHECK_LIB([lzo2], [lzo_version], [ -+ LZO2_LIBS="-llzo2" -+ LZO2_CFLAGS="" -+ LZO2_LIBS_STATIC="-llzo2"],[ -+ AC_MSG_ERROR([cannot find lzo2 library]) -+ ]) -+ AC_SUBST([LZO2_LIBS]) -+ AC_SUBST([LZO2_LIBS_STATIC]) -+ AC_SUBST([LZO2_CFLAGS]) -+fi -+ -+AS_IF([test "x$enable_lzo" = xyes], [BTRFSRESTORE_LZO=1], [BTRFSRESTORE_LZO=0]) -+AC_SUBST(BTRFSRESTORE_LZO) - - dnl call PKG_INSTALLDIR from pkg.m4 to set pkgconfigdir - m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], [AC_MSG_ERROR([please install pkgconf])]) --- -2.25.1 - diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.2.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.18.bb similarity index 95% rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.2.bb rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_5.18.bb index 88b5c6259c..f5120d3980 100644 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.2.bb +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.18.bb @@ -17,9 +17,8 @@ DEPENDS = "util-linux zlib" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master \ file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ - file://lzo-option.patch \ " -SRCREV = "31458c9c81935abbed010221261897273a98d2c1" +SRCREV = "f9e303584272b81b05b926a0cc9010f43af12a03" S = "${WORKDIR}/git" PACKAGECONFIG ??= " \ @@ -28,7 +27,7 @@ PACKAGECONFIG ??= " \ python \ crypto-builtin \ " -PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, asciidoc-native xmlto-native" +PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, python3-sphinx-native" PACKAGECONFIG[programs] = "--enable-programs,--disable-programs" PACKAGECONFIG[convert] = "--enable-convert --with-convert=ext2,--disable-convert --without-convert,e2fsprogs" PACKAGECONFIG[zoned] = "--enable-zoned,--disable-zoned" From patchwork Mon Jun 6 12:01:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 8878 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 52182CCA484 for ; Mon, 6 Jun 2022 12:01:44 +0000 (UTC) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.groups.io with SMTP id smtpd.web10.31062.1654516899677751131 for ; Mon, 06 Jun 2022 05:01:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=YlY2wJQW; spf=pass (domain: gmail.com, ip: 209.85.221.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f52.google.com with SMTP id k16so19568751wrg.7 for ; Mon, 06 Jun 2022 05:01:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BLnP077TAh9+ef9b1aZgqXVi3HluvSjx4/cMgLkpuTg=; b=YlY2wJQWQebUxmbk2ZmUZ7bpl1Cjabv1f7Z0tspoNfFuWYC48LTFwdB63BvNyeKGZe B1637pcIQ6XFqhfJxM8nkPqIj4oKveFLLZ75B92w6b1ZUsXpfPI8yCOV+A+1XCgrQTH8 fXpPIs4A/OhKquzEK2p8JHlp+Dr/U27oAb2dYvU8sV71nZaZJisohBddwsL1mA4DM9FN ZeVq/6133OBB0e1jH3f1zPgWQ+O1v9yKSVpPwMwLuP6Woy2gGGMRYhAQV0fWUa67KGei cjQXCC/SdVH+txKgsyFqT3esvO3lEUy+pgB6A4scvocKc84kziT6JHA/+uwRLRH1lK68 omdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BLnP077TAh9+ef9b1aZgqXVi3HluvSjx4/cMgLkpuTg=; b=SHXf0vJHkXg42Mj/25rMkM7/HcBxmGMyqxwK9W7yw0KquqHNwIzgWRiSklIVDpdgaB PNpJBzBYAvahTCpM/6vBdPRiW2+MGWlYxMDlDQ2GWDkCXHevecUCRxLk9m/9YiWCJMbz x174RabvQz+/zz853LwPt2fNc2UEAQamMB1lpb6MJDVPf2EkDlkbmgqokM6T8slSk1Z/ SsY++fA3JwX1in0w+EJTLlyTHRxeCcYrkQvzEZKzQFUK5+wh6CG3SILKYQh+OReNAWHo k0VPDYiH3mOy5msD38Z1FVwOHaBGzGiAFv95a5+/mQWQNWJf312KdMTWbKuMVl7YLiaq QeHg== X-Gm-Message-State: AOAM532P25bTT65IfOX3Vx9lACIBwhbn/oyKC1VXu9Zr2YOkvffSq+xn fbeHafdnridE4ubvZ/7CnZ/nyb+5kj+CWQ== X-Google-Smtp-Source: ABdhPJyk1uTdEmebl0uWpHlS4qHQEwLjDCr2ay7pWzS3RUyBlGKJtqVlPsYLoESHQSzDKEd/uGImMw== X-Received: by 2002:adf:f9ce:0:b0:210:316f:3ab with SMTP id w14-20020adff9ce000000b00210316f03abmr21002212wrr.487.1654516898249; Mon, 06 Jun 2022 05:01:38 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002100316b126sm15526455wru.6.2022.06.06.05.01.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 05:01:37 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 09/21] llvm: update 14.0.3 -> 14.0.4 Date: Mon, 6 Jun 2022 14:01:14 +0200 Message-Id: <20220606120126.3381438-9-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606120126.3381438-1-alex@linutronix.de> References: <20220606120126.3381438-1-alex@linutronix.de> 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, 06 Jun 2022 12:01:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166601 Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/llvm/llvm_git.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 1179ba172f..eb2f01b967 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -26,7 +26,7 @@ QEMUVERSION ?= "7.0%" GOVERSION ?= "1.18%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump -LLVMVERSION ?= "14.0.3" +LLVMVERSION ?= "14.0.4" RUSTVERSION ?= "1.60%" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index 0b5301cbff..67ed1eab00 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb @@ -19,14 +19,14 @@ inherit cmake pkgconfig PROVIDES += "llvm${PV}" -PV = "14.0.3" +PV = "14.0.4" MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" LLVM_RELEASE = "${PV}" BRANCH = "release/${MAJOR_VERSION}.x" -SRCREV = "1f9140064dfbfb0bbda8e51306ea51080b2f7aac" +SRCREV = "29f1039a7285a5c3a9c353d054140bf2556d4c4d" SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=https \ file://0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch;striplevel=2 \ file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ From patchwork Mon Jun 6 12:01:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 8882 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 41525CCA47F for ; Mon, 6 Jun 2022 12:01:44 +0000 (UTC) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.groups.io with SMTP id smtpd.web11.30981.1654516900561492149 for ; Mon, 06 Jun 2022 05:01:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=jAjdyCaC; spf=pass (domain: gmail.com, ip: 209.85.128.53, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f53.google.com with SMTP id 67-20020a1c1946000000b00397382b44f4so7812650wmz.2 for ; Mon, 06 Jun 2022 05:01:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fpodBt9ueEMCA7cY9VkUzUbbKH1qSAzEepVyl19qZ4M=; b=jAjdyCaCDd4kRcfgJbz1ONSbUf0511wwqBw6g1LQJ1+goExsroV9oXKGEIzplKRluY jrTwHitBaC3LGnkVlTSdyrcW/CWf6Aguz55Ju2wulQzcy/ebaO4m6sMwV2keYOjIJ+7t 624kJmUegVSlBeKDb4Kj7yejLiVg+erwrSXXFcNY8XDn4rhrGklH/zE/0gW2mRCWEvoH Tlr2EIvMGjtQQXIA3zlTwX8FpclafjMPq1ZdSCReuM3WQRUka8zOnBPdVviTaMAfHeC8 C5m/8HUVSY2iTIgTyMODYJBIyAHpV6F/q/X9WWBOe312Qnnxr3vPfBAyg7dlmva64ctC bWyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fpodBt9ueEMCA7cY9VkUzUbbKH1qSAzEepVyl19qZ4M=; b=kIePEfNWe1oyvah9Gq0YMykcNonssjv8aDuOW9jHRaBGk7tsAh++kwIPu8TDq/hShi by0nEbAOmxsU/jX6JYgRbQAKYed4GMW5HI7/1MKc1v+fylTxmgyjOGkREu7EguT01zQI utz70565eDAc2C2RAVYhRDPpTIpHbVSZp/ocL59orAgjC3nq/MLzEIrIjfC4aTq5/uvo Hp4srpMFtrC7MiWVxOfzskkFbb0HkuuIVlG3mwnZ8qRxvuwyvXy7DpRzrxzlX4Bm3bRG UnkYdsWLlhOxxAqsg75wGAdOAkHaU/BJmB81+vQVY6bG4O8iBhZTQichnfNMwlTG6RyC OwLA== X-Gm-Message-State: AOAM5318sKD+tKDJaWfDzWB0h9+Md8pVlsx/QfIpgJg6aJdLOlcC3It4 su0tn9/m0kNbkc57tag4xcwLsI8RxmUXcQ== X-Google-Smtp-Source: ABdhPJz6M0nTMtoJbOiIei2WQlqqkWh0cuB34iqiusvdc9BGLLiyC6QCUk6AI1mlb4H6wZdZ+Z/8Rw== X-Received: by 2002:a7b:cb4b:0:b0:39c:49dd:b2cc with SMTP id v11-20020a7bcb4b000000b0039c49ddb2ccmr9154845wmj.123.1654516898995; Mon, 06 Jun 2022 05:01:38 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002100316b126sm15526455wru.6.2022.06.06.05.01.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 05:01:38 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 10/21] python3-psutil: update 5.9.0 -> 5.9.1 Date: Mon, 6 Jun 2022 14:01:15 +0200 Message-Id: <20220606120126.3381438-10-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606120126.3381438-1-alex@linutronix.de> References: <20220606120126.3381438-1-alex@linutronix.de> 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, 06 Jun 2022 12:01:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166603 Drop the patch, as we do not actually have ptests for the module, and the patch submitted upstream differs significantly, so it makes no sense to rebase the in-layer version. Signed-off-by: Alexander Kanavin --- .../0001-fix-failure-test-cases.patch | 197 ------------------ ...sutil_5.9.0.bb => python3-psutil_5.9.1.bb} | 4 +- 2 files changed, 1 insertion(+), 200 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-psutil/0001-fix-failure-test-cases.patch rename meta/recipes-devtools/python/{python3-psutil_5.9.0.bb => python3-psutil_5.9.1.bb} (81%) diff --git a/meta/recipes-devtools/python/python3-psutil/0001-fix-failure-test-cases.patch b/meta/recipes-devtools/python/python3-psutil/0001-fix-failure-test-cases.patch deleted file mode 100644 index 99bfccca3f..0000000000 --- a/meta/recipes-devtools/python/python3-psutil/0001-fix-failure-test-cases.patch +++ /dev/null @@ -1,197 +0,0 @@ -From 8b4e38958ff8bdbb3ece4796bfa2d3b6f7536f71 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Wed, 23 Feb 2022 11:54:40 +0800 -Subject: [PATCH] fix failure test cases - -The test cases is not robust enough. skip some cases that is -not suitable for all conditions. - -* test_io_counters failed when kernel config CONFIG_TASKSTATS - and CONFIG_TASK_IO_ACCOUNTING are not enable in OE -* test_setup_script failed since oe don't install setup.py -* test_used failed since oe use git source for free, so the version - is 3.3.17-dirty -* test_weird_environ failed since gcc not installed -* test_debug failed since it is designed to run when PSUTIL_DEBUG is set -* test_against_findmnt/test_comparisons/test_disk_partitions_mocked/ - test_disk_partitions is not suitable for Linux nfs boot - -Upstream-Status: Submitted [https://github.com/giampaolo/psutil/pull/2097] - -Signed-off-by: Changqing Li ---- - psutil/tests/test_contracts.py | 1 + - psutil/tests/test_linux.py | 8 ++++++-- - psutil/tests/test_misc.py | 4 ++++ - psutil/tests/test_process.py | 5 +++++ - psutil/tests/test_system.py | 1 + - psutil/tests/test_unicode.py | 4 +++- - 6 files changed, 20 insertions(+), 3 deletions(-) - -diff --git a/psutil/tests/test_contracts.py b/psutil/tests/test_contracts.py -index 7401cc1..bf0fca0 100755 ---- a/psutil/tests/test_contracts.py -+++ b/psutil/tests/test_contracts.py -@@ -172,6 +172,7 @@ class TestAvailProcessAPIs(PsutilTestCase): - def test_rlimit(self): - self.assertEqual(hasattr(psutil.Process, "rlimit"), LINUX or FREEBSD) - -+ @unittest.skip("broken on OE since kernel config maye not be enabled") - def test_io_counters(self): - hasit = hasattr(psutil.Process, "io_counters") - self.assertEqual(hasit, False if MACOS or SUNOS else True) -diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py -index 20e28d2..66b6dda 100755 ---- a/psutil/tests/test_linux.py -+++ b/psutil/tests/test_linux.py -@@ -196,8 +196,9 @@ def get_free_version_info(): - out = sh(["free", "-V"]).strip() - if 'UNKNOWN' in out: - raise unittest.SkipTest("can't determine free version") -- return tuple(map(int, out.split()[-1].split('.'))) -- -+ vlist = out.split()[-1].split('.') -+ vlist[:] = [n.split('-')[0] for n in vlist] -+ return tuple(map(int, vlist)) - - @contextlib.contextmanager - def mock_open_content(for_path, content): -@@ -1289,6 +1290,7 @@ class TestRootFsDeviceFinder(PsutilTestCase): - finder.ask_sys_class_block() - - @unittest.skipIf(GITHUB_ACTIONS, "unsupported on GITHUB_ACTIONS") -+ @unittest.skip("Broken for oe") - def test_comparisons(self): - finder = RootFsDeviceFinder() - self.assertIsNotNone(finder.find()) -@@ -1311,11 +1313,13 @@ class TestRootFsDeviceFinder(PsutilTestCase): - - @unittest.skipIf(not which("findmnt"), "findmnt utility not available") - @unittest.skipIf(GITHUB_ACTIONS, "unsupported on GITHUB_ACTIONS") -+ @unittest.skip("Broken for oe") - def test_against_findmnt(self): - psutil_value = RootFsDeviceFinder().find() - findmnt_value = sh("findmnt -o SOURCE -rn /") - self.assertEqual(psutil_value, findmnt_value) - -+ @unittest.skip("Broken for oe") - def test_disk_partitions_mocked(self): - with mock.patch( - 'psutil._pslinux.cext.disk_partitions', -diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py -index d946eb6..121004a 100755 ---- a/psutil/tests/test_misc.py -+++ b/psutil/tests/test_misc.py -@@ -54,6 +54,8 @@ from psutil.tests import unittest - # =================================================================== - - -+PSUTIL_DEBUG = bool(os.getenv('PSUTIL_DEBUG', 0)) -+ - class TestMisc(PsutilTestCase): - - def test_process__repr__(self, func=repr): -@@ -368,6 +370,7 @@ class TestMisc(PsutilTestCase): - - # XXX: https://github.com/pypa/setuptools/pull/2896 - @unittest.skipIf(APPVEYOR, "temporarily disabled due to setuptools bug") -+ @unittest.skip("OE run this test outof source tree") - def test_setup_script(self): - setup_py = os.path.join(ROOT_DIR, 'setup.py') - if CI_TESTING and not os.path.exists(setup_py): -@@ -401,6 +404,7 @@ class TestMisc(PsutilTestCase): - reload_module(psutil) - self.assertIn("version conflict", str(cm.exception).lower()) - -+ @unittest.skipIf(not PSUTIL_DEBUG, "env PSUTIL_DEBUG not set") - def test_debug(self): - if PY3: - from io import StringIO -diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py -index c9059e3..a34ba3d 100755 ---- a/psutil/tests/test_process.py -+++ b/psutil/tests/test_process.py -@@ -36,6 +36,7 @@ from psutil._compat import PY3 - from psutil._compat import FileNotFoundError - from psutil._compat import long - from psutil._compat import super -+from psutil._compat import which - from psutil.tests import APPVEYOR - from psutil.tests import CI_TESTING - from psutil.tests import GITHUB_ACTIONS -@@ -726,6 +727,7 @@ class TestProcess(PsutilTestCase): - self.assertEqual(' '.join(p.cmdline()), ' '.join(cmdline)) - - @unittest.skipIf(PYPY, "broken on PYPY") -+ @unittest.skipIf(not which("gcc"), "gcc not installed") - def test_long_cmdline(self): - testfn = self.get_testfn() - create_exe(testfn) -@@ -740,6 +742,7 @@ class TestProcess(PsutilTestCase): - assert pyexe.startswith(name), (pyexe, name) - - @unittest.skipIf(PYPY, "unreliable on PYPY") -+ @unittest.skipIf(not which("gcc"), "gcc not installed") - def test_long_name(self): - testfn = self.get_testfn(suffix="0123456789" * 2) - create_exe(testfn) -@@ -750,6 +753,7 @@ class TestProcess(PsutilTestCase): - @unittest.skipIf(SUNOS, "broken on SUNOS") - @unittest.skipIf(AIX, "broken on AIX") - @unittest.skipIf(PYPY, "broken on PYPY") -+ @unittest.skipIf(not which("gcc"), "gcc not installed") - def test_prog_w_funky_name(self): - # Test that name(), exe() and cmdline() correctly handle programs - # with funky chars such as spaces and ")", see: -@@ -1408,6 +1412,7 @@ class TestProcess(PsutilTestCase): - - @unittest.skipIf(not HAS_ENVIRON, "not supported") - @unittest.skipIf(not POSIX, "POSIX only") -+ @unittest.skipIf(not which("gcc"), "gcc not installed") - def test_weird_environ(self): - # environment variables can contain values without an equals sign - code = textwrap.dedent(""" -diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py -index db2cb34..5ee519f 100755 ---- a/psutil/tests/test_system.py -+++ b/psutil/tests/test_system.py -@@ -580,6 +580,7 @@ class TestDiskAPIs(PsutilTestCase): - def test_disk_usage_bytes(self): - psutil.disk_usage(b'.') - -+ @unittest.skip("Broken for oe") - def test_disk_partitions(self): - def check_ntuple(nt): - self.assertIsInstance(nt.device, str) -diff --git a/psutil/tests/test_unicode.py b/psutil/tests/test_unicode.py -index e635726..7ba5b0f 100755 ---- a/psutil/tests/test_unicode.py -+++ b/psutil/tests/test_unicode.py -@@ -86,6 +86,7 @@ from psutil import POSIX - from psutil import WINDOWS - from psutil._compat import PY3 - from psutil._compat import u -+from psutil._compat import which - from psutil.tests import APPVEYOR - from psutil.tests import ASCII_FS - from psutil.tests import CI_TESTING -@@ -156,7 +157,7 @@ def try_unicode(suffix): - # FS APIs - # =================================================================== - -- -+@unittest.skipIf(not which("gcc"), "gcc not installed") - class BaseUnicodeTest(PsutilTestCase): - funky_suffix = None - -@@ -169,6 +170,7 @@ class BaseUnicodeTest(PsutilTestCase): - @serialrun - @unittest.skipIf(ASCII_FS, "ASCII fs") - @unittest.skipIf(PYPY and not PY3, "too much trouble on PYPY2") -+@unittest.skipIf(not which("gcc"), "gcc not installed") - class TestFSAPIs(BaseUnicodeTest): - """Test FS APIs with a funky, valid, UTF8 path name.""" - --- -2.25.1 - diff --git a/meta/recipes-devtools/python/python3-psutil_5.9.0.bb b/meta/recipes-devtools/python/python3-psutil_5.9.1.bb similarity index 81% rename from meta/recipes-devtools/python/python3-psutil_5.9.0.bb rename to meta/recipes-devtools/python/python3-psutil_5.9.1.bb index df304f01e6..04b6fb02de 100644 --- a/meta/recipes-devtools/python/python3-psutil_5.9.0.bb +++ b/meta/recipes-devtools/python/python3-psutil_5.9.1.bb @@ -3,12 +3,10 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=e35fd9f271d19d5f742f20a9d1f8bb8b" HOMEPAGE = "https://pypi.org/project/psutil/" -SRC_URI[sha256sum] = "869842dbd66bb80c3217158e629d6fceaecc3a3166d3d1faee515b05dd26ca25" +SRC_URI[sha256sum] = "57f1819b5d9e95cdfb0c881a8a5b7d542ed0b7c522d575706a80bedc848c8954" inherit pypi setuptools3 -SRC_URI += "file://0001-fix-failure-test-cases.patch" - PACKAGES =+ "${PN}-tests" FILES:${PN}-tests += " \ From patchwork Mon Jun 6 12:01:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 8881 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 41C64CCA483 for ; Mon, 6 Jun 2022 12:01:44 +0000 (UTC) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.groups.io with SMTP id smtpd.web08.31123.1654516896874581292 for ; Mon, 06 Jun 2022 05:01:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ErAEbfO5; spf=pass (domain: gmail.com, ip: 209.85.221.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f49.google.com with SMTP id k19so19542506wrd.8 for ; Mon, 06 Jun 2022 05:01:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GRScUJdaj72u5QgA7AAbG8n2nhEkAS3CeGodh5Xv/Ss=; b=ErAEbfO5+6skeHzldfughfvZx3oMu0RV+DPgw4gh93zR0wIn7nJVvkqjW6plSqu7Ah 8xg6PO6bOzNdX5TaHHCUfb/lL9j+zb/hnHjINJ49CQr7BPCeXo7rlXqx6zWvbjZW0dLp CGCV/kb7VdmEMprVilLBkS/8xGn+4b4S4pkJVc0NLRB9Nun8173AhvMfWOV8YzQtiQIk UpV9axPEykBEpIBUAff4L1S9fn1VU3tXP7F2/FdE/WZx7Y/h0yIYitwg0/xiqXSeuBxF T8Fc7oUVGuthmBBVMMupFW0Sdu3ImD8hFcXpQwe1daEJa5KVRc5nQbquYkrSn7PSc4lP bSWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GRScUJdaj72u5QgA7AAbG8n2nhEkAS3CeGodh5Xv/Ss=; b=sqPPakkidm2VzXdAuTmTyh/UyoBWX/KtnJTzq5fTRrDCIVCH0nbYovJNEwgy/WNmML dxoVuLQTl/6B6JjUSWuOL8/eFntBb9R4uWFjfVSRLaMCcS1VWyNgzlL4hiz8xo1wwOhJ BmZYRr3FPQS76VUKMP0oURYJ67uYzkB3hQ34qeM/79rg3zI0rbIXGO/OnRFCniOailW8 MzZbxey1xO6ikD/act0NM9h4tMrYLNd1CXBEMLfrU3u2rJ7biDa0Kys9RXmgynGRgZfy PWJoKTIbW+cXPV+CTUVAvkRt3Qyjdum+y3YpDvnNSF2AGmFKwgUg9XggrjaTecqarJJB 8YOw== X-Gm-Message-State: AOAM531mfW0SMwIrM6fn2vpARCtNQzhstzePu/Tqfif+mGS14P7Ee/80 CenFk0L2+FG1Zw9I8iBnVmOdcz1QiJDvTA== X-Google-Smtp-Source: ABdhPJwpj3sRysucdI5XoHBwXnoYi3hdQ2/GGwl826H4vgA1N4Hqx37ODahbKLPZClvWhKCqQPjoww== X-Received: by 2002:a5d:64c7:0:b0:216:5021:687f with SMTP id f7-20020a5d64c7000000b002165021687fmr11414127wri.295.1654516899818; Mon, 06 Jun 2022 05:01:39 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002100316b126sm15526455wru.6.2022.06.06.05.01.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 05:01:39 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 11/21] tiff: update 4.3.0 -> 4.4.0 Date: Mon, 6 Jun 2022 14:01:16 +0200 Message-Id: <20220606120126.3381438-11-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606120126.3381438-1-alex@linutronix.de> References: <20220606120126.3381438-1-alex@linutronix.de> 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, 06 Jun 2022 12:01:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166604 Drop all CVE backports. Signed-off-by: Alexander Kanavin --- ...rash-when-reading-a-file-with-multip.patch | 38 --- ...al-buffer-overflow-for-ASCII-tags-wh.patch | 43 ---- ...ue-380-and-382-heap-buffer-overflow-.patch | 219 ------------------ ...-for-return-value-of-limitMalloc-392.patch | 93 -------- ...ag-avoid-calling-memcpy-with-a-null-.patch | 33 --- .../0005-fix-the-FPE-in-tiffcrop-393.patch | 36 --- ...x-heap-buffer-overflow-in-tiffcp-278.patch | 57 ----- ...99c99f987dc32ae110370cfdd7df7975586b.patch | 30 --- ...0712f4c3a5b449f70c57988260a667ddbdef.patch | 32 --- .../libtiff/{tiff_4.3.0.bb => tiff_4.4.0.bb} | 16 +- 10 files changed, 3 insertions(+), 594 deletions(-) delete mode 100644 meta/recipes-multimedia/libtiff/tiff/0001-tif_jbig.c-fix-crash-when-reading-a-file-with-multip.patch delete mode 100644 meta/recipes-multimedia/libtiff/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags-wh.patch delete mode 100644 meta/recipes-multimedia/libtiff/tiff/0002-tiffcrop-fix-issue-380-and-382-heap-buffer-overflow-.patch delete mode 100644 meta/recipes-multimedia/libtiff/tiff/0003-add-checks-for-return-value-of-limitMalloc-392.patch delete mode 100644 meta/recipes-multimedia/libtiff/tiff/0004-TIFFFetchNormalTag-avoid-calling-memcpy-with-a-null-.patch delete mode 100644 meta/recipes-multimedia/libtiff/tiff/0005-fix-the-FPE-in-tiffcrop-393.patch delete mode 100644 meta/recipes-multimedia/libtiff/tiff/0006-fix-heap-buffer-overflow-in-tiffcp-278.patch delete mode 100644 meta/recipes-multimedia/libtiff/tiff/561599c99f987dc32ae110370cfdd7df7975586b.patch delete mode 100644 meta/recipes-multimedia/libtiff/tiff/eecb0712f4c3a5b449f70c57988260a667ddbdef.patch rename meta/recipes-multimedia/libtiff/{tiff_4.3.0.bb => tiff_4.4.0.bb} (74%) diff --git a/meta/recipes-multimedia/libtiff/tiff/0001-tif_jbig.c-fix-crash-when-reading-a-file-with-multip.patch b/meta/recipes-multimedia/libtiff/tiff/0001-tif_jbig.c-fix-crash-when-reading-a-file-with-multip.patch deleted file mode 100644 index f1a4ab4251..0000000000 --- a/meta/recipes-multimedia/libtiff/tiff/0001-tif_jbig.c-fix-crash-when-reading-a-file-with-multip.patch +++ /dev/null @@ -1,38 +0,0 @@ -CVE: CVE-2022-0865 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 88da11ae3c4db527cb870fb1017456cc8fbac2e7 Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Thu, 24 Feb 2022 22:26:02 +0100 -Subject: [PATCH 1/6] tif_jbig.c: fix crash when reading a file with multiple - IFD in memory-mapped mode and when bit reversal is needed (fixes #385) - ---- - libtiff/tif_jbig.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/libtiff/tif_jbig.c b/libtiff/tif_jbig.c -index 74086338..8bfa4cef 100644 ---- a/libtiff/tif_jbig.c -+++ b/libtiff/tif_jbig.c -@@ -209,6 +209,16 @@ int TIFFInitJBIG(TIFF* tif, int scheme) - */ - tif->tif_flags |= TIFF_NOBITREV; - tif->tif_flags &= ~TIFF_MAPPED; -+ /* We may have read from a previous IFD and thus set TIFF_BUFFERMMAP and -+ * cleared TIFF_MYBUFFER. It is necessary to restore them to their initial -+ * value to be consistent with the state of a non-memory mapped file. -+ */ -+ if (tif->tif_flags&TIFF_BUFFERMMAP) { -+ tif->tif_rawdata = NULL; -+ tif->tif_rawdatasize = 0; -+ tif->tif_flags &= ~TIFF_BUFFERMMAP; -+ tif->tif_flags |= TIFF_MYBUFFER; -+ } - - /* Setup the function pointers for encode, decode, and cleanup. */ - tif->tif_setupdecode = JBIGSetupDecode; --- -2.25.1 - diff --git a/meta/recipes-multimedia/libtiff/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags-wh.patch b/meta/recipes-multimedia/libtiff/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags-wh.patch deleted file mode 100644 index 72776f09ba..0000000000 --- a/meta/recipes-multimedia/libtiff/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags-wh.patch +++ /dev/null @@ -1,43 +0,0 @@ -CVE: CVE-2022-22844 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From b12a0326e6064b6e0b051d1184a219877472f69b Mon Sep 17 00:00:00 2001 -From: 4ugustus -Date: Tue, 25 Jan 2022 16:25:28 +0000 -Subject: [PATCH] tiffset: fix global-buffer-overflow for ASCII tags where - count is required (fixes #355) - ---- - tools/tiffset.c | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/tools/tiffset.c b/tools/tiffset.c -index 8c9e23c5..e7a88c09 100644 ---- a/tools/tiffset.c -+++ b/tools/tiffset.c -@@ -146,9 +146,19 @@ main(int argc, char* argv[]) - - arg_index++; - if (TIFFFieldDataType(fip) == TIFF_ASCII) { -- if (TIFFSetField(tiff, TIFFFieldTag(fip), argv[arg_index]) != 1) -- fprintf( stderr, "Failed to set %s=%s\n", -- TIFFFieldName(fip), argv[arg_index] ); -+ if(TIFFFieldPassCount( fip )) { -+ size_t len; -+ len = strlen(argv[arg_index]) + 1; -+ if (len > UINT16_MAX || TIFFSetField(tiff, TIFFFieldTag(fip), -+ (uint16_t)len, argv[arg_index]) != 1) -+ fprintf( stderr, "Failed to set %s=%s\n", -+ TIFFFieldName(fip), argv[arg_index] ); -+ } else { -+ if (TIFFSetField(tiff, TIFFFieldTag(fip), -+ argv[arg_index]) != 1) -+ fprintf( stderr, "Failed to set %s=%s\n", -+ TIFFFieldName(fip), argv[arg_index] ); -+ } - } else if (TIFFFieldWriteCount(fip) > 0 - || TIFFFieldWriteCount(fip) == TIFF_VARIABLE) { - int ret = 1; --- -2.25.1 diff --git a/meta/recipes-multimedia/libtiff/tiff/0002-tiffcrop-fix-issue-380-and-382-heap-buffer-overflow-.patch b/meta/recipes-multimedia/libtiff/tiff/0002-tiffcrop-fix-issue-380-and-382-heap-buffer-overflow-.patch deleted file mode 100644 index 812ffb232d..0000000000 --- a/meta/recipes-multimedia/libtiff/tiff/0002-tiffcrop-fix-issue-380-and-382-heap-buffer-overflow-.patch +++ /dev/null @@ -1,219 +0,0 @@ -CVE: CVE-2022-0891 -CVE: CVE-2022-1056 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From e46b49e60fddb2e924302fb1751f79eb9cfb2253 Mon Sep 17 00:00:00 2001 -From: Su Laus -Date: Tue, 8 Mar 2022 17:02:44 +0000 -Subject: [PATCH 2/6] tiffcrop: fix issue #380 and #382 heap buffer overflow in - extractImageSection - ---- - tools/tiffcrop.c | 92 +++++++++++++++++++----------------------------- - 1 file changed, 36 insertions(+), 56 deletions(-) - -diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c -index b85c2ce7..302a7e91 100644 ---- a/tools/tiffcrop.c -+++ b/tools/tiffcrop.c -@@ -105,8 +105,8 @@ - * of messages to monitor progress without enabling dump logs. - */ - --static char tiffcrop_version_id[] = "2.4"; --static char tiffcrop_rev_date[] = "12-13-2010"; -+static char tiffcrop_version_id[] = "2.4.1"; -+static char tiffcrop_rev_date[] = "03-03-2010"; - - #include "tif_config.h" - #include "libport.h" -@@ -6710,10 +6710,10 @@ extractImageSection(struct image_data *image, struct pageseg *section, - #ifdef DEVELMODE - uint32_t img_length; - #endif -- uint32_t j, shift1, shift2, trailing_bits; -+ uint32_t j, shift1, trailing_bits; - uint32_t row, first_row, last_row, first_col, last_col; - uint32_t src_offset, dst_offset, row_offset, col_offset; -- uint32_t offset1, offset2, full_bytes; -+ uint32_t offset1, full_bytes; - uint32_t sect_width; - #ifdef DEVELMODE - uint32_t sect_length; -@@ -6723,7 +6723,6 @@ extractImageSection(struct image_data *image, struct pageseg *section, - #ifdef DEVELMODE - int k; - unsigned char bitset; -- static char *bitarray = NULL; - #endif - - img_width = image->width; -@@ -6741,17 +6740,12 @@ extractImageSection(struct image_data *image, struct pageseg *section, - dst_offset = 0; - - #ifdef DEVELMODE -- if (bitarray == NULL) -- { -- if ((bitarray = (char *)malloc(img_width)) == NULL) -- { -- TIFFError ("", "DEBUG: Unable to allocate debugging bitarray"); -- return (-1); -- } -- } -+ char bitarray[39]; - #endif - -- /* rows, columns, width, length are expressed in pixels */ -+ /* rows, columns, width, length are expressed in pixels -+ * first_row, last_row, .. are index into image array starting at 0 to width-1, -+ * last_col shall be also extracted. */ - first_row = section->y1; - last_row = section->y2; - first_col = section->x1; -@@ -6761,9 +6755,14 @@ extractImageSection(struct image_data *image, struct pageseg *section, - #ifdef DEVELMODE - sect_length = last_row - first_row + 1; - #endif -- img_rowsize = ((img_width * bps + 7) / 8) * spp; -- full_bytes = (sect_width * spp * bps) / 8; /* number of COMPLETE bytes per row in section */ -- trailing_bits = (sect_width * bps) % 8; -+ /* The read function loadImage() used copy separate plane data into a buffer as interleaved -+ * samples rather than separate planes so the same logic works to extract regions -+ * regardless of the way the data are organized in the input file. -+ * Furthermore, bytes and bits are arranged in buffer according to COMPRESSION=1 and FILLORDER=1 -+ */ -+ img_rowsize = (((img_width * spp * bps) + 7) / 8); /* row size in full bytes of source image */ -+ full_bytes = (sect_width * spp * bps) / 8; /* number of COMPLETE bytes per row in section */ -+ trailing_bits = (sect_width * spp * bps) % 8; /* trailing bits within the last byte of destination buffer */ - - #ifdef DEVELMODE - TIFFError ("", "First row: %"PRIu32", last row: %"PRIu32", First col: %"PRIu32", last col: %"PRIu32"\n", -@@ -6776,10 +6775,9 @@ extractImageSection(struct image_data *image, struct pageseg *section, - - if ((bps % 8) == 0) - { -- col_offset = first_col * spp * bps / 8; -+ col_offset = (first_col * spp * bps) / 8; - for (row = first_row; row <= last_row; row++) - { -- /* row_offset = row * img_width * spp * bps / 8; */ - row_offset = row * img_rowsize; - src_offset = row_offset + col_offset; - -@@ -6792,14 +6790,12 @@ extractImageSection(struct image_data *image, struct pageseg *section, - } - else - { /* bps != 8 */ -- shift1 = spp * ((first_col * bps) % 8); -- shift2 = spp * ((last_col * bps) % 8); -+ shift1 = ((first_col * spp * bps) % 8); /* shift1 = bits to skip in the first byte of source buffer*/ - for (row = first_row; row <= last_row; row++) - { - /* pull out the first byte */ - row_offset = row * img_rowsize; -- offset1 = row_offset + (first_col * bps / 8); -- offset2 = row_offset + (last_col * bps / 8); -+ offset1 = row_offset + ((first_col * spp * bps) / 8); /* offset1 = offset into source of byte with first bits to be extracted */ - - #ifdef DEVELMODE - for (j = 0, k = 7; j < 8; j++, k--) -@@ -6811,12 +6807,12 @@ extractImageSection(struct image_data *image, struct pageseg *section, - sprintf(&bitarray[9], " "); - for (j = 10, k = 7; j < 18; j++, k--) - { -- bitset = *(src_buff + offset2) & (((unsigned char)1 << k)) ? 1 : 0; -+ bitset = *(src_buff + offset1 + full_bytes) & (((unsigned char)1 << k)) ? 1 : 0; - sprintf(&bitarray[j], (bitset) ? "1" : "0"); - } - bitarray[18] = '\0'; -- TIFFError ("", "Row: %3d Offset1: %"PRIu32", Shift1: %"PRIu32", Offset2: %"PRIu32", Shift2: %"PRIu32"\n", -- row, offset1, shift1, offset2, shift2); -+ TIFFError ("", "Row: %3d Offset1: %"PRIu32", Shift1: %"PRIu32", Offset2: %"PRIu32", Trailing_bits: %"PRIu32"\n", -+ row, offset1, shift1, offset1+full_bytes, trailing_bits); - #endif - - bytebuff1 = bytebuff2 = 0; -@@ -6840,11 +6836,12 @@ extractImageSection(struct image_data *image, struct pageseg *section, - - if (trailing_bits != 0) - { -- bytebuff2 = src_buff[offset2] & ((unsigned char)255 << (7 - shift2)); -+ /* Only copy higher bits of samples and mask lower bits of not wanted column samples to zero */ -+ bytebuff2 = src_buff[offset1 + full_bytes] & ((unsigned char)255 << (8 - trailing_bits)); - sect_buff[dst_offset] = bytebuff2; - #ifdef DEVELMODE - TIFFError ("", " Trailing bits src offset: %8"PRIu32", Dst offset: %8"PRIu32"\n", -- offset2, dst_offset); -+ offset1 + full_bytes, dst_offset); - for (j = 30, k = 7; j < 38; j++, k--) - { - bitset = *(sect_buff + dst_offset) & (((unsigned char)1 << k)) ? 1 : 0; -@@ -6863,8 +6860,10 @@ extractImageSection(struct image_data *image, struct pageseg *section, - #endif - for (j = 0; j <= full_bytes; j++) - { -- bytebuff1 = src_buff[offset1 + j] & ((unsigned char)255 >> shift1); -- bytebuff2 = src_buff[offset1 + j + 1] & ((unsigned char)255 << (7 - shift1)); -+ /* Skip the first shift1 bits and shift the source up by shift1 bits before save to destination.*/ -+ /* Attention: src_buff size needs to be some bytes larger than image size, because could read behind image here. */ -+ bytebuff1 = src_buff[offset1 + j] & ((unsigned char)255 >> shift1); -+ bytebuff2 = src_buff[offset1 + j + 1] & ((unsigned char)255 << (8 - shift1)); - sect_buff[dst_offset + j] = (bytebuff1 << shift1) | (bytebuff2 >> (8 - shift1)); - } - #ifdef DEVELMODE -@@ -6880,36 +6879,17 @@ extractImageSection(struct image_data *image, struct pageseg *section, - #endif - dst_offset += full_bytes; - -+ /* Copy the trailing_bits for the last byte in the destination buffer. -+ Could come from one ore two bytes of the source buffer. */ - if (trailing_bits != 0) - { - #ifdef DEVELMODE -- TIFFError ("", " Trailing bits src offset: %8"PRIu32", Dst offset: %8"PRIu32"\n", offset1 + full_bytes, dst_offset); --#endif -- if (shift2 > shift1) -- { -- bytebuff1 = src_buff[offset1 + full_bytes] & ((unsigned char)255 << (7 - shift2)); -- bytebuff2 = bytebuff1 & ((unsigned char)255 << shift1); -- sect_buff[dst_offset] = bytebuff2; --#ifdef DEVELMODE -- TIFFError ("", " Shift2 > Shift1\n"); -+ TIFFError("", " Trailing bits %4"PRIu32" src offset: %8"PRIu32", Dst offset: %8"PRIu32"\n", trailing_bits, offset1 + full_bytes, dst_offset); - #endif -+ /* More than necessary bits are already copied into last destination buffer, -+ * only masking of last byte in destination buffer is necessary.*/ -+ sect_buff[dst_offset] &= ((uint8_t)0xFF << (8 - trailing_bits)); - } -- else -- { -- if (shift2 < shift1) -- { -- bytebuff2 = ((unsigned char)255 << (shift1 - shift2 - 1)); -- sect_buff[dst_offset] &= bytebuff2; --#ifdef DEVELMODE -- TIFFError ("", " Shift2 < Shift1\n"); --#endif -- } --#ifdef DEVELMODE -- else -- TIFFError ("", " Shift2 == Shift1\n"); --#endif -- } -- } - #ifdef DEVELMODE - sprintf(&bitarray[28], " "); - sprintf(&bitarray[29], " "); -@@ -7062,7 +7042,7 @@ writeImageSections(TIFF *in, TIFF *out, struct image_data *image, - width = sections[i].x2 - sections[i].x1 + 1; - length = sections[i].y2 - sections[i].y1 + 1; - sectsize = (uint32_t) -- ceil((width * image->bps + 7) / (double)8) * image->spp * length; -+ ceil((width * image->bps * image->spp + 7) / (double)8) * length; - /* allocate a buffer if we don't have one already */ - if (createImageSection(sectsize, sect_buff_ptr)) - { --- -2.25.1 - diff --git a/meta/recipes-multimedia/libtiff/tiff/0003-add-checks-for-return-value-of-limitMalloc-392.patch b/meta/recipes-multimedia/libtiff/tiff/0003-add-checks-for-return-value-of-limitMalloc-392.patch deleted file mode 100644 index a0b856b9e1..0000000000 --- a/meta/recipes-multimedia/libtiff/tiff/0003-add-checks-for-return-value-of-limitMalloc-392.patch +++ /dev/null @@ -1,93 +0,0 @@ -CVE: CVE-2022-0907 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From a139191cc86f4dc44c74a0f22928e0fb38ed2485 Mon Sep 17 00:00:00 2001 -From: Augustus -Date: Mon, 7 Mar 2022 18:21:49 +0800 -Subject: [PATCH 3/6] add checks for return value of limitMalloc (#392) - ---- - tools/tiffcrop.c | 33 +++++++++++++++++++++------------ - 1 file changed, 21 insertions(+), 12 deletions(-) - -diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c -index 302a7e91..e407bf51 100644 ---- a/tools/tiffcrop.c -+++ b/tools/tiffcrop.c -@@ -7357,7 +7357,11 @@ createImageSection(uint32_t sectsize, unsigned char **sect_buff_ptr) - if (!sect_buff) - { - sect_buff = (unsigned char *)limitMalloc(sectsize); -- *sect_buff_ptr = sect_buff; -+ if (!sect_buff) -+ { -+ TIFFError("createImageSection", "Unable to allocate/reallocate section buffer"); -+ return (-1); -+ } - _TIFFmemset(sect_buff, 0, sectsize); - } - else -@@ -7373,15 +7377,15 @@ createImageSection(uint32_t sectsize, unsigned char **sect_buff_ptr) - else - sect_buff = new_buff; - -+ if (!sect_buff) -+ { -+ TIFFError("createImageSection", "Unable to allocate/reallocate section buffer"); -+ return (-1); -+ } - _TIFFmemset(sect_buff, 0, sectsize); - } - } - -- if (!sect_buff) -- { -- TIFFError("createImageSection", "Unable to allocate/reallocate section buffer"); -- return (-1); -- } - prev_sectsize = sectsize; - *sect_buff_ptr = sect_buff; - -@@ -7648,7 +7652,11 @@ createCroppedImage(struct image_data *image, struct crop_mask *crop, - if (!crop_buff) - { - crop_buff = (unsigned char *)limitMalloc(cropsize); -- *crop_buff_ptr = crop_buff; -+ if (!crop_buff) -+ { -+ TIFFError("createCroppedImage", "Unable to allocate/reallocate crop buffer"); -+ return (-1); -+ } - _TIFFmemset(crop_buff, 0, cropsize); - prev_cropsize = cropsize; - } -@@ -7664,15 +7672,15 @@ createCroppedImage(struct image_data *image, struct crop_mask *crop, - } - else - crop_buff = new_buff; -+ if (!crop_buff) -+ { -+ TIFFError("createCroppedImage", "Unable to allocate/reallocate crop buffer"); -+ return (-1); -+ } - _TIFFmemset(crop_buff, 0, cropsize); - } - } - -- if (!crop_buff) -- { -- TIFFError("createCroppedImage", "Unable to allocate/reallocate crop buffer"); -- return (-1); -- } - *crop_buff_ptr = crop_buff; - - if (crop->crop_mode & CROP_INVERT) -@@ -9231,3 +9239,4 @@ invertImage(uint16_t photometric, uint16_t spp, uint16_t bps, uint32_t width, ui - * fill-column: 78 - * End: - */ -+ --- -2.25.1 - diff --git a/meta/recipes-multimedia/libtiff/tiff/0004-TIFFFetchNormalTag-avoid-calling-memcpy-with-a-null-.patch b/meta/recipes-multimedia/libtiff/tiff/0004-TIFFFetchNormalTag-avoid-calling-memcpy-with-a-null-.patch deleted file mode 100644 index 719dabaecc..0000000000 --- a/meta/recipes-multimedia/libtiff/tiff/0004-TIFFFetchNormalTag-avoid-calling-memcpy-with-a-null-.patch +++ /dev/null @@ -1,33 +0,0 @@ -CVE: CVE-2022-0908 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From ef5a0bf271823df168642444d051528a68205cb0 Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Thu, 17 Feb 2022 15:28:43 +0100 -Subject: [PATCH 4/6] TIFFFetchNormalTag(): avoid calling memcpy() with a null - source pointer and size of zero (fixes #383) - ---- - libtiff/tif_dirread.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c -index d84147a0..4e8ce729 100644 ---- a/libtiff/tif_dirread.c -+++ b/libtiff/tif_dirread.c -@@ -5079,7 +5079,10 @@ TIFFFetchNormalTag(TIFF* tif, TIFFDirEntry* dp, int recover) - _TIFFfree(data); - return(0); - } -- _TIFFmemcpy(o,data,(uint32_t)dp->tdir_count); -+ if (dp->tdir_count > 0 ) -+ { -+ _TIFFmemcpy(o,data,(uint32_t)dp->tdir_count); -+ } - o[(uint32_t)dp->tdir_count]=0; - if (data!=0) - _TIFFfree(data); --- -2.25.1 - diff --git a/meta/recipes-multimedia/libtiff/tiff/0005-fix-the-FPE-in-tiffcrop-393.patch b/meta/recipes-multimedia/libtiff/tiff/0005-fix-the-FPE-in-tiffcrop-393.patch deleted file mode 100644 index 64dbe9ef92..0000000000 --- a/meta/recipes-multimedia/libtiff/tiff/0005-fix-the-FPE-in-tiffcrop-393.patch +++ /dev/null @@ -1,36 +0,0 @@ -CVE: CVE-2022-0909 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 4768355a074d562177e0a8b551c561d1af7eb74a Mon Sep 17 00:00:00 2001 -From: 4ugustus -Date: Tue, 8 Mar 2022 16:22:04 +0000 -Subject: [PATCH 5/6] fix the FPE in tiffcrop (#393) - ---- - libtiff/tif_dir.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c -index a6c254fc..77da6ea4 100644 ---- a/libtiff/tif_dir.c -+++ b/libtiff/tif_dir.c -@@ -335,13 +335,13 @@ _TIFFVSetField(TIFF* tif, uint32_t tag, va_list ap) - break; - case TIFFTAG_XRESOLUTION: - dblval = va_arg(ap, double); -- if( dblval < 0 ) -+ if( dblval != dblval || dblval < 0 ) - goto badvaluedouble; - td->td_xresolution = _TIFFClampDoubleToFloat( dblval ); - break; - case TIFFTAG_YRESOLUTION: - dblval = va_arg(ap, double); -- if( dblval < 0 ) -+ if( dblval != dblval || dblval < 0 ) - goto badvaluedouble; - td->td_yresolution = _TIFFClampDoubleToFloat( dblval ); - break; --- -2.25.1 - diff --git a/meta/recipes-multimedia/libtiff/tiff/0006-fix-heap-buffer-overflow-in-tiffcp-278.patch b/meta/recipes-multimedia/libtiff/tiff/0006-fix-heap-buffer-overflow-in-tiffcp-278.patch deleted file mode 100644 index afd5e59960..0000000000 --- a/meta/recipes-multimedia/libtiff/tiff/0006-fix-heap-buffer-overflow-in-tiffcp-278.patch +++ /dev/null @@ -1,57 +0,0 @@ -CVE: CVE-2022-0924 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 1074b9691322b1e3671cd8ea0b6b3509d08978fb Mon Sep 17 00:00:00 2001 -From: 4ugustus -Date: Thu, 10 Mar 2022 08:48:00 +0000 -Subject: [PATCH 6/6] fix heap buffer overflow in tiffcp (#278) - ---- - tools/tiffcp.c | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - -diff --git a/tools/tiffcp.c b/tools/tiffcp.c -index 1f889516..552d8fad 100644 ---- a/tools/tiffcp.c -+++ b/tools/tiffcp.c -@@ -1661,12 +1661,27 @@ DECLAREwriteFunc(writeBufferToSeparateStrips) - tdata_t obuf; - tstrip_t strip = 0; - tsample_t s; -+ uint16_t bps = 0, bytes_per_sample; - - obuf = limitMalloc(stripsize); - if (obuf == NULL) - return (0); - _TIFFmemset(obuf, 0, stripsize); - (void) TIFFGetFieldDefaulted(out, TIFFTAG_ROWSPERSTRIP, &rowsperstrip); -+ (void) TIFFGetField(out, TIFFTAG_BITSPERSAMPLE, &bps); -+ if( bps == 0 ) -+ { -+ TIFFError(TIFFFileName(out), "Error, cannot read BitsPerSample"); -+ _TIFFfree(obuf); -+ return 0; -+ } -+ if( (bps % 8) != 0 ) -+ { -+ TIFFError(TIFFFileName(out), "Error, cannot handle BitsPerSample that is not a multiple of 8"); -+ _TIFFfree(obuf); -+ return 0; -+ } -+ bytes_per_sample = bps/8; - for (s = 0; s < spp; s++) { - uint32_t row; - for (row = 0; row < imagelength; row += rowsperstrip) { -@@ -1676,7 +1691,7 @@ DECLAREwriteFunc(writeBufferToSeparateStrips) - - cpContigBufToSeparateBuf( - obuf, (uint8_t*) buf + row * rowsize + s, -- nrows, imagewidth, 0, 0, spp, 1); -+ nrows, imagewidth, 0, 0, spp, bytes_per_sample); - if (TIFFWriteEncodedStrip(out, strip++, obuf, stripsize) < 0) { - TIFFError(TIFFFileName(out), - "Error, can't write strip %"PRIu32, --- -2.25.1 - diff --git a/meta/recipes-multimedia/libtiff/tiff/561599c99f987dc32ae110370cfdd7df7975586b.patch b/meta/recipes-multimedia/libtiff/tiff/561599c99f987dc32ae110370cfdd7df7975586b.patch deleted file mode 100644 index 0b41dde606..0000000000 --- a/meta/recipes-multimedia/libtiff/tiff/561599c99f987dc32ae110370cfdd7df7975586b.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 561599c99f987dc32ae110370cfdd7df7975586b Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Sat, 5 Feb 2022 20:36:41 +0100 -Subject: [PATCH] TIFFReadDirectory(): avoid calling memcpy() with a null - source pointer and size of zero (fixes #362) - -Upstream-Status: Backport -CVE: CVE-2022-0562 - ---- - libtiff/tif_dirread.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c -index 2bbc4585..23194ced 100644 ---- a/libtiff/tif_dirread.c -+++ b/libtiff/tif_dirread.c -@@ -4177,7 +4177,8 @@ TIFFReadDirectory(TIFF* tif) - goto bad; - } - -- memcpy(new_sampleinfo, tif->tif_dir.td_sampleinfo, old_extrasamples * sizeof(uint16_t)); -+ if (old_extrasamples > 0) -+ memcpy(new_sampleinfo, tif->tif_dir.td_sampleinfo, old_extrasamples * sizeof(uint16_t)); - _TIFFsetShortArray(&tif->tif_dir.td_sampleinfo, new_sampleinfo, tif->tif_dir.td_extrasamples); - _TIFFfree(new_sampleinfo); - } --- -GitLab - diff --git a/meta/recipes-multimedia/libtiff/tiff/eecb0712f4c3a5b449f70c57988260a667ddbdef.patch b/meta/recipes-multimedia/libtiff/tiff/eecb0712f4c3a5b449f70c57988260a667ddbdef.patch deleted file mode 100644 index 74f9649fdf..0000000000 --- a/meta/recipes-multimedia/libtiff/tiff/eecb0712f4c3a5b449f70c57988260a667ddbdef.patch +++ /dev/null @@ -1,32 +0,0 @@ -From eecb0712f4c3a5b449f70c57988260a667ddbdef Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Sun, 6 Feb 2022 13:08:38 +0100 -Subject: [PATCH] TIFFFetchStripThing(): avoid calling memcpy() with a null - source pointer and size of zero (fixes #362) - -Upstream-Status: Backport -CVE: CVE-2022-0561 - ---- - libtiff/tif_dirread.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c -index 23194ced..50ebf8ac 100644 ---- a/libtiff/tif_dirread.c -+++ b/libtiff/tif_dirread.c -@@ -5777,8 +5777,9 @@ TIFFFetchStripThing(TIFF* tif, TIFFDirEntry* dir, uint32_t nstrips, uint64_t** l - _TIFFfree(data); - return(0); - } -- _TIFFmemcpy(resizeddata,data, (uint32_t)dir->tdir_count * sizeof(uint64_t)); -- _TIFFmemset(resizeddata+(uint32_t)dir->tdir_count, 0, (nstrips - (uint32_t)dir->tdir_count) * sizeof(uint64_t)); -+ if( dir->tdir_count ) -+ _TIFFmemcpy(resizeddata,data, (uint32_t)dir->tdir_count * sizeof(uint64_t)); -+ _TIFFmemset(resizeddata+(uint32_t)dir->tdir_count, 0, (nstrips - (uint32_t)dir->tdir_count) * sizeof(uint64_t)); - _TIFFfree(data); - data=resizeddata; - } --- -GitLab - diff --git a/meta/recipes-multimedia/libtiff/tiff_4.3.0.bb b/meta/recipes-multimedia/libtiff/tiff_4.4.0.bb similarity index 74% rename from meta/recipes-multimedia/libtiff/tiff_4.3.0.bb rename to meta/recipes-multimedia/libtiff/tiff_4.4.0.bb index 7a5e4816a6..c82965ffa1 100644 --- a/meta/recipes-multimedia/libtiff/tiff_4.3.0.bb +++ b/meta/recipes-multimedia/libtiff/tiff_4.4.0.bb @@ -8,19 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=34da3db46fab7501992f9615d7e158cf" CVE_PRODUCT = "libtiff" -SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ - file://0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags-wh.patch \ - file://561599c99f987dc32ae110370cfdd7df7975586b.patch \ - file://eecb0712f4c3a5b449f70c57988260a667ddbdef.patch \ - file://0001-tif_jbig.c-fix-crash-when-reading-a-file-with-multip.patch \ - file://0002-tiffcrop-fix-issue-380-and-382-heap-buffer-overflow-.patch \ - file://0003-add-checks-for-return-value-of-limitMalloc-392.patch \ - file://0004-TIFFFetchNormalTag-avoid-calling-memcpy-with-a-null-.patch \ - file://0005-fix-the-FPE-in-tiffcrop-393.patch \ - file://0006-fix-heap-buffer-overflow-in-tiffcp-278.patch \ - " - -SRC_URI[sha256sum] = "0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8" +SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz" + +SRC_URI[sha256sum] = "917223b37538959aca3b790d2d73aa6e626b688e02dcda272aec24c2f498abed" # exclude betas UPSTREAM_CHECK_REGEX = "tiff-(?P\d+(\.\d+)+).tar" From patchwork Mon Jun 6 12:01:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 8879 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 32835C433EF for ; Mon, 6 Jun 2022 12:01:44 +0000 (UTC) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.groups.io with SMTP id smtpd.web12.30991.1654516902621180731 for ; Mon, 06 Jun 2022 05:01:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=o/kfvmUc; spf=pass (domain: gmail.com, ip: 209.85.221.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f49.google.com with SMTP id q7so19563313wrg.5 for ; Mon, 06 Jun 2022 05:01:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1rzHQHHCIIJDNozBEtgpix/4UpR8Nc7ppfB+YI9+Yus=; b=o/kfvmUcZPUF4dORaPLcdIFlpeyY7+d9IoLynWvku5jqNvp8oJWmA7yHC1wsf0/dWa LjtzpEhX4De8d1zCfyfpFp6QJrpBbYRFMQm1/8W8XYnE2olhFvxMbUNzO1vNnI22u7Ue t4iGpjG/6Tj/2xNfbBTJwJSI/e070vX1RnGLz5uVXDVS5haXklY21dKJgndmfDeIYIDa 0LtKs41o5VXITmJMkvan8Qb8YKtfOKnd6Gc0zWJtHoiBxryNo3geQVsBrJkdWpJ+xZu3 Vg1yj7sXpnDgFgbgSM4BTwOY9ZbCjTDlI6hLfdKhtiSOIGp+2SY2t0mkZyINe/jfBkUY d5GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1rzHQHHCIIJDNozBEtgpix/4UpR8Nc7ppfB+YI9+Yus=; b=jFV1L59jVEXzZ0HSmeRxUTWEyqNNRRd3asp9xwadCZj+SJXItcxO4+ARAT4epXW77j m8xtDrLB1IvA3YXa+PhxCQHmm2ClXLA3DJzd52Khmx7TIkHBTelx+PVxUbhF5D2ZAFCE XQ1tFAu4BOti7fPDOUm8uCrE+Mpupk5kT3jE5/ij7oDA5RgrzTDLIzYSxB54NB84ENVs 29/HjqzIMgE9DWDLWXncAqOz29NqnpO4nQCsMNTHvq/1Qew4YNZYKM4RM5yyN5eCyq63 aNjPI+kvt1f22JA4Nt7NzHJR4Ix2CYEP/3ET++TPvgm2OlPTyXlPIxtRzW+F6g8x/It0 zoGw== X-Gm-Message-State: AOAM533aw1Db2nFTqBbJhrYC05jveDQ/SzI4yOj9+wexLuNOl5I08yjl mUtzP4UHKJF+MrutcF6pxmbE+uG7b8qAvg== X-Google-Smtp-Source: ABdhPJyh9h1vP1HW0lDjjEfJ/qVk+0r7LX3A6sHfeATw5VtnfdirHDYDZPZZudDyWeQiLtkQ/Rd2Yw== X-Received: by 2002:a5d:66c7:0:b0:210:3385:1e44 with SMTP id k7-20020a5d66c7000000b0021033851e44mr21775181wrw.566.1654516900655; Mon, 06 Jun 2022 05:01:40 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002100316b126sm15526455wru.6.2022.06.06.05.01.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 05:01:40 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 12/21] pulseaudio: update 15.0 -> 16.0 Date: Mon, 6 Jun 2022 14:01:17 +0200 Message-Id: <20220606120126.3381438-12-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606120126.3381438-1-alex@linutronix.de> References: <20220606120126.3381438-1-alex@linutronix.de> 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, 06 Jun 2022 12:01:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166605 Drop patch as issue fixed upstream: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/1b96b49f65744930050b927a548a3d2e771c7310 Signed-off-by: Alexander Kanavin --- .../pulseaudio/pulseaudio.inc | 2 +- .../0001-meson-Check-for-__get_cpuid.patch | 82 ------------------- ...{pulseaudio_15.0.bb => pulseaudio_16.0.bb} | 3 +- 3 files changed, 2 insertions(+), 85 deletions(-) delete mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio/0001-meson-Check-for-__get_cpuid.patch rename meta/recipes-multimedia/pulseaudio/{pulseaudio_15.0.bb => pulseaudio_16.0.bb} (75%) diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 821ce7d1df..602d7263ce 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -213,7 +213,7 @@ pkg_postinst:${PN}-server() { } python populate_packages:prepend() { - plugindir = d.expand('${libdir}/pulse-${PV}/modules/') + plugindir = d.expand('${libdir}/pulseaudio/modules/') do_split_packages(d, plugindir, r'^module-(.*)\.so$', '${PN}-module-%s', 'PulseAudio module for %s', extra_depends='', prepend=True) do_split_packages(d, plugindir, r'^lib(.*)\.so$', '${PN}-lib-%s', 'PulseAudio library for %s', extra_depends='', prepend=True) } diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-meson-Check-for-__get_cpuid.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-meson-Check-for-__get_cpuid.patch deleted file mode 100644 index c9d8abcbf2..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-meson-Check-for-__get_cpuid.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 9d0dc8aedd08d77797f90fa6075a59613f18bf0d Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 20 Dec 2020 07:56:07 -0800 -Subject: [PATCH] meson: Check for __get_cpuid - -checking for presence of cpuid.h header alone is not sufficient in some case to use -cpuid related functions. e.g. when using clang which is built for -multiple targets will have cpuid.h header as part of compiler headers in -distribution but one maybe compiling pulseaudion for non-x86 target. The -current check in meson succeeds and then compile fails later because -cpuid.h is x86-specific header. Therefore checking for symbol that is -needed makes this robust, so even if header exist it will try to ensure -the given symbol can be used - -Fixes -src/pulsecore/core-util.c:113: -| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/pulseaudio/14.0-r0/recipe-sysroot-native/usr/lib/clang/11.0.1/include/cpuid.h:11:2: error: this header is for x86 only -| #error this header is for x86 only -| ^ - -Upstream-Status: Pending - -Signed-off-by: Khem Raj -Cc: Tanu Kaskinen ---- - meson.build | 5 ++++- - src/pulsecore/core-util.c | 2 +- - src/pulsecore/cpu-x86.c | 2 +- - 3 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index 2589627..5f5127e 100644 ---- a/meson.build -+++ b/meson.build -@@ -185,7 +185,6 @@ endif - check_headers = [ - 'arpa/inet.h', - 'byteswap.h', -- 'cpuid.h', - 'dlfcn.h', - 'execinfo.h', - 'grp.h', -@@ -243,6 +242,10 @@ if cc.has_header_symbol('pthread.h', 'PTHREAD_PRIO_INHERIT') - cdata.set('HAVE_PTHREAD_PRIO_INHERIT', 1) - endif - -+if cc.has_header_symbol('cpuid.h', '__get_cpuid') -+ cdata.set('HAVE_GET_CPUID', 1) -+endif -+ - # Functions - - check_functions = [ -diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c -index 601b1d1..6f34e7c 100644 ---- a/src/pulsecore/core-util.c -+++ b/src/pulsecore/core-util.c -@@ -109,7 +109,7 @@ - #include - #endif - --#ifdef HAVE_CPUID_H -+#ifdef HAVE_GET_CPUID - #include - #endif - -diff --git a/src/pulsecore/cpu-x86.c b/src/pulsecore/cpu-x86.c -index 4e59e14..86595d4 100644 ---- a/src/pulsecore/cpu-x86.c -+++ b/src/pulsecore/cpu-x86.c -@@ -24,7 +24,7 @@ - - #include - --#ifdef HAVE_CPUID_H -+#ifdef HAVE_GET_CPUID - #include - #endif - --- -2.29.2 - diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_15.0.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_16.0.bb similarity index 75% rename from meta/recipes-multimedia/pulseaudio/pulseaudio_15.0.bb rename to meta/recipes-multimedia/pulseaudio/pulseaudio_16.0.bb index 239d31810b..f9940d4c85 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_15.0.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_16.0.bb @@ -3,9 +3,8 @@ require pulseaudio.inc SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ file://0001-client-conf-Add-allow-autospawn-for-root.patch \ file://0002-do-not-display-CLFAGS-to-improve-reproducibility-bui.patch \ - file://0001-meson-Check-for-__get_cpuid.patch \ file://volatiles.04_pulse \ file://0001-doxygen-meson.build-remove-dependency-on-doxygen-bin.patch \ " -SRC_URI[sha256sum] = "a40b887a3ba98cc26976eb11bdb6613988f145b19024d1b6555c6a03c9cba1a0" +SRC_URI[sha256sum] = "b4ec6271910a1a86803f165056547f700dfabaf8d5c6c69736f706b5bb889f47" UPSTREAM_CHECK_REGEX = "pulseaudio-(?P\d+(\.(?!99)\d+)+)\.tar" From patchwork Mon Jun 6 12:01:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 8880 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 31293C43334 for ; Mon, 6 Jun 2022 12:01:44 +0000 (UTC) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.groups.io with SMTP id smtpd.web09.31132.1654516902782616671 for ; Mon, 06 Jun 2022 05:01:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=WyQEL7AK; spf=pass (domain: gmail.com, ip: 209.85.221.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f52.google.com with SMTP id q26so9187958wra.1 for ; Mon, 06 Jun 2022 05:01:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GAcwu5nbMwK8cDfC6lnFm5Lht1mRYKy6J799/UojQa4=; b=WyQEL7AKFvDnoD7j4b9Z5ajUnrSu829ZOnFfC2YJFVYq1GwCvI9D2pvjVn2/9YtwUY YbwIb6HFq+t4fwdg7Z2V06bnXOiHw9bkGieE8jFNSKsEIG/Fj8FX5mrqE2gafVXDDs86 AinW4z3u8CxopFhmDJo9Q5FXzV5CS3yMuH9VtL3l9kwf/752xhSiGVzlo7JL4PH227Gf nw1BBZpMgn1hYBKmw4DLl1ZblMSrN9rCVMRRYH/TaMSvM3J4F0FsZx0LbV/ilppZO8oD W6W9oaOwHkezXX5k3XcBYl169yrG2NGfaE9YwZ+9/2d2UjFJU/V8zAm8mTbcZjzpeCg4 AlgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GAcwu5nbMwK8cDfC6lnFm5Lht1mRYKy6J799/UojQa4=; b=MACyU35p+R8SDHoXKH7Htf1fYcn2q9m8lNoNDem+MLeVNToCuII1FG4odqevXHUjke tnYkbAabcM5puhcTxC1pb18ymL9uC2FSUg8kgsz3SwA7a/s4dh4o6jTIKetbXGdspnph I1q6uI45nKgeJW/zEcujEvbunB+52izpDAk4D/mjltbB/cDJl+OgIoh6VJbHZbrI8InO 6L53K3X3U127CyB8s+/h4+NirquGFEeBzpSx3uLhX6w2YQ4gJ4KZg0IBCR3A014I5k43 8syCK5yC349BAvMC638X75S+tMEaQQmqyPVWs3b95bfgFtC1PfP+rnUBALqvs0WL5Yst KsDA== X-Gm-Message-State: AOAM533liPXqP613w1auH+0VN1QjWDS9grnaplXPySpMreBVzv+3XEoN iNGjQy8UDUuxrhERbPHDOpFbbnMIjtbfBg== X-Google-Smtp-Source: ABdhPJywJ/JJUc4GVXgUXc/2YArV2RzCUQzT74IyUcIWpRjkyo4etI/pztxhO1wQVTP6VJHeUKg1Cg== X-Received: by 2002:adf:e2c9:0:b0:20c:dbc2:a411 with SMTP id d9-20020adfe2c9000000b0020cdbc2a411mr21009344wrj.391.1654516901381; Mon, 06 Jun 2022 05:01:41 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002100316b126sm15526455wru.6.2022.06.06.05.01.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 05:01:40 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 13/21] alsa-utils-scripts: merge into alsa-utils Date: Mon, 6 Jun 2022 14:01:18 +0200 Message-Id: <20220606120126.3381438-13-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606120126.3381438-1-alex@linutronix.de> References: <20220606120126.3381438-1-alex@linutronix.de> 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, 06 Jun 2022 12:01:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166606 There is no reason to keep the recipe separate: bash dependency is not a problem until the alsa-utils-scripts package is explicitly installed into a target image. Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/maintainers.inc | 1 - .../alsa/alsa-utils-scripts_1.2.6.bb | 25 ---- meta/recipes-multimedia/alsa/alsa-utils.inc | 108 ---------------- .../alsa/alsa-utils_1.2.6.bb | 120 +++++++++++++++++- 4 files changed, 119 insertions(+), 135 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.6.bb delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils.inc diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index de3fb7474c..6ab2ed9a9f 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -38,7 +38,6 @@ RECIPE_MAINTAINER:pn-alsa-tools = "Michael Opdenacker X-Patchwork-Id: 8888 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 7AE80CCA48B for ; Mon, 6 Jun 2022 12:01:44 +0000 (UTC) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.groups.io with SMTP id smtpd.web08.31124.1654516903771248854 for ; Mon, 06 Jun 2022 05:01:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=FluSHx1/; spf=pass (domain: gmail.com, ip: 209.85.221.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f52.google.com with SMTP id h5so19608753wrb.0 for ; Mon, 06 Jun 2022 05:01:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VzzwwRczujQSZ8zJ/eQRqEO3AHipd22SHS7aX5ON92I=; b=FluSHx1/gaVqX7hK//pW70AttbxVB/aEaC28gJWiNaJV+R26zb8roEPX+UcrfYxXNI n5/2a3D3MKjKXwFL662j/a81KuNN3DxRjIRzTND/hN2xCDP3K8BYhWtnNV3Ua23ZuJPS VpVFoZKiTI5X8GnZuW5ZuYGRKBywlIjCXkZ/Lo1viQDZr4zu6MqHTnhWO/wEZ1GG3Qt6 /QL/NnLyD3d1eSiAbTTU8aF6fvQ3hJ79GmWvOUPsmutmgoRD8hT+rl4gKmqvH322uNEh YRlyYmU1o1nLbVz+Ds2BQpSyTvEHmFTQTRugu0D8uXpwWdRak+jdWzeu2TiiQbWlab5x 9UPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VzzwwRczujQSZ8zJ/eQRqEO3AHipd22SHS7aX5ON92I=; b=TlP0xk2eNVtPFhr3xPWQbBgJx040LlZfJ325cTsOocDsg8e7+RsUQeW6Py84kEfkRa Y99NcXYme9FeDLTvRKm8KanUDjl49POT1fmQRDg0uwHuze6qWqnaaQTHMDf/IYoU3BQs 3xDZgYsWxIsBputFXLACIytImRmBhejt9XPJHxxaVcFYiCsULFv78M5K4r9ZrvPeQZJB 0KxLYyGp/UPEyL9/f4aD4Ko4ZTPbkrGkjHrhGwhu6CFB3VbD1QvxOz2v5MIPOPIvGreo 75mzxgDv8r3dbnfP8JtEL0vF8Ow1SIYNJE9mpKGhpSu45ZMyKWJlgHhVQy9E2RBRLE3w 7FlA== X-Gm-Message-State: AOAM531Dfgr4DUpgWjsqdeSAJ79AsYX3tKr0ML9v/hHrC7pRT0hHtTTt mXcjDS35sWZr+avQIadFlcBCAQFrcYRgGQ== X-Google-Smtp-Source: ABdhPJyxiPvxv8fJoVC523eU5qespFrhkSYep2VQV6sHFegByRJsJ/JxOZzfkRClJeVpWNnQgTMmqA== X-Received: by 2002:a05:6000:244:b0:210:cc02:889a with SMTP id m4-20020a056000024400b00210cc02889amr21795644wrz.141.1654516902084; Mon, 06 Jun 2022 05:01:42 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002100316b126sm15526455wru.6.2022.06.06.05.01.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 05:01:41 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 14/21] alsa-utils: update 1.2.6 -> 1.2.7 Date: Mon, 6 Jun 2022 14:01:19 +0200 Message-Id: <20220606120126.3381438-14-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606120126.3381438-1-alex@linutronix.de> References: <20220606120126.3381438-1-alex@linutronix.de> 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, 06 Jun 2022 12:01:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166607 Signed-off-by: Alexander Kanavin --- .../alsa/{alsa-utils_1.2.6.bb => alsa-utils_1.2.7.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-multimedia/alsa/{alsa-utils_1.2.6.bb => alsa-utils_1.2.7.bb} (97%) diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.2.6.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.7.bb similarity index 97% rename from meta/recipes-multimedia/alsa/alsa-utils_1.2.6.bb rename to meta/recipes-multimedia/alsa/alsa-utils_1.2.7.bb index 6bb4e3158d..a78df2e112 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.2.6.bb +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.2.7.bb @@ -25,7 +25,7 @@ PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook # alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2" -SRC_URI[sha256sum] = "6a1efd8a1f1d9d38e489633eaec1fffa5c315663b316cab804be486887e6145d" +SRC_URI[sha256sum] = "e906bf2404ff04c448eaa3d226d283a62b9a283f12e4fd8457fb24bac274e678" # On build machines with python-docutils (not python3-docutils !!) installed # rst2man (not rst2man.py) is detected and compile fails with @@ -62,7 +62,7 @@ RDEPENDS:${PN} += "${ALSA_UTILS_PKGS}" FILES:${PN} = "" ALLOW_EMPTY:alsa-utils = "1" FILES:alsa-utils-alsabat = "${bindir}/alsabat" -FILES:alsa-utils-alsatplg = "${bindir}/alsatplg" +FILES:alsa-utils-alsatplg = "${bindir}/alsatplg ${libdir}/alsa-topology" FILES:alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord ${bindir}/axfer" FILES:alsa-utils-amixer = "${bindir}/amixer" FILES:alsa-utils-alsamixer = "${bindir}/alsamixer" From patchwork Mon Jun 6 12:01:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 8895 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 7FF7ACCA483 for ; Mon, 6 Jun 2022 12:01:54 +0000 (UTC) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.groups.io with SMTP id smtpd.web10.31066.1654516904534869132 for ; Mon, 06 Jun 2022 05:01:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=nQ9vCjRF; spf=pass (domain: gmail.com, ip: 209.85.221.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f41.google.com with SMTP id u8so15222173wrm.13 for ; Mon, 06 Jun 2022 05:01:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OfVJ1n/sbEkhn1+7IoZ9PDbcqDaoX0keBMu2ehqBk+U=; b=nQ9vCjRFrX/D6HqWoMWbWnBErWK5AKpo4gvzwld7TdXZj0uxK2CIK31I4NAdjfw1rO 00orhNInAYcdQK2fIi+CMx8UwwOXPbfpJdUjjbTkVzDYlvpq9nvG/HpGqONtxL8Dr+RB RW2TlPswrmMlbmhpRSiyNs8J6Uo9bHMYbxn29rnUyfLDlfOtWRyZ0lW5bp7YTqhOpca8 kAbZ/Wb7jtO4rZaYCw6aKQywk1knOuNs27haISQQgQ2eycCo1hwtlX6oxGaDyBMaxCor jzqKOD6TYVXBBaqPXQrH+OVBES9k9vbBt4tTX5M4tX9rhyQiecTU+X33eNvIi0ZenZfW em4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OfVJ1n/sbEkhn1+7IoZ9PDbcqDaoX0keBMu2ehqBk+U=; b=U8vtemqEex/5JG1ZOrYVhnwWsdPsHnv3rfavw5c/CTXoXYtkFb6z+TR2BJ1/LWjFE3 a013xhou/ahtltuBiR9/q8HGUXCmZ8n5QOtd7V400Xwies3vNB6xfNc0uERa/F0Xvgtv FMwmZZGBJjZhtv7vTb6d26GO++Ntxnz7IWwje6PKfZcn7sKAyknE5x1CX8jxq+aBLOvb 8+9ioZvzovroaUUYZ6Kjt64HJ6zARWjtRWDwDd93DYJc+9mClpNMqCpxjljyMgmHw0hI CwkUj11I+z8LCAE1+2PhYlGSsQdI295o9YIOJOdStlcZvgePjKNsmYH75gJ9gr3zqGKD 9tQw== X-Gm-Message-State: AOAM533aH/nQA3eHKxaqYfUn4fQCHZsDLjpovqfOyQ7m02PkyPQSYamn NM8l78RUKI29eG2j4JwcWl+2VPaAw/Co/Q== X-Google-Smtp-Source: ABdhPJxaZym1PDeTrWPB/1rhh1eMJcfDEcZGCFbHbJOI4Mq2Fh2wcye/PvvvLcJcgsz2Lm+4QHrQwQ== X-Received: by 2002:a05:6000:2cf:b0:212:27f2:a6c5 with SMTP id o15-20020a05600002cf00b0021227f2a6c5mr21387778wry.530.1654516902983; Mon, 06 Jun 2022 05:01:42 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002100316b126sm15526455wru.6.2022.06.06.05.01.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 05:01:42 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 15/21] ovmf: update 202202 -> 202205 Date: Mon, 6 Jun 2022 14:01:20 +0200 Message-Id: <20220606120126.3381438-15-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606120126.3381438-1-alex@linutronix.de> References: <20220606120126.3381438-1-alex@linutronix.de> 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, 06 Jun 2022 12:01:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166609 Signed-off-by: Alexander Kanavin --- .../0001-BaseTools-fix-gcc12-warning-1.patch | 51 ------------------- .../0001-BaseTools-fix-gcc12-warning.patch | 49 ------------------ meta/recipes-core/ovmf/ovmf_git.bb | 6 +-- 3 files changed, 2 insertions(+), 104 deletions(-) delete mode 100644 meta/recipes-core/ovmf/ovmf/0001-BaseTools-fix-gcc12-warning-1.patch delete mode 100644 meta/recipes-core/ovmf/ovmf/0001-BaseTools-fix-gcc12-warning.patch diff --git a/meta/recipes-core/ovmf/ovmf/0001-BaseTools-fix-gcc12-warning-1.patch b/meta/recipes-core/ovmf/ovmf/0001-BaseTools-fix-gcc12-warning-1.patch deleted file mode 100644 index 23366b4d07..0000000000 --- a/meta/recipes-core/ovmf/ovmf/0001-BaseTools-fix-gcc12-warning-1.patch +++ /dev/null @@ -1,51 +0,0 @@ -From b0a0b7b605aeb8106e7b50d1efeb746f401498cc Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Thu, 24 Mar 2022 20:04:35 +0800 -Subject: [PATCH] BaseTools: fix gcc12 warning - -Sdk/C/LzmaEnc.c: In function ?LzmaEnc_CodeOneMemBlock?: -Sdk/C/LzmaEnc.c:2828:19: error: storing the address of local variable ?outStream? in ?*p.rc.outStream? [-Werror=dangling-pointer=] - 2828 | p->rc.outStream = &outStream.vt; - | ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~ -Sdk/C/LzmaEnc.c:2811:28: note: ?outStream? declared here - 2811 | CLzmaEnc_SeqOutStreamBuf outStream; - | ^~~~~~~~~ -Sdk/C/LzmaEnc.c:2811:28: note: ?pp? declared here -Sdk/C/LzmaEnc.c:2828:19: error: storing the address of local variable ?outStream? in ?*(CLzmaEnc *)pp.rc.outStream? [-Werror=dangling-pointer=] - 2828 | p->rc.outStream = &outStream.vt; - | ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~ -Sdk/C/LzmaEnc.c:2811:28: note: ?outStream? declared here - 2811 | CLzmaEnc_SeqOutStreamBuf outStream; - | ^~~~~~~~~ -Sdk/C/LzmaEnc.c:2811:28: note: ?pp? declared here -cc1: all warnings being treated as errors - -Upstream-Status: Backport [https://github.com/tianocore/edk2/commit/85021f8cf22d1bd4114803c6c610dea5ef0059f1] -Signed-off-by: Gerd Hoffmann -Reviewed-by: Bob Feng ---- - BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c b/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c -index 4e9b499f8d..4b9f5fa692 100644 ---- a/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c -+++ b/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c -@@ -2825,12 +2825,13 @@ SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, BoolInt reInit, - - nowPos64 = p->nowPos64; - RangeEnc_Init(&p->rc); -- p->rc.outStream = &outStream.vt; - - if (desiredPackSize == 0) - return SZ_ERROR_OUTPUT_EOF; - -+ p->rc.outStream = &outStream.vt; - res = LzmaEnc_CodeOneBlock(p, desiredPackSize, *unpackSize); -+ p->rc.outStream = NULL; - - *unpackSize = (UInt32)(p->nowPos64 - nowPos64); - *destLen -= outStream.rem; --- -2.36.1 - diff --git a/meta/recipes-core/ovmf/ovmf/0001-BaseTools-fix-gcc12-warning.patch b/meta/recipes-core/ovmf/ovmf/0001-BaseTools-fix-gcc12-warning.patch deleted file mode 100644 index 91c01647db..0000000000 --- a/meta/recipes-core/ovmf/ovmf/0001-BaseTools-fix-gcc12-warning.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 2435c17e56652479315853cec5b91fb0ea0911a3 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Thu, 24 Mar 2022 20:04:34 +0800 -Subject: [PATCH] BaseTools: fix gcc12 warning - -GenFfs.c:545:5: error: pointer ?InFileHandle? used after ?fclose? [-Werror=use-after-free] - 545 | Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s", InFileHandle); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -GenFfs.c:544:5: note: call to ?fclose? here - 544 | fclose (InFileHandle); - | ^~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Backport [https://github.com/tianocore/edk2/commit/7b005f344e533cd913c3ca05b266f9872df886d1] -Signed-off-by: Gerd Hoffmann -Reviewed-by: Bob Feng ---- - BaseTools/Source/C/GenFfs/GenFfs.c | 2 +- - BaseTools/Source/C/GenSec/GenSec.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/BaseTools/Source/C/GenFfs/GenFfs.c b/BaseTools/Source/C/GenFfs/GenFfs.c -index 949025c333..d78d62ab36 100644 ---- a/BaseTools/Source/C/GenFfs/GenFfs.c -+++ b/BaseTools/Source/C/GenFfs/GenFfs.c -@@ -542,7 +542,7 @@ GetAlignmentFromFile(char *InFile, UINT32 *Alignment) - PeFileBuffer = (UINT8 *) malloc (PeFileSize); - if (PeFileBuffer == NULL) { - fclose (InFileHandle); -- Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s", InFileHandle); -+ Error(NULL, 0, 4001, "Resource", "memory cannot be allocated for %s", InFile); - return EFI_OUT_OF_RESOURCES; - } - fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle); -diff --git a/BaseTools/Source/C/GenSec/GenSec.c b/BaseTools/Source/C/GenSec/GenSec.c -index d54a4f9e0a..b1d05367ec 100644 ---- a/BaseTools/Source/C/GenSec/GenSec.c -+++ b/BaseTools/Source/C/GenSec/GenSec.c -@@ -1062,7 +1062,7 @@ GetAlignmentFromFile(char *InFile, UINT32 *Alignment) - PeFileBuffer = (UINT8 *) malloc (PeFileSize); - if (PeFileBuffer == NULL) { - fclose (InFileHandle); -- Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s", InFileHandle); -+ Error(NULL, 0, 4001, "Resource", "memory cannot be allocated for %s", InFile); - return EFI_OUT_OF_RESOURCES; - } - fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle); --- -2.36.1 - diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index 84e3360a3a..aac30ead30 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb @@ -25,12 +25,10 @@ SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \ file://0003-ovmf-Update-to-latest.patch \ file://0005-debug-prefix-map.patch \ file://0006-reproducible.patch \ - file://0001-BaseTools-fix-gcc12-warning.patch \ - file://0001-BaseTools-fix-gcc12-warning-1.patch \ " -PV = "edk2-stable202202" -SRCREV = "b24306f15daa2ff8510b06702114724b33895d3c" +PV = "edk2-stable202205" +SRCREV = "16779ede2d366bfc6b702e817356ccf43425bcc8" UPSTREAM_CHECK_GITTAGREGEX = "(?Pedk2-stable.*)" inherit deploy From patchwork Mon Jun 6 12:01:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 8891 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 68985C3F2D4 for ; Mon, 6 Jun 2022 12:01:54 +0000 (UTC) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.groups.io with SMTP id smtpd.web12.30986.1654516893735839745 for ; Mon, 06 Jun 2022 05:01:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=hlXOAwJQ; spf=pass (domain: gmail.com, ip: 209.85.221.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f41.google.com with SMTP id x17so19559575wrg.6 for ; Mon, 06 Jun 2022 05:01:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2gw+9/K+dpnOkR+jTTM1NF9iGQYOUamnTG4/FnkDL98=; b=hlXOAwJQWeJFW7pulWpuzJy9UARIpohQIe1BMY5sq4IiVa1qhY8Ot3ugC0sRSAR1eS MaF2t+OZz79p0ebA7FqlHToN5pYJ7HcrqjfxtWDDPgBw45brvh2Vw5B07SB/7QhEsbX3 Fuf23nWfjDg+TTefb/rN+9vEUmGVCnIBW/jf8llNi9VDRLQV06W0UBkkcnvZik1c7DEC Vl/K3zXW6j/DSG2BZD/OGf9uhTxgyP6mxM4r/t+keWsKdz0xuiZDdvGWOuUsAeiLS8p6 cQi3kQ87AHv62/y3n083v+7VyxXSxQZT3mQo+eyu+Zz7p0q4Nk7iDLyhtBjGBKva59+s GCMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2gw+9/K+dpnOkR+jTTM1NF9iGQYOUamnTG4/FnkDL98=; b=ORRT/SUWbdTYVxExRJ62L6Xv4b1Iedw0KSC4n1LWPyUMi8wpwtIKySrzYyaldiqQAg ZSzSDb7SybCw1XhwQLDpzJNUbujBGEdD1oegtfuB0CO6nj1Mf1x2iRo9nrEKnR1ZGlaB DfDKXtMX5kP3Y4pPhWDx/E2RUiwKc49Ml+zHb5s2R7vSCrr28qmxnh361cQVpIxbaaJq 0vOzQ6JanzsJ5gYii4HyRgNgIyNEelto5YXjH4YD7X6Vfey3vdP65emtqNrGAav+scaU me9+sD64ze1wzVvKXaMZy3CfC3UEPS83SbYthnAYk8lU4fektV97V6J/Jm1Th5t3f++P UP9g== X-Gm-Message-State: AOAM5325eBnFHNXNDrEyLuIAubMi1xbFqiMW8REJHVZqbnEDrLsIaput e6jzJYyUoij+3t+e2WiKoem5waJ/7DhCXg== X-Google-Smtp-Source: ABdhPJwzTutXKJsz/M3NSrlV5KAt8wdOgwQElQMZDNBGaAcLc/zdzg1cYVQYC5tW1IWN3y/SeTVvzA== X-Received: by 2002:a5d:4a4c:0:b0:210:27dd:e57 with SMTP id v12-20020a5d4a4c000000b0021027dd0e57mr20753328wrs.655.1654516903778; Mon, 06 Jun 2022 05:01:43 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002100316b126sm15526455wru.6.2022.06.06.05.01.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 05:01:43 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 16/21] cmake: update 3.23.1 -> 3.23.2 Date: Mon, 6 Jun 2022 14:01:21 +0200 Message-Id: <20220606120126.3381438-16-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606120126.3381438-1-alex@linutronix.de> References: <20220606120126.3381438-1-alex@linutronix.de> 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, 06 Jun 2022 12:01:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166608 Signed-off-by: Alexander Kanavin --- .../cmake/{cmake-native_3.23.1.bb => cmake-native_3.23.2.bb} | 0 meta/recipes-devtools/cmake/cmake.inc | 2 +- .../recipes-devtools/cmake/{cmake_3.23.1.bb => cmake_3.23.2.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/cmake/{cmake-native_3.23.1.bb => cmake-native_3.23.2.bb} (100%) rename meta/recipes-devtools/cmake/{cmake_3.23.1.bb => cmake_3.23.2.bb} (100%) diff --git a/meta/recipes-devtools/cmake/cmake-native_3.23.1.bb b/meta/recipes-devtools/cmake/cmake-native_3.23.2.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake-native_3.23.1.bb rename to meta/recipes-devtools/cmake/cmake-native_3.23.2.bb diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 934d577acf..4a6884e871 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -21,7 +21,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ " -SRC_URI[sha256sum] = "33fd10a8ec687a4d0d5b42473f10459bb92b3ae7def2b745dc10b192760869f3" +SRC_URI[sha256sum] = "f316b40053466f9a416adf981efda41b160ca859e97f6a484b447ea299ff26aa" UPSTREAM_CHECK_REGEX = "cmake-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/cmake/cmake_3.23.1.bb b/meta/recipes-devtools/cmake/cmake_3.23.2.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake_3.23.1.bb rename to meta/recipes-devtools/cmake/cmake_3.23.2.bb From patchwork Mon Jun 6 12:01:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 8897 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 771D1C433EF for ; Mon, 6 Jun 2022 12:01:54 +0000 (UTC) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.groups.io with SMTP id smtpd.web09.31135.1654516905940517049 for ; Mon, 06 Jun 2022 05:01:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=LXKCeD7F; spf=pass (domain: gmail.com, ip: 209.85.221.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f47.google.com with SMTP id a15so11033541wrh.2 for ; Mon, 06 Jun 2022 05:01:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RojXnKoDB9ACYSwBFxX6VTJBBdd3t1UNaxVOJJPM+3I=; b=LXKCeD7F9oFtB5NzIPBBsxnxeB0jPjjux9t9CxtqgmeUcD4yxdSzKWfB62uJinXTmB dsda3UDhjz2rSqwGhzzRittkJktHhXN62WP8bqz5b2BA0WjyF1CnY2eErgE2cFmzQYAz /hGNGubG5XP7shcnmG66CidW4v58tDZpU6M7asHD19LzOb5aj5Xirw2IUMd5N+YPJvmO QtyCkp8+l0tO4dQPsUZa4lMNUBe/2STXQSnpwcDevzMJPyA4wPDF+5odpq35SPBAmG+i gJgjvzLM+/mjM5KaHTAFqtZiGNXiyFvfIb2Q1AH63AaRi4WIfbPO1GH/ANdo6t61DvJD YSXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RojXnKoDB9ACYSwBFxX6VTJBBdd3t1UNaxVOJJPM+3I=; b=BpgWFr0NiEu8nnoHl7cuXKZQzmoykzPcrQhiwCoMBTLBD16RuBe8RbcQrB+COoqU3E APDGa+kk0Vr5XStt8bo6Be4Q4+5KoX6cj+5AMYpsxIUSeLwiHXKaOjj09UFw9usiD2+4 iPyrR8TOMyUlaJDXXXXvTh6tSeFZN5+2MUFHQ5kI4qC59vR1sH8/o6Iopf/AyOrY/yR1 AHjg/6wFjhNxGF1NYfbNBeEFJk/6Byzacj9Fqsc2bQDUuD9ZhEcuJ92+PDHq5IrtH+jF ojtVDp6DpK3APzu5z3fiWRBErr7eN22oYpFSBkHBtf69PPIKqNyFS+1B4GdOUwnijEBM Oipg== X-Gm-Message-State: AOAM531wQEY7QBlAmoTVwp9mBeMtNtPQVHTNxyd9ZiUSnOh22u9mC1NH krLjI3l4nocX/6zZ7dcA3gCdVI5a/n8zUw== X-Google-Smtp-Source: ABdhPJxrKQf1nbIRUHaxpmQiHHC5Bez5NZHDTImq2qGTvEUz4KDCLjTPr7xK1dectHgVni+kTXeoCw== X-Received: by 2002:adf:fec3:0:b0:216:ea3d:b118 with SMTP id q3-20020adffec3000000b00216ea3db118mr9676299wrs.517.1654516904521; Mon, 06 Jun 2022 05:01:44 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002100316b126sm15526455wru.6.2022.06.06.05.01.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 05:01:44 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 17/21] ltp: upgrade 20220121 -> 20220527 Date: Mon, 6 Jun 2022 14:01:22 +0200 Message-Id: <20220606120126.3381438-17-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606120126.3381438-1-alex@linutronix.de> References: <20220606120126.3381438-1-alex@linutronix.de> 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, 06 Jun 2022 12:01:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166610 Disable stack protection as newly added kvm tests won't build with it. Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/security_flags.inc | 1 + ...sh-sort-filelist-for-reproducibility.patch | 28 ------------------- .../ltp/{ltp_20220121.bb => ltp_20220527.bb} | 3 +- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch rename meta/recipes-extended/ltp/{ltp_20220121.bb => ltp_20220527.bb} (97%) diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index 8374cb8544..2972f05b4e 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc @@ -61,6 +61,7 @@ TARGET_LDFLAGS:append:class-cross-canadian = " ${SECURITY_LDFLAGS}" SECURITY_STACK_PROTECTOR:pn-gcc-runtime = "" SECURITY_STACK_PROTECTOR:pn-glibc = "" SECURITY_STACK_PROTECTOR:pn-glibc-testsuite = "" +SECURITY_STACK_PROTECTOR:pn-ltp = "" # All xorg module drivers need to be linked this way as well and are # handled in recipes-graphics/xorg-driver/xorg-driver-common.inc SECURITY_LDFLAGS:pn-xserver-xorg = "${SECURITY_X_LDFLAGS}" diff --git a/meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch b/meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch deleted file mode 100644 index e8d9f212a9..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4aad23f208cc7725cd61bbe5aaadb9994c794cd0 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 26 Jan 2022 20:58:46 +0100 -Subject: [PATCH] metadata/parse.sh: sort filelist for reproducibility - -find does not guarantee the order of the files. - -Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/907] -Signed-off-by: Alexander Kanavin ---- - metadata/parse.sh | 2 +- - -diff --git a/metadata/parse.sh b/metadata/parse.sh -index b43d024c68..1811665bfe 100755 ---- a/metadata/parse.sh -+++ b/metadata/parse.sh -@@ -29,7 +29,7 @@ echo ' "tests": {' - - first=1 - --for test in `find testcases/ -name '*.c'`; do -+for test in `find testcases/ -name '*.c'|sort`; do - a=$($top_builddir/metadata/metaparse -Iinclude -Itestcases/kernel/syscalls/utils/ "$test") - if [ -n "$a" ]; then - if [ -z "$first" ]; then --- -2.20.1 - diff --git a/meta/recipes-extended/ltp/ltp_20220121.bb b/meta/recipes-extended/ltp/ltp_20220527.bb similarity index 97% rename from meta/recipes-extended/ltp/ltp_20220121.bb rename to meta/recipes-extended/ltp/ltp_20220527.bb index 8a13dcf9d0..b136c83860 100644 --- a/meta/recipes-extended/ltp/ltp_20220121.bb +++ b/meta/recipes-extended/ltp/ltp_20220527.bb @@ -22,11 +22,10 @@ CFLAGS:append:x86-64 = " -fomit-frame-pointer" CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "b0561ad8d9ee9fe1244b5385e941eb65a21e91a1" +SRCREV = "6f88e0f6f1d6eb12c48c902f50f47ecbd3b0f18a" SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \ file://0001-Remove-OOM-tests-from-runtest-mm.patch \ - file://0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch \ file://disable_hanging_tests.patch \ " From patchwork Mon Jun 6 12:01:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 8896 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 72D22CCA481 for ; Mon, 6 Jun 2022 12:01:54 +0000 (UTC) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.groups.io with SMTP id smtpd.web10.31067.1654516906654903212 for ; Mon, 06 Jun 2022 05:01:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=hTZAQc+0; spf=pass (domain: gmail.com, ip: 209.85.221.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f49.google.com with SMTP id p10so19549890wrg.12 for ; Mon, 06 Jun 2022 05:01:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=60NLNuD+oId00XF/smJzULO4DFEtndCZELVE7v0SpsM=; b=hTZAQc+0o3Ji+iqgwJHhGXtIDEPYPitKM4eCCUyZqcxvWJuU6fdmxIrXLVG5bxDsbF I70zatEoU388/jLSu0wrd6uZw5AGh/coiY0wZX1x1Br7BDRJc24sNMIHM6kvICgatobD 7eGcoO6XPPUGmn3NA5mBlpa1lNxYS31ngrDoG0vFAhi9FaA+WllLIP9comVZ3J71qDl1 ccEMMg9nKFct2fqWfJ2D6XcS3nymt15UeuK7yMoEm+NpfMxNe1FxazHmbIwLB9pa6NNv W58Bw/epoXkHD+HNFU0tqE44oYJtiYWqFb5sBncssPe/mg/v5CUzFuPjbVp59WnnHwbi PQdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=60NLNuD+oId00XF/smJzULO4DFEtndCZELVE7v0SpsM=; b=aDYkEd/fmTGDUAwRX20WhTOtTveXPAcWZaARdBg+YIR5rHO2R2mxGB37b4M1Zpteu2 xYuujPRC/wogHFAvU+62RhpnfNHKG8doE2EklPqAV4H/7fK+642HjN7vjJQXIgamIntL XECp40U/32mpGkCyc+cdzQ40Ec55BIs/iI1s+Dy0aNskCiYXgjSY8qbuhqDeTfvA9heX tMccROGfzmlAWcTpK/aBw5l7tZioHLHmFoQJGPF1pPeV5ySs5S0haAwDcAlC4K3larGC cCqO6tnoeO63KpNK/cl9Cq2L2zVygJl9H3nP1recD92gWjIIaIqvTRBnTBEsWBYTYmL1 8sSg== X-Gm-Message-State: AOAM5311cdORmIL341VMHC5NcpR/5qFDIB1VKXi/c3OqQa/cgXJ3h6d5 qAt0SMPt3As9E9BaB4eTJmepsWkyOcv8uA== X-Google-Smtp-Source: ABdhPJwN1ikDBy7kRo+WiAICNfTcsk4ANLU3pdHVxqu6igun/I6kpnMXRuSdEedzlNCn8JcL62K7QA== X-Received: by 2002:adf:f842:0:b0:213:5c4b:981d with SMTP id d2-20020adff842000000b002135c4b981dmr19865170wrq.694.1654516905220; Mon, 06 Jun 2022 05:01:45 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002100316b126sm15526455wru.6.2022.06.06.05.01.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 05:01:44 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 18/21] perl: update 5.34.1 -> 5.36.0 Date: Mon, 6 Jun 2022 14:01:23 +0200 Message-Id: <20220606120126.3381438-18-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606120126.3381438-1-alex@linutronix.de> References: <20220606120126.3381438-1-alex@linutronix.de> 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, 06 Jun 2022 12:01:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166612 Signed-off-by: Alexander Kanavin --- .../{perlcross_1.3.7.bb => perlcross_1.4.bb} | 2 +- .../perl/files/perl-configpm-switch.patch | 2 +- .../perl/files/perl-dynloader.patch | 2 +- .../perl/files/perl-rdepends.txt | 49 ++++++++++++------- .../perl/{perl_5.34.1.bb => perl_5.36.0.bb} | 2 +- 5 files changed, 35 insertions(+), 22 deletions(-) rename meta/recipes-devtools/perl-cross/{perlcross_1.3.7.bb => perlcross_1.4.bb} (92%) rename meta/recipes-devtools/perl/{perl_5.34.1.bb => perl_5.36.0.bb} (99%) diff --git a/meta/recipes-devtools/perl-cross/perlcross_1.3.7.bb b/meta/recipes-devtools/perl-cross/perlcross_1.4.bb similarity index 92% rename from meta/recipes-devtools/perl-cross/perlcross_1.3.7.bb rename to meta/recipes-devtools/perl-cross/perlcross_1.4.bb index 99a9ca1027..1329306b0e 100644 --- a/meta/recipes-devtools/perl-cross/perlcross_1.3.7.bb +++ b/meta/recipes-devtools/perl-cross/perlcross_1.4.bb @@ -18,7 +18,7 @@ SRC_URI = "https://github.com/arsv/perl-cross/releases/download/${PV}/perl-cross " UPSTREAM_CHECK_URI = "https://github.com/arsv/perl-cross/releases/" -SRC_URI[perl-cross.sha256sum] = "77f13ca84a63025053852331b72d4046c1f90ded98bd45ccedea738621907335" +SRC_URI[perl-cross.sha256sum] = "be9d9f9f7148edff7a2f9695ba3cb7e3975eff6b25a9a81dd311725fd757aa91" S = "${WORKDIR}/perl-cross-${PV}" diff --git a/meta/recipes-devtools/perl/files/perl-configpm-switch.patch b/meta/recipes-devtools/perl/files/perl-configpm-switch.patch index 15189a0c04..f80de88974 100644 --- a/meta/recipes-devtools/perl/files/perl-configpm-switch.patch +++ b/meta/recipes-devtools/perl/files/perl-configpm-switch.patch @@ -1,4 +1,4 @@ -From 1f7cc5db2ca549c37c6a7923368e1a0104f31b99 Mon Sep 17 00:00:00 2001 +From 055d4c31f41611b7d7fb6b0e38b3818a053de38d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 27 May 2007 21:04:11 +0000 Subject: [PATCH] perl: 5.8.7 -> 5.8.8 (from OE) diff --git a/meta/recipes-devtools/perl/files/perl-dynloader.patch b/meta/recipes-devtools/perl/files/perl-dynloader.patch index b49e6e4066..887f7c0f7f 100644 --- a/meta/recipes-devtools/perl/files/perl-dynloader.patch +++ b/meta/recipes-devtools/perl/files/perl-dynloader.patch @@ -22,7 +22,7 @@ Index: perl-5.24.1/dist/XSLoader/XSLoader_pm.PL + my $hostlib = $ENV{PERLHOSTLIB}; + my $hostarchlib = $ENV{PERLHOSTARCHLIB}; + print STDERR "*** Module name IN: $modlibname\n"; -+ ($p1, $p2, $p3, $p4, $p5, $p6, $p7) = $modlibname =~ m/(^(.*lib\w*\/)?)((perl5\/[0-9\.]*\/)?)(([^\/]*)\/)?(.*)$/; ++ my ($p1, $p2, $p3, $p4, $p5, $p6, $p7) = $modlibname =~ m/(^(.*lib\w*\/)?)((perl5\/[0-9\.]*\/)?)(([^\/]*)\/)?(.*)$/; + print STDERR "*** p1: $p1 p3: $p3 p5: $p5 p7: $p7\n"; + if ( $p1 ne "" ) { + $modlibname = $hostlib.$p7; diff --git a/meta/recipes-devtools/perl/files/perl-rdepends.txt b/meta/recipes-devtools/perl/files/perl-rdepends.txt index 74c24c3bb5..e5f45bf291 100644 --- a/meta/recipes-devtools/perl/files/perl-rdepends.txt +++ b/meta/recipes-devtools/perl/files/perl-rdepends.txt @@ -131,28 +131,23 @@ RDEPENDS:perl-module-b-concise += "perl-module-strict" RDEPENDS:perl-module-b-concise += "perl-module-warnings" RDEPENDS:perl-module-benchmark += "perl-module-exporter" RDEPENDS:perl-module-benchmark += "perl-module-strict" +RDEPENDS:perl-module-bigfloat += "perl-module-constant" +RDEPENDS:perl-module-bigfloat += "perl-module-exporter" +RDEPENDS:perl-module-bigfloat += "perl-module-overload" +RDEPENDS:perl-module-bigfloat += "perl-module-strict" +RDEPENDS:perl-module-bigfloat += "perl-module-warnings" RDEPENDS:perl-module-bigint += "perl-module-constant" RDEPENDS:perl-module-bigint += "perl-module-exporter" -RDEPENDS:perl-module-bigint += "perl-module-math-bigint" -RDEPENDS:perl-module-bigint += "perl-module-math-bigint-trace" RDEPENDS:perl-module-bigint += "perl-module-overload" RDEPENDS:perl-module-bigint += "perl-module-strict" RDEPENDS:perl-module-bigint += "perl-module-warnings" -RDEPENDS:perl-module-bignum += "perl-module-bigint" +RDEPENDS:perl-module-bignum += "perl-module-constant" RDEPENDS:perl-module-bignum += "perl-module-exporter" -RDEPENDS:perl-module-bignum += "perl-module-math-bigfloat" -RDEPENDS:perl-module-bignum += "perl-module-math-bigfloat-trace" -RDEPENDS:perl-module-bignum += "perl-module-math-bigint" -RDEPENDS:perl-module-bignum += "perl-module-math-bigint-trace" RDEPENDS:perl-module-bignum += "perl-module-overload" RDEPENDS:perl-module-bignum += "perl-module-strict" RDEPENDS:perl-module-bignum += "perl-module-warnings" -RDEPENDS:perl-module-bigrat += "perl-module-bigint" +RDEPENDS:perl-module-bigrat += "perl-module-constant" RDEPENDS:perl-module-bigrat += "perl-module-exporter" -RDEPENDS:perl-module-bigrat += "perl-module-math-bigfloat" -RDEPENDS:perl-module-bigrat += "perl-module-math-bigint" -RDEPENDS:perl-module-bigrat += "perl-module-math-bigint-trace" -RDEPENDS:perl-module-bigrat += "perl-module-math-bigrat" RDEPENDS:perl-module-bigrat += "perl-module-overload" RDEPENDS:perl-module-bigrat += "perl-module-strict" RDEPENDS:perl-module-bigrat += "perl-module-warnings" @@ -166,6 +161,8 @@ RDEPENDS:perl-module-b-showlex += "perl-module-strict" RDEPENDS:perl-module-b-terse += "perl-module-b" RDEPENDS:perl-module-b-terse += "perl-module-b-concise" RDEPENDS:perl-module-b-terse += "perl-module-strict" +RDEPENDS:perl-module-builtin += "perl-module-strict" +RDEPENDS:perl-module-builtin += "perl-module-warnings" RDEPENDS:perl-module-b-xref += "perl-module-b" RDEPENDS:perl-module-b-xref += "perl-module-config" RDEPENDS:perl-module-b-xref += "perl-module-strict" @@ -257,7 +254,6 @@ RDEPENDS:perl-module-cwd += "perl-module-errno" RDEPENDS:perl-module-cwd += "perl-module-exporter" RDEPENDS:perl-module-cwd += "perl-module-strict" RDEPENDS:perl-module-cwd += "perl-module-xsloader" -RDEPENDS:perl-module-data-dumper += "perl-module-config" RDEPENDS:perl-module-data-dumper += "perl-module-constant" RDEPENDS:perl-module-data-dumper += "perl-module-exporter" RDEPENDS:perl-module-data-dumper += "perl-module-strict" @@ -313,6 +309,8 @@ RDEPENDS:perl-module-digest-sha += "perl-module-vars" RDEPENDS:perl-module-digest-sha += "perl-module-warnings" RDEPENDS:perl-module-digest-sha += "perl-module-xsloader" RDEPENDS:perl-module-dynaloader += "perl-module-config" +RDEPENDS:perl-module-dynaloader += "perl-module-strict" +RDEPENDS:perl-module-dynaloader += "perl-module-vars" RDEPENDS:perl-module-encode-alias += "perl-module-constant" RDEPENDS:perl-module-encode-alias += "perl-module-encode" RDEPENDS:perl-module-encode-alias += "perl-module-exporter" @@ -796,11 +794,12 @@ RDEPENDS:perl-module-file-basename += "perl-module-warnings" RDEPENDS:perl-module-filecache += "perl-module-parent" RDEPENDS:perl-module-filecache += "perl-module-strict" RDEPENDS:perl-module-file-compare += "perl-module-exporter" -RDEPENDS:perl-module-file-compare += "perl-module-strict" RDEPENDS:perl-module-file-compare += "perl-module-warnings" +RDEPENDS:perl-module-file-copy += "perl-module-builtin" RDEPENDS:perl-module-file-copy += "perl-module-config" RDEPENDS:perl-module-file-copy += "perl-module-exporter" RDEPENDS:perl-module-file-copy += "perl-module-file-basename" +RDEPENDS:perl-module-file-copy += "perl-module-overload" RDEPENDS:perl-module-file-copy += "perl-module-strict" RDEPENDS:perl-module-file-copy += "perl-module-warnings" RDEPENDS:perl-module-file-dosglob += "perl-module-strict" @@ -887,10 +886,12 @@ RDEPENDS:perl-module-getopt-long += "perl-module-warnings" RDEPENDS:perl-module-getopt-std += "perl-module-exporter" RDEPENDS:perl-module-getopt-std += "perl-module-strict" RDEPENDS:perl-module-getopt-std += "perl-module-warnings" +RDEPENDS:perl-module-hash-util-fieldhash += "perl-module-builtin" RDEPENDS:perl-module-hash-util-fieldhash += "perl-module-exporter" RDEPENDS:perl-module-hash-util-fieldhash += "perl-module-strict" RDEPENDS:perl-module-hash-util-fieldhash += "perl-module-warnings" RDEPENDS:perl-module-hash-util-fieldhash += "perl-module-xsloader" +RDEPENDS:perl-module-hash-util += "perl-module-builtin" RDEPENDS:perl-module-hash-util += "perl-module-exporter" RDEPENDS:perl-module-hash-util += "perl-module-hash-util-fieldhash" RDEPENDS:perl-module-hash-util += "perl-module-strict" @@ -1258,6 +1259,7 @@ RDEPENDS:perl-module-math-bigint-calc += "perl-module-integer" RDEPENDS:perl-module-math-bigint-calc += "perl-module-math-bigint-lib" RDEPENDS:perl-module-math-bigint-calc += "perl-module-strict" RDEPENDS:perl-module-math-bigint-calc += "perl-module-warnings" +RDEPENDS:perl-module-math-bigint-fastcalc += "perl-module-config" RDEPENDS:perl-module-math-bigint-fastcalc += "perl-module-math-bigint-calc" RDEPENDS:perl-module-math-bigint-fastcalc += "perl-module-strict" RDEPENDS:perl-module-math-bigint-fastcalc += "perl-module-warnings" @@ -1278,9 +1280,15 @@ RDEPENDS:perl-module-math-bigint-trace += "perl-module-strict" RDEPENDS:perl-module-math-bigint-trace += "perl-module-warnings" RDEPENDS:perl-module-math-bigrat += "perl-module-math-bigfloat" RDEPENDS:perl-module-math-bigrat += "perl-module-math-bigint" +RDEPENDS:perl-module-math-bigrat += "perl-module-math-complex" RDEPENDS:perl-module-math-bigrat += "perl-module-overload" RDEPENDS:perl-module-math-bigrat += "perl-module-strict" RDEPENDS:perl-module-math-bigrat += "perl-module-warnings" +RDEPENDS:perl-module-math-bigrat-trace += "perl-module-exporter" +RDEPENDS:perl-module-math-bigrat-trace += "perl-module-math-bigrat" +RDEPENDS:perl-module-math-bigrat-trace += "perl-module-overload" +RDEPENDS:perl-module-math-bigrat-trace += "perl-module-strict" +RDEPENDS:perl-module-math-bigrat-trace += "perl-module-warnings" RDEPENDS:perl-module-math-complex += "perl-module-config" RDEPENDS:perl-module-math-complex += "perl-module-exporter" RDEPENDS:perl-module-math-complex += "perl-module-overload" @@ -1665,6 +1673,7 @@ RDEPENDS:perl-module-socket += "perl-module-strict" RDEPENDS:perl-module-socket += "perl-module-warnings-register" RDEPENDS:perl-module-socket += "perl-module-xsloader" RDEPENDS:perl-module-sort += "perl-module-strict" +RDEPENDS:perl-module-sort += "perl-module-warnings" RDEPENDS:perl-module-storable += "perl-module-exporter" RDEPENDS:perl-module-storable += "perl-module-io-file" RDEPENDS:perl-module-subs += "perl-module-strict" @@ -1697,6 +1706,7 @@ RDEPENDS:perl-module-tap-base += "perl-module-constant" RDEPENDS:perl-module-tap-base += "perl-module-strict" RDEPENDS:perl-module-tap-base += "perl-module-warnings" RDEPENDS:perl-module-tap-formatter-base += "perl-module-base" +RDEPENDS:perl-module-tap-formatter-base += "perl-module-config" RDEPENDS:perl-module-tap-formatter-base += "perl-module-posix" RDEPENDS:perl-module-tap-formatter-base += "perl-module-strict" RDEPENDS:perl-module-tap-formatter-base += "perl-module-tap-formatter-color" @@ -1770,6 +1780,7 @@ RDEPENDS:perl-module-tap-parser-iterator-stream += "perl-module-strict" RDEPENDS:perl-module-tap-parser-iterator-stream += "perl-module-warnings" RDEPENDS:perl-module-tap-parser-multiplexer += "perl-module-base" RDEPENDS:perl-module-tap-parser-multiplexer += "perl-module-constant" +RDEPENDS:perl-module-tap-parser-multiplexer += "perl-module-errno" RDEPENDS:perl-module-tap-parser-multiplexer += "perl-module-io-select" RDEPENDS:perl-module-tap-parser-multiplexer += "perl-module-strict" RDEPENDS:perl-module-tap-parser-multiplexer += "perl-module-warnings" @@ -1947,6 +1958,7 @@ RDEPENDS:perl-module-test2-api += "perl-module-test2-hub-interceptor-terminator" RDEPENDS:perl-module-test2-api += "perl-module-test2-hub-subtest" RDEPENDS:perl-module-test2-api += "perl-module-test2-util" RDEPENDS:perl-module-test2-api += "perl-module-test2-util-trace" +RDEPENDS:perl-module-test2-api += "perl-module-time-hires" RDEPENDS:perl-module-test2-api += "perl-module-warnings" RDEPENDS:perl-module-test2-api-stack += "perl-module-strict" RDEPENDS:perl-module-test2-api-stack += "perl-module-test2-api" @@ -2197,14 +2209,11 @@ RDEPENDS:perl-module-text-balanced += "perl-module-strict" RDEPENDS:perl-module-text-balanced += "perl-module-vars" RDEPENDS:perl-module-text-parsewords += "perl-module-exporter" RDEPENDS:perl-module-text-parsewords += "perl-module-strict" -RDEPENDS:perl-module-text-tabs += "perl-module-exporter" +RDEPENDS:perl-module-text-parsewords += "perl-module-warnings" RDEPENDS:perl-module-text-tabs += "perl-module-strict" -RDEPENDS:perl-module-text-tabs += "perl-module-vars" -RDEPENDS:perl-module-text-wrap += "perl-module-exporter" RDEPENDS:perl-module-text-wrap += "perl-module-re" RDEPENDS:perl-module-text-wrap += "perl-module-strict" RDEPENDS:perl-module-text-wrap += "perl-module-text-tabs" -RDEPENDS:perl-module-text-wrap += "perl-module-vars" RDEPENDS:perl-module-text-wrap += "perl-module-warnings-register" RDEPENDS:perl-module-thread += "perl-module-config" RDEPENDS:perl-module-thread += "perl-module-exporter" @@ -2246,6 +2255,8 @@ RDEPENDS:perl-module-tie-scalar += "perl-module-warnings-register" RDEPENDS:perl-module-tie-stdhandle += "perl-module-strict" RDEPENDS:perl-module-tie-stdhandle += "perl-module-tie-handle" RDEPENDS:perl-module-tie-substrhash += "perl-module-integer" +RDEPENDS:perl-module-tie-substrhash += "perl-module-strict" +RDEPENDS:perl-module-tie-substrhash += "perl-module-warnings" RDEPENDS:perl-module-time-gmtime += "perl-module-exporter" RDEPENDS:perl-module-time-gmtime += "perl-module-strict" RDEPENDS:perl-module-time-gmtime += "perl-module-time-tm" @@ -2295,6 +2306,7 @@ RDEPENDS:perl-module-unicode-collate += "perl-module-constant" RDEPENDS:perl-module-unicode-collate += "perl-module-strict" RDEPENDS:perl-module-unicode-collate += "perl-module-warnings" RDEPENDS:perl-module-unicode-collate += "perl-module-xsloader" +RDEPENDS:perl-module-unicode-normalize += "perl-module-bytes" RDEPENDS:perl-module-unicode-normalize += "perl-module-exporter" RDEPENDS:perl-module-unicode-normalize += "perl-module-strict" RDEPENDS:perl-module-unicode-normalize += "perl-module-warnings" @@ -2323,3 +2335,4 @@ RDEPENDS:perl-module-version += "perl-module-version-regex" RDEPENDS:perl-module-version += "perl-module-warnings-register" RDEPENDS:perl-module-version-regex += "perl-module-strict" RDEPENDS:perl-module-xsloader += "perl-module-dynaloader" +RDEPENDS:perl-module-xsloader += "perl-module-strict" diff --git a/meta/recipes-devtools/perl/perl_5.34.1.bb b/meta/recipes-devtools/perl/perl_5.36.0.bb similarity index 99% rename from meta/recipes-devtools/perl/perl_5.34.1.bb rename to meta/recipes-devtools/perl/perl_5.36.0.bb index 4b9d2e2c50..9f7ce15f84 100644 --- a/meta/recipes-devtools/perl/perl_5.34.1.bb +++ b/meta/recipes-devtools/perl/perl_5.36.0.bb @@ -26,7 +26,7 @@ SRC_URI:append:class-target = " \ file://encodefix.patch \ " -SRC_URI[perl.sha256sum] = "357951a491b0ba1ce3611263922feec78ccd581dddc24a446b033e25acf242a1" +SRC_URI[perl.sha256sum] = "e26085af8ac396f62add8a533c3a0ea8c8497d836f0689347ac5abd7b7a4e00a" S = "${WORKDIR}/perl-${PV}" From patchwork Mon Jun 6 12:01:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 8894 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 72CD1CCA47F for ; Mon, 6 Jun 2022 12:01:54 +0000 (UTC) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.groups.io with SMTP id smtpd.web12.30988.1654516894928751584 for ; Mon, 06 Jun 2022 05:01:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Il1zm+BY; spf=pass (domain: gmail.com, ip: 209.85.128.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f43.google.com with SMTP id m39-20020a05600c3b2700b0039c511ebbacso888738wms.3 for ; Mon, 06 Jun 2022 05:01:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LOu+Wtys2jmM2dI8UM18pRCGs8LKI33ujL6BBMZRvv4=; b=Il1zm+BYv/1t+m0DROfFNhcFf0JAFHUtha7Ojalo6/P1z51m7DYxEEdgYtRz2bEZYG hhxbU1EKHK+DlyHJa93xLbr3kag2d0rRfOUpVnrfKHNNR1AI4BCi+skEGgvftNcaDXma frz975FmDwVbSL8/P29lRz4cpyb1h+Hc0C2ribzcUirE8f0diK1bCDDG/9I4WzkhH+sR DWu9Pk51kHh7sI5DK53J0P0guS9bpTMHlaNRd1N1eGXz/plADNOrmTMC19/DbYaILNF9 D6RQFIGGw01/uA21mDJZwRZXt5yryh586dScVVevAhpe8ylfN0KySNMfK3QN2hkIq6qA 6FhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LOu+Wtys2jmM2dI8UM18pRCGs8LKI33ujL6BBMZRvv4=; b=Ic1fgZNawinSv3Dw6Pvc04Ls5+tI8BbrBaK3gjXH+UZGIzdjKouVWghGbh0TF1r9wo OdEmbaFFNOJHuB+HvN/99t5UaP6cCFavJ3HtV9KPUFFve4oVDKmW7he2/ioEzF46dyrW cc6vKVQ3NKlvt+STwCT1D+KJBjFLzn+kgiQSuvY9vhz+g2KZd6Vnfd0+KLHqntNoaMXQ AC6v/p2qJPU0u+lCRb2ejxBVCsVmZmGK6mzL6a3FJPqJys09KIi6v0wGOJFayq2yc8R+ i5KFpN3SG53SKd1NMwRUZTvcwGAWbamPN8YBDfaSbR40bVlG7BuxY1znc6GX/Umcv+b7 xqUg== X-Gm-Message-State: AOAM533bn8R2OKCM+5acvixBOLES3hKP4MlB27zZ5Zs2PPHMD69DaI57 BnMQzLQBrN84Lbm74fZxbDairTjMo8x+hQ== X-Google-Smtp-Source: ABdhPJxPfZgMMojVEEuxGygRl7iqD78cnHLeecBaysLsuolNwOTcjxpLvwgC5aPgAHFYAccRJxm1Gw== X-Received: by 2002:a7b:c1cf:0:b0:39c:4460:cfa8 with SMTP id a15-20020a7bc1cf000000b0039c4460cfa8mr13059300wmj.21.1654516905894; Mon, 06 Jun 2022 05:01:45 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002100316b126sm15526455wru.6.2022.06.06.05.01.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 05:01:45 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 19/21] perl: drop perltoc regeneration Date: Mon, 6 Jun 2022 14:01:24 +0200 Message-Id: <20220606120126.3381438-19-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606120126.3381438-1-alex@linutronix.de> References: <20220606120126.3381438-1-alex@linutronix.de> 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, 06 Jun 2022 12:01:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166611 According to the linked ticket the issue is fixed. Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/perl/perl_5.36.0.bb | 8 -------- 1 file changed, 8 deletions(-) diff --git a/meta/recipes-devtools/perl/perl_5.36.0.bb b/meta/recipes-devtools/perl/perl_5.36.0.bb index 9f7ce15f84..838ad0b75a 100644 --- a/meta/recipes-devtools/perl/perl_5.36.0.bb +++ b/meta/recipes-devtools/perl/perl_5.36.0.bb @@ -115,14 +115,6 @@ print(datetime.fromtimestamp($SOURCE_DATE_EPOCH, timezone.utc).strftime('%a %b % do_compile() { oe_runmake - # This isn't generated reliably so delete and re-generate. - # https://github.com/arsv/perl-cross/issues/86 - - if [ -e pod/perltoc.pod ]; then - bbnote Rebuilding perltoc.pod - rm -f pod/perltoc.pod - oe_runmake pod/perltoc.pod - fi } do_install() { From patchwork Mon Jun 6 12:01:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 8892 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 67D8AC43334 for ; Mon, 6 Jun 2022 12:01:54 +0000 (UTC) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.groups.io with SMTP id smtpd.web11.30983.1654516908115467788 for ; Mon, 06 Jun 2022 05:01:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=q0kjOblo; spf=pass (domain: gmail.com, ip: 209.85.128.44, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f44.google.com with SMTP id z9so772803wmf.3 for ; Mon, 06 Jun 2022 05:01:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3Kvw3hoWdqfPJ6z1TQnE5GlNA1FNMgsk4uvk5Rfa/1s=; b=q0kjOblo6OZAQMAcl7oVI8RfGJhCFwA14wi/C3Q8rMeu2rGchfe1dQgCDHku2g1MMk vizmVeMiFQmbYuTXstUpB8u0STTfJGNAJNkziMo9SD4/9m+hssQMxPsq8s2syPbEvqPO 8RZ+fKmXHVH3hQl4tlPq7vUI0MNBuODIjyoSf6IKsABS/fEKR4IMXZrXOno2mWK4OyYv KtmJ30hZ/btc4GviG/+BCWvr2NtgEOZmHoR/z7SIMHS4zuKZD39z5yzlsZRYrrrAfAOK rd3pchbU9njZph7U/kRliBKCgcJJlw9gyto1NDbttSsSJtmYVQDeL2J0sH6tvE0WFh7l w61A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3Kvw3hoWdqfPJ6z1TQnE5GlNA1FNMgsk4uvk5Rfa/1s=; b=8Di2XZEiwAnzFylgP0BNuw6K0qNju1MXq4IovMKpuR7y8gJB5HaH9zFRdBmjH5MgLU VFieVyowYpVGrDmbxE7L/EEwS1biJ1t8+iWaS24qxRPTWX+MsOi3oxQoAVIpnvOZo3SA WVDqrmLMMTGat2hKrIfzS+oSMz2ILu3HgTKKO1Yi0I7yVhuqGMrey/C2YtTw7ts1JSef dT7lQqr/Ip/PYQoxSCbSTpNDdU00HhLVviTO3W6tLtAe8mSmUi1tcEmwXP+WlDZ1BEFT d/pTF7t85Vm+bnq5khs72InAYsWo9Dj9poLB/UoePmgdljWhgkV0bCOTEq0cjk+eDOMi B86Q== X-Gm-Message-State: AOAM5326Z2TJ8xt8NfUGylSMnqHSxWSvQcg3eK7zB4YcWAddtFjKZNdi 9mWeQ+M13Pym1yD3WaBtXr5eh1fpvScJyw== X-Google-Smtp-Source: ABdhPJxKMFyr536YsimSb5Bp7jw8TMHsgb09NGNEAeN1bASy/vqtbQ1nTD/TueZrkWdeYoyNFjSJUg== X-Received: by 2002:a05:600c:2e47:b0:39c:37f5:cd74 with SMTP id q7-20020a05600c2e4700b0039c37f5cd74mr18556834wmf.32.1654516906665; Mon, 06 Jun 2022 05:01:46 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002100316b126sm15526455wru.6.2022.06.06.05.01.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 05:01:46 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 20/21] perl: clean prior to build Date: Mon, 6 Jun 2022 14:01:25 +0200 Message-Id: <20220606120126.3381438-20-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606120126.3381438-1-alex@linutronix.de> References: <20220606120126.3381438-1-alex@linutronix.de> 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, 06 Jun 2022 12:01:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166613 Otherwise, when running configure/make on a previously built tree, makefiles generated by makemaker may detect that 'configuration has changed', followed by self-deletion, self-regeneration, requesting the user to re-run make and exit 1. And therefore do_compile goes kaboom. Signed-off-by: Alexander Kanavin --- ...ctly-list-modules-when-cleaning-them.patch | 24 ++++++++++++++++ ...file-do-not-clean-config.h-xconfig.h.patch | 28 +++++++++++++++++++ .../perl-cross/perlcross_1.4.bb | 2 ++ meta/recipes-devtools/perl/perl_5.36.0.bb | 1 + 4 files changed, 55 insertions(+) create mode 100644 meta/recipes-devtools/perl-cross/files/0001-Makefile-correctly-list-modules-when-cleaning-them.patch create mode 100644 meta/recipes-devtools/perl-cross/files/0001-Makefile-do-not-clean-config.h-xconfig.h.patch diff --git a/meta/recipes-devtools/perl-cross/files/0001-Makefile-correctly-list-modules-when-cleaning-them.patch b/meta/recipes-devtools/perl-cross/files/0001-Makefile-correctly-list-modules-when-cleaning-them.patch new file mode 100644 index 0000000000..80388fa9b0 --- /dev/null +++ b/meta/recipes-devtools/perl-cross/files/0001-Makefile-correctly-list-modules-when-cleaning-them.patch @@ -0,0 +1,24 @@ +From 7b8d819e012c24df228a313beb86e1942611c904 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sat, 4 Jun 2022 13:00:12 +0200 +Subject: [PATCH] Makefile: correctly list modules when cleaning them + +Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/133] +Signed-off-by: Alexander Kanavin +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 6b35fb0..9ef9324 100644 +--- a/Makefile ++++ b/Makefile +@@ -462,7 +462,7 @@ clean-subdirs: + + # assuming modules w/o Makefiles were never built and need no cleaning + clean-modules: config.h +- @for i in $(modules disabled); do \ ++ @for i in $(modules) $(disabled); do \ + test -f $$i/Makefile && \ + touch $$i/Makefile && \ + $(MAKE) -C $$i clean \ diff --git a/meta/recipes-devtools/perl-cross/files/0001-Makefile-do-not-clean-config.h-xconfig.h.patch b/meta/recipes-devtools/perl-cross/files/0001-Makefile-do-not-clean-config.h-xconfig.h.patch new file mode 100644 index 0000000000..cbb935c71b --- /dev/null +++ b/meta/recipes-devtools/perl-cross/files/0001-Makefile-do-not-clean-config.h-xconfig.h.patch @@ -0,0 +1,28 @@ +From ade4a70308d3b9d79cc3db841c0f60385780fe1a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sat, 4 Jun 2022 13:45:20 +0200 +Subject: [PATCH] Makefile: do not clean config.h/xconfig.h + +These are generated by ./configure and not by make. + +Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/134] +Signed-off-by: Alexander Kanavin +--- + Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 9ef9324..3de2c2e 100644 +--- a/Makefile ++++ b/Makefile +@@ -473,7 +473,6 @@ clean-generated-files: + -rm -f uudmap.h opmini.c generate_uudmap$X bitcount.h $(CONFIGPM) + -rm -f git_version.h lib/re.pm lib/Config_git.pl + -rm -f perlmini.c perlmain.c +- -rm -f config.h xconfig.h + -rm -f pod/perlmodlib.pod + -rm -f ext.libs static.list + -rm -f $(patsubst %,%/ppport.h,$(mkppport_lst)) +-- +2.30.2 + diff --git a/meta/recipes-devtools/perl-cross/perlcross_1.4.bb b/meta/recipes-devtools/perl-cross/perlcross_1.4.bb index 1329306b0e..2704976e17 100644 --- a/meta/recipes-devtools/perl-cross/perlcross_1.4.bb +++ b/meta/recipes-devtools/perl-cross/perlcross_1.4.bb @@ -15,6 +15,8 @@ SRC_URI = "https://github.com/arsv/perl-cross/releases/download/${PV}/perl-cross file://0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch \ file://determinism.patch \ file://0001-Makefile-check-the-file-if-patched-or-not.patch \ + file://0001-Makefile-correctly-list-modules-when-cleaning-them.patch \ + file://0001-Makefile-do-not-clean-config.h-xconfig.h.patch \ " UPSTREAM_CHECK_URI = "https://github.com/arsv/perl-cross/releases/" diff --git a/meta/recipes-devtools/perl/perl_5.36.0.bb b/meta/recipes-devtools/perl/perl_5.36.0.bb index 838ad0b75a..cb82cad36c 100644 --- a/meta/recipes-devtools/perl/perl_5.36.0.bb +++ b/meta/recipes-devtools/perl/perl_5.36.0.bb @@ -111,6 +111,7 @@ print(datetime.fromtimestamp($SOURCE_DATE_EPOCH, timezone.utc).strftime('%a %b % ")" echo "#define PERL_BUILD_DATE \"$PERL_BUILD_DATE\"" >> config.h fi + oe_runmake clean } do_compile() { From patchwork Mon Jun 6 12:01:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 8893 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 68285CCA473 for ; Mon, 6 Jun 2022 12:01:54 +0000 (UTC) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.groups.io with SMTP id smtpd.web11.30984.1654516909299934436 for ; Mon, 06 Jun 2022 05:01:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=AtUCI84O; spf=pass (domain: gmail.com, ip: 209.85.221.53, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f53.google.com with SMTP id t13so19560240wrg.9 for ; Mon, 06 Jun 2022 05:01:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cZzngFStWJ8LCzzc3CMAzyfWxtqAkqzdYqGjni7MWz8=; b=AtUCI84OYa28ZLRvN04h2C+Re7iYrexJagXLkxzLFR7D6mMsdOHWLyLRNDtX9ocgvl YW8wjBtLlDiVp7lWLrAx7NqXTxgD2Tqrw/1dy26VZYhoIXrNfnXZ/FJ/gFZ+UWVzG+HV zeas8i11VD8J+dJP1qMY4ratKbHo3B9s9mKRBgFl7xKHo3aINjfJHrYFxgtCMozhb4cj g9oMke8TuxLVI/GdbB34nS9k8zK64sUtVJnrnAlSwJl19aB+Pecf+8P56IXJmdx/cwc4 yOHNgmTrc7z3BxooC4Jm592qurezbhFumMxjHhyprwYWdfKZnjhqTsSP2jB09y75mVh+ KCqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cZzngFStWJ8LCzzc3CMAzyfWxtqAkqzdYqGjni7MWz8=; b=ZpiMyp8HXHAlsTflxCUx4rX9F5FgaFVxPmSlww9lzoPkEzWDn1S8QMM3FQkCzD3dPw /xMFW3xXboDVq875mJ9mAJxlOHXRH+f5Y7cCoDeRQaMWmG5QmTC1IBMuaEpJQBA/H9dH WsXj6uHQIDDf4pOl6Hz9W2Fe7q/T63jN/W0MlCMCCRBlkQ7k7kDhtzMNY8FhIXQUJL6A dLBSxcwIOA65NOGAPaKloAxX3A58PL2iv3ddZ3iJfPjYZFDWxmAXaPFVCuRLG2E4yd2W GSl1buXvRT9fAY+X9zoW3oevuKTzHROg34WfZsoyytuaYgeALE7oqHuqqjL+a60o+Fgo tcPQ== X-Gm-Message-State: AOAM530EjIT2N2xlronCw3ZEOir+HBUZzsg2eY5EN2c++F5wJspswpQr 7688qpcOzAfB3imCHWoUdS45ZDGbKwPBxQ== X-Google-Smtp-Source: ABdhPJy+Jv//71Yyn45TRbHQ0PtEFh7Jtp99Gsn4LMectJd4cbfrrMrQZtp0zvs5NtefZQRlD7B33Q== X-Received: by 2002:adf:dc51:0:b0:210:21ea:8840 with SMTP id m17-20020adfdc51000000b0021021ea8840mr21351831wrj.664.1654516907539; Mon, 06 Jun 2022 05:01:47 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002100316b126sm15526455wru.6.2022.06.06.05.01.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 05:01:47 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 21/21] perl: enable _GNU_SOURCE define via d_gnulibc Date: Mon, 6 Jun 2022 14:01:26 +0200 Message-Id: <20220606120126.3381438-21-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606120126.3381438-1-alex@linutronix.de> References: <20220606120126.3381438-1-alex@linutronix.de> 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, 06 Jun 2022 12:01:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166614 This is needed to properly support memmem() and friends under musl as musl guards the declarations with _GNU_SOURCE define, and if the declarations are not present, gcc will issue warnings and generate assembly that assumes the functions return int (instead of e.g. void*), with catastrophic consequences at runtime. Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/perl/perl_5.36.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/perl/perl_5.36.0.bb b/meta/recipes-devtools/perl/perl_5.36.0.bb index cb82cad36c..60785c72a5 100644 --- a/meta/recipes-devtools/perl/perl_5.36.0.bb +++ b/meta/recipes-devtools/perl/perl_5.36.0.bb @@ -59,6 +59,7 @@ do_configure:class-target() { -Dlibpth='${libdir} ${base_libdir}' \ -Dglibpth='${libdir} ${base_libdir}' \ -Alddlflags=' ${LDFLAGS}' \ + -Dd_gnulibc=define \ ${PACKAGECONFIG_CONFARGS} #perl.c uses an ARCHLIB_EXP define to generate compile-time code that