From patchwork Tue Jun 21 20:16: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: 9433 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 B4642CCA473 for ; Tue, 21 Jun 2022 20:16:46 +0000 (UTC) Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by mx.groups.io with SMTP id smtpd.web09.48606.1655842605458582478 for ; Tue, 21 Jun 2022 13:16:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=YzjFEejL; spf=pass (domain: gmail.com, ip: 209.85.218.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f48.google.com with SMTP id g26so8452235ejb.5 for ; Tue, 21 Jun 2022 13:16: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:mime-version :content-transfer-encoding; bh=4wlp8GO3qhmf9t34FB67nN+np1mrReFE+aI2b9rURSw=; b=YzjFEejLogzpELLNIi9MhSjhzcqgoSxgiq8nDFOIdyXHo9lUZvpXAqnKntLVqdDncl /QRBdcFxKFfqHzYIJ8Vgnn1aWHOqVrFAFEep18mOHB1jRPgUpthQv87uR/cPGrxQvV5p ZpF5Bf+wnd0xdJzCwjpO8C6ar79qlAM5X2Tjj8EP25e/MnI5jssn8D6aTZJrfxwNPU6B q5MJl9GpFCZWAK+FaDU9+9koS7m86A3IFyspl/Vn9b+0AxD8nAwfOFtkws01C5zwTdGP sBaT9cPkgFXEwOPRtKNSaLRo2+U5N29BJwIlrvlhTqaVX3su/Hmcr5QiP0PRKY39Ixue pGkw== 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=y0Jy/WaccTPrSYqdukPWHci9+DG16AUEJnmKWZwz8K2jq7MasHCitsm458S+UEB7B1 apWv7u1O/b0QyJ1OQjXSN7JKZU5rj3u0NcCCu8xhiZfIViBdQxdasrZVD5ojl5amQmZQ 2SJVpFByL8rpj8HDJSqY3DJu/NFTtUAE6i3Lk6lWdOldIrmAk7cc5wWu5IHRGbulYsGO QbPD+GfcJxwk5eBAxMrn+xUN1e9Ftz8I6fnytOFthTYtFv7URYnwgJxVEMirThksVYUr xqsaPbim+1fslbZ2cJfm+7TWtAZ1/EvfvY+s0qmiM0HlCxsUdvM99fqPB1eTXu8HxFHR f2QA== X-Gm-Message-State: AJIora+QYQqni69B6pXCHDSX/Wiko+QmeVeqvuXpKfXSuXvzfPHjuQ3x mo6iAmuzXCddDw+n9mM+BNy9I2+2O8o0hg== X-Google-Smtp-Source: AGRyM1szdSkkJvPXZUIM/SnO6Sk2Bt24ola45VxwbVZLPihgbdZSCfZ89lkGJuQFQ/Wv9iAYHdH10A== X-Received: by 2002:a17:906:77d2:b0:722:e726:addc with SMTP id m18-20020a17090677d200b00722e726addcmr3373759ejn.96.1655842603780; Tue, 21 Jun 2022 13:16: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 j8-20020a056402238800b0043590660f16sm3420890eda.35.2022.06.21.13.16.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 13:16:43 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 01/18] sato: work around missing icons in adwaita 42.0 Date: Tue, 21 Jun 2022 22:16:20 +0200 Message-Id: <20220621201637.1378306-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 ; Tue, 21 Jun 2022 20:16:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167169 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 Tue Jun 21 20:16: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: 9438 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 789E8C433EF for ; Tue, 21 Jun 2022 20:16:56 +0000 (UTC) Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by mx.groups.io with SMTP id smtpd.web10.47954.1655842606808933030 for ; Tue, 21 Jun 2022 13:16:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=pH6gi0iF; spf=pass (domain: gmail.com, ip: 209.85.218.42, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f42.google.com with SMTP id pk21so6721291ejb.2 for ; Tue, 21 Jun 2022 13:16: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=9OH4Y24qtv8AZjVzixNzSiwCoJkKPpzastnvATKuTbQ=; b=pH6gi0iFfsz6e3MU33G50GTjdrf8fiaSY/XeXSIuAqlpOpty1Lo9ok9TbnRN2jIAVH 1mEnn4K92dmzRgjB+mXcJKq4ZX1IDk7gLGwuBz5joTkjRcNId12M5brlzkMC7boMHThu iv1Nfp42yCohcQj9pwiBIvEiDAHLUcT33yyCA28b7uanwrd3rxaNmprv1By6xYApUNK/ IY3G23eRxFdjydAH4otnA1nAsqAglIq/kT3+1r/mncR3FzA/FgI/kI0ODeAZjmtJG6yv PlOpciyu38bm6TJxTn1gkF8EYhYk5vKmOLQeUmOtajxUoyhNh6UeWUrEj3OsFBJMkzdb P6mg== 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=VgtbFFsUId0McXevVWOZ2h0QkwAUnFj59iY1lwFLgxgc81z04JHPL2W4AhNGzq+Sfd xU8/ZL9rIEjUMUYRELRc+GkTnEJcIFFhwBLao/3CvIGvFDCDCqvyh3p8sixqmdEos4hG LTQp4fa1d/QoRyAbDtDInr5KV1Aqd48yuXRrnC2EifK8JKeYu3jMk8yp+Dp5f/5aL/e/ pbiChBbAjsAHPKF0VnSGDA0GeoZKeiWWVR1ba6yMF6Ds68CokwBaqG6jcX9q/jMXnCY9 3qdOrnq25cw8CCjJwjJR83Q17iUbtNOfInfV9wYvhu0QYEaAfWudh0OanjnIL7cEQUyU GhmQ== X-Gm-Message-State: AJIora/TWLEJcW3Z5lFsMmWPQibtS8YKz7FwPQujUd1untnHMQRSj5Z9 /l4/ofUa94bvPkV8L/BrdECjetVshEv6DA== X-Google-Smtp-Source: AGRyM1sr6x+9kbPDMJtPn1v1MGdAbd7G7UQEn+T3nCYsW31mR07MPMobPqF2yRMKeht5s5YJ0ng84Q== X-Received: by 2002:a17:907:3d8a:b0:70d:e791:f82d with SMTP id he10-20020a1709073d8a00b0070de791f82dmr27954156ejc.528.1655842605260; Tue, 21 Jun 2022 13:16: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 j8-20020a056402238800b0043590660f16sm3420890eda.35.2022.06.21.13.16.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 13:16:44 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 02/18] adwaita-icon-theme: upgrade 41.0 -> 42.0 Date: Tue, 21 Jun 2022 22:16:21 +0200 Message-Id: <20220621201637.1378306-2-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220621201637.1378306-1-alex@linutronix.de> References: <20220621201637.1378306-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 ; Tue, 21 Jun 2022 20:16:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167170 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 Tue Jun 21 20:16: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: 9440 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 994AECCA485 for ; Tue, 21 Jun 2022 20:16:56 +0000 (UTC) Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by mx.groups.io with SMTP id smtpd.web12.48350.1655842609402190144 for ; Tue, 21 Jun 2022 13:16:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=HP6qf5CX; spf=pass (domain: gmail.com, ip: 209.85.218.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f48.google.com with SMTP id mf9so9506761ejb.0 for ; Tue, 21 Jun 2022 13:16: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=NYWWkaWH5G9SUe/ZOnwa1CTbgYS/0R3esCflU1cQzoQ=; b=HP6qf5CXDDcQWGgIMIxttvDP0fAty2x+/oPSfQLqCDIhnCPmBjJneQKUyl7y/cjej9 x4XrdY97Iy617HI8A7A+bAvAYY/APwf+t37OR8DhV80/JxdFVDtXd2NlZcdqnxIPwdnE F3sl+E+0kGCU0Km9Ec2ee//Bvypv8YJp7OXhfoXT4Ctdy2dZZqFF1U1LUVRpsw5r4hnv 5lxRkObuhazR2JCG6PexfUHtaB0v/mV6Gz/YX3EaCUiyvlQ/T/VcsSGqNad6whZVL4fX GiSmE5vPxFsI9EACVm1JBN/BX5JozzmKs9OWucru/Lt7uLv3jn54vMGCfeqXS6coceyj rFPw== 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=NYWWkaWH5G9SUe/ZOnwa1CTbgYS/0R3esCflU1cQzoQ=; b=veGNMKSx4Yqqfzsmb7MFsI8pNDwvDjCJqbIOaeZPI8MbSFKiCOZfcSVC1c9IWsu5Kl bnFkW3kUt9/mA6pZr7TiuFPR/yatzcnzfPeoUYce/JQoQjCQZ6h7XJja3GIxHOQEKa2K MKc3Rh4WzF+PpyGGGe2LFlXz1KBdVhljm2i6vNrFmyQ0PQz4HUEfbzkIMIYFaI20usD1 3Xvbbf+YkW7hn+B1wQcAga/oKXR8EAgWgwEF+u505aJAh8CM7Y7yYTYj+sT9WW3hqHX+ tCnM7IgWaGWMPOlE6Jf6fIiV3Cjmbowy/ApiUjyt6kndVjuE4o2F24ALlaN3zhytgEDY v5tg== X-Gm-Message-State: AJIora/WJUXVjjJIz8AA9a23iTh53Dd9pkSLRPlXkve/Dkx3vuYrs3fp 9DNJtUvPWgt2IYaKZIWnJdzDWt0shYxltA== X-Google-Smtp-Source: AGRyM1tLzrLjpsgrBhMiEGloLfIMsEMfcqfnm9+YILwgINCgxbi8ZHv4WniWI/bGgEcQmtQsGHX2xA== X-Received: by 2002:a17:907:1c18:b0:711:c83b:8a14 with SMTP id nc24-20020a1709071c1800b00711c83b8a14mr26376605ejc.379.1655842607906; Tue, 21 Jun 2022 13:16: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 j8-20020a056402238800b0043590660f16sm3420890eda.35.2022.06.21.13.16.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 13:16:47 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 03/18] mesa: update 22.0.3 -> 22.1.2 Date: Tue, 21 Jun 2022 22:16:22 +0200 Message-Id: <20220621201637.1378306-3-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220621201637.1378306-1-alex@linutronix.de> References: <20220621201637.1378306-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 ; Tue, 21 Jun 2022 20:16:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167171 Signed-off-by: Alexander Kanavin --- ...wkmsDRI2Extension-instead-of-driDRI2.patch | 113 ++++++++++++++++++ .../{mesa-gl_22.0.3.bb => mesa-gl_22.1.2.bb} | 0 meta/recipes-graphics/mesa/mesa.inc | 3 +- .../mesa/{mesa_22.0.3.bb => mesa_22.1.2.bb} | 0 4 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/mesa/files/0001-swrast_kms-use-swkmsDRI2Extension-instead-of-driDRI2.patch rename meta/recipes-graphics/mesa/{mesa-gl_22.0.3.bb => mesa-gl_22.1.2.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_22.0.3.bb => mesa_22.1.2.bb} (100%) diff --git a/meta/recipes-graphics/mesa/files/0001-swrast_kms-use-swkmsDRI2Extension-instead-of-driDRI2.patch b/meta/recipes-graphics/mesa/files/0001-swrast_kms-use-swkmsDRI2Extension-instead-of-driDRI2.patch new file mode 100644 index 0000000000..db25e16f4a --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0001-swrast_kms-use-swkmsDRI2Extension-instead-of-driDRI2.patch @@ -0,0 +1,113 @@ +From feb4ec510b1328fdd9aa77305d3273d1f9c7e124 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Thu, 9 Jun 2022 11:42:05 +0200 +Subject: [PATCH] swrast_kms: use swkmsDRI2Extension instead of + driDRI2Extension + +This set of changes: +https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15649 + +caused a regression in Xorg when using swrast_kms: + (EE) AIGLX error: Calling driver entry point failed + +This commit changes the swrast_kms driver to use a dedicated screen init function +(which I believe was overlooked); I also took the opportunity to rename the +associated plumbling to have swrast-specific names. + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16942] +Signed-off-by: Alexander Kanavin +--- + src/gallium/frontends/dri/dri2.c | 16 ++++++++-------- + src/gallium/frontends/dri/dri_screen.h | 4 ++-- + src/gallium/frontends/dri/dri_util.c | 2 +- + src/gallium/targets/dri/target.c | 2 +- + 4 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/src/gallium/frontends/dri/dri2.c b/src/gallium/frontends/dri/dri2.c +index 63ac9d5..de33789 100644 +--- a/src/gallium/frontends/dri/dri2.c ++++ b/src/gallium/frontends/dri/dri2.c +@@ -2508,7 +2508,7 @@ release_pipe: + * Returns the struct gl_config supported by this driver. + */ + static const __DRIconfig ** +-dri_kms_init_screen(__DRIscreen * sPriv) ++dri_swrast_kms_init_screen(__DRIscreen * sPriv) + { + #if defined(GALLIUM_SOFTPIPE) + const __DRIconfig **configs; +@@ -2613,8 +2613,8 @@ static const struct __DRIDriverVtableExtensionRec galliumdrm_vtable = { + * hook. The latter is used to explicitly initialise the kms_swrast driver + * rather than selecting the approapriate driver as suggested by the loader. + */ +-const struct __DriverAPIRec dri_kms_driver_api = { +- .InitScreen = dri_kms_init_screen, ++const struct __DriverAPIRec dri_swrast_kms_driver_api = { ++ .InitScreen = dri_swrast_kms_init_screen, + .DestroyScreen = dri_destroy_screen, + .CreateBuffer = dri2_create_buffer, + .DestroyBuffer = dri_destroy_buffer, +@@ -2633,17 +2633,17 @@ const __DRIextension *galliumdrm_driver_extensions[] = { + NULL + }; + +-static const struct __DRIDriverVtableExtensionRec dri_kms_vtable = { ++static const struct __DRIDriverVtableExtensionRec dri_swrast_kms_vtable = { + .base = { __DRI_DRIVER_VTABLE, 1 }, +- .vtable = &dri_kms_driver_api, ++ .vtable = &dri_swrast_kms_driver_api, + }; + +-const __DRIextension *dri_kms_driver_extensions[] = { ++const __DRIextension *dri_swrast_kms_driver_extensions[] = { + &driCoreExtension.base, + &driImageDriverExtension.base, +- &driDRI2Extension.base, ++ &swkmsDRI2Extension.base, + &gallium_config_options.base, +- &dri_kms_vtable.base, ++ &dri_swrast_kms_vtable.base, + NULL + }; + +diff --git a/src/gallium/frontends/dri/dri_screen.h b/src/gallium/frontends/dri/dri_screen.h +index 0ee2feb..0bb8817 100644 +--- a/src/gallium/frontends/dri/dri_screen.h ++++ b/src/gallium/frontends/dri/dri_screen.h +@@ -168,8 +168,8 @@ dri_destroy_screen_helper(struct dri_screen * screen); + void + dri_destroy_screen(__DRIscreen * sPriv); + +-extern const struct __DriverAPIRec dri_kms_driver_api; +-extern const __DRIextension *dri_kms_driver_extensions[]; ++extern const struct __DriverAPIRec dri_swrast_kms_driver_api; ++extern const __DRIextension *dri_swrast_kms_driver_extensions[]; + extern const struct __DriverAPIRec galliumdrm_driver_api; + extern const __DRIextension *galliumdrm_driver_extensions[]; + extern const struct __DriverAPIRec galliumsw_driver_api; +diff --git a/src/gallium/frontends/dri/dri_util.c b/src/gallium/frontends/dri/dri_util.c +index 8d60526..03614e1 100644 +--- a/src/gallium/frontends/dri/dri_util.c ++++ b/src/gallium/frontends/dri/dri_util.c +@@ -187,7 +187,7 @@ swkmsCreateNewScreen(int scrn, int fd, + const __DRIconfig ***driver_configs, void *data) + { + return driCreateNewScreen2(scrn, fd, extensions, +- dri_kms_driver_extensions, ++ dri_swrast_kms_driver_extensions, + driver_configs, data); + } + +diff --git a/src/gallium/targets/dri/target.c b/src/gallium/targets/dri/target.c +index 9b78351..e02b03b 100644 +--- a/src/gallium/targets/dri/target.c ++++ b/src/gallium/targets/dri/target.c +@@ -25,7 +25,7 @@ const __DRIextension **__driDriverGetExtensions_kms_swrast(void); + + PUBLIC const __DRIextension **__driDriverGetExtensions_kms_swrast(void) + { +- return dri_kms_driver_extensions; ++ return dri_swrast_kms_driver_extensions; + } + + #endif diff --git a/meta/recipes-graphics/mesa/mesa-gl_22.0.3.bb b/meta/recipes-graphics/mesa/mesa-gl_22.1.2.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_22.0.3.bb rename to meta/recipes-graphics/mesa/mesa-gl_22.1.2.bb diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 3c26b23ed5..83705fc34d 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -21,9 +21,10 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ file://0001-util-format-Check-for-NEON-before-using-it.patch \ file://0001-Revert-egl-wayland-deprecate-drm_handle_format-and-d.patch \ + file://0001-swrast_kms-use-swkmsDRI2Extension-instead-of-driDRI2.patch \ " -SRC_URI[sha256sum] = "9f2b30f5276a9abaf71aafc6979685e2636189de1a87aea2c9e69744a6d0ebb9" +SRC_URI[sha256sum] = "0971226b4a6a3d10cfc255736b33e4017e18c14c9db1e53863ac1f8ae0deb9ea" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/mesa/mesa_22.0.3.bb b/meta/recipes-graphics/mesa/mesa_22.1.2.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa_22.0.3.bb rename to meta/recipes-graphics/mesa/mesa_22.1.2.bb From patchwork Tue Jun 21 20:16: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: 9435 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 87BF8CCA483 for ; Tue, 21 Jun 2022 20:16:56 +0000 (UTC) Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by mx.groups.io with SMTP id smtpd.web12.48351.1655842611630756622 for ; Tue, 21 Jun 2022 13:16:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Ji9qp1mP; spf=pass (domain: gmail.com, ip: 209.85.218.44, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f44.google.com with SMTP id u15so2168031ejc.10 for ; Tue, 21 Jun 2022 13:16:51 -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=grZLQ71WhdPTxBARdYqJ3tEhnR9dYRIgNdSIzmPOcc4=; b=Ji9qp1mPxH7vZnQPXtF9Yy53guBVznMKiDf0KkAn8a+JqrXdpanBSgMJGmpvCNrADh gBkcabtQeGa8srl2+oddk+iDuXBAsDRRDXRBu0l4FzI9y5+ICo+l5lGcjzkbjJCRcU8c zzIc7nuoXgecmfaPjxFz0ejr4nk89loChLTGy/FXiNlc2tgbG+1UElw/L32KLq5GjxnM lgaY5zRvZgWL+fUbnabb8dd80J7TLOFlUYaxHS4EUcZlZFmx8ANzm2BUd+KLcm4dzBlO yrZzAQKseytxxasySo5jz9OGR/HaEhfKD4QEdZEaaTeCFD0eBYMgwTl75r4BBKwnN/8P Qx/Q== 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=grZLQ71WhdPTxBARdYqJ3tEhnR9dYRIgNdSIzmPOcc4=; b=7UiEidUNFopg0jNv6G1QK7ygZK8evOkMbSzZtUI7pa4TLl3IzzrGRSAzgg9jy8dKZ7 oTp0g4/fuayOZZ1g45KTPp3XARNYt0R034DEL+OTFeW/9wvVFCPNyONNAdF9VaJlvvtf u6mRAUAJ7RADu/IKbCErVHU15ZrUxO/pFDuBHrEBL8lxxbGV0Adpivshh5xfqF/rlKgr HIyN6zN5+1UReTg0387sUpuWnzo8ZeHm6CkoRU9+3IWZMgjOh55a/viAfN85Zn45VExM UTEFfUbiBCdv5F4EpDUbbxNgSQDOCE+vZ2dlkkpbIaL815vS2J/jRYH/lB4alwmWQ2c3 h/tw== X-Gm-Message-State: AJIora+4ckGTkU35/C5paTQSUXuPTS+YeU4B2NVsjqjVBwXcV+x6Yt32 Wcr+RUBxVSYSxsIooGiz7gP4V/0SKAI6lQ== X-Google-Smtp-Source: AGRyM1u7hNyh0VgNJ+3s0g/VFO0L0swldfkBXfhDuwUIfB7NVfIh12KwYI102McqqNej9KK62xWUZA== X-Received: by 2002:a17:907:da0:b0:722:c42e:25b9 with SMTP id go32-20020a1709070da000b00722c42e25b9mr10894363ejc.260.1655842610173; Tue, 21 Jun 2022 13:16:50 -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 j8-20020a056402238800b0043590660f16sm3420890eda.35.2022.06.21.13.16.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 13:16:49 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 04/18] python3-numpy: update 1.22.3 -> 1.22.4 Date: Tue, 21 Jun 2022 22:16:23 +0200 Message-Id: <20220621201637.1378306-4-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220621201637.1378306-1-alex@linutronix.de> References: <20220621201637.1378306-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 ; Tue, 21 Jun 2022 20:16:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167172 Signed-off-by: Alexander Kanavin --- ...y-do-not-write-full-path-to-output-f.patch | 28 +++++++++++++++++++ ...umpy_1.22.3.bb => python3-numpy_1.22.4.bb} | 3 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/python/python3-numpy/0001-generate_umath.py-do-not-write-full-path-to-output-f.patch rename meta/recipes-devtools/python/{python3-numpy_1.22.3.bb => python3-numpy_1.22.4.bb} (93%) diff --git a/meta/recipes-devtools/python/python3-numpy/0001-generate_umath.py-do-not-write-full-path-to-output-f.patch b/meta/recipes-devtools/python/python3-numpy/0001-generate_umath.py-do-not-write-full-path-to-output-f.patch new file mode 100644 index 0000000000..41dea89682 --- /dev/null +++ b/meta/recipes-devtools/python/python3-numpy/0001-generate_umath.py-do-not-write-full-path-to-output-f.patch @@ -0,0 +1,28 @@ +From 3c7deaa3a961a0f3ce4ff108468e3d70118f17b3 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Thu, 9 Jun 2022 17:23:42 +0200 +Subject: [PATCH] generate_umath.py: do not write full path to output files + +This helps reproducibility as those paths vary in automated +build environments. + +Upstream-Status: Submitted [https://github.com/numpy/numpy/pull/21707] +Signed-off-by: Alexander Kanavin + +--- + numpy/core/code_generators/generate_umath.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/numpy/core/code_generators/generate_umath.py b/numpy/core/code_generators/generate_umath.py +index 292d9e0..df37941 100644 +--- a/numpy/core/code_generators/generate_umath.py ++++ b/numpy/core/code_generators/generate_umath.py +@@ -1233,7 +1233,7 @@ def make_code(funcdict, filename): + + return 0; + } +- """) % (filename, code1, code2, code3) ++ """) % (os.path.basename(filename), code1, code2, code3) + return code + + diff --git a/meta/recipes-devtools/python/python3-numpy_1.22.3.bb b/meta/recipes-devtools/python/python3-numpy_1.22.4.bb similarity index 93% rename from meta/recipes-devtools/python/python3-numpy_1.22.3.bb rename to meta/recipes-devtools/python/python3-numpy_1.22.4.bb index b5b1c4e714..8ad3442413 100644 --- a/meta/recipes-devtools/python/python3-numpy_1.22.3.bb +++ b/meta/recipes-devtools/python/python3-numpy_1.22.4.bb @@ -11,8 +11,9 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ file://0001-numpy-core-Define-RISCV-32-support.patch \ file://run-ptest \ + file://0001-generate_umath.py-do-not-write-full-path-to-output-f.patch \ " -SRC_URI[sha256sum] = "a906c0b4301a3d62ccf66d058fe779a65c1c34f6719ef2058f96e1856f48bca5" +SRC_URI[sha256sum] = "b4308198d0e41efaa108e57d69973398439c7299a9d551680cdd603cf6d20709" UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)\.tar" From patchwork Tue Jun 21 20:16: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: 9437 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 86D41CCA47E for ; Tue, 21 Jun 2022 20:16:56 +0000 (UTC) Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by mx.groups.io with SMTP id smtpd.web12.48352.1655842612433487191 for ; Tue, 21 Jun 2022 13:16:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=bWoMXnv2; spf=pass (domain: gmail.com, ip: 209.85.218.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f54.google.com with SMTP id h23so29787086ejj.12 for ; Tue, 21 Jun 2022 13:16:52 -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=9XAwPOedvybPPVgluX96gN27ZGYixRLwW9Gj46X5Gkc=; b=bWoMXnv2BGlDttSdzCSCHPzjjzWA15YNe2zxn6fpSeahgPwN+13tNKLUEOMeFxj426 beXGWvUXKeMGiyhDLWXOPUn03AXTSlfpFaexaGHlkjHkQs2lz9sjHGHd7jENZuOWvypa osSg/prSbt0522xRa81Of0Mp6QxY7qX1Hk5HIioR/qWSxNILTRMz9xu0Nwqw+8Tf2TPL 5vwc7kjsh0ZemEHgUGIqFQDQOpV0sZi3WU/kE8sAFzx+AE5CeAzvxmn7dUv77xEr574H xmthvuCZPA3vc4mUCgjArB0SEs4/Kykoar3vhj9h5mw3mG/92iVgkTrjF0N/EqLyv40n 4IGA== 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=9XAwPOedvybPPVgluX96gN27ZGYixRLwW9Gj46X5Gkc=; b=LQYICUMTsCQZ1Gxa4Lb8962jd8lqFDWnhwQLjt4QVafwskLS+7ApQTEfZ1LPz4+QW1 //7i2rk01TI4sj8Nbo+GWsXnZ99BJYG94BTzu7iy1Z/k8ZI+YjMxGoRE5G8M41qcJ97o AolTT/k1d0s/z9X7SVrC+uDFVoqPrJaxdSH+l+E1AKvmgNWMPDEc6EjDtfDZn5f8IkJh 2Q3+Fl7/NPk4CctuUJq459yjnrAf+5XTY1EOHbaKjVpzmPNAzhWk267bI0bgrkEqNgK4 xMRAzpvwi3dO/j7sKI8eEiOGBD2bCFsoWUf+2XeuflCYV+mxW6xIh//3N2cWSK10JaOp iBIQ== X-Gm-Message-State: AJIora9BkgBpvzDmLo1xrwep4mBMp7VH47gkIQkVNgXRj/Jd29jcW6bN 7t/Lsa6CI6hsy0jduhZu24v2+/mm/o3Mkg== X-Google-Smtp-Source: AGRyM1vgSA+xKcF/VePMms4pnrEnetTW7i5kwm/kFFwr6c4NoUcIF4qIgkfDrMF5Tc+X8hIbWQYlgA== X-Received: by 2002:a17:906:9b86:b0:6fe:d37f:b29d with SMTP id dd6-20020a1709069b8600b006fed37fb29dmr27511522ejc.327.1655842610920; Tue, 21 Jun 2022 13:16:50 -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 j8-20020a056402238800b0043590660f16sm3420890eda.35.2022.06.21.13.16.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 13:16:50 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 05/18] python3-setuptools: update 62.3.2 -> 62.5.0 Date: Tue, 21 Jun 2022 22:16:24 +0200 Message-Id: <20220621201637.1378306-5-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220621201637.1378306-1-alex@linutronix.de> References: <20220621201637.1378306-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 ; Tue, 21 Jun 2022 20:16:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167173 Signed-off-by: Alexander Kanavin --- ...ly-do-not-fetch-code-by-easy_install.patch | 2 +- ...nfig.py-make-it-possible-to-substite.patch | 35 +++++++++---------- ...62.3.2.bb => python3-setuptools_62.5.0.bb} | 2 +- 3 files changed, 19 insertions(+), 20 deletions(-) rename meta/recipes-devtools/python/{python3-setuptools_62.3.2.bb => python3-setuptools_62.5.0.bb} (95%) diff --git a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch index b28865291c..6d4a9ff0a2 100644 --- a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch +++ b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch @@ -1,4 +1,4 @@ -From d03595e69cc532e27c0d3d535f08107349669d3d Mon Sep 17 00:00:00 2001 +From 5dfa8a8e0b1ad4712a8b8309c8663b7b598ba2a8 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 17 Jul 2018 10:13:38 +0800 Subject: [PATCH] conditionally do not fetch code by easy_install diff --git a/meta/recipes-devtools/python/python3-setuptools/0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch b/meta/recipes-devtools/python/python3-setuptools/0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch index c1b3dd6a30..e1960b8d9f 100644 --- a/meta/recipes-devtools/python/python3-setuptools/0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch +++ b/meta/recipes-devtools/python/python3-setuptools/0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch @@ -1,4 +1,4 @@ -From 41f78746cbe88d263400ee948abef5b3f89cce29 Mon Sep 17 00:00:00 2001 +From 3fd8fcd33d2b0f3ac2fc043eac8641ab4432967d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 11 May 2022 21:41:14 +0200 Subject: [PATCH] _distutils/sysconfig.py: make it possible to substite the @@ -15,26 +15,25 @@ would happen to this module in light of distutils deprecation. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin + --- - setuptools/_distutils/sysconfig.py | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) + setuptools/_distutils/sysconfig.py | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py -index 55a42e1..ead63b9 100644 +index e41d51e..c17a79a 100644 --- a/setuptools/_distutils/sysconfig.py +++ b/setuptools/_distutils/sysconfig.py -@@ -102,7 +102,9 @@ def get_python_inc(plat_specific=0, prefix=None): - If 'prefix' is supplied, use it instead of sys.base_prefix or +@@ -119,6 +119,8 @@ def get_python_inc(plat_specific=0, prefix=None): sys.base_exec_prefix -- i.e., ignore 'plat_specific'. """ -- if prefix is None: -+ if prefix is None and os.environ.get('STAGING_INCDIR', ""): -+ prefix = os.environ['STAGING_INCDIR'].rstrip('include') -+ elif prefix is None: - prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX - if os.name == "posix": - if IS_PYPY and sys.version_info < (3, 8): -@@ -167,7 +169,13 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): + default_prefix = BASE_EXEC_PREFIX if plat_specific else BASE_PREFIX ++ if os.environ.get('STAGING_INCDIR', ""): ++ default_prefix = os.environ['STAGING_INCDIR'].rstrip('include') + resolved_prefix = prefix if prefix is not None else default_prefix + try: + getter = globals()[f'_get_python_inc_{os.name}'] +@@ -221,7 +223,13 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): early_prefix = prefix @@ -49,12 +48,12 @@ index 55a42e1..ead63b9 100644 if standard_lib: prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX else: -@@ -182,7 +190,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): +@@ -236,7 +244,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): # Pure Python libdir = "lib" implementation = 'pypy' if IS_PYPY else 'python' -- libpython = os.path.join(prefix, libdir, -+ libpython = os.path.join(prefix, lib_basename, - implementation + get_python_version()) +- libpython = os.path.join(prefix, libdir, implementation + get_python_version()) ++ libpython = os.path.join(prefix, lib_basename, implementation + get_python_version()) return _posix_lib(standard_lib, libpython, early_prefix, prefix) elif os.name == "nt": + if standard_lib: diff --git a/meta/recipes-devtools/python/python3-setuptools_62.3.2.bb b/meta/recipes-devtools/python/python3-setuptools_62.5.0.bb similarity index 95% rename from meta/recipes-devtools/python/python3-setuptools_62.3.2.bb rename to meta/recipes-devtools/python/python3-setuptools_62.5.0.bb index 406a4bd4e7..b3286d5dab 100644 --- a/meta/recipes-devtools/python/python3-setuptools_62.3.2.bb +++ b/meta/recipes-devtools/python/python3-setuptools_62.5.0.bb @@ -11,7 +11,7 @@ SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-e SRC_URI += "file://0001-change-shebang-to-python3.patch \ file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch" -SRC_URI[sha256sum] = "a43bdedf853c670e5fed28e5623403bad2f73cf02f9a2774e91def6bda8265a7" +SRC_URI[sha256sum] = "a4c782ac58fcc9e3a86e5e1a4c74cf9d24bf21e4f1562043309022e1bb76951c" DEPENDS += "${PYTHON_PN}" From patchwork Tue Jun 21 20:16: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: 9436 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 8871EC3F2D4 for ; Tue, 21 Jun 2022 20:16:56 +0000 (UTC) Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by mx.groups.io with SMTP id smtpd.web08.48527.1655842613447796271 for ; Tue, 21 Jun 2022 13:16:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Fmc6ZzkF; spf=pass (domain: gmail.com, ip: 209.85.218.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f54.google.com with SMTP id sb34so785820ejc.11 for ; Tue, 21 Jun 2022 13:16:53 -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=4e+hXT9K3okQLwHuT1D7ZnTx3G4L/EBjhhHU5Rfw3Xc=; b=Fmc6ZzkF3nmEto2xUDLHpTilmmGjHdGVR+keezwcp/gP4GpkZ5XH1H0od8OHqc279x PvO3CIv0A/tkb8cESegLYQxvvMSzpg5PjijGBcwlCpJFmLvPWxAZPIZ7Npas1x7KcgUG CxU2Wx7m6zK0nu1RfkG95HgGO6oYDCsPkCVPMX3HVtXidyRhHZvEHkf/gIRLofZLnAZC EU/0kEjsQwTZvVr886ER3HwDr1QbLwos27xF45ByiEpPCAMnnojSWGOgRfxY26CulOiA kJWDDfVfm+PjSDF93XAc49o2myrOUF7F+XGBac+7IZjuc0Ar3ah5413U8CVf2kwgWj7e RmcA== 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=4e+hXT9K3okQLwHuT1D7ZnTx3G4L/EBjhhHU5Rfw3Xc=; b=1ek0oGBijodNIAmVoLts6zmjiCTTbgdVUONZWlLLcUk/xz4p81Rd9GZ5rjwuo8wWIS cng7UJPuiN0e+GmPlEAnN2TUv+SKP1yns8NKilQaMejd3Oy30yCI853UAi4mhQ9djs1T dHK+kJZwuyLVW2SSFTrfwb8W2yF/IxX5PNOakiPUBI7kr0wUKqtJAlj5MFWUBDPfYXL4 p82OcXxA7qPVWLqqeJYAFs4U8oeRr+tu4L4JkEMgb/70TQuptjCZCCarSmndRQl5FLCj m7dm2SUCarLV8P46aDci8JMfFv8TCI5OleQbNU0jrg0GauivUtS7SNR4K6vqfT9hH68N N1mw== X-Gm-Message-State: AJIora9yPqtQs4YgPjje/OAP/GbirqKCg/aktG1XThxfzMdlDe265W1b 91uMafEG3vC1893dXdzp9w7fhJuHFfuWtg== X-Google-Smtp-Source: AGRyM1sdt7Ga7zFu6HPNs5Tvf6wQx5wkDUPoRaNYljQu0p0vUsOd9VNWebrSJeGT3+4nC/F9An4LDg== X-Received: by 2002:a17:907:d24:b0:712:1142:88c7 with SMTP id gn36-20020a1709070d2400b00712114288c7mr28664570ejc.435.1655842611945; Tue, 21 Jun 2022 13:16:51 -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 j8-20020a056402238800b0043590660f16sm3420890eda.35.2022.06.21.13.16.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 13:16:51 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 06/18] vulkan: upgrade 1.3.211.0 -> 1.3.216.0 Date: Tue, 21 Jun 2022 22:16:25 +0200 Message-Id: <20220621201637.1378306-6-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220621201637.1378306-1-alex@linutronix.de> References: <20220621201637.1378306-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 ; Tue, 21 Jun 2022 20:16:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167174 Signed-off-by: Alexander Kanavin --- .../glslang/{glslang_1.3.211.0.bb => glslang_1.3.216.0.bb} | 2 +- ...{spirv-headers_1.3.211.0.bb => spirv-headers_1.3.216.0.bb} | 2 +- .../{spirv-tools_1.3.211.0.bb => spirv-tools_1.3.216.0.bb} | 2 +- ...ulkan-headers_1.3.211.0.bb => vulkan-headers_1.3.216.0.bb} | 2 +- ...{vulkan-loader_1.3.211.0.bb => vulkan-loader_1.3.216.0.bb} | 4 ++-- .../{vulkan-tools_1.3.211.0.bb => vulkan-tools_1.3.216.0.bb} | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) rename meta/recipes-graphics/glslang/{glslang_1.3.211.0.bb => glslang_1.3.216.0.bb} (95%) rename meta/recipes-graphics/spir/{spirv-headers_1.3.211.0.bb => spirv-headers_1.3.216.0.bb} (92%) rename meta/recipes-graphics/spir/{spirv-tools_1.3.211.0.bb => spirv-tools_1.3.216.0.bb} (96%) rename meta/recipes-graphics/vulkan/{vulkan-headers_1.3.211.0.bb => vulkan-headers_1.3.216.0.bb} (93%) rename meta/recipes-graphics/vulkan/{vulkan-loader_1.3.211.0.bb => vulkan-loader_1.3.216.0.bb} (94%) rename meta/recipes-graphics/vulkan/{vulkan-tools_1.3.211.0.bb => vulkan-tools_1.3.216.0.bb} (93%) diff --git a/meta/recipes-graphics/glslang/glslang_1.3.211.0.bb b/meta/recipes-graphics/glslang/glslang_1.3.216.0.bb similarity index 95% rename from meta/recipes-graphics/glslang/glslang_1.3.211.0.bb rename to meta/recipes-graphics/glslang/glslang_1.3.216.0.bb index 37dea07a8a..69d9a0a84e 100644 --- a/meta/recipes-graphics/glslang/glslang_1.3.211.0.bb +++ b/meta/recipes-graphics/glslang/glslang_1.3.216.0.bb @@ -8,7 +8,7 @@ HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler" LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3" -SRCREV = "9bb8cfffb0eed010e07132282c41d73064a7a609" +SRCREV = "adbf0d3106b26daa237b10b9bf72b1af7c31092d" SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=master \ file://0001-generate-glslang-pkg-config.patch" PE = "1" diff --git a/meta/recipes-graphics/spir/spirv-headers_1.3.211.0.bb b/meta/recipes-graphics/spir/spirv-headers_1.3.216.0.bb similarity index 92% rename from meta/recipes-graphics/spir/spirv-headers_1.3.211.0.bb rename to meta/recipes-graphics/spir/spirv-headers_1.3.216.0.bb index 910ba668af..94500a96ba 100644 --- a/meta/recipes-graphics/spir/spirv-headers_1.3.211.0.bb +++ b/meta/recipes-graphics/spir/spirv-headers_1.3.216.0.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d" -SRCREV = "4995a2f2723c401eb0ea3e10c81298906bf1422b" +SRCREV = "b2a156e1c0434bc8c99aaebba1c7be98be7ac580" SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=master" PE = "1" UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.211.0.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb similarity index 96% rename from meta/recipes-graphics/spir/spirv-tools_1.3.211.0.bb rename to meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb index 9804febbcd..eb907326c4 100644 --- a/meta/recipes-graphics/spir/spirv-tools_1.3.211.0.bb +++ b/meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb @@ -7,7 +7,7 @@ SECTION = "graphics" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "7826e1941eab1aa66fbe84c48b95921bff402a96" +SRCREV = "c94501352d545e84c821ce031399e76d1af32d18" SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https" PE = "1" UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.211.0.bb b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.216.0.bb similarity index 93% rename from meta/recipes-graphics/vulkan/vulkan-headers_1.3.211.0.bb rename to meta/recipes-graphics/vulkan/vulkan-headers_1.3.216.0.bb index c74eb4cf5b..5f7917ae82 100644 --- a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.211.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.216.0.bb @@ -11,7 +11,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https" -SRCREV = "76f00ef6cbb1886eb1162d1fa39bee8b51e22ee8" +SRCREV = "3ef4c97fd6ea001d75a8e9da408ee473c180e456" S = "${WORKDIR}/git" diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.211.0.bb b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.216.0.bb similarity index 94% rename from meta/recipes-graphics/vulkan/vulkan-loader_1.3.211.0.bb rename to meta/recipes-graphics/vulkan/vulkan-loader_1.3.216.0.bb index cb4932ef79..15a079879b 100644 --- a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.211.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.216.0.bb @@ -9,8 +9,8 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.211;protocol=https" -SRCREV = "bfb419161602361626e40a7a3af0a63e06bcf204" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.216;protocol=https" +SRCREV = "322f7e3212b4fd9d70d7f48972963c83d24d06e4" S = "${WORKDIR}/git" diff --git a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.211.0.bb b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.216.0.bb similarity index 93% rename from meta/recipes-graphics/vulkan/vulkan-tools_1.3.211.0.bb rename to meta/recipes-graphics/vulkan/vulkan-tools_1.3.216.0.bb index 3cb4ccc23f..e26f4504f1 100644 --- a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.211.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.216.0.bb @@ -6,8 +6,8 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.3.211;protocol=https" -SRCREV = "4fdfd2b1187ab44f062d091ba3113c5e3eab5a1b" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=master;protocol=https" +SRCREV = "ef9db7a8ec52f6c56158d83f5d57ef388c1abec1" S = "${WORKDIR}/git" From patchwork Tue Jun 21 20:16: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: 9441 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 7ABA1CCA473 for ; Tue, 21 Jun 2022 20:16:56 +0000 (UTC) Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by mx.groups.io with SMTP id smtpd.web11.38027.1655842614661233111 for ; Tue, 21 Jun 2022 13:16:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=lk3B3dXp; spf=pass (domain: gmail.com, ip: 209.85.218.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f45.google.com with SMTP id cw10so6103399ejb.3 for ; Tue, 21 Jun 2022 13:16:54 -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=rF+XyY0OGlQ6xuU4xeqh6cFeAqFS5NGKL2cvJbK7nbg=; b=lk3B3dXpmxK4O2F3JW/fWA8CF62NAlyb50bRdjfW26q/AdysdpneX8ouxQ9DSE291k UCEhdBGnV2Yone0UcbulhlAAhqTmP0ZRuteuzSvw4B3Dx0sH+NKyWq4n7usiThCKupmJ aeUc9SYVGpyGPhWrOihqUbKvK04nGHppgGW4hwJ6mKHgESv4FULiesYPvDMo23B7MkmE l/yt36MJJFhHCv+GcJIYZW+0pCcSkCT5ZzM9kOlnYZuIw3xvfPi7HV6imt3J9sEha/Is gqvtYSx79gsKZY13T5dOC07l8cdALwFgjdgbNQ8KYEqHktsZsrNRrh/DL4eIKAov42nc 9Zxg== 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=rF+XyY0OGlQ6xuU4xeqh6cFeAqFS5NGKL2cvJbK7nbg=; b=kC3pVjFo0jXduwkGV+ErvpjnDgPb+W1uaOa9Ju1hhsRxq1QUuZHI9BrZLvtPveSrl/ 2BbjJArgQiCHG4lFdqVUzFBDCKSWSd5ce6AHFFzpBYklBfkL6YJM90bW/xy36OwMHVoZ U/vctXF7tCIR1eMVGATgTriva9OMxHcXiOWJ5GI11YboKQQ68M0/AqMtv4MJYBaYEgP2 nuJWapohzTwueXAOG606E0aMkBdxylKGH9ZS2CFpV/uNvewGCNzmewiPlxHIy50xCJ6O n01/Csc56MKVjkL7AXzgP/+tF4vkjtDO6OLPpyhxN2bgvGui9A4zq6BrIF2GL2aJkUvf J1OA== X-Gm-Message-State: AJIora8IrdhfxAoMs9ACLGhji+UiGuw/M9yAOvNWlqVnPJ5acYVBSFjG UMd04HJ22UBKzQc0lUqvI6IGzzlgcfTi4Q== X-Google-Smtp-Source: AGRyM1viINeM0HwTRtfVx3nKdTJJnaZEVvrs8b2BKAH6Q2MlciYaI0AmS9rdyBh3fs+SCCFRY7y7nw== X-Received: by 2002:a17:906:65c8:b0:713:ee3e:254d with SMTP id z8-20020a17090665c800b00713ee3e254dmr27777490ejn.0.1655842612863; Tue, 21 Jun 2022 13:16:52 -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 j8-20020a056402238800b0043590660f16sm3420890eda.35.2022.06.21.13.16.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 13:16:52 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 07/18] lttng-modules: update 2.13.3 -> 2.13.4 Date: Tue, 21 Jun 2022 22:16:26 +0200 Message-Id: <20220621201637.1378306-7-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220621201637.1378306-1-alex@linutronix.de> References: <20220621201637.1378306-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 ; Tue, 21 Jun 2022 20:16:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167175 Drop backports; one of them (0009) is present only on the master branch and not on 2.13 branch, and so stays in the recipe. Signed-off-by: Alexander Kanavin --- ...x-compaction-migratepages-event-name.patch | 37 ---- ...emove-unused-tracepoints-v5.10-v5.15.patch | 44 ----- ...g-Append-prev_state-to-tp-args-inste.patch | 59 ------ ...vent-allow-same-provider-and-event-n.patch | 48 ----- ...g-Don-t-re-read-p-state-when-emittin.patch | 183 ------------------ .../0004-fix-block-remove-genhd.h-v5.18.patch | 45 ----- ...emove-REQ_OP_WRITE_SAME-support-v5.1.patch | 79 -------- ...ndom-remove-unused-tracepoints-v5.18.patch | 47 ----- ...rethook-for-kretprobe-if-possible-v5.patch | 72 ------- ...ore-Remove-scsi-scsi_request.h-v5.18.patch | 44 ----- ...n-cleanup-the-compaction-trace-event.patch | 106 ---------- ...ules_2.13.3.bb => lttng-modules_2.13.4.bb} | 15 +- 12 files changed, 2 insertions(+), 777 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-Fix-compaction-migratepages-event-name.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-random-remove-unused-tracepoints-v5.10-v5.15.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-sched-tracing-Append-prev_state-to-tp-args-inste.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0002-Fix-tracepoint-event-allow-same-provider-and-event-n.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0003-fix-sched-tracing-Don-t-re-read-p-state-when-emittin.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0004-fix-block-remove-genhd.h-v5.18.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0005-fix-scsi-block-Remove-REQ_OP_WRITE_SAME-support-v5.1.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0006-fix-random-remove-unused-tracepoints-v5.18.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0007-fix-kprobes-Use-rethook-for-kretprobe-if-possible-v5.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0008-fix-scsi-core-Remove-scsi-scsi_request.h-v5.18.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0010-fix-mm-compaction-cleanup-the-compaction-trace-event.patch rename meta/recipes-kernel/lttng/{lttng-modules_2.13.3.bb => lttng-modules_2.13.4.bb} (60%) diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-compaction-migratepages-event-name.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-compaction-migratepages-event-name.patch deleted file mode 100644 index e988f7a3d5..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-compaction-migratepages-event-name.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c312bda00d2dc10ce5f6c1189acbefee5c6c8c6c Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers -Date: Tue, 29 Mar 2022 16:34:07 -0400 -Subject: [PATCH 01/10] Fix: compaction migratepages event name - -The commit "fix: mm: compaction: fix the migration stats in trace_mm_compaction_migratepages() (v5.17)" - -Triggers this warning: - - LTTng: event provider mismatch: The event name needs to start with provider name + _ + one or more letter, provider: compaction, event name: mm_compaction_migratepages - -Upstream-Status: Backport - -Signed-off-by: Mathieu Desnoyers -Change-Id: I01c7485af765084dafb33bf33ae392e60bfbf1e7 ---- - include/instrumentation/events/compaction.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/include/instrumentation/events/compaction.h b/include/instrumentation/events/compaction.h -index 340e41f5..15964537 100644 ---- a/include/instrumentation/events/compaction.h -+++ b/include/instrumentation/events/compaction.h -@@ -98,7 +98,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(compaction_isolate_template, - #endif /* #else #if LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,0,0) */ - - #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) --LTTNG_TRACEPOINT_EVENT(mm_compaction_migratepages, -+LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, -+ -+ compaction_migratepages, - - TP_PROTO(unsigned long nr_all, - unsigned int nr_succeeded), --- -2.19.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-random-remove-unused-tracepoints-v5.10-v5.15.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-random-remove-unused-tracepoints-v5.10-v5.15.patch deleted file mode 100644 index d27cbc314f..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-random-remove-unused-tracepoints-v5.10-v5.15.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 13e4c978d45237b8780f1de6d404812b3af26a49 Mon Sep 17 00:00:00 2001 -From: He Zhe -Date: Thu, 2 Jun 2022 06:36:08 +0000 -Subject: [PATCH] fix: random: remove unused tracepoints (v5.10, v5.15) - -The following kernel commit has been back ported to v5.10.119 and v5.15.44. - -commit 14c174633f349cb41ea90c2c0aaddac157012f74 -Author: Jason A. Donenfeld -Date: Thu Feb 10 16:40:44 2022 +0100 - - random: remove unused tracepoints - - These explicit tracepoints aren't really used and show sign of aging. - It's work to keep these up to date, and before I attempted to keep them - up to date, they weren't up to date, which indicates that they're not - really used. These days there are better ways of introspecting anyway. - -Upstream-Status: Pending - -Signed-off-by: He Zhe ---- - src/probes/Kbuild | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/probes/Kbuild b/src/probes/Kbuild -index 5478447..31e0ee8 100644 ---- a/src/probes/Kbuild -+++ b/src/probes/Kbuild -@@ -204,7 +204,10 @@ endif - - # Introduced in v3.6, remove in v5.18 - obj-$(CONFIG_LTTNG) += $(shell \ -- if [ \( ! \( $(VERSION) -ge 6 -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) \) \ -+ if [ \( ! \( $(VERSION) -ge 6 \ -+ -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \ -+ -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -eq 15 -a $(SUBLEVEL) -ge 44 \) \ -+ -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -eq 10 -a $(SUBLEVEL) -ge 119 \) \) \) \ - -a \ - $(VERSION) -ge 4 \ - -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 6 \) \ --- -2.32.0 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-sched-tracing-Append-prev_state-to-tp-args-inste.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-sched-tracing-Append-prev_state-to-tp-args-inste.patch deleted file mode 100644 index b41053b6bc..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-sched-tracing-Append-prev_state-to-tp-args-inste.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 9c5b8de32b5745f3ff31079c02da64595e101bee Mon Sep 17 00:00:00 2001 -From: Michael Jeanson -Date: Tue, 17 May 2022 11:46:29 -0400 -Subject: [PATCH] fix: sched/tracing: Append prev_state to tp args instead - (v5.18) - -See upstream commit : - - commit 9c2136be0878c88c53dea26943ce40bb03ad8d8d - Author: Delyan Kratunov - Date: Wed May 11 18:28:36 2022 +0000 - - sched/tracing: Append prev_state to tp args instead - - Commit fa2c3254d7cf (sched/tracing: Don't re-read p->state when emitting - sched_switch event, 2022-01-20) added a new prev_state argument to the - sched_switch tracepoint, before the prev task_struct pointer. - - This reordering of arguments broke BPF programs that use the raw - tracepoint (e.g. tp_btf programs). The type of the second argument has - changed and existing programs that assume a task_struct* argument - (e.g. for bpf_task_storage access) will now fail to verify. - - If we instead append the new argument to the end, all existing programs - would continue to work and can conditionally extract the prev_state - argument on supported kernel versions. - - -Upstream-Status: Backport - -Change-Id: Ife2ec88a8bea2743562590cbd357068d7773863f -Signed-off-by: Michael Jeanson -Signed-off-by: Mathieu Desnoyers ---- - include/instrumentation/events/sched.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/instrumentation/events/sched.h b/include/instrumentation/events/sched.h -index 339bec94..c1c3df15 100644 ---- a/include/instrumentation/events/sched.h -+++ b/include/instrumentation/events/sched.h -@@ -356,11 +356,11 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup_new, - LTTNG_TRACEPOINT_EVENT(sched_switch, - - TP_PROTO(bool preempt, -- unsigned int prev_state, - struct task_struct *prev, -- struct task_struct *next), -+ struct task_struct *next, -+ unsigned int prev_state), - -- TP_ARGS(preempt, prev_state, prev, next), -+ TP_ARGS(preempt, prev, next, prev_state), - - TP_FIELDS( - ctf_array_text(char, prev_comm, prev->comm, TASK_COMM_LEN) --- -2.19.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-tracepoint-event-allow-same-provider-and-event-n.patch b/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-tracepoint-event-allow-same-provider-and-event-n.patch deleted file mode 100644 index 00367eebf8..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-tracepoint-event-allow-same-provider-and-event-n.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a7eb2e3d0a4beb1ee80b132927641dd05ef2d542 Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers -Date: Mon, 4 Apr 2022 15:49:32 -0400 -Subject: [PATCH 02/10] Fix: tracepoint event: allow same provider and event - name - -Using the same name for the provider (TRACE_SYSTEM) and event name -causes a compilation error because the same identifiers are emitted -twice. - -Fix this by prefixing the provider identifier with -"__provider_event_desc___". - -Upstream-Status: Backport - -Signed-off-by: Mathieu Desnoyers -Change-Id: I8cdf8f859e35b8bd5c19737860d12f1ed546dfc2 ---- - include/lttng/tracepoint-event-impl.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/lttng/tracepoint-event-impl.h b/include/lttng/tracepoint-event-impl.h -index 38b1dc43..dcb22247 100644 ---- a/include/lttng/tracepoint-event-impl.h -+++ b/include/lttng/tracepoint-event-impl.h -@@ -1255,7 +1255,7 @@ static const struct lttng_kernel_event_desc __event_desc___##_map = { \ - #define TP_ID1(_token, _system) _token##_system - #define TP_ID(_token, _system) TP_ID1(_token, _system) - --static const struct lttng_kernel_event_desc * const TP_ID(__event_desc___, TRACE_SYSTEM)[] = { -+static const struct lttng_kernel_event_desc * const TP_ID(__provider_event_desc___, TRACE_SYSTEM)[] = { - #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) - }; - -@@ -1274,8 +1274,8 @@ static const struct lttng_kernel_event_desc * const TP_ID(__event_desc___, TRACE - /* non-const because list head will be modified when registered. */ - static __used struct lttng_kernel_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = { - .provider_name = __stringify(TRACE_SYSTEM), -- .event_desc = TP_ID(__event_desc___, TRACE_SYSTEM), -- .nr_events = ARRAY_SIZE(TP_ID(__event_desc___, TRACE_SYSTEM)), -+ .event_desc = TP_ID(__provider_event_desc___, TRACE_SYSTEM), -+ .nr_events = ARRAY_SIZE(TP_ID(__provider_event_desc___, TRACE_SYSTEM)), - .head = { NULL, NULL }, - .lazy_init_head = { NULL, NULL }, - .lazy = 0, --- -2.19.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0003-fix-sched-tracing-Don-t-re-read-p-state-when-emittin.patch b/meta/recipes-kernel/lttng/lttng-modules/0003-fix-sched-tracing-Don-t-re-read-p-state-when-emittin.patch deleted file mode 100644 index afe514de82..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0003-fix-sched-tracing-Don-t-re-read-p-state-when-emittin.patch +++ /dev/null @@ -1,183 +0,0 @@ -From 8e52fd71e693619f7a58de2692e59f0c826e9988 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson -Date: Mon, 4 Apr 2022 13:52:57 -0400 -Subject: [PATCH 03/10] fix: sched/tracing: Don't re-read p->state when - emitting sched_switch event (v5.18) - -See upstream commit : - - commit fa2c3254d7cfff5f7a916ab928a562d1165f17bb - Author: Valentin Schneider - Date: Thu Jan 20 16:25:19 2022 +0000 - - sched/tracing: Don't re-read p->state when emitting sched_switch event - - As of commit - - c6e7bd7afaeb ("sched/core: Optimize ttwu() spinning on p->on_cpu") - - the following sequence becomes possible: - - p->__state = TASK_INTERRUPTIBLE; - __schedule() - deactivate_task(p); - ttwu() - READ !p->on_rq - p->__state=TASK_WAKING - trace_sched_switch() - __trace_sched_switch_state() - task_state_index() - return 0; - - TASK_WAKING isn't in TASK_REPORT, so the task appears as TASK_RUNNING in - the trace event. - - Prevent this by pushing the value read from __schedule() down the trace - event. - -Upstream-Status: Backport - -Change-Id: I46743cd006be4b4d573cae2d77df7d6d16744d04 -Signed-off-by: Michael Jeanson -Signed-off-by: Mathieu Desnoyers ---- - include/instrumentation/events/sched.h | 88 +++++++++++++++++++++++--- - 1 file changed, 78 insertions(+), 10 deletions(-) - -diff --git a/include/instrumentation/events/sched.h b/include/instrumentation/events/sched.h -index 91953a6f..339bec94 100644 ---- a/include/instrumentation/events/sched.h -+++ b/include/instrumentation/events/sched.h -@@ -20,7 +20,37 @@ - #ifndef _TRACE_SCHED_DEF_ - #define _TRACE_SCHED_DEF_ - --#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,15,0)) -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) -+ -+static inline long __trace_sched_switch_state(bool preempt, -+ unsigned int prev_state, -+ struct task_struct *p) -+{ -+ unsigned int state; -+ -+#ifdef CONFIG_SCHED_DEBUG -+ BUG_ON(p != current); -+#endif /* CONFIG_SCHED_DEBUG */ -+ -+ /* -+ * Preemption ignores task state, therefore preempted tasks are always -+ * RUNNING (we will not have dequeued if state != RUNNING). -+ */ -+ if (preempt) -+ return TASK_REPORT_MAX; -+ -+ /* -+ * task_state_index() uses fls() and returns a value from 0-8 range. -+ * Decrement it by 1 (except TASK_RUNNING state i.e 0) before using -+ * it for left shift operation to get the correct task->state -+ * mapping. -+ */ -+ state = __task_state_index(prev_state, p->exit_state); -+ -+ return state ? (1 << (state - 1)) : state; -+} -+ -+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,15,0)) - - static inline long __trace_sched_switch_state(bool preempt, struct task_struct *p) - { -@@ -321,43 +351,81 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup_new, - /* - * Tracepoint for task switches, performed by the scheduler: - */ -+ -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) - LTTNG_TRACEPOINT_EVENT(sched_switch, - --#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,4,0)) - TP_PROTO(bool preempt, -- struct task_struct *prev, -- struct task_struct *next), -+ unsigned int prev_state, -+ struct task_struct *prev, -+ struct task_struct *next), - -- TP_ARGS(preempt, prev, next), -+ TP_ARGS(preempt, prev_state, prev, next), -+ -+ TP_FIELDS( -+ ctf_array_text(char, prev_comm, prev->comm, TASK_COMM_LEN) -+ ctf_integer(pid_t, prev_tid, prev->pid) -+ ctf_integer(int, prev_prio, prev->prio - MAX_RT_PRIO) -+#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM -+ ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(preempt, prev_state, prev)) - #else -- TP_PROTO(struct task_struct *prev, -+ ctf_integer(long, prev_state, __trace_sched_switch_state(preempt, prev_state, prev)) -+#endif -+ ctf_array_text(char, next_comm, next->comm, TASK_COMM_LEN) -+ ctf_integer(pid_t, next_tid, next->pid) -+ ctf_integer(int, next_prio, next->prio - MAX_RT_PRIO) -+ ) -+) -+ -+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,4,0)) -+ -+LTTNG_TRACEPOINT_EVENT(sched_switch, -+ -+ TP_PROTO(bool preempt, -+ struct task_struct *prev, - struct task_struct *next), - -- TP_ARGS(prev, next), --#endif /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,4,0)) */ -+ TP_ARGS(preempt, prev, next), - - TP_FIELDS( - ctf_array_text(char, prev_comm, prev->comm, TASK_COMM_LEN) - ctf_integer(pid_t, prev_tid, prev->pid) - ctf_integer(int, prev_prio, prev->prio - MAX_RT_PRIO) --#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,4,0)) - #ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM - ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(preempt, prev)) - #else - ctf_integer(long, prev_state, __trace_sched_switch_state(preempt, prev)) - #endif -+ ctf_array_text(char, next_comm, next->comm, TASK_COMM_LEN) -+ ctf_integer(pid_t, next_tid, next->pid) -+ ctf_integer(int, next_prio, next->prio - MAX_RT_PRIO) -+ ) -+) -+ - #else -+ -+LTTNG_TRACEPOINT_EVENT(sched_switch, -+ -+ TP_PROTO(struct task_struct *prev, -+ struct task_struct *next), -+ -+ TP_ARGS(prev, next), -+ -+ TP_FIELDS( -+ ctf_array_text(char, prev_comm, prev->comm, TASK_COMM_LEN) -+ ctf_integer(pid_t, prev_tid, prev->pid) -+ ctf_integer(int, prev_prio, prev->prio - MAX_RT_PRIO) - #ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM - ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(prev)) - #else - ctf_integer(long, prev_state, __trace_sched_switch_state(prev)) --#endif - #endif - ctf_array_text(char, next_comm, next->comm, TASK_COMM_LEN) - ctf_integer(pid_t, next_tid, next->pid) - ctf_integer(int, next_prio, next->prio - MAX_RT_PRIO) - ) - ) -+#endif - - /* - * Tracepoint for a task being migrated: --- -2.19.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0004-fix-block-remove-genhd.h-v5.18.patch b/meta/recipes-kernel/lttng/lttng-modules/0004-fix-block-remove-genhd.h-v5.18.patch deleted file mode 100644 index 9248ffe4ff..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0004-fix-block-remove-genhd.h-v5.18.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 868e0b6db59159197c2cec3550fa4ad5e6572bc5 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson -Date: Mon, 4 Apr 2022 13:54:59 -0400 -Subject: [PATCH 04/10] fix: block: remove genhd.h (v5.18) - -See upstream commit : - - commit 322cbb50de711814c42fb088f6d31901502c711a - Author: Christoph Hellwig - Date: Mon Jan 24 10:39:13 2022 +0100 - - block: remove genhd.h - - There is no good reason to keep genhd.h separate from the main blkdev.h - header that includes it. So fold the contents of genhd.h into blkdev.h - and remove genhd.h entirely. - -Upstream-Status: Backport - -Change-Id: I7cf2aaa3a4c133320b95f2edde49f790f9515dbd -Signed-off-by: Michael Jeanson -Signed-off-by: Mathieu Desnoyers ---- - include/wrapper/genhd.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/include/wrapper/genhd.h b/include/wrapper/genhd.h -index 3c6dbcbe..4a59b68e 100644 ---- a/include/wrapper/genhd.h -+++ b/include/wrapper/genhd.h -@@ -12,7 +12,11 @@ - #ifndef _LTTNG_WRAPPER_GENHD_H - #define _LTTNG_WRAPPER_GENHD_H - -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) -+#include -+#else - #include -+#endif - - #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) - #define LTTNG_GENHD_FL_HIDDEN GENHD_FL_HIDDEN --- -2.19.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0005-fix-scsi-block-Remove-REQ_OP_WRITE_SAME-support-v5.1.patch b/meta/recipes-kernel/lttng/lttng-modules/0005-fix-scsi-block-Remove-REQ_OP_WRITE_SAME-support-v5.1.patch deleted file mode 100644 index 0751827613..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0005-fix-scsi-block-Remove-REQ_OP_WRITE_SAME-support-v5.1.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 2bc7cb7193124d20aa4e1b5dbad0410bfb97a470 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson -Date: Mon, 4 Apr 2022 14:12:13 -0400 -Subject: [PATCH 05/10] fix: scsi: block: Remove REQ_OP_WRITE_SAME support - (v5.18) - -See upstream commit : - - commit 73bd66d9c834220579c881a3eb020fd8917075d8 - Author: Christoph Hellwig - Date: Wed Feb 9 09:28:28 2022 +0100 - - scsi: block: Remove REQ_OP_WRITE_SAME support - - No more users of REQ_OP_WRITE_SAME or drivers implementing it are left, - so remove the infrastructure. - -Upstream-Status: Backport - -Change-Id: Ifbff71f79f8b590436fc7cb79f82d90c6e033d84 -Signed-off-by: Michael Jeanson -Signed-off-by: Mathieu Desnoyers ---- - include/instrumentation/events/block.h | 32 ++++++++++++++++++++++++++ - 1 file changed, 32 insertions(+) - -diff --git a/include/instrumentation/events/block.h b/include/instrumentation/events/block.h -index 3e1104d7..050a59a2 100644 ---- a/include/instrumentation/events/block.h -+++ b/include/instrumentation/events/block.h -@@ -66,6 +66,37 @@ LTTNG_TRACEPOINT_ENUM(block_rq_type, - #define lttng_bio_op(bio) bio_op(bio) - #define lttng_bio_rw(bio) ((bio)->bi_opf) - -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) -+#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM -+#define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes) \ -+ ctf_enum(block_rq_type, type, rwbs, \ -+ ( (op) == REQ_OP_WRITE ? RWBS_FLAG_WRITE : \ -+ ( (op) == REQ_OP_DISCARD ? RWBS_FLAG_DISCARD : \ -+ ( (op) == REQ_OP_SECURE_ERASE ? (RWBS_FLAG_DISCARD | RWBS_FLAG_SECURE) : \ -+ ( (op) == REQ_OP_FLUSH ? RWBS_FLAG_FLUSH : \ -+ ( (op) == REQ_OP_READ ? RWBS_FLAG_READ : \ -+ ( 0 )))))) \ -+ | ((rw) & REQ_RAHEAD ? RWBS_FLAG_RAHEAD : 0) \ -+ | ((rw) & REQ_SYNC ? RWBS_FLAG_SYNC : 0) \ -+ | ((rw) & REQ_META ? RWBS_FLAG_META : 0) \ -+ | ((rw) & REQ_PREFLUSH ? RWBS_FLAG_PREFLUSH : 0) \ -+ | ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0)) -+#else -+#define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes) \ -+ ctf_integer(type, rwbs, \ -+ ( (op) == REQ_OP_WRITE ? RWBS_FLAG_WRITE : \ -+ ( (op) == REQ_OP_DISCARD ? RWBS_FLAG_DISCARD : \ -+ ( (op) == REQ_OP_SECURE_ERASE ? (RWBS_FLAG_DISCARD | RWBS_FLAG_SECURE) : \ -+ ( (op) == REQ_OP_FLUSH ? RWBS_FLAG_FLUSH : \ -+ ( (op) == REQ_OP_READ ? RWBS_FLAG_READ : \ -+ ( 0 )))))) \ -+ | ((rw) & REQ_RAHEAD ? RWBS_FLAG_RAHEAD : 0) \ -+ | ((rw) & REQ_SYNC ? RWBS_FLAG_SYNC : 0) \ -+ | ((rw) & REQ_META ? RWBS_FLAG_META : 0) \ -+ | ((rw) & REQ_PREFLUSH ? RWBS_FLAG_PREFLUSH : 0) \ -+ | ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0)) -+#endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */ -+#else - #ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM - #define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes) \ - ctf_enum(block_rq_type, type, rwbs, \ -@@ -95,6 +126,7 @@ LTTNG_TRACEPOINT_ENUM(block_rq_type, - | ((rw) & REQ_PREFLUSH ? RWBS_FLAG_PREFLUSH : 0) \ - | ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0)) - #endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */ -+#endif - - #elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,1,0)) - --- -2.19.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0006-fix-random-remove-unused-tracepoints-v5.18.patch b/meta/recipes-kernel/lttng/lttng-modules/0006-fix-random-remove-unused-tracepoints-v5.18.patch deleted file mode 100644 index 9c2f70d4af..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0006-fix-random-remove-unused-tracepoints-v5.18.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 369d82bb1746447514c877088d7c5fd0f39140f8 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson -Date: Mon, 4 Apr 2022 14:33:42 -0400 -Subject: [PATCH 06/10] fix: random: remove unused tracepoints (v5.18) - -See upstream commit : - - commit 14c174633f349cb41ea90c2c0aaddac157012f74 - Author: Jason A. Donenfeld - Date: Thu Feb 10 16:40:44 2022 +0100 - - random: remove unused tracepoints - - These explicit tracepoints aren't really used and show sign of aging. - It's work to keep these up to date, and before I attempted to keep them - up to date, they weren't up to date, which indicates that they're not - really used. These days there are better ways of introspecting anyway. - -Upstream-Status: Backport - -Change-Id: I3b8c3e2732e7efdd76ce63204ac53a48784d0df6 -Signed-off-by: Michael Jeanson -Signed-off-by: Mathieu Desnoyers ---- - src/probes/Kbuild | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/probes/Kbuild b/src/probes/Kbuild -index e26b4359..8d6ff0f2 100644 ---- a/src/probes/Kbuild -+++ b/src/probes/Kbuild -@@ -187,8 +187,11 @@ ifneq ($(CONFIG_FRAME_WARN),0) - CFLAGS_lttng-probe-printk.o += -Wframe-larger-than=2200 - endif - -+# Introduced in v3.6, remove in v5.18 - obj-$(CONFIG_LTTNG) += $(shell \ -- if [ $(VERSION) -ge 4 \ -+ if [ \( ! \( $(VERSION) -ge 6 -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) \) \ -+ -a \ -+ $(VERSION) -ge 4 \ - -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 6 \) \ - -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 5 -a $(SUBLEVEL) -ge 2 \) \ - -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 4 -a $(SUBLEVEL) -ge 9 \) \ --- -2.19.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0007-fix-kprobes-Use-rethook-for-kretprobe-if-possible-v5.patch b/meta/recipes-kernel/lttng/lttng-modules/0007-fix-kprobes-Use-rethook-for-kretprobe-if-possible-v5.patch deleted file mode 100644 index effd37ffe1..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0007-fix-kprobes-Use-rethook-for-kretprobe-if-possible-v5.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 3c46ddc134621dba65030263aa321dd6bdae3ba3 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson -Date: Mon, 4 Apr 2022 15:02:10 -0400 -Subject: [PATCH 07/10] fix: kprobes: Use rethook for kretprobe if possible - (v5.18) - -See upstream commit : - - commit 73f9b911faa74ac5107879de05c9489c419f41bb - Author: Masami Hiramatsu - Date: Sat Mar 26 11:27:05 2022 +0900 - - kprobes: Use rethook for kretprobe if possible - - Use rethook for kretprobe function return hooking if the arch sets - CONFIG_HAVE_RETHOOK=y. In this case, CONFIG_KRETPROBE_ON_RETHOOK is - set to 'y' automatically, and the kretprobe internal data fields - switches to use rethook. If not, it continues to use kretprobe - specific function return hooks. - -Upstream-Status: Backport - -Change-Id: I2b7670dc04e4769c1e3c372582ad2f555f6d7a66 -Signed-off-by: Michael Jeanson -Signed-off-by: Mathieu Desnoyers ---- - include/wrapper/kprobes.h | 17 +++++++++++++++++ - src/probes/lttng-kretprobes.c | 2 +- - 2 files changed, 18 insertions(+), 1 deletion(-) - -diff --git a/include/wrapper/kprobes.h b/include/wrapper/kprobes.h -index b546d615..51d32b7c 100644 ---- a/include/wrapper/kprobes.h -+++ b/include/wrapper/kprobes.h -@@ -29,4 +29,21 @@ struct kretprobe *lttng_get_kretprobe(struct kretprobe_instance *ri) - - #endif /* LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) */ - -+ -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) -+static inline -+unsigned long lttng_get_kretprobe_retaddr(struct kretprobe_instance *ri) -+{ -+ return get_kretprobe_retaddr(ri); -+} -+ -+#else -+ -+static inline -+unsigned long lttng_get_kretprobe_retaddr(struct kretprobe_instance *ri) -+{ -+ return (unsigned long) ri->ret_addr; -+} -+#endif -+ - #endif /* _LTTNG_WRAPPER_KPROBES_H */ -diff --git a/src/probes/lttng-kretprobes.c b/src/probes/lttng-kretprobes.c -index 5cb2e953..565df739 100644 ---- a/src/probes/lttng-kretprobes.c -+++ b/src/probes/lttng-kretprobes.c -@@ -81,7 +81,7 @@ int _lttng_kretprobes_handler(struct kretprobe_instance *krpi, - int ret; - - payload.ip = (unsigned long) lttng_get_kretprobe(krpi)->kp.addr; -- payload.parent_ip = (unsigned long) krpi->ret_addr; -+ payload.parent_ip = lttng_get_kretprobe_retaddr(krpi); - - lib_ring_buffer_ctx_init(&ctx, event_recorder, sizeof(payload), - lttng_alignof(payload), <tng_probe_ctx); --- -2.19.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0008-fix-scsi-core-Remove-scsi-scsi_request.h-v5.18.patch b/meta/recipes-kernel/lttng/lttng-modules/0008-fix-scsi-core-Remove-scsi-scsi_request.h-v5.18.patch deleted file mode 100644 index 13c504b859..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0008-fix-scsi-core-Remove-scsi-scsi_request.h-v5.18.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e8d2f286b5b208ac8870d0a9c167b170e96169b3 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson -Date: Mon, 4 Apr 2022 15:08:48 -0400 -Subject: [PATCH 08/10] fix: scsi: core: Remove (v5.18) - -See upstream commit : - - commit 26440303310591e29121964ede0048583cb3126d - Author: Christoph Hellwig - Date: Thu Feb 24 18:55:52 2022 +0100 - - scsi: core: Remove - - This header is empty now except for an include of , so - remove it. - -Upstream-Status: Backport - -Change-Id: Ic8ee3352f1e8bddfcd44c31be9b788db82f183aa -Signed-off-by: Michael Jeanson -Signed-off-by: Mathieu Desnoyers ---- - include/instrumentation/events/block.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/instrumentation/events/block.h b/include/instrumentation/events/block.h -index 050a59a2..882e6e08 100644 ---- a/include/instrumentation/events/block.h -+++ b/include/instrumentation/events/block.h -@@ -11,9 +11,9 @@ - #include - #include - --#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0)) -+#if LTTNG_KERNEL_RANGE(4,11,0, 5,18,0) - #include --#endif /* (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0)) */ -+#endif /* LTTNG_KERNEL_RANGE(4,11,0, 5,18,0) */ - - #ifndef _TRACE_BLOCK_DEF_ - #define _TRACE_BLOCK_DEF_ --- -2.19.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0010-fix-mm-compaction-cleanup-the-compaction-trace-event.patch b/meta/recipes-kernel/lttng/lttng-modules/0010-fix-mm-compaction-cleanup-the-compaction-trace-event.patch deleted file mode 100644 index 892d3f0d23..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0010-fix-mm-compaction-cleanup-the-compaction-trace-event.patch +++ /dev/null @@ -1,106 +0,0 @@ -From f9208dc00756dfa0a2f191799722030bdf3f793d Mon Sep 17 00:00:00 2001 -From: Michael Jeanson -Date: Mon, 4 Apr 2022 15:14:01 -0400 -Subject: [PATCH 10/10] fix: mm: compaction: cleanup the compaction trace - events (v5.18) - -See upstream commit : - - commit abd4349ff9b8d242376b67711254221f64f447c7 - Author: Baolin Wang - Date: Tue Mar 22 14:45:56 2022 -0700 - - mm: compaction: cleanup the compaction trace events - - As Steven suggested [1], we should access the pointers from the trace - event to avoid dereferencing them to the tracepoint function when the - tracepoint is disabled. - - [1] https://lkml.org/lkml/2021/11/3/409 - -Upstream-Status: Backport - -Change-Id: I6c08250df8596e8dbc76780ae5d95c899c12e6fe -Signed-off-by: Michael Jeanson -Signed-off-by: Mathieu Desnoyers ---- - include/instrumentation/events/compaction.h | 17 ++++++++++++++++- - src/probes/Kbuild | 17 ++++++++++++++++- - src/probes/lttng-probe-compaction.c | 5 +++++ - 3 files changed, 37 insertions(+), 2 deletions(-) - -diff --git a/include/instrumentation/events/compaction.h b/include/instrumentation/events/compaction.h -index 15964537..ecae39a8 100644 ---- a/include/instrumentation/events/compaction.h -+++ b/include/instrumentation/events/compaction.h -@@ -97,7 +97,22 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(compaction_isolate_template, - - #endif /* #else #if LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,0,0) */ - --#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) -+LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, -+ -+ compaction_migratepages, -+ -+ TP_PROTO(struct compact_control *cc, -+ unsigned int nr_succeeded), -+ -+ TP_ARGS(cc, nr_succeeded), -+ -+ TP_FIELDS( -+ ctf_integer(unsigned long, nr_migrated, nr_succeeded) -+ ctf_integer(unsigned long, nr_failed, cc->nr_migratepages - nr_succeeded) -+ ) -+) -+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) - LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, - - compaction_migratepages, -diff --git a/src/probes/Kbuild b/src/probes/Kbuild -index 8d6ff0f2..54784477 100644 ---- a/src/probes/Kbuild -+++ b/src/probes/Kbuild -@@ -167,7 +167,22 @@ ifneq ($(CONFIG_BTRFS_FS),) - endif # $(wildcard $(btrfs_dep)) - endif # CONFIG_BTRFS_FS - --obj-$(CONFIG_LTTNG) += lttng-probe-compaction.o -+# A dependency on internal header 'mm/internal.h' was introduced in v5.18 -+compaction_dep = $(srctree)/mm/internal.h -+compaction_dep_wildcard = $(wildcard $(compaction_dep)) -+compaction_dep_check = $(shell \ -+if [ \( $(VERSION) -ge 6 \ -+ -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) -a \ -+ -z "$(compaction_dep_wildcard)" ] ; then \ -+ echo "warn" ; \ -+else \ -+ echo "ok" ; \ -+fi ;) -+ifeq ($(compaction_dep_check),ok) -+ obj-$(CONFIG_LTTNG) += lttng-probe-compaction.o -+else -+ $(warning Files $(compaction_dep) not found. Probe "compaction" is disabled. Use full kernel source tree to enable it.) -+endif # $(wildcard $(compaction_dep)) - - ifneq ($(CONFIG_EXT4_FS),) - ext4_dep = $(srctree)/fs/ext4/*.h -diff --git a/src/probes/lttng-probe-compaction.c b/src/probes/lttng-probe-compaction.c -index f8ddf384..ffaf45f0 100644 ---- a/src/probes/lttng-probe-compaction.c -+++ b/src/probes/lttng-probe-compaction.c -@@ -10,6 +10,11 @@ - - #include - #include -+#include -+ -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) -+#include "../mm/internal.h" -+#endif - - /* - * Create the tracepoint static inlines from the kernel to validate that our --- -2.19.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.3.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb similarity index 60% rename from meta/recipes-kernel/lttng/lttng-modules_2.13.3.bb rename to meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb index e049bdc6d2..90d48e5867 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.13.3.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb @@ -10,24 +10,13 @@ inherit module include lttng-platforms.inc SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://0001-Fix-compaction-migratepages-event-name.patch \ - file://0002-Fix-tracepoint-event-allow-same-provider-and-event-n.patch \ - file://0003-fix-sched-tracing-Don-t-re-read-p-state-when-emittin.patch \ - file://0004-fix-block-remove-genhd.h-v5.18.patch \ - file://0005-fix-scsi-block-Remove-REQ_OP_WRITE_SAME-support-v5.1.patch \ - file://0006-fix-random-remove-unused-tracepoints-v5.18.patch \ - file://0007-fix-kprobes-Use-rethook-for-kretprobe-if-possible-v5.patch \ - file://0008-fix-scsi-core-Remove-scsi-scsi_request.h-v5.18.patch \ file://0009-Rename-genhd-wrapper-to-blkdev.patch \ - file://0010-fix-mm-compaction-cleanup-the-compaction-trace-event.patch \ - file://0001-fix-sched-tracing-Append-prev_state-to-tp-args-inste.patch \ - file://0001-fix-random-remove-unused-tracepoints-v5.10-v5.15.patch \ - " + " # Use :append here so that the patch is applied also when using devupstream SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch" -SRC_URI[sha256sum] = "7cf1acbb50b84116acc9b4281b81dcc2643d6018bbd1e8514ad1270239896c4b" +SRC_URI[sha256sum] = "6159d00e4e1d59546eec8d4a67e1aa39c1084ceb5e5afeb666eab4b8a5b5a9ee" export INSTALL_MOD_DIR="kernel/lttng-modules" From patchwork Tue Jun 21 20:16:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 9434 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 78A17C43334 for ; Tue, 21 Jun 2022 20:16:56 +0000 (UTC) Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) by mx.groups.io with SMTP id smtpd.web10.47955.1655842615109594643 for ; Tue, 21 Jun 2022 13:16:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=DDpDlONy; spf=pass (domain: gmail.com, ip: 209.85.208.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f49.google.com with SMTP id cf14so11142499edb.8 for ; Tue, 21 Jun 2022 13:16:54 -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=33cRbX2zRd5kroHA/p0Kqw+1wNgoEwkPhHzPA8Skh20=; b=DDpDlONyrcEyuiIAXe3kKDeRccLzcT0cO12qN1fApQ3LW26UAD71yDVvH7GBMhjk3B w/ig3cusjDuEvhSEIVCWEUYOO9kZW9+HUWe30v9hkhdorJ8Zpblnw85kPgZWX+rYl5eP LOKEldsfm8HJWocucvj22N8GF4cj0oXkMA1amnBlp9x42AHs+LIi72V8WlsQFhORoszo 3tDlT9055HA+Gtg2U3oaXKqUBeOBXGRBnvQN/al7+bAP+lIQsvVWi5+NB8PRbk/KyoFv i5rTkF0Ut6A0p9LOlFvVcYngAPSkIf9Hl4uOUipgPW/PEWKBFLyH4pWF4ZeCEwI54yjS NMdA== 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=33cRbX2zRd5kroHA/p0Kqw+1wNgoEwkPhHzPA8Skh20=; b=uDtArQbumHM5bFB4zqRBaU3hOSjXJCMZ3WABegkY2Ne/V3IEdcWHTGptAcIb1wtxo3 r30QrBTJh6azkq6rhNrqtT91Ej0E/osQ0A0XiiBG+CdIODP3DjtC3GntroXU+ONp213a AaYm37GpoiM0leynITj75z2kYwuA80g3R9lJx56MN3VEPoNKTM4eV0Ln/XpEAu20kPJk AoirI0KaFeNeP3eMsbyp2iuUMHpcBFjJpRs2N5WMxMLvy2aSkYJtva62oYEWpbBVkp2h 75jGtrQpQReAAlbhqLCwKFdcqmNVn08nQo/FZImy+IXidK1TQ2NLFKoHh3eN1KXPRecm GNoA== X-Gm-Message-State: AJIora8B5Rms2BHoI7si9JS1P5TjW/OiPOLFao3ROo8qGWla6gQX7k9y nFQSWnQ3paRK77nTQH3m9kqGtIw6db3HbQ== X-Google-Smtp-Source: AGRyM1uc048fCxyPXuNNnd42E61HomoshqjQw6NXmggix16MBsUuL4m7N62eMpizu55V/mfumfXbpA== X-Received: by 2002:a50:fa99:0:b0:435:90d5:4e05 with SMTP id w25-20020a50fa99000000b0043590d54e05mr8627002edr.295.1655842613662; Tue, 21 Jun 2022 13:16:53 -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 j8-20020a056402238800b0043590660f16sm3420890eda.35.2022.06.21.13.16.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 13:16:53 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 08/18] go: update 1.18.2 -> 1.18.3 Date: Tue, 21 Jun 2022 22:16:27 +0200 Message-Id: <20220621201637.1378306-8-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220621201637.1378306-1-alex@linutronix.de> References: <20220621201637.1378306-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 ; Tue, 21 Jun 2022 20:16:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167176 Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/go/{go-1.18.2.inc => go-1.18.3.inc} | 2 +- ...{go-binary-native_1.18.2.bb => go-binary-native_1.18.3.bb} | 4 ++-- ...o-cross-canadian_1.18.2.bb => go-cross-canadian_1.18.3.bb} | 0 .../go/{go-cross_1.18.2.bb => go-cross_1.18.3.bb} | 0 .../go/{go-crosssdk_1.18.2.bb => go-crosssdk_1.18.3.bb} | 0 .../go/{go-native_1.18.2.bb => go-native_1.18.3.bb} | 0 .../go/{go-runtime_1.18.2.bb => go-runtime_1.18.3.bb} | 0 meta/recipes-devtools/go/{go_1.18.2.bb => go_1.18.3.bb} | 0 8 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-devtools/go/{go-1.18.2.inc => go-1.18.3.inc} (88%) rename meta/recipes-devtools/go/{go-binary-native_1.18.2.bb => go-binary-native_1.18.3.bb} (83%) rename meta/recipes-devtools/go/{go-cross-canadian_1.18.2.bb => go-cross-canadian_1.18.3.bb} (100%) rename meta/recipes-devtools/go/{go-cross_1.18.2.bb => go-cross_1.18.3.bb} (100%) rename meta/recipes-devtools/go/{go-crosssdk_1.18.2.bb => go-crosssdk_1.18.3.bb} (100%) rename meta/recipes-devtools/go/{go-native_1.18.2.bb => go-native_1.18.3.bb} (100%) rename meta/recipes-devtools/go/{go-runtime_1.18.2.bb => go-runtime_1.18.3.bb} (100%) rename meta/recipes-devtools/go/{go_1.18.2.bb => go_1.18.3.bb} (100%) diff --git a/meta/recipes-devtools/go/go-1.18.2.inc b/meta/recipes-devtools/go/go-1.18.3.inc similarity index 88% rename from meta/recipes-devtools/go/go-1.18.2.inc rename to meta/recipes-devtools/go/go-1.18.3.inc index 8f4f47db9e..68062952ca 100644 --- a/meta/recipes-devtools/go/go-1.18.2.inc +++ b/meta/recipes-devtools/go/go-1.18.3.inc @@ -14,4 +14,4 @@ SRC_URI += "\ file://0001-exec.go-do-not-write-linker-flags-into-buildids.patch \ file://0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ " -SRC_URI[main.sha256sum] = "2c44d03ea2c34092137ab919ba602f2c261a038d08eb468528a3f3a28e5667e2" +SRC_URI[main.sha256sum] = "0012386ddcbb5f3350e407c679923811dbd283fcdc421724931614a842ecbc2d" diff --git a/meta/recipes-devtools/go/go-binary-native_1.18.2.bb b/meta/recipes-devtools/go/go-binary-native_1.18.3.bb similarity index 83% rename from meta/recipes-devtools/go/go-binary-native_1.18.2.bb rename to meta/recipes-devtools/go/go-binary-native_1.18.3.bb index c5514c5fdf..f207a47e90 100644 --- a/meta/recipes-devtools/go/go-binary-native_1.18.2.bb +++ b/meta/recipes-devtools/go/go-binary-native_1.18.3.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" PROVIDES = "go-native" SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "e54bec97a1a5d230fc2f9ad0880fcbabb5888f30ed9666eca4a91c5a32e86cbc" -SRC_URI[go_linux_arm64.sha256sum] = "fc4ad28d0501eaa9c9d6190de3888c9d44d8b5fb02183ce4ae93713f67b8a35b" +SRC_URI[go_linux_amd64.sha256sum] = "956f8507b302ab0bb747613695cdae10af99bbd39a90cae522b7c0302cc27245" +SRC_URI[go_linux_arm64.sha256sum] = "beacbe1441bee4d7978b900136d1d6a71d150f0a9bb77e9d50c822065623a35a" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P\d+(\.\d+)+)\.linux" diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.18.2.bb b/meta/recipes-devtools/go/go-cross-canadian_1.18.3.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross-canadian_1.18.2.bb rename to meta/recipes-devtools/go/go-cross-canadian_1.18.3.bb diff --git a/meta/recipes-devtools/go/go-cross_1.18.2.bb b/meta/recipes-devtools/go/go-cross_1.18.3.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross_1.18.2.bb rename to meta/recipes-devtools/go/go-cross_1.18.3.bb diff --git a/meta/recipes-devtools/go/go-crosssdk_1.18.2.bb b/meta/recipes-devtools/go/go-crosssdk_1.18.3.bb similarity index 100% rename from meta/recipes-devtools/go/go-crosssdk_1.18.2.bb rename to meta/recipes-devtools/go/go-crosssdk_1.18.3.bb diff --git a/meta/recipes-devtools/go/go-native_1.18.2.bb b/meta/recipes-devtools/go/go-native_1.18.3.bb similarity index 100% rename from meta/recipes-devtools/go/go-native_1.18.2.bb rename to meta/recipes-devtools/go/go-native_1.18.3.bb diff --git a/meta/recipes-devtools/go/go-runtime_1.18.2.bb b/meta/recipes-devtools/go/go-runtime_1.18.3.bb similarity index 100% rename from meta/recipes-devtools/go/go-runtime_1.18.2.bb rename to meta/recipes-devtools/go/go-runtime_1.18.3.bb diff --git a/meta/recipes-devtools/go/go_1.18.2.bb b/meta/recipes-devtools/go/go_1.18.3.bb similarity index 100% rename from meta/recipes-devtools/go/go_1.18.2.bb rename to meta/recipes-devtools/go/go_1.18.3.bb From patchwork Tue Jun 21 20:16:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 9439 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 9E3A4CCA486 for ; Tue, 21 Jun 2022 20:16:56 +0000 (UTC) Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by mx.groups.io with SMTP id smtpd.web08.48530.1655842615956589455 for ; Tue, 21 Jun 2022 13:16:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=H6JhYzWY; spf=pass (domain: gmail.com, ip: 209.85.218.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f46.google.com with SMTP id o7so29864954eja.1 for ; Tue, 21 Jun 2022 13:16:55 -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=rhpMGdwIXdZFTVXIBOCqEq43GofCswaJmbVG9NNx6CU=; b=H6JhYzWYQ9vCuZ7efbQ4ZuqpQnw087FZo9dWcY1pYg4uiHNz2o0KNzMYMdDDKQ96Jh i+wAHCejLGMgVKoJwHjWRR/tjcAhDrvd0owDB+4+lmaXxBFDLJhLRNl3JV0XJZgvv7kb yc97PagEU/LbcBYMmF9+aEUgSDRQamCvm5PVJW2JXugmUClJ0bUHJ1lqTSwaaPOudP+p LDBlISsB+reYg7nCtiDalUrktSQ0YZYg3v0EGH6GAikLM9jthhT/CdjBzL8I78z6MdbA +SAHeQUjuYQgSrvxizXrKNIc4f+GfMCzwzoWVE3GNtPwo3GgJIiTKF3Edy/8W77wmI1r hXZw== 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=rhpMGdwIXdZFTVXIBOCqEq43GofCswaJmbVG9NNx6CU=; b=m1dJkH18OqgxFB/6ACXiUc9GMXW8CENf0J9ImtA9LWOgJOxYFmCH7/dRAmjUekiE1U QAgkO9T8RJzSFbpewEvLjOK18PSld1UN/aHWXSylD4njs0KhBH8o5+Yr1a58n3NbUjEh q6gcFOWhryT2rV35mXUxHk4wsdaGplTadlGU4wIbWiZzuS3BtOOmdYBtE+6U2hrrU43K BF/MxzMB5705C0Ze6zW3QG2IfHHuReqa8dTx1DwxNjjCyjA6bhi0Yo/J9YMCa3yG/ubW AZZRg+vVVeRlnMAcwMkMjWeVlEQ7thOrYItvATXTKLkcl+NxWwZswo2slzYrynaTw/lC sxng== X-Gm-Message-State: AJIora8xK8Y1TahHAJ3XfUwyhfdPQRTFke2ScBJXJvXPTbA/IIWxn6G5 LUsWImp0Qrm8OzqQY+NmoOD5VIZwVOpPcA== X-Google-Smtp-Source: AGRyM1vksfrbtk7XwswpcL3ZP7rnfm04cJrv6kaJ6s2hyey99jlzITl31Wp3htqU5USQWcTyWdUKww== X-Received: by 2002:a17:906:b048:b0:6fe:be4a:3ecf with SMTP id bj8-20020a170906b04800b006febe4a3ecfmr27810307ejb.104.1655842614486; Tue, 21 Jun 2022 13:16:54 -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 j8-20020a056402238800b0043590660f16sm3420890eda.35.2022.06.21.13.16.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 13:16:54 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 09/18] ell: update 0.50 -> 0.51 Date: Tue, 21 Jun 2022 22:16:28 +0200 Message-Id: <20220621201637.1378306-9-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220621201637.1378306-1-alex@linutronix.de> References: <20220621201637.1378306-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 ; Tue, 21 Jun 2022 20:16:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167177 Signed-off-by: Alexander Kanavin --- ...-fix-time.h-related-breakage-on-musl.patch | 79 +++++++++++++++++++ .../ell/{ell_0.50.bb => ell_0.51.bb} | 3 +- 2 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/ell/ell/0001-build-fix-time.h-related-breakage-on-musl.patch rename meta/recipes-core/ell/{ell_0.50.bb => ell_0.51.bb} (82%) diff --git a/meta/recipes-core/ell/ell/0001-build-fix-time.h-related-breakage-on-musl.patch b/meta/recipes-core/ell/ell/0001-build-fix-time.h-related-breakage-on-musl.patch new file mode 100644 index 0000000000..02b5a9f21e --- /dev/null +++ b/meta/recipes-core/ell/ell/0001-build-fix-time.h-related-breakage-on-musl.patch @@ -0,0 +1,79 @@ +From cd9513a025174181b66ac13de45813f6e15727d3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=2E=20Stani=C4=87?= +Date: Mon, 6 Jun 2022 22:05:39 +0200 +Subject: [PATCH] build: fix time.h related breakage on musl + +missing time.h for struct timeval usage +forward declaration of struct timeval in time-private.h + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin +--- + ell/dhcp-transport.c | 1 + + ell/dhcp6-transport.c | 1 + + ell/icmp6.c | 1 + + ell/time-private.h | 2 +- + ell/time.c | 1 + + 5 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/ell/dhcp-transport.c b/ell/dhcp-transport.c +index ef030de..c4cf0ca 100644 +--- a/ell/dhcp-transport.c ++++ b/ell/dhcp-transport.c +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + #include "io.h" + #include "util.h" +diff --git a/ell/dhcp6-transport.c b/ell/dhcp6-transport.c +index 30c425f..5ff6516 100644 +--- a/ell/dhcp6-transport.c ++++ b/ell/dhcp6-transport.c +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + + #include "private.h" + #include "missing.h" +diff --git a/ell/icmp6.c b/ell/icmp6.c +index 368977f..7319903 100644 +--- a/ell/icmp6.c ++++ b/ell/icmp6.c +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + #include "private.h" + #include "useful.h" +diff --git a/ell/time-private.h b/ell/time-private.h +index 5295d94..83c23dd 100644 +--- a/ell/time-private.h ++++ b/ell/time-private.h +@@ -19,7 +19,7 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ +- ++struct timeval; + uint64_t _time_pick_interval_secs(uint32_t min_secs, uint32_t max_secs); + uint64_t _time_fuzz_msecs(uint64_t ms); + uint64_t _time_fuzz_secs(uint32_t secs, uint32_t max_offset); +diff --git a/ell/time.c b/ell/time.c +index 10e10b0..41e5725 100644 +--- a/ell/time.c ++++ b/ell/time.c +@@ -26,6 +26,7 @@ + + #define _GNU_SOURCE + #include ++#include + + #include "time.h" + #include "time-private.h" diff --git a/meta/recipes-core/ell/ell_0.50.bb b/meta/recipes-core/ell/ell_0.51.bb similarity index 82% rename from meta/recipes-core/ell/ell_0.50.bb rename to meta/recipes-core/ell/ell_0.51.bb index 243ac01530..806833bc7d 100644 --- a/meta/recipes-core/ell/ell_0.50.bb +++ b/meta/recipes-core/ell/ell_0.51.bb @@ -15,8 +15,9 @@ DEPENDS = "dbus" inherit autotools pkgconfig SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz \ + file://0001-build-fix-time.h-related-breakage-on-musl.patch \ " -SRC_URI[sha256sum] = "0fe51d51c6eddc2a2784092f1dfdd1143a5ef27f15c274ecfbadd680d3a72fd9" +SRC_URI[sha256sum] = "ba86cfa4aaf10151443edd63a7687914465d969f5dda00a2c1fcb11bd85e417f" do_configure:prepend () { mkdir -p ${S}/build-aux From patchwork Tue Jun 21 20:16:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 9443 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 89ED4CCA47E for ; Tue, 21 Jun 2022 20:17:06 +0000 (UTC) Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by mx.groups.io with SMTP id smtpd.web12.48354.1655842616604057683 for ; Tue, 21 Jun 2022 13:16:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=H0voNW1f; spf=pass (domain: gmail.com, ip: 209.85.208.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f48.google.com with SMTP id eq6so13574749edb.6 for ; Tue, 21 Jun 2022 13:16:56 -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=eE2t4hGrkGJifTHjmcLA3zqse20uLdz0JPEz7sUQHfQ=; b=H0voNW1fvX8kmeK44LKi6gxeNB2AwxkiQwSPPQKfb0L1NhYkihv/Sl7A0/xd5oTzAb KShlE9QUXs5jW4I3sOgPkvtMYEEC0P9dc+2W1Km6zzfl+ErS56C2CPahm5IVyI7AdqIa ZrxNFGNsec6F/EBGhzoVJhhS2ImXFo+TAAxL5dNrmrb+g9JZixEpNOZ7DYSawFT/hk30 MXyy7M2uiE+Oi6wF/JKlGU3PljccJuWVUtTl287HN9ar+kMVyW5iCOT+JuTiI2GNVI1A 9ZLm7IqOwWngydXggB+AO4wlWItb4ICArr+Fk++HdmKKkR3mEtk1oEU9mXI9Huw9ugL0 YULQ== 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=eE2t4hGrkGJifTHjmcLA3zqse20uLdz0JPEz7sUQHfQ=; b=0qcro6bq7STqhhP9fS/9mgV0wyHpxc3f0gjxcthySRBSQahGaBsJ6V6qrBr6kfodkL Fye6khMdLGSIcAdASZm/gZg9stCD6+VfhHiHsDBOY1W2NQJ+n1oYyIbk65ZK1/UcRYD4 B2slH/Maz43Hs2t9ef+ukqNi5B0Nfhkx8blTYXiWJ52jsdod6d41/LJOiSdVAhItCchZ 9hvwRrwiGiYnHgIBH/xTqWY1ulKxZ3iwp35Svq2mOtfv3f4SCwJai9UYyfDw1sVY+F/i X3F23l0246NoyoViWKs7wfarvQD8M2Po3tkv2EA1WYSfqNvQysan7acHnaBZ18FECe65 /l1Q== X-Gm-Message-State: AJIora+cNmvOSu3vbzenmUy0c/u60+dQvsHR/J7DIV0QgO86mNL1wPzL JJY948CjtXLKtYN6CNL2NnYCCl2hN2K63w== X-Google-Smtp-Source: AGRyM1t1hlzdRGxp7TAMLf7FiehK3edVu1B/LR0TX7I2o+CwtZ9EIILhYY1BcpqT+YB+VhYtilucjA== X-Received: by 2002:aa7:cb83:0:b0:435:9170:8e3b with SMTP id r3-20020aa7cb83000000b0043591708e3bmr7768956edt.144.1655842615238; Tue, 21 Jun 2022 13:16:55 -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 j8-20020a056402238800b0043590660f16sm3420890eda.35.2022.06.21.13.16.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 13:16:54 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 10/18] libdrm: update 2.4.110 -> 2.4.111 Date: Tue, 21 Jun 2022 22:16:29 +0200 Message-Id: <20220621201637.1378306-10-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220621201637.1378306-1-alex@linutronix.de> References: <20220621201637.1378306-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 ; Tue, 21 Jun 2022 20:17:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167178 libkms option dropped by upstream. Signed-off-by: Alexander Kanavin --- .../drm/{libdrm_2.4.110.bb => libdrm_2.4.111.bb} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename meta/recipes-graphics/drm/{libdrm_2.4.110.bb => libdrm_2.4.111.bb} (91%) diff --git a/meta/recipes-graphics/drm/libdrm_2.4.110.bb b/meta/recipes-graphics/drm/libdrm_2.4.111.bb similarity index 91% rename from meta/recipes-graphics/drm/libdrm_2.4.110.bb rename to meta/recipes-graphics/drm/libdrm_2.4.111.bb index dd775939a5..17b737c556 100644 --- a/meta/recipes-graphics/drm/libdrm_2.4.110.bb +++ b/meta/recipes-graphics/drm/libdrm_2.4.111.bb @@ -13,12 +13,11 @@ DEPENDS = "libpthread-stubs" SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.xz \ " -SRC_URI[sha256sum] = "eecee4c4b47ed6d6ce1a9be3d6d92102548ea35e442282216d47d05293cf9737" +SRC_URI[sha256sum] = "1ad7164f77424de6f4ecba7c262bde196a214c6e19a6fbf497f0815f4d7ab2a9" inherit meson pkgconfig manpages -PACKAGECONFIG ??= "libkms intel radeon amdgpu nouveau vmwgfx omap freedreno vc4 etnaviv install-test-programs" -PACKAGECONFIG[libkms] = "-Dlibkms=true,-Dlibkms=false" +PACKAGECONFIG ??= "intel radeon amdgpu nouveau vmwgfx omap freedreno vc4 etnaviv install-test-programs" PACKAGECONFIG[intel] = "-Dintel=true,-Dintel=false,libpciaccess" PACKAGECONFIG[radeon] = "-Dradeon=true,-Dradeon=false" PACKAGECONFIG[amdgpu] = "-Damdgpu=true,-Damdgpu=false" From patchwork Tue Jun 21 20:16:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 9447 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 9EB18CCA473 for ; Tue, 21 Jun 2022 20:17:06 +0000 (UTC) Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by mx.groups.io with SMTP id smtpd.web12.48355.1655842617405100590 for ; Tue, 21 Jun 2022 13:16:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=iggcydGJ; spf=pass (domain: gmail.com, ip: 209.85.208.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f45.google.com with SMTP id e40so8360810eda.2 for ; Tue, 21 Jun 2022 13:16:57 -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=ToLno+E8kKCpiSNpuM67x9nGlPsZGIREC4Btgpkcj3g=; b=iggcydGJCPi1aAnEGgNqH81yJn/EmSJcrQpuIIhEWnkWpd52NxfnbPIoHs48sm4azx MDq3io5v3nYIaeAH+JZF9ZaU8Xljq4v/oERDjYGesa2RxheBJGkVDSRO+bK9r5/3UiaI ax6O4DtQVtWvc5+Y22G8sE1H7mg8UXsA4OHphAGY5ZASLYIPrXoPMR5W0SKFjQ80PWMs dJeLM7X4XK3JbW5bXA1bFQL0jl+I9EVQIdRAbdSYQYSSge6RAKrvdTZAU4jzQNsGKkXM BDdbkyLcyhbex2qiR97m4nU0FcwBKTPpXZWsfB+IVgCdDXC9Mf3hel/FPPSmJkkHujhe OFBA== 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=ToLno+E8kKCpiSNpuM67x9nGlPsZGIREC4Btgpkcj3g=; b=tkI7kKratxNRu+HLxHTsCJqnmH1JkQyCYJwURaJ7UQytbJ4oG8gUFLNsfxJA4p5ebi /9p46paqVai4CItsL6G9WLlo2fg+q9oFWWlsgi2AGcAxEL2nzvV5YlIa+b1fOxR1oe6B 5Nbr/j9QsRH1oemNSKnAxGOasNSUYXzO8D2EMRhAFNS2fH9N3kccKgfC8MkP4lhSSUvE u8BnDSw3/+a4vloZu6/+kJrcSpegGDf/MHJoLkUceW3Oif6KJ+p2T3tV/FUC7VfVs5fr oC2SDi8naZJU8wt1KqdVoRhnBjjT5iuT43N9IvpQqmFq1WVtnNuh7c+B1xbCZ7oM97tr dOHA== X-Gm-Message-State: AJIora/eY5DdWpU/bs3s0P7Tb0/bsqlH+E5Qq6MF4GK6bwgAJpIGuR4+ rWyJ+CiX6wAovkzi/Jz9oACzBQNjesOV/w== X-Google-Smtp-Source: AGRyM1s3sH6exF3C2mMEVpNzHP/lhMdQTXDdKsBKAFV4PhbsxgadUpdy5s/Of/rKIs0AyOsAEC60pg== X-Received: by 2002:a05:6402:278e:b0:431:73ab:49b9 with SMTP id b14-20020a056402278e00b0043173ab49b9mr37411274ede.415.1655842615955; Tue, 21 Jun 2022 13:16:55 -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 j8-20020a056402238800b0043590660f16sm3420890eda.35.2022.06.21.13.16.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 13:16:55 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 11/18] diffoscope: upgrade 215 -> 216 Date: Tue, 21 Jun 2022 22:16:30 +0200 Message-Id: <20220621201637.1378306-11-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220621201637.1378306-1-alex@linutronix.de> References: <20220621201637.1378306-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 ; Tue, 21 Jun 2022 20:17:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167179 Signed-off-by: Alexander Kanavin --- .../diffoscope/{diffoscope_215.bb => diffoscope_216.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/diffoscope/{diffoscope_215.bb => diffoscope_216.bb} (92%) diff --git a/meta/recipes-support/diffoscope/diffoscope_215.bb b/meta/recipes-support/diffoscope/diffoscope_216.bb similarity index 92% rename from meta/recipes-support/diffoscope/diffoscope_215.bb rename to meta/recipes-support/diffoscope/diffoscope_216.bb index a61d68f7eb..87172e9512 100644 --- a/meta/recipes-support/diffoscope/diffoscope_215.bb +++ b/meta/recipes-support/diffoscope/diffoscope_216.bb @@ -12,7 +12,7 @@ PYPI_PACKAGE = "diffoscope" inherit pypi setuptools3 -SRC_URI[sha256sum] = "4754ad3356b0acc1d2ceffbfa516961a7df0a2d816cd3cce6c9d084ce54d9433" +SRC_URI[sha256sum] = "7809caabf4369a1f1dffb9fa37e247b4326aa3366cabd6ab3eb7de5cb4402c39" RDEPENDS:${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic python3-rpm" From patchwork Tue Jun 21 20:16:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 9445 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 93230CCA482 for ; Tue, 21 Jun 2022 20:17:06 +0000 (UTC) Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by mx.groups.io with SMTP id smtpd.web10.47954.1655842606808933030 for ; Tue, 21 Jun 2022 13:16:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=OfN55fZZ; spf=pass (domain: gmail.com, ip: 209.85.218.42, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f42.google.com with SMTP id pk21so6721291ejb.2 for ; Tue, 21 Jun 2022 13:16:57 -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=TA6ATqhoHJN1/t4lQEA3h5QlFKzn4rPlc8qH3HdPMd4=; b=OfN55fZZ19xN/6UrW5S7yyLf+jecNT3brDGmerdMmnUR91pHtyU3e0tLTzh/wXHrBH zWR3/lwiNmSUm/vCKnEqtEwZ6ZDwjKXHl4gjbQuV6VYCgMrqL9iDuXw27XxYZqPm7sVF uA3ULcL0un/rfooiRxZd+mtyI5j/VYZt8EXgQhrVcy6v4/944M0CXk27MGTY8C11FiJ0 DK2d51UjBzUbNzgdKzI5Qt++WOtlsV0ZVD2+k0qsaw5mJIjKdVRM80/8A4OQcUjsEAfa pbxWZdEDN8XQdTSLlMIxfioN1of97m9m6twm0Qov0qZ75sk9dDJRBRARC7D91F8NldBg Lvkw== 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=TA6ATqhoHJN1/t4lQEA3h5QlFKzn4rPlc8qH3HdPMd4=; b=g2d2Gn44sZNZoGEl4URBwd7JZGiuwAJOj2akU5v/bsDm8eWPnvFe30KHZLeerDQgJl 74mGJI3RIxbfZOYuHZv3xE6gqLiE1aI5iWh59ubPrVcbVQhQX69f5wrZyY0VQ58/X5Pr +qZbqZoNY5kdZitVB/AIUucNfv/shBrd1d8QRlj6k7AD0BhIZ26K79y2kwiKeIRC3Oes 26NWlXSD9f3SXQ/1PxhM7a4yZEx2iRXNMoV7Vi5+F0/p3Qw+yu8Xyr6EWps5Dv5QeR2l 52sqlvkgQlaXAUKHNfVAjbeGiYvKrLrxlWJDUH5V2cX4XZHG0ej6ZZ0ueGCFfO7nE61+ mJBA== X-Gm-Message-State: AJIora8qPhkCf+xvt0VzBE6+Fvk7mZOSTpI4cL8XWYpLq2hVINDDvG6b wTVk7/FQoRqE9GFD5m8IkVHtx1+l9dr54w== X-Google-Smtp-Source: AGRyM1vZQHpDuVGJEQNgztcvrQLt4Ke3PjEtD7MImcgAR3hDHLuhiEZQH3Pz2gJgUgo7Zk/MJCR9vA== X-Received: by 2002:a17:906:64c9:b0:722:e8ca:f929 with SMTP id p9-20020a17090664c900b00722e8caf929mr1988982ejn.675.1655842616813; Tue, 21 Jun 2022 13:16:56 -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 j8-20020a056402238800b0043590660f16sm3420890eda.35.2022.06.21.13.16.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 13:16:56 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 12/18] dos2unix: upgrade 7.4.2 -> 7.4.3 Date: Tue, 21 Jun 2022 22:16:31 +0200 Message-Id: <20220621201637.1378306-12-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220621201637.1378306-1-alex@linutronix.de> References: <20220621201637.1378306-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 ; Tue, 21 Jun 2022 20:17:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167180 License-Update: copyright years Signed-off-by: Alexander Kanavin --- .../dos2unix/{dos2unix_7.4.2.bb => dos2unix_7.4.3.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/dos2unix/{dos2unix_7.4.2.bb => dos2unix_7.4.3.bb} (88%) diff --git a/meta/recipes-support/dos2unix/dos2unix_7.4.2.bb b/meta/recipes-support/dos2unix/dos2unix_7.4.3.bb similarity index 88% rename from meta/recipes-support/dos2unix/dos2unix_7.4.2.bb rename to meta/recipes-support/dos2unix/dos2unix_7.4.3.bb index 509a0a0ddc..0d71c38bd1 100644 --- a/meta/recipes-support/dos2unix/dos2unix_7.4.2.bb +++ b/meta/recipes-support/dos2unix/dos2unix_7.4.3.bb @@ -6,12 +6,12 @@ HOMEPAGE = "http://waterlan.home.xs4all.nl/dos2unix.html" SECTION = "support" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=8a7c3499a1142df819e727253cd53a12" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=9641fc4af7b564646f533f3911074b7a" SRC_URI = "git://git.code.sf.net/p/dos2unix/dos2unix;branch=master" UPSTREAM_CHECK_GITTAGREGEX = "dos2unix-(?P(\d+(\.\d+)+))" -SRCREV = "72596f0ae21faa25a07a872d4843bc885475115d" +SRCREV = "dae6d4bbc42d03fabb89cde65ed89f22a165d16e" S = "${WORKDIR}/git/dos2unix" From patchwork Tue Jun 21 20:16:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 9448 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 9387EC3F2D4 for ; Tue, 21 Jun 2022 20:17:06 +0000 (UTC) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by mx.groups.io with SMTP id smtpd.web10.47958.1655842619321299712 for ; Tue, 21 Jun 2022 13:16:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Tz0x0pli; spf=pass (domain: gmail.com, ip: 209.85.208.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f46.google.com with SMTP id o9so11673810edt.12 for ; Tue, 21 Jun 2022 13:16:59 -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=+rjCXpo/UwfVhJdUh/gfjZ4KGoZQ43L/Kkbz+efjgnc=; b=Tz0x0plixrysy54zTpKjyGtN0PPLvHSQo2BtKOpL055Qr1Ec8h5AUl98srW3fQTwFD PvGJ2quFiIjD/ieKGmLT9sNkT6rM3tecNPK8OhXa/AJkxI9g++dcbeknYOunEaVBW6GF AoRFOmQyuyHrr//pIgJOio1llQ7UqiRmSxEI5Ya4bihhmxcILoBOPt9EfweGPHD3B99T FwiXUus1/pTEH2T+dcOwaVCzoTL/qAcpBdfitJ/gq/PzogAvTBdukStyOfJ/WHEPmGDQ e7P9Pw7aQaZE60v8EWvMF7BhkNisuRA9IIR414kZcFGNavmqcaC3X3zAKyCRjcbknsN2 vNdg== 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=+rjCXpo/UwfVhJdUh/gfjZ4KGoZQ43L/Kkbz+efjgnc=; b=SBdVfAB5RUkJ45psZFqF6/5bGBqBfoF1oVn0IyThuIudNXhs3yfhsfCAVtNO8fM2wJ iYc+WVEf8waCJmwuvZknJiEqScGurhdPX0dNVWMspS/aDBanfX4VDCQf+1GvwX+j4Cf/ lyW5KFibADmwkBQHd/ar1afrI2hg5nFIQ4Nm5dH2wFje0xISsX/w8bTt2ieF9QZfjT/f +IMuwIS4MpfYvCX8ds6ngbseUXXfveEsiF5CWWWghe4sAhdU94yHOP3B0TeTQnY6kg7Q oPZSkcPhcjhNBE1Ao/Ub1djSyJTBrH4dJwOt3cSDBuqZPbI/uTcIrSLwQBenH8ABOcdR tSoA== X-Gm-Message-State: AJIora+isXEfTwBP7Jao5S2nq1tCN2n9VItbn+QChpFvH7PIrBYdYwvS WIPXHGRCFyOaIrQhz8fZ+bW09YHTKnb2Aw== X-Google-Smtp-Source: AGRyM1stqrmTycgVqtyJPPaejSAqcXlxYck7MrBR/2T8jVg4KAGHqsSrpQOeBvM95hBOohtBBFxYeg== X-Received: by 2002:a05:6402:3592:b0:42d:fb03:319c with SMTP id y18-20020a056402359200b0042dfb03319cmr37028867edc.137.1655842617858; Tue, 21 Jun 2022 13:16:57 -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 j8-20020a056402238800b0043590660f16sm3420890eda.35.2022.06.21.13.16.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 13:16:57 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 13/18] librsvg: upgrade 2.54.3 -> 2.54.4 Date: Tue, 21 Jun 2022 22:16:32 +0200 Message-Id: <20220621201637.1378306-13-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220621201637.1378306-1-alex@linutronix.de> References: <20220621201637.1378306-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 ; Tue, 21 Jun 2022 20:17:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167181 Signed-off-by: Alexander Kanavin --- .../librsvg/{librsvg_2.54.3.bb => librsvg_2.54.4.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-gnome/librsvg/{librsvg_2.54.3.bb => librsvg_2.54.4.bb} (96%) diff --git a/meta/recipes-gnome/librsvg/librsvg_2.54.3.bb b/meta/recipes-gnome/librsvg/librsvg_2.54.4.bb similarity index 96% rename from meta/recipes-gnome/librsvg/librsvg_2.54.3.bb rename to meta/recipes-gnome/librsvg/librsvg_2.54.4.bb index 3578898692..cc7fb9bbdf 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.54.3.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.54.4.bb @@ -20,7 +20,7 @@ SRC_URI += "file://0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.pat file://0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch \ " -SRC_URI[archive.sha256sum] = "66158f2ef46dde260026846c4da102e4a9dd4e5293010f30949c6cc26dd6efe8" +SRC_URI[archive.sha256sum] = "ea152a243f6a43c0e036a28c70de3fcbcdea5664c6811c78592bc229ecc24833" # librsvg is still autotools-based, but is calling cargo from its automake-driven makefiles # so we cannot use cargo class directly, but still need bits and pieces from it From patchwork Tue Jun 21 20:16:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 9444 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 9371ACCA483 for ; Tue, 21 Jun 2022 20:17:06 +0000 (UTC) Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by mx.groups.io with SMTP id smtpd.web10.47954.1655842606808933030 for ; Tue, 21 Jun 2022 13:17:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=RK2SW/Du; spf=pass (domain: gmail.com, ip: 209.85.218.42, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f42.google.com with SMTP id pk21so6721291ejb.2 for ; Tue, 21 Jun 2022 13:17:00 -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=QN/bChrvXZMfdeD8E1vBj3sVjeECRK7H6eWwhooI//A=; b=RK2SW/Du7YMoOxioXSc5zXsri3QKDwEtjCFqHV5/oEQ3vFBYUPAlSDN2PgW4+VpPbk 9ixsDKxVCnnjprvjtvr8J/y1cKK4afX/k9smmJDm7uYHVBPVRc6bAgZO5NmahKUZ6Xpx z5bvkF1/tuHNgX9N5w8Ttst/YEeXyfzgo3x7dXaIEw4tQM3vb4qRiyTymkO8Ilrr4C7D 8CBvv17+AiTuW8yQKKIyK4WaBvUv5O0KcsHJ2M1g7wl8yjglxKL0Lz7bTzMMc8AhntvF zNfhaFYDaBxmjlfoU6KmxiD04dR4dU05KL2eDp6JUHXuAvl3Twhfdw9NE0F7z5ds1TZ3 FtPg== 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=QN/bChrvXZMfdeD8E1vBj3sVjeECRK7H6eWwhooI//A=; b=qMcoyeKWzTdQ9AbYPugdEsTaw1SzWznTgQkcKrXOVF+yFt/Y0MxDF2SDokZJt5WgZO BRjSWHgC57g0PQ6V3PfTxgEECAr51im2o7cDcXoEkJQvzbzA6bzc2UFz4U+zUedTaBbF HffvC823iifzkZQNdZW52hKWOGNC8+zsjbulMwPJQEUsIAEC8ZRB8odIWAa5ffX8qBDt nA3L7U05FcM9err3lWy1oVVh8Xtb/NSK/jBy6zXy4aQDI2sSR9NkU4b+NzaCo3KykP4c I9o9ulSVaU7qAKQjY0EAgZxOxdxXlsOTMg0ygbAz8Go1no3f1caL1rkwApLqFQ6UjDRs J+0g== X-Gm-Message-State: AJIora9d1ILPBS7Dx9MLdwUpi7H31C0PfkNoxWtkpmLrlbNXxeAIPmtX If+NvGK5tI9MP/V/d3OELSFC3hI6IE1j0w== X-Google-Smtp-Source: AGRyM1uTiMm2FTdcLhhP4ZXE9Q+9+uSIOozVXWslyYwBdPYc5aov9cEmv8s+CQutvsbpmQCKWe48LQ== X-Received: by 2002:a17:907:8a13:b0:707:194c:30df with SMTP id sc19-20020a1709078a1300b00707194c30dfmr28087819ejc.154.1655842620259; Tue, 21 Jun 2022 13:17:00 -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 j8-20020a056402238800b0043590660f16sm3420890eda.35.2022.06.21.13.16.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 13:16:59 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 14/18] puzzles: upgrade to latest revision Date: Tue, 21 Jun 2022 22:16:33 +0200 Message-Id: <20220621201637.1378306-14-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220621201637.1378306-1-alex@linutronix.de> References: <20220621201637.1378306-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 ; Tue, 21 Jun 2022 20:17:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167182 Signed-off-by: Alexander Kanavin --- meta/recipes-sato/puzzles/puzzles_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb index 6f038cc475..94912bee60 100644 --- a/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/meta/recipes-sato/puzzles/puzzles_git.bb @@ -10,7 +10,7 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "git://git.tartarus.org/simon/puzzles.git;branch=main" UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "c43a34fbfe430d235bafc379595761880a19ed9f" +SRCREV = "387d323dd8d579db2c90b499b3b19f746cbdbce5" PE = "2" PV = "0.0+git${SRCPV}" From patchwork Tue Jun 21 20:16:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 9446 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 86C18C43334 for ; Tue, 21 Jun 2022 20:17:06 +0000 (UTC) Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by mx.groups.io with SMTP id smtpd.web09.48618.1655842623824846966 for ; Tue, 21 Jun 2022 13:17:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=cK4DYdGU; spf=pass (domain: gmail.com, ip: 209.85.208.53, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f53.google.com with SMTP id eo8so20961664edb.0 for ; Tue, 21 Jun 2022 13:17:03 -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=vdnIcQLYUJF2fdxFVdg+WgQ+NqAzOPNm9xXq++6pH/s=; b=cK4DYdGUKX2OsWHjsF3sYuUMvSVc8Hkp4npZmeQ+DLk0HNejvvJ/FXIkEaA28UGAbt 40/kZrem0Y2M+74HvM6BXRvJ+pwY1FaAmCJ+gU5s779poncrWjqqdqasD4A/45nH6mUN ++lcpfyNegWcvTGceX+tK1p8u+mFBEd3hOGwsm+SxOSStjKS3N10aIxtPhgzJyE9BAlG W0Ko0GPIJJeeGbshNrUTF4ErtlVbWjuykLNu7E5EWHmgTDlcmsr6Jy5mNTSQuNeGDTd9 n+sBt0gEMZ2TCY+K18illR+n91Y/lkWbt9URl9Vmynfx5JZXzeP4+3AaCnrn0PGsZnp4 3Xjw== 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=vdnIcQLYUJF2fdxFVdg+WgQ+NqAzOPNm9xXq++6pH/s=; b=Ksaz5Z0IHfCDVPrwzaFSLjIZrNF2WZpSCGS+6HK6dKFisN0AIRk55MaOOshHeFFsh9 WxbVb2wovOrFuEALN6bcTcnT22BAuAGbOfrIxALgL9cb2SnyUYoaQ8AN68ZjOIDdrMXf Y8zYjnbR2MCVstGKKTrFOoDUTdY6FEc1npFjzwRI2AFCWTeredq07L8G0M7YCnc3MZG6 ZUKr1BgEmkYQ+w8XcuSwRWvWESP+QjyAsV4wL73xqSVc/CP+CrlsLLjXuBzxS4lNxLL+ 0LSPQUmUOzrqHOy0JlobDETUI3c2uHXxP82MJ1llV8z5+/WoVxRyAB0plkNrpCDL94uJ JbbA== X-Gm-Message-State: AJIora8IDv0m5j4s+uCyAz4OAy8M/F/4Bab06kLxab34nwv3R6N9cOiD e20HRzBytnqzfV86GjCSQp2ZM9Y6eMiuiw== X-Google-Smtp-Source: AGRyM1shPMQqCcOaconvLJ1zfC35i/1Ar0ZOKwkYZ5SRoEZz6nndXcOtM51+ZAqO268w4PAN5/oHMg== X-Received: by 2002:a05:6402:50c7:b0:435:923b:9b23 with SMTP id h7-20020a05640250c700b00435923b9b23mr7651584edb.336.1655842622362; Tue, 21 Jun 2022 13:17:02 -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 j8-20020a056402238800b0043590660f16sm3420890eda.35.2022.06.21.13.17.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 13:17:01 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 15/18] sudo: upgrade 1.9.10 -> 1.9.11p2 Date: Tue, 21 Jun 2022 22:16:34 +0200 Message-Id: <20220621201637.1378306-15-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220621201637.1378306-1-alex@linutronix.de> References: <20220621201637.1378306-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 ; Tue, 21 Jun 2022 20:17:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167183 Signed-off-by: Alexander Kanavin --- meta/recipes-extended/sudo/{sudo_1.9.10.bb => sudo_1.9.11p2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-extended/sudo/{sudo_1.9.10.bb => sudo_1.9.11p2.bb} (96%) diff --git a/meta/recipes-extended/sudo/sudo_1.9.10.bb b/meta/recipes-extended/sudo/sudo_1.9.11p2.bb similarity index 96% rename from meta/recipes-extended/sudo/sudo_1.9.10.bb rename to meta/recipes-extended/sudo/sudo_1.9.11p2.bb index aa0d814ed7..b3eae4a0fa 100644 --- a/meta/recipes-extended/sudo/sudo_1.9.10.bb +++ b/meta/recipes-extended/sudo/sudo_1.9.11p2.bb @@ -8,7 +8,7 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[sha256sum] = "44a1461098e7c7b8e6ac597499c24fb2e43748c0c139a8b4944e57d1349a64f4" +SRC_URI[sha256sum] = "a21918eb9fc0063794f6887464fa2d924ab6d192e19063191a429605c22791d2" DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" From patchwork Tue Jun 21 20:16:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 9442 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 89EA7C433EF for ; Tue, 21 Jun 2022 20:17:06 +0000 (UTC) Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by mx.groups.io with SMTP id smtpd.web12.48352.1655842612433487191 for ; Tue, 21 Jun 2022 13:17:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=kd9x898Z; spf=pass (domain: gmail.com, ip: 209.85.218.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f54.google.com with SMTP id h23so29787086ejj.12 for ; Tue, 21 Jun 2022 13:17:04 -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=hhUHxddf3/je86wjbrSnK+VYORDqsCep2CqIPgXjrYQ=; b=kd9x898ZUEWQfapV57V3mITorijsWn3ifAymwafhZxQBHTBZO4WEZR5/CTZJ8M6pI1 eaA7tlpe9BjH46TBYWqNLY9/sfimZMjCnRv85vPMqQs4p7gEYFAw52SGJPeEKu5cWR5s Fgn9fBUpJeav/BIa8b5eB7pAhI+S5PnQqIRmRcHCftOlgsd6zwFjc96808EPewmk3ebl TeuiLZ8OodP1DFELKVX60Z8TzksAOftIo5Tt5J0TRYdblaP2NN1fZTVTpAvNdqi8etGS k48FdgxhFtpgNmpvMj+LmnrLPwsgKXHG0yRS6+UCcg8KmX9OHjW0NwhDkF3gomll9IaQ ASJQ== 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=hhUHxddf3/je86wjbrSnK+VYORDqsCep2CqIPgXjrYQ=; b=JRQC+r78SCLrPdd3rhkFeHomUkW69mcLujAxjMwZM5KTAYqvrBpr1ABf+wGtKuW/+c t8fhwJnB6sK++K0ZL+X1sPRTldZ5jf9tvRTbKN6JnY01CpeIAnT3dfpDuHTlSNJ0110R k7AT4/NFufcuvJCApDLRYO6SjAJKhz0WaCPWafzrn56R+3rt0xvG5mbrkr4hInsjoJVy 2KEL1VzxbVkjlkTR8DCCKk5FVoW71dh880/vCjGic+wBXXXA9oP3OZNgm8hCQmF/suG4 9bdxEbb9+t5RmMrO/A8PZblHiwQTpL84CN5kTEBM8YHyA2f5ohEijOLWoek12T6GUrxR lBHQ== X-Gm-Message-State: AJIora+vY/yp5wEMCdVto2oQGNT9WA9/CwnXb4ZyKqmWNYfTOzHXE2dl HVUOCASgyvoZ/PbcxoahXiI3Z1QEdByLOg== X-Google-Smtp-Source: AGRyM1vCHv5wTDDiLD59eAigXgUIB5GMgkbFY4r/uBB1yelCe95BiFU1tWlsU6cFrKyrw1ixhhcqpQ== X-Received: by 2002:a17:907:6eab:b0:722:dbb8:8e2 with SMTP id sh43-20020a1709076eab00b00722dbb808e2mr7061307ejc.746.1655842624510; Tue, 21 Jun 2022 13:17:04 -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 j8-20020a056402238800b0043590660f16sm3420890eda.35.2022.06.21.13.17.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 13:17:04 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 16/18] wireless-regdb: upgrade 2022.04.08 -> 2022.06.06 Date: Tue, 21 Jun 2022 22:16:35 +0200 Message-Id: <20220621201637.1378306-16-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220621201637.1378306-1-alex@linutronix.de> References: <20220621201637.1378306-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 ; Tue, 21 Jun 2022 20:17:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167184 Signed-off-by: Alexander Kanavin --- ...ireless-regdb_2022.04.08.bb => wireless-regdb_2022.06.06.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2022.04.08.bb => wireless-regdb_2022.06.06.bb} (94%) diff --git a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.04.08.bb b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.06.06.bb similarity index 94% rename from meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.04.08.bb rename to meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.06.06.bb index cd42039680..2eba4f873b 100644 --- a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.04.08.bb +++ b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.06.06.bb @@ -5,7 +5,7 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz" -SRC_URI[sha256sum] = "884ba2e3c1e8b98762b6dc25ff60b5ec75c8d33a39e019b3ed4aa615491460d3" +SRC_URI[sha256sum] = "ac00f97efecce5046ed069d1d93f3365fdf994c7c7854a8fc50831e959537230" inherit bin_package allarch From patchwork Tue Jun 21 20:16:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 9449 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 9257CC43334 for ; Tue, 21 Jun 2022 20:17:16 +0000 (UTC) Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by mx.groups.io with SMTP id smtpd.web10.47965.1655842627315424022 for ; Tue, 21 Jun 2022 13:17:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=p+rMXyen; spf=pass (domain: gmail.com, ip: 209.85.208.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f41.google.com with SMTP id c13so16436679eds.10 for ; Tue, 21 Jun 2022 13:17:07 -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=QduIpIy53ETnQqVcGeRHpzNrnu6QxnzJGEQMx50voME=; b=p+rMXyenhZtL4eurwzJRcOSYt60u8RUmKAxjZ5vE3o5fWNe0F+0KdcfJW0pSlpggVY mnHcwLoMDGJW7wz43hbYFNkt16ds2+BO3hfSSZT4Mnr8EbluSIg4KItmdvNqQELypWHC pEgKWwaYIYXx56Ssc+C+OMVSXdp50Eel8WuNOShraOqgSAsolGLsyA47XDieYLRKJQ10 eP2X4HhwdsvzTQ4nYSIF6XgwL33Xz7bmrhw4QhcXdVAtoW8P3qfbdtRV9Sa3b9RpyfIe E47R6n165oq7zLPzp3VOjkbuUIQ/5Eva8kKzk8H1oU/Zi2oRk+MXXrr/qpG5zQnWf2L4 W2Cw== 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=QduIpIy53ETnQqVcGeRHpzNrnu6QxnzJGEQMx50voME=; b=zo5MCLrgTUKkmqnvEFF2J/olWjgo3Zk+NWzYDT3pBgVXCs0F2b0pwAzPQXPQ6nEuAF beqTyTxNWH7KnZhVjdllROor/hM9lD1d7P4hVmT+I8DJC/EstFgy4El7J0vu0Xt/Mtdy eArulhiPRgcVRfOTzohoE8tmw3gz8LuVySaOU8yNmfvFmgkBjDFznoG9tUJdUPHPr3ab tw/FDMEJmv5EUB6aKw3aTxnvmGnAzj5pN7MsbMXES+wodrZv352VxLQfd0Jyrkq/JgsC /m44YoD7LWY5thd81yVLD+VGfJ5G7SHkCzGimt5iAuq2tMmvQHUYWIMxnlnzpY6Azao3 JFIQ== X-Gm-Message-State: AJIora/3ya1+EthjzNV2lsUhz4EEqV7tJf92bJyl8xbiFypUU+rrDS/D vSuBEkco/G7SrncFsl4RnRXOwSMo6KSoug== X-Google-Smtp-Source: AGRyM1vNW20rcst+uhUt79YNUjTP+3adMRK7JmBYr5jF14Wj+slftTWZhv8GAemNUc91sSKM5xW+Yw== X-Received: by 2002:a05:6402:11c7:b0:42e:c47a:ffdf with SMTP id j7-20020a05640211c700b0042ec47affdfmr37367778edw.113.1655842625958; Tue, 21 Jun 2022 13:17:05 -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 j8-20020a056402238800b0043590660f16sm3420890eda.35.2022.06.21.13.17.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 13:17:05 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 17/18] x264: upgrade to latest revision Date: Tue, 21 Jun 2022 22:16:36 +0200 Message-Id: <20220621201637.1378306-17-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220621201637.1378306-1-alex@linutronix.de> References: <20220621201637.1378306-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 ; Tue, 21 Jun 2022 20:17:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167185 Signed-off-by: Alexander Kanavin --- meta/recipes-multimedia/x264/x264_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb index 51ae9d1179..2ac2b6f1a6 100644 --- a/meta/recipes-multimedia/x264/x264_git.bb +++ b/meta/recipes-multimedia/x264/x264_git.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/mirror/x264;branch=stable;protocol=https \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "5db6aa6cab1b146e07b60cc1736a01f21da01154" +SRCREV = "baee400fa9ced6f5481a728138fed6e867b0ff7f" PV = "r3039+git${SRCPV}" From patchwork Tue Jun 21 20:16:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 9450 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 96F1FC433EF for ; Tue, 21 Jun 2022 20:17:16 +0000 (UTC) Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by mx.groups.io with SMTP id smtpd.web08.48527.1655842613447796271 for ; Tue, 21 Jun 2022 13:17:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=G8qGT/1o; spf=pass (domain: gmail.com, ip: 209.85.218.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f54.google.com with SMTP id sb34so785820ejc.11 for ; Tue, 21 Jun 2022 13:17:07 -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=ZJR5Qn08cdn8uFFMP5KXOsafcJNNZyqizLp/p4+n6Io=; b=G8qGT/1oOjryLDNMYiOwH4RobyK0Aj8xPaSOPAbaz5+HPyKN0PcJqzWopBeCZEzzlB CWRlqVi4ouIG7/SN5eiGuIk7Mx0re3s0ncV/8Wgfa4wRiDXL66BXqlcRG18TVRO4PY1t CA9MWArp4/lxp4LPtwItDcW7AFAnaNQ66gy0NXuC0QIxRD2/6LjBYAk0ImCF7coKuYi4 CDey5LyAI8SArmHbD5Z+aiXU9i5LM097W64VbbonwRUgri2y7w9MXphguuEbUBfUZPmY bCrl1J5QYucEb3r9wv/xV2+75sXun0qsSm46fIu9nTIQobbjIIAavBnaEB6r5VDzxBui ebmw== 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=ZJR5Qn08cdn8uFFMP5KXOsafcJNNZyqizLp/p4+n6Io=; b=20khTNVVO1UQx6s7XmxHmMJl5ozWRD6A2A989ivp93x7v9gCY7ZgD6ZQwbS7rdALb2 oB+mfNqIv4dcQMvXgqYGRjVawzvs16eO5mixTxyVq/FH3RLV1wz2kMlncsGCvGetFzmM 9l7CuFWlHryUGQDUqu8DkOeTtY9UfLNeY7NgmfJYG6xT2HYk+XQflzSpuUm7pngJcb2K 3PDJkuagih+WYzyza42KY1kQmM/ekBS7dn6PKYQhUQnL/3HxlMr8+Ir9J9YAj/hCngB5 9o6Ilat5Uc/lIaCnrXIiFX8gV+4LlWTjKWbclRcqSESZ3ou4M54KDCU8x3uWwUZN9jut KBMA== X-Gm-Message-State: AJIora8jQw2bFajFzZwKo4nehEb9DATb5HNTzwR0gkTqINWhgRfn0CbB c6AbPBhnS1Oc/rliD+QcobJbpn2oKpM4kA== X-Google-Smtp-Source: AGRyM1uO+58zuJqGfzc5N2t6yH0EzWgFFm6QI46aS+1nOGNfVPWgdn3LItcqE0xMrL9090EIKxrAtg== X-Received: by 2002:a17:907:1c18:b0:711:c83b:8a14 with SMTP id nc24-20020a1709071c1800b00711c83b8a14mr26377612ejc.379.1655842627374; Tue, 21 Jun 2022 13:17:07 -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 j8-20020a056402238800b0043590660f16sm3420890eda.35.2022.06.21.13.17.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 13:17:06 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 18/18] python3-requests: upgrade 2.27.1 -> 2.28.0 Date: Tue, 21 Jun 2022 22:16:37 +0200 Message-Id: <20220621201637.1378306-18-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220621201637.1378306-1-alex@linutronix.de> References: <20220621201637.1378306-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 ; Tue, 21 Jun 2022 20:17:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167186 Signed-off-by: Alexander Kanavin --- .../{python3-requests_2.27.1.bb => python3-requests_2.28.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/python/{python3-requests_2.27.1.bb => python3-requests_2.28.0.bb} (86%) diff --git a/meta/recipes-devtools/python/python3-requests_2.27.1.bb b/meta/recipes-devtools/python/python3-requests_2.28.0.bb similarity index 86% rename from meta/recipes-devtools/python/python3-requests_2.27.1.bb rename to meta/recipes-devtools/python/python3-requests_2.28.0.bb index af52b7caf5..f71763565d 100644 --- a/meta/recipes-devtools/python/python3-requests_2.27.1.bb +++ b/meta/recipes-devtools/python/python3-requests_2.28.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://python-requests.org" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" -SRC_URI[sha256sum] = "68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61" +SRC_URI[sha256sum] = "d568723a7ebd25875d8d1eaf5dfa068cd2fc8194b2e483d7b1f7c81918dbec6b" inherit pypi setuptools3