From patchwork Sat May 7 06:44:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 7711 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 80A5EC433EF for ; Sat, 7 May 2022 06:45:04 +0000 (UTC) Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by mx.groups.io with SMTP id smtpd.web08.7382.1651905902817481088 for ; Fri, 06 May 2022 23:45:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=oMBRzOae; spf=pass (domain: gmail.com, ip: 209.85.208.51, mailfrom: alex.kiernan@gmail.com) Received: by mail-ed1-f51.google.com with SMTP id p4so10898300edx.0 for ; Fri, 06 May 2022 23:45:02 -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=ieV7aGoqMrITzTiU7Kqi9J9kbftQw+LWGv+hVG7wl/s=; b=oMBRzOaeMCKUbwMcNFgQeELhoPqip+arx9L6pYubrBhrtL9fewRG6q23MTHaKmXs5Y okmC7wN4lQuz+zLLlB6Eg1wEC93kAr8ZLQE1QtL4NoxgwOLpl8ulvx/cRBWc2yYUeNrj W/oRBTfk7cX5c4K58XBinxjuibWwWxpgCB+9DtP9+ZAfGCnbF5Tz+1bMvUNNRyxflCoV MTRB8LrYsoNq9dkCpWrcJWEom9l+wqjATjvqNXS8tPKT7isbu5ZwxjDolFDYN5AoENru qMZFsUmxkntfYCNi2VhgKAu6CgDJa1YoVdzOlDXXy0UdEszVpzrX+UQYm+IqMbfzTNdK uiFQ== 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=ieV7aGoqMrITzTiU7Kqi9J9kbftQw+LWGv+hVG7wl/s=; b=JbqkkYJXs7LI1ds4aMDPHWr2JWRCcoDsofJGoPMIPGyWWSRCM2JZCQwm1Lbfdij94p HhJyiTLPkctAcCEH0QjlrAD9qVnGShbQBmVPCN9DghSrIZUYY1B7VLF5f0g7ZSRNlTST kaLqZh567pb7tbs9hP0DfurKNLn/9CvGCTMyXBq2ltI0njWxq34RuUUuvkc/QLWPhTTZ vb0riR7YgRxUxZ+cdeU4OjpAjLiJ4jK5mSzJRmffP71CxPSbVpqrhlTgp8409OSuvgRz L1TBxlJSjmvuWjf4IVqRL0SChVznlMNjfN0rCiySerG3y6Rkrik4NM2Qn3YGqLLOks3R IqXA== X-Gm-Message-State: AOAM532nmNOhmCRDE/sXNGVQuvaCIC6wUjAtv806FWUbx8XVWIXSTo0v B/9TVlYdoLXyEjphxZDLPvfeBrscc4w= X-Google-Smtp-Source: ABdhPJwHZOkoEwhOXGQL0uKU2bJzPkpryCZmaBbpd24V6Icxrpglo1u/y5q3uizeKH7F1kEdw+9xZw== X-Received: by 2002:a05:6402:11c9:b0:422:b76c:bef8 with SMTP id j9-20020a05640211c900b00422b76cbef8mr7506345edw.238.1651905900960; Fri, 06 May 2022 23:45:00 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id g11-20020a170906c18b00b006f5294986besm1294229ejz.111.2022.05.06.23.44.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 May 2022 23:45:00 -0700 (PDT) From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan , Alex Kiernan Subject: [OE-Core][PATCH 1/4] eudev: Upgrade 3.2.10 -> 3.2.11 Date: Sat, 7 May 2022 07:44:46 +0100 Message-Id: <20220507064449.25809-1-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 07 May 2022 06:45:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165353 The upstream has moved from Gentoo to GitHub and is now maintained by a new collection of cross-distribution contributors. Drop the revert of the userspace firmware loading removal patch as these are only required to support kernels older than 3.7, do not apply cleanly and will never be merged upstream. Signed-off-by: Alex Kiernan Signed-off-by: Alex Kiernan --- ...-rules-remove-firmware-loading-rules.patch | 28 -- ...ve-userspace-firmware-loading-suppor.patch | 364 ------------------ .../udev/{eudev_3.2.10.bb => eudev_3.2.11.bb} | 9 +- 3 files changed, 3 insertions(+), 398 deletions(-) delete mode 100644 meta/recipes-core/udev/eudev/0014-Revert-rules-remove-firmware-loading-rules.patch delete mode 100644 meta/recipes-core/udev/eudev/Revert-udev-remove-userspace-firmware-loading-suppor.patch rename meta/recipes-core/udev/{eudev_3.2.10.bb => eudev_3.2.11.bb} (86%) diff --git a/meta/recipes-core/udev/eudev/0014-Revert-rules-remove-firmware-loading-rules.patch b/meta/recipes-core/udev/eudev/0014-Revert-rules-remove-firmware-loading-rules.patch deleted file mode 100644 index fe2ba5328dc6..000000000000 --- a/meta/recipes-core/udev/eudev/0014-Revert-rules-remove-firmware-loading-rules.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4f0a722489154da99e7f6b3051afde984eed2f74 Mon Sep 17 00:00:00 2001 -From: Jonathan Liu -Date: Thu, 19 Mar 2015 15:01:29 +1100 -Subject: [PATCH] Revert "rules: remove firmware loading rules" - -This reverts commit 70e7d754ddb356fb1a2942b262f8cee9650e2a19. -Userspace firmware loading support is needed for Linux < 3.7. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Jonathan Liu ---- - rules/50-firmware.rules | 3 +++ - 1 file changed, 3 insertions(+) - create mode 100644 rules/50-firmware.rules - -diff --git a/rules/50-firmware.rules b/rules/50-firmware.rules -new file mode 100644 -index 0000000..f0ae684 ---- /dev/null -+++ b/rules/50-firmware.rules -@@ -0,0 +1,3 @@ -+# do not edit this file, it will be overwritten on update -+ -+SUBSYSTEM=="firmware", ACTION=="add", RUN{builtin}="firmware" --- -2.3.3 - diff --git a/meta/recipes-core/udev/eudev/Revert-udev-remove-userspace-firmware-loading-suppor.patch b/meta/recipes-core/udev/eudev/Revert-udev-remove-userspace-firmware-loading-suppor.patch deleted file mode 100644 index db333e9376f9..000000000000 --- a/meta/recipes-core/udev/eudev/Revert-udev-remove-userspace-firmware-loading-suppor.patch +++ /dev/null @@ -1,364 +0,0 @@ -From e415372cc7a2f52e70e1cfa8c6c1f633b411355d Mon Sep 17 00:00:00 2001 -From: Lauren Post -Date: Wed, 8 Jun 2016 06:51:56 -0500 -Subject: [PATCH] Revert "udev: remove userspace firmware loading support" - -This reverts commit 3b717594600fa717cdf9bcfd0c7c1b703b245482. - -Conflicts: - configure.ac - src/udev/udevd.c - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Lauren Post ---- - configure.ac | 39 +++++++++- - rules/Makefile.am | 5 ++ - src/udev/Makefile.am | 10 +++ - src/udev/udev-builtin-firmware.c | 154 +++++++++++++++++++++++++++++++++++++++ - src/udev/udev-builtin.c | 3 + - src/udev/udev.h | 6 ++ - src/udev/udevd.c | 13 ++++ - 7 files changed, 227 insertions(+), 3 deletions(-) - create mode 100644 src/udev/udev-builtin-firmware.c - -diff --git a/configure.ac b/configure.ac -index 8691891..65028c2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -238,9 +238,42 @@ AC_CHECK_DECL([unshare], - [#include ]) - - # ------------------------------------------------------------------------------ --AC_PATH_TOOL(GPERF, gperf) --if test -z "$GPERF" ; then -- AC_MSG_ERROR([*** gperf not found]) -+AC_ARG_WITH(firmware-path, -+ AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]], -+ [Firmware search path (default=ROOTPREFIX/lib/firmware/updates:ROOTPREFIX/lib/firmware)]), -+ [], [with_firmware_path="$rootprefix/lib/firmware/updates:$rootprefix/lib/firmware"]) -+OLD_IFS=$IFS -+IFS=: -+for i in $with_firmware_path; do -+ if test "x${FIRMWARE_PATH}" = "x"; then -+ FIRMWARE_PATH="\\\"${i}/\\\"" -+ else -+ FIRMWARE_PATH="${FIRMWARE_PATH}, \\\"${i}/\\\"" -+ fi -+done -+IFS=$OLD_IFS -+AC_SUBST(FIRMWARE_PATH) -+AS_IF([test "x${FIRMWARE_PATH}" != "x"], [ AC_DEFINE(HAVE_FIRMWARE, 1, [Define if FIRMWARE is available]) ]) -+AM_CONDITIONAL(ENABLE_FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"]) -+ -+# ------------------------------------------------------------------------------ -+AC_ARG_ENABLE([gudev], -+ AS_HELP_STRING([--disable-gudev], [disable Gobject libudev support @<:@default=enabled@:>@]), -+ [], [enable_gudev=yes]) -+AS_IF([test "x$enable_gudev" = "xyes"], [ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0]) ]) -+AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = "xyes"]) -+ -+# ------------------------------------------------------------------------------ -+AC_ARG_ENABLE([keymap], -+ AS_HELP_STRING([--disable-keymap], [disable keymap fixup support @<:@default=enabled@:>@]), -+ [], [enable_keymap=yes]) -+ -+if test "x$enable_keymap" = "xyes"; then -+ AC_PATH_TOOL(GPERF, gperf) -+ if test -z "$GPERF" ; then -+ AC_MSG_ERROR([*** gperf not found]) -+ fi -+ AC_DEFINE([ENABLE_KEYMAP], [1], [Define if we are enabling rule generator]) - fi - - # ------------------------------------------------------------------------------ -diff --git a/rules/Makefile.am b/rules/Makefile.am -index 24c099c..d714ae3 100644 ---- a/rules/Makefile.am -+++ b/rules/Makefile.am -@@ -22,6 +22,11 @@ dist_udevrules_DATA += \ - 80-net-name-slot.rules - endif - -+if ENABLE_FIRMWARE -+dist_udevrules_DATA += \ -+ 50-firmware.rules -+endif -+ - if HAVE_BLKID - dist_udevrules_DATA += \ - 60-persistent-storage.rules -diff --git a/src/udev/Makefile.am b/src/udev/Makefile.am -index 401af01..742fbc8 100644 ---- a/src/udev/Makefile.am -+++ b/src/udev/Makefile.am -@@ -53,12 +53,18 @@ libudev_core_la_SOURCES = \ - udev-ctrl.c \ - udev-builtin.c \ - udev-builtin-btrfs.c \ -+ udev-builtin-firmware.c \ - udev-builtin-hwdb.c \ - udev-builtin-input_id.c \ - udev-builtin-net_id.c \ - udev-builtin-path_id.c \ - udev-builtin-usb_id.c - -+if ENABLE_FIRMWARE -+libudev_core_la_SOURCES += \ -+ udev-builtin-firmware.c -+endif -+ - include_HEADERS = \ - udev.h - -@@ -86,6 +92,10 @@ libudev_core_la_LIBADD += \ - $(KMOD_LIBS) - endif - -+libudev_core_la_CPPFLAGS = \ -+ $(AM_CPPFLAGS) \ -+ -DFIRMWARE_PATH="$(FIRMWARE_PATH)" -+ - # - # Extras - # -diff --git a/src/udev/udev-builtin-firmware.c b/src/udev/udev-builtin-firmware.c -new file mode 100644 -index 0000000..bd8c2fb ---- /dev/null -+++ b/src/udev/udev-builtin-firmware.c -@@ -0,0 +1,154 @@ -+/* -+ * firmware - Kernel firmware loader -+ * -+ * Copyright (C) 2009 Piter Punk -+ * Copyright (C) 2009-2011 Kay Sievers -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, but -+ * WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * General Public License for more details:* -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "udev.h" -+ -+static bool set_loading(struct udev *udev, char *loadpath, const char *state) { -+ FILE *ldfile; -+ -+ ldfile = fopen(loadpath, "we"); -+ if (ldfile == NULL) { -+ log_error("error: can not open '%s'", loadpath); -+ return false; -+ }; -+ fprintf(ldfile, "%s\n", state); -+ fclose(ldfile); -+ return true; -+} -+ -+static bool copy_firmware(struct udev *udev, const char *source, const char *target, size_t size) { -+ char *buf; -+ FILE *fsource = NULL, *ftarget = NULL; -+ bool ret = false; -+ -+ buf = malloc(size); -+ if (buf == NULL) { -+ log_error("No memory available to load firmware file"); -+ return false; -+ } -+ -+ log_debug("writing '%s' (%zi) to '%s'", source, size, target); -+ -+ fsource = fopen(source, "re"); -+ if (fsource == NULL) -+ goto exit; -+ ftarget = fopen(target, "we"); -+ if (ftarget == NULL) -+ goto exit; -+ if (fread(buf, size, 1, fsource) != 1) -+ goto exit; -+ if (fwrite(buf, size, 1, ftarget) == 1) -+ ret = true; -+exit: -+ if (ftarget != NULL) -+ fclose(ftarget); -+ if (fsource != NULL) -+ fclose(fsource); -+ free(buf); -+ return ret; -+} -+ -+static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], bool test) { -+ struct udev *udev = udev_device_get_udev(dev); -+ static const char *searchpath[] = { FIRMWARE_PATH }; -+ char loadpath[UTIL_PATH_SIZE]; -+ char datapath[UTIL_PATH_SIZE]; -+ char fwpath[UTIL_PATH_SIZE]; -+ const char *firmware; -+ FILE *fwfile = NULL; -+ struct utsname kernel; -+ struct stat statbuf; -+ unsigned int i; -+ int rc = EXIT_SUCCESS; -+ -+ firmware = udev_device_get_property_value(dev, "FIRMWARE"); -+ if (firmware == NULL) { -+ log_error("firmware parameter missing"); -+ rc = EXIT_FAILURE; -+ goto exit; -+ } -+ -+ /* lookup firmware file */ -+ uname(&kernel); -+ for (i = 0; i < ELEMENTSOF(searchpath); i++) { -+ strscpyl(fwpath, sizeof(fwpath), searchpath[i], kernel.release, "/", firmware, NULL); -+ fwfile = fopen(fwpath, "re"); -+ if (fwfile != NULL) -+ break; -+ -+ strscpyl(fwpath, sizeof(fwpath), searchpath[i], firmware, NULL); -+ fwfile = fopen(fwpath, "re"); -+ if (fwfile != NULL) -+ break; -+ } -+ -+ strscpyl(loadpath, sizeof(loadpath), udev_device_get_syspath(dev), "/loading", NULL); -+ -+ if (fwfile == NULL) { -+ log_debug("did not find firmware file '%s'", firmware); -+ rc = EXIT_FAILURE; -+ /* -+ * Do not cancel the request in the initrd, the real root might have -+ * the firmware file and the 'coldplug' run in the real root will find -+ * this pending request and fulfill or cancel it. -+ * */ -+ if (!in_initrd()) -+ set_loading(udev, loadpath, "-1"); -+ goto exit; -+ } -+ -+ if (stat(fwpath, &statbuf) < 0 || statbuf.st_size == 0) { -+ if (!in_initrd()) -+ set_loading(udev, loadpath, "-1"); -+ rc = EXIT_FAILURE; -+ goto exit; -+ } -+ -+ if (!set_loading(udev, loadpath, "1")) -+ goto exit; -+ -+ strscpyl(datapath, sizeof(datapath), udev_device_get_syspath(dev), "/data", NULL); -+ if (!copy_firmware(udev, fwpath, datapath, statbuf.st_size)) { -+ log_error("error sending firmware '%s' to device", firmware); -+ set_loading(udev, loadpath, "-1"); -+ rc = EXIT_FAILURE; -+ goto exit; -+ }; -+ -+ set_loading(udev, loadpath, "0"); -+exit: -+ if (fwfile) -+ fclose(fwfile); -+ return rc; -+} -+ -+const struct udev_builtin udev_builtin_firmware = { -+ .name = "firmware", -+ .cmd = builtin_firmware, -+ .help = "kernel firmware loader", -+ .run_once = true, -+}; -diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c -index 74b3bdc..3657106 100644 ---- a/src/udev/udev-builtin.c -+++ b/src/udev/udev-builtin.c -@@ -34,6 +34,9 @@ static const struct udev_builtin *builtins[] = { - [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid, - #endif - [UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs, -+#ifdef HAVE_FIRMWARE -+ [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware, -+#endif - [UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb, - [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id, - [UDEV_BUILTIN_KEYBOARD] = &udev_builtin_keyboard, -diff --git a/src/udev/udev.h b/src/udev/udev.h -index 198cb2c..01a1e9c 100644 ---- a/src/udev/udev.h -+++ b/src/udev/udev.h -@@ -149,6 +149,9 @@ enum udev_builtin_cmd { - UDEV_BUILTIN_BLKID, - #endif - UDEV_BUILTIN_BTRFS, -+#ifdef HAVE_FIRMWARE -+ UDEV_BUILTIN_FIRMWARE, -+#endif - UDEV_BUILTIN_HWDB, - UDEV_BUILTIN_INPUT_ID, - UDEV_BUILTIN_KEYBOARD, -@@ -173,6 +176,9 @@ struct udev_builtin { - extern const struct udev_builtin udev_builtin_blkid; - #endif - extern const struct udev_builtin udev_builtin_btrfs; -+#ifdef HAVE_FIRMWARE -+extern const struct udev_builtin udev_builtin_firmware; -+#endif - extern const struct udev_builtin udev_builtin_hwdb; - extern const struct udev_builtin udev_builtin_input_id; - extern const struct udev_builtin udev_builtin_keyboard; -diff --git a/src/udev/udevd.c b/src/udev/udevd.c -index b1de97a..35655d8 100644 ---- a/src/udev/udevd.c -+++ b/src/udev/udevd.c -@@ -101,6 +101,9 @@ struct event { - bool is_block; - usec_t start_usec; - bool warned; -+#ifdef HAVE_FIRMWARE -+ bool nodelay; -+#endif - }; - - static inline struct event *node_to_event(struct udev_list_node *node) { -@@ -491,6 +494,10 @@ static int event_queue_insert(struct udev_device *dev) { - event->devnum = udev_device_get_devnum(dev); - event->is_block = streq("block", udev_device_get_subsystem(dev)); - event->ifindex = udev_device_get_ifindex(dev); -+#ifdef HAVE_FIRMWARE -+ if (streq(udev_device_get_subsystem(dev), "firmware")) -+ event->nodelay = true; -+#endif - - log_debug("seq %llu queued, '%s' '%s'", udev_device_get_seqnum(dev), - udev_device_get_action(dev), udev_device_get_subsystem(dev)); -@@ -566,6 +573,12 @@ static bool is_devpath_busy(struct event *event) { - return true; - } - -+#ifdef HAVE_FIRMWARE -+ /* allow to bypass the dependency tracking */ -+ if (event->nodelay) -+ continue; -+#endif -+ - /* parent device event found */ - if (event->devpath[common] == '/') { - event->delaying_seqnum = loop_event->seqnum; --- -1.9.1 - diff --git a/meta/recipes-core/udev/eudev_3.2.10.bb b/meta/recipes-core/udev/eudev_3.2.11.bb similarity index 86% rename from meta/recipes-core/udev/eudev_3.2.10.bb rename to meta/recipes-core/udev/eudev_3.2.11.bb index b0536124920a..49fa9a74c3da 100644 --- a/meta/recipes-core/udev/eudev_3.2.10.bb +++ b/meta/recipes-core/udev/eudev_3.2.11.bb @@ -1,5 +1,5 @@ SUMMARY = "eudev is a fork of systemd's udev" -HOMEPAGE = "https://wiki.gentoo.org/wiki/Eudev" +HOMEPAGE = "https://github.com/eudev-project/eudev" DESCRIPTION = "eudev is Gentoo's fork of udev, systemd's device file manager for the Linux kernel. It manages device nodes in /dev and handles all user space actions when adding or removing devices." LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" LICENSE:libudev = "LGPL-2.1-or-later" @@ -9,15 +9,12 @@ DEPENDS = "glib-2.0 glib-2.0-native gperf-native kmod libxslt-native util-linux" PROVIDES = "udev" -SRC_URI = "https://dev.gentoo.org/~blueness/${BPN}/${BP}.tar.gz \ - file://0014-Revert-rules-remove-firmware-loading-rules.patch \ - file://Revert-udev-remove-userspace-firmware-loading-suppor.patch \ +SRC_URI = "https://github.com/eudev-project/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ file://init \ file://local.rules \ " -SRC_URI[md5sum] = "60b135a189523f333cea5f71a3345c8d" -SRC_URI[sha256sum] = "87bb028d470fd1b85169349b44c55d5b733733dc2d50ddf1196e026725ead034" +SRC_URI[sha256sum] = "19847cafec67897da855fde56f9dc7d92e21c50e450aa79068a7e704ed44558b" inherit autotools update-rc.d qemu pkgconfig features_check From patchwork Sat May 7 06:44:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 7710 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 827F2C433FE for ; Sat, 7 May 2022 06:45:04 +0000 (UTC) Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) by mx.groups.io with SMTP id smtpd.web08.7383.1651905903371189951 for ; Fri, 06 May 2022 23:45:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=VwaeqhJG; spf=pass (domain: gmail.com, ip: 209.85.208.42, mailfrom: alex.kiernan@gmail.com) Received: by mail-ed1-f42.google.com with SMTP id a21so10882242edb.1 for ; Fri, 06 May 2022 23:45: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=XYp/lTzIkUY+594RBzYx9NkvUvNCLmdZfWPmayybspw=; b=VwaeqhJGMZmRpCv/O2jD3PD3DmxQ4Ln/DNTMdTOXW2V4TjWXbvoB+vEvSjOegTrqZ4 bJdxbugDR88ibes4uiPKlXZ2+aUT0tZ+R1ORgjhBHRYDmyp9xBliJhw3l7rdms9KcUjz P0am+2oqXw/aeTJSG5e+zP5DVklX9DlrrEJCl3MI3VxMgiQKCT1Gr7GQfh5tO2xwft4B 4Qwn7We6wu2913V68cbFiFB4UNm1x6WmOmupaFrvFjSsE0EQ/6NXDxkLxXkl3gGE7Pe1 Q7mUWklmdovcbylaY6lnVgCUvQcGFG5NbadpY8sT1evpzQeTn6hFtbpPt/rINAQVff9F ZOsg== 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=XYp/lTzIkUY+594RBzYx9NkvUvNCLmdZfWPmayybspw=; b=rlrGPulzoabW4dhvj+hWXAJ+fw62oX/eTfQ+reb5RlS6EAx/C83ct05jO4z9Depyeg Qt+wkVZVx+ExQtYZfT4opbqGesGOgfhjUAFeP97/XJTxFjb22wzn7XcrfMOvujqWZIhC TzwDoKpWLYccaO8juaoSbIicWCBIMMYl/L5s1TMM+j5kfDLxfqd9HPi8S9/SL/kXvafb ZA8245T20IF+0HG+jQeMwHcGuXTtHlWcK0KrbZnO4YtGJx0+WRnPbzuSwbv0MfM129fl ev7KDlLlJ7t+f1nbeC1/M2ldV1lhb9K6tRhPpG1cNTBvg5rLfSUj5VIYQapTK0jp7hEd L1Vg== X-Gm-Message-State: AOAM530nW5qhTcfezgWyIAzVpeKpSojZ2hkKQvjK/WkzNPwcpnY24Hxa Ro7ZR2F2hC8aiP7Jg+YKU5myAyN0DLo= X-Google-Smtp-Source: ABdhPJw3vu+g9uiLwvaTpvBJqQN7V08jHZhrexBp/tDsMEgabQ30eshBZlHdRkDW53+30dugWbfXfg== X-Received: by 2002:a05:6402:1a26:b0:425:d3cf:d7f0 with SMTP id be6-20020a0564021a2600b00425d3cfd7f0mr7464040edb.251.1651905901827; Fri, 06 May 2022 23:45:01 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id g11-20020a170906c18b00b006f5294986besm1294229ejz.111.2022.05.06.23.45.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 May 2022 23:45:01 -0700 (PDT) From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan , Alex Kiernan Subject: [OE-Core][PATCH 2/4] eudev: Add PACKAGECONFIG for manpages & selinux Date: Sat, 7 May 2022 07:44:47 +0100 Message-Id: <20220507064449.25809-2-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220507064449.25809-1-alex.kiernan@gmail.com> References: <20220507064449.25809-1-alex.kiernan@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 07 May 2022 06:45:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165354 Drop DEPENDS on libxslt-native which is unused as the tarball includes the manpages and the build process never invokes the script which regenerates them (make.sh) Signed-off-by: Alex Kiernan Signed-off-by: Alex Kiernan --- meta/recipes-core/udev/eudev_3.2.11.bb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/udev/eudev_3.2.11.bb b/meta/recipes-core/udev/eudev_3.2.11.bb index 49fa9a74c3da..276456ae460c 100644 --- a/meta/recipes-core/udev/eudev_3.2.11.bb +++ b/meta/recipes-core/udev/eudev_3.2.11.bb @@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" LICENSE:libudev = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "glib-2.0 glib-2.0-native gperf-native kmod libxslt-native util-linux" +DEPENDS = "glib-2.0 glib-2.0-native gperf-native kmod util-linux" PROVIDES = "udev" @@ -16,7 +16,7 @@ SRC_URI = "https://github.com/eudev-project/${BPN}/releases/download/v${PV}/${BP SRC_URI[sha256sum] = "19847cafec67897da855fde56f9dc7d92e21c50e450aa79068a7e704ed44558b" -inherit autotools update-rc.d qemu pkgconfig features_check +inherit autotools update-rc.d qemu pkgconfig features_check manpages CONFLICT_DISTRO_FEATURES = "systemd" @@ -27,8 +27,12 @@ EXTRA_OECONF = " \ --with-rootprefix= \ " -PACKAGECONFIG ??= "hwdb" +PACKAGECONFIG ?= "hwdb \ + ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ +" PACKAGECONFIG[hwdb] = "--enable-hwdb,--disable-hwdb" +PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages" +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" do_install:append() { install -d ${D}${sysconfdir}/init.d From patchwork Sat May 7 06:44:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 7713 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 78C17C433FE for ; Sat, 7 May 2022 06:45:14 +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.web09.7500.1651905904325011007 for ; Fri, 06 May 2022 23:45:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=UEmeZ2wy; spf=pass (domain: gmail.com, ip: 209.85.208.45, mailfrom: alex.kiernan@gmail.com) Received: by mail-ed1-f45.google.com with SMTP id y21so10881166edo.2 for ; Fri, 06 May 2022 23:45: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=QRF2ATuFMuDBPkP7KuQZd0DsFKSb+TQBWDVokelevEo=; b=UEmeZ2wyqqvjvrwMedAZ9DQ/EAWklR/tdIOrNOx0IZxPETI/vPk3KptsaqtdPca/vu 9KtCXLPwbhUnBg8eU983VwbFoat/JXGCu47NEj2+fkUMLhuTsLlXyUl4aoi4ZwTtjWcj TI0bc6uFhFdjgHUzHqZ0U69acFbSjBklq8XLQ8BW8YZ3gV4B8CCELpY3DmRjizvvtxQ8 Dun8wmzJAN0XNTydvjR+EeMnHUO+CLf9wGheH8OZUe7s64Pzx2WYMYpFId4n5+3bMdta FkEamrEUMFrd+9orH224YBoZjoIWzwCHWfY0J9vfJ695xZJnIxGVanEXY6rXLfwGPP8V yuUQ== 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=QRF2ATuFMuDBPkP7KuQZd0DsFKSb+TQBWDVokelevEo=; b=iGbtYpjIPSGgdGFcH7TTt1hAlGBw2dyKg0GadlZ71SF81UjRRDh9rn/eDLjgjI/9eA rZF/kSlA4fVvknsk4r7b1CiNAkD6jAfjtk8oeLDNtac8SOjQXVcScAFtSHklAbSfvtdn /dO3XQeWA3Hx7TvsDLFdsFMaTV/kqrV47Dx5st8zSBZ8j50XXdCRU52HNuE0Y3lvVyMl ewjwOdOtIYa9qNMFpqucguCCL+n5/ZWwFsz7lApbWqDQYdJux6PEeIDyaSYlS9MRkCAy qdcXepoCR0UQCJkzd8mgt+uXdu5GbX+FB9LygeoE2FK3oHBx5Ly99oW8Gf0VQvHVfM9w VT1A== X-Gm-Message-State: AOAM531vOjUnRgx/hWlsLzrd4nsIX+OWZzwuA2TOxdzvVrxXKIAl1Xau BmK1GekyPW8rJsbE++nGOE4aQpcOM8o= X-Google-Smtp-Source: ABdhPJzWeigkc5bN1xQgFupxxB9PVYz5jKC7doe7d7tnNmI4oZ2rSIGEPMUdhmEuBSApqjeHe2kIMw== X-Received: by 2002:a05:6402:26d3:b0:427:c571:86fe with SMTP id x19-20020a05640226d300b00427c57186femr7261739edd.133.1651905902624; Fri, 06 May 2022 23:45:02 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id g11-20020a170906c18b00b006f5294986besm1294229ejz.111.2022.05.06.23.45.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 May 2022 23:45:02 -0700 (PDT) From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan , Alex Kiernan Subject: [OE-Core][PATCH 3/4] pypi.bbclass: Set CVE_PRODUCT to PYPI_PACKAGE Date: Sat, 7 May 2022 07:44:48 +0100 Message-Id: <20220507064449.25809-3-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220507064449.25809-1-alex.kiernan@gmail.com> References: <20220507064449.25809-1-alex.kiernan@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 07 May 2022 06:45:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165355 The CVE product name for PyPI packages is (usually) the same as the PyPI package name (and not our recipe name), so use that as the default. Signed-off-by: Alex Kiernan Signed-off-by: Alex Kiernan --- meta/classes/pypi.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/pypi.bbclass b/meta/classes/pypi.bbclass index 9405d5860181..5fa7b8a6ae23 100644 --- a/meta/classes/pypi.bbclass +++ b/meta/classes/pypi.bbclass @@ -24,3 +24,5 @@ S = "${WORKDIR}/${PYPI_PACKAGE}-${PV}" UPSTREAM_CHECK_URI ?= "https://pypi.org/project/${PYPI_PACKAGE}/" UPSTREAM_CHECK_REGEX ?= "/${PYPI_PACKAGE}/(?P(\d+[\.\-_]*)+)/" + +CVE_PRODUCT ?= "python:${PYPI_PACKAGE}" From patchwork Sat May 7 06:44:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 7712 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 5E53BC433EF for ; Sat, 7 May 2022 06:45:14 +0000 (UTC) Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by mx.groups.io with SMTP id smtpd.web11.7454.1651905904853425222 for ; Fri, 06 May 2022 23:45:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=pcGP0UCa; spf=pass (domain: gmail.com, ip: 209.85.208.44, mailfrom: alex.kiernan@gmail.com) Received: by mail-ed1-f44.google.com with SMTP id k27so10870133edk.4 for ; Fri, 06 May 2022 23:45: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=8OYxPAIMJY38stDyFP6IoKNBJ0gGa9n2CqP2Msm70Do=; b=pcGP0UCar6eDOXUvIHDJA+FSQJTfxKqp4BxCuGWmH6CAtbd23XuUftuRO/gWu4DFQp ESs/eu+idsMSUsU2KyUX6bxfIgRxEp5HC5Cu0Ah8/pYaZpojeY6gjBqV+hT+FNUnCIBt f3a/L3NQCoLVl0fyPFSJVHVb/K33bZFXsaiiXHT6CiZB1Rz6Tl9/oFgUXxLWQw4RAOKS xGV5uaNwhdK8kMLbzSPChsx3HIGqzv9mFy+Yd+eU+ZckE8wizW/g58JDaj+TVIhVlqMd cFJnSfIl1LZOBLm2sn6+AmG2nOzKX/uLhMprGBvXHgdVWkDutDDqkTJ/KlGbSsJcMnWI GM9Q== 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=8OYxPAIMJY38stDyFP6IoKNBJ0gGa9n2CqP2Msm70Do=; b=Ykd8dU81et0Nd3jvmVUq7zUEkYes1rboze7NmtmsOY0RgSpO1ZLuCmIzr+OMEZdowd b0Xkle3iRZqG07NpWaC3kqy7+N5dRQzD+bzqdFJ5241SC13mBmqh+1aKRL+0E7DDsTVF l+Plr+jmZzyeTHd/HjSdWq2+m9SWf00FSN2WRwOA09RN8fVrARdLu+AOPsZUfeoe0Q+J gQ36h4AkVpaFro1gon/zFJAeueAOkoSCox+yVQblbzWr/UToU6rGqpV/zelVjYGk4U21 xRqPBt4DSXjHiy9nW+XNR+DyZ283hq9asCohr/8v5Z43NwOLijiNlebhb2U6n8dEHnVp /d5Q== X-Gm-Message-State: AOAM531MGn0gHwJv/Qgn+qDdd5VEnL6b31UpRHeftrGspP3aKi64MJ1Y +lOihUZSIJFxwd0RodKjt8rierIMIoQ= X-Google-Smtp-Source: ABdhPJz7HAQQj/6sQmtY92G6OvidVip9LH6s5l2SFNre5KClXgLbaY04+MTKrmYPdaPdUVsrHZBfxw== X-Received: by 2002:aa7:db4c:0:b0:428:111c:b6bd with SMTP id n12-20020aa7db4c000000b00428111cb6bdmr7208238edt.318.1651905903319; Fri, 06 May 2022 23:45:03 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id g11-20020a170906c18b00b006f5294986besm1294229ejz.111.2022.05.06.23.45.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 May 2022 23:45:02 -0700 (PDT) From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan , Alex Kiernan Subject: [OE-Core][PATCH 4/4] openssh: Add openssh-sftp-server to openssh RDEPENDS Date: Sat, 7 May 2022 07:44:49 +0100 Message-Id: <20220507064449.25809-4-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220507064449.25809-1-alex.kiernan@gmail.com> References: <20220507064449.25809-1-alex.kiernan@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 07 May 2022 06:45:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165356 OpenSSH 9.0 uses sftp by default as the transport for scp, add in sftp-server so that this works as expected for users, rather than being left with a confusing "scp: Connection closed" message. Signed-off-by: Alex Kiernan Signed-off-by: Alex Kiernan --- meta/recipes-connectivity/openssh/openssh_9.0p1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssh/openssh_9.0p1.bb b/meta/recipes-connectivity/openssh/openssh_9.0p1.bb index 975faed5473b..b63ea2b13731 100644 --- a/meta/recipes-connectivity/openssh/openssh_9.0p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_9.0p1.bb @@ -158,7 +158,7 @@ FILES:${PN}-sftp-server = "${libexecdir}/sftp-server" FILES:${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*" FILES:${PN}-keygen = "${bindir}/ssh-keygen" -RDEPENDS:${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" +RDEPENDS:${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen ${PN}-sftp-server" RDEPENDS:${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}" RRECOMMENDS:${PN}-sshd:append:class-target = "\ ${@bb.utils.filter('PACKAGECONFIG', 'rng-tools', d)} \