From patchwork Sat May 7 11:22:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 7717 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 910F5C433EF for ; Sat, 7 May 2022 11:22:26 +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.web10.8811.1651922542035549978 for ; Sat, 07 May 2022 04:22:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=F3HxOjoo; spf=pass (domain: gmail.com, ip: 209.85.218.45, mailfrom: alex.kiernan@gmail.com) Received: by mail-ej1-f45.google.com with SMTP id i19so18690711eja.11 for ; Sat, 07 May 2022 04:22:21 -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=b9eszbqyCYagaCsF6DfdHnCTFyM1ED748CG5v1bemZM=; b=F3HxOjoosMELPdfEb8s9oBCzMLErJ5FG/1eM+I8fDx3myJTYsBq6x9L9sydxfZSeL1 3MYaQjyUXwA9BItwRF1JTaFTfkm2+pkZrYMR0AUFLjEZjIzUh8BeANo+V47T1i0v8Jjl Ipai9E0+vpOOnK7ZljkH4JRl/fsjH5UtzidRWQBRGE48Q2iPD7Iq1LAzP68Twhs+Ed1P Vfw2w9ro1E2eTL5sjS/V84KwQWMwIKGcE/vFnhNpUWgjq8G66W72Wt18wYFCJftP9Cb3 XmDCw80uhITFMArIKqjgecrgbqLG+/Qq45cDUj+NqiLRJa9xgUEJtr+1TZLzd2B151DZ 0zLw== 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=b9eszbqyCYagaCsF6DfdHnCTFyM1ED748CG5v1bemZM=; b=AzBqmMcrp/Mx4hCK/ApjnkAuyUNnaVR+4lZPY7xFeLXO740iZu39Nr7dIXqaKF1XgM gyx22OHVs0XcdDlJKW6s7ZBQzqqiHjZPXmVCZCRjr02WSqgeIGmKDwo4VJ/hcUCpOhXJ +r7cKa8K0H2+BTWH0a9WYL74mQRQRYxbC4vSIRNQCzL6/4YwB5Vm8CpX7dt5j/y/k6LA NNlIAVOBcy/Zy57q0XObAT7eFrFi4JoMFYBcHBsh2JvJfJ3EKtGTZkCuNafVIiYonkgl 08su90f+8qQ3Sn+sopgk8hAOM2S7k8BClVpcThaMGs/d8RgcYoWTF7FqtuwNMdtPDnB7 ZUGA== X-Gm-Message-State: AOAM533MLokxgzhcd1BPVQsNb3Yyc/hkqcEfiDFrwWV7hUh/92yOuxPo exFyW4zUhnfuwo/bP45IyaLKcRM/J2o= X-Google-Smtp-Source: ABdhPJxX1xufsGLVjIeKC0Sb3O5ywb+7DmxOjc3V3H5g/tl0OvxLA/iLwnP5kbM7klG7MbMCXCpupg== X-Received: by 2002:a17:907:2cc4:b0:6f5:28ea:83f with SMTP id hg4-20020a1709072cc400b006f528ea083fmr5879115ejc.255.1651922539906; Sat, 07 May 2022 04:22:19 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id gz12-20020a170906f2cc00b006f3ef214de8sm2898577ejb.78.2022.05.07.04.22.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 May 2022 04:22:19 -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 12:22:09 +0100 Message-Id: <20220507112212.16408-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 11:22:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165360 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} | 12 +- 3 files changed, 6 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..56a39320d300 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,15 @@ 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" + +UPSTREAM_CHECK_URI = "https://github.com/eudev-project/eudev/releases" +UPSTREAM_CHECK_REGEX = "eudev-(?P\d+(\.\d+)+)\.tar" inherit autotools update-rc.d qemu pkgconfig features_check From patchwork Sat May 7 11:22:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 7715 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 9395BC433F5 for ; Sat, 7 May 2022 11:22:26 +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.web08.8781.1651922542421113458 for ; Sat, 07 May 2022 04:22:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=BJRRFqXO; spf=pass (domain: gmail.com, ip: 209.85.208.48, mailfrom: alex.kiernan@gmail.com) Received: by mail-ed1-f48.google.com with SMTP id p18so11294901edr.7 for ; Sat, 07 May 2022 04:22:22 -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=XSpMLWwcsCAyOsdwdMOvkhOy5RrZetJXc08Y3HVVDlk=; b=BJRRFqXOBQhnnZldc29TqZAJ1Tm6mInSh8YGXJphdxyVJYykgbmdWIgRfnzwhBzLad 30boIoOqJPkhFQivOQCvq1l2XKjL6GSL5TtBh373twqZUhDuzYrJxtmVKpvWkrn1GWSx PFAUbG/OubhlyuPdUMeyzuZRYCncwlms/oN6CG2At2oVr1hCJ8PiIu/B/WYR7khcnZxE bxxtIzaoO2bHKzrv9mGoncXRvOGsscCeHzggEGI0lIaq9ec4LuHmpStc3cFexnNWNbP9 F/yEhWM65HcgOjkZGe/5LcPAY7XMhB3019RBCACSvuPcHROgZWIHgqCEzN36Fc8SgEmh /ZNg== 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=XSpMLWwcsCAyOsdwdMOvkhOy5RrZetJXc08Y3HVVDlk=; b=MEVBpEkKx/hkTE8uKfRm3FfsqkYOHrsmAW8FLwPCfZRw8zvjdSASXXCZI4FpGjten7 tVhy2oOLT+4Db64arPyrNhY4k/QL0L/Zc+rUOJFqzMQffxHKNpx9NSPIsG4Rh0ZEKozn OtyG86H2pMHaR4seewhwaXkRXAF8CtuZXiSf43x8s6RxYpucRaMMaQXHgzZAgRu7Nbnb Tcy9V3Yk47QlBI8uoScO/yseesH9FaDdJTX5p+8iQ5qAlUWACvavFkDu/M7PTMBG64lt 9ToI/ZkDJYQlopnOmtvFFzvdsu7OHZb1XVD29H2eXR6r8YIwx0gJnYwV5hTRHorIRw52 +R+g== X-Gm-Message-State: AOAM532SWPRu2/WgugyEdnROz+3JQI2kKjALDEh1WDklj3E9zWoUL4Yi 31TMLDGOmNB7qFH34OaaGK8GqjS6uJY= X-Google-Smtp-Source: ABdhPJwUEbBfgiRCghBWgcpHHxycyhs9qNby5HMako+0YHDv12gxMRewWbIgggXNGvcBJ4oIG9Spug== X-Received: by 2002:a05:6402:3508:b0:427:b100:b825 with SMTP id b8-20020a056402350800b00427b100b825mr8051858edd.268.1651922540579; Sat, 07 May 2022 04:22:20 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id gz12-20020a170906f2cc00b006f3ef214de8sm2898577ejb.78.2022.05.07.04.22.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 May 2022 04:22:20 -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 12:22:10 +0100 Message-Id: <20220507112212.16408-2-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220507112212.16408-1-alex.kiernan@gmail.com> References: <20220507112212.16408-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 11:22:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165361 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 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/udev/eudev_3.2.11.bb b/meta/recipes-core/udev/eudev_3.2.11.bb index 56a39320d300..841039f6d745 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" @@ -19,7 +19,7 @@ SRC_URI[sha256sum] = "19847cafec67897da855fde56f9dc7d92e21c50e450aa79068a7e704ed UPSTREAM_CHECK_URI = "https://github.com/eudev-project/eudev/releases" UPSTREAM_CHECK_REGEX = "eudev-(?P\d+(\.\d+)+)\.tar" -inherit autotools update-rc.d qemu pkgconfig features_check +inherit autotools update-rc.d qemu pkgconfig features_check manpages CONFLICT_DISTRO_FEATURES = "systemd" @@ -30,8 +30,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 @@ -60,7 +64,6 @@ INITSCRIPT_PARAMS = "start 04 S ." PACKAGES =+ "libudev" PACKAGES =+ "eudev-hwdb" - FILES:${PN} += "${libexecdir} ${nonarch_base_libdir}/udev ${bindir}/udevadm" FILES:${PN}-dev = "${datadir}/pkgconfig/udev.pc \ ${includedir}/libudev.h ${libdir}/libudev.so \ From patchwork Sat May 7 11:22:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 7714 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 92C2EC433FE for ; Sat, 7 May 2022 11:22:26 +0000 (UTC) Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by mx.groups.io with SMTP id smtpd.web08.8782.1651922543049916736 for ; Sat, 07 May 2022 04:22:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Jd011n4N; spf=pass (domain: gmail.com, ip: 209.85.218.43, mailfrom: alex.kiernan@gmail.com) Received: by mail-ej1-f43.google.com with SMTP id g6so18723990ejw.1 for ; Sat, 07 May 2022 04:22:22 -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=Jd011n4NIznH8+XhbUpPUeJeOFLfJiTqYtnLxH6FA5S9sPXbhvtSIhbU++IJRPhmlF xHbyHQkY78qiyd6lqX2rk5sBso53+P1m76BlSNiQqH1a5eb8Gl4wcyvwH6auVLb8GfTQ NwmZ6m26QLP7M/KAm13Db5PyQ3ErL3H7rj+DR0mKB5cEcgV5U5oXITgBhNzADzOv0gcG Gz8HoZFhgu+HRg7gaHWu8EY64vDXWO3aHfJFCBqpf846YLGGrN2D+f4eGqnAAudrqY/I s46EHQ1Qu68+bM2Rp27+sse6QhXqXl/EfPeSvzh1zVAP2il7ji8CZVVuszBJ3nAyRFCp INYw== 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=sKrb0znREH2H0AN7Z5R6uUJmohmsN2exxm5goDCEqTmKW9gKdBAvxTl3rSa7meWLWh CIdLi69d8J5WPurz728E2jGz/heFlgzuZ3aHatJzXZIIg3ScsQUAUAzONC/rhlNZtCRq 3K0wri56NcsWAO+TxjttbDEo0luuVCPJOs17rN95Plc6WIt6jpkyfZiaTaZRAZUovGWJ x33BB1A1wr1iYlaNCYoq7Sb4cbrxGfgHa6IdoWKW2Tykjq6J+HNSC0Ufx4KCZwWAgReF v57GZVuheXpGAc8VMCgMe0sNldAvtatizJ0+6U/MssJCHOehbPnvv7pVeIU+TCEJDFx9 tNqA== X-Gm-Message-State: AOAM533o/ctXZdXvp+ER5iT05BMf+4LKG9SMiDoIazYWpwDtamjckmCc 41O8lp2QRHeWtq/G+3dFD7LvsKBTOTY= X-Google-Smtp-Source: ABdhPJyBLD/6AtvpEUI8FPgZw0fm8lu6j0yDm/Rs6Dnx7WuRAouKykSgnqeUj6d5Sit267BugT8jyA== X-Received: by 2002:a17:906:99c2:b0:6f4:a99c:8dfc with SMTP id s2-20020a17090699c200b006f4a99c8dfcmr7396921ejn.386.1651922541347; Sat, 07 May 2022 04:22:21 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id gz12-20020a170906f2cc00b006f3ef214de8sm2898577ejb.78.2022.05.07.04.22.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 May 2022 04:22:20 -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 12:22:11 +0100 Message-Id: <20220507112212.16408-3-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220507112212.16408-1-alex.kiernan@gmail.com> References: <20220507112212.16408-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 11:22:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165362 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 11:22:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 7716 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 A5267C4332F for ; Sat, 7 May 2022 11:22:26 +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.web09.8960.1651922543757691940 for ; Sat, 07 May 2022 04:22:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=YvRbuB2Y; spf=pass (domain: gmail.com, ip: 209.85.218.46, mailfrom: alex.kiernan@gmail.com) Received: by mail-ej1-f46.google.com with SMTP id y3so18653046ejo.12 for ; Sat, 07 May 2022 04:22:23 -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=YvRbuB2YLjlaP8AW1HNHR8CwLf0RAJ9uqgq61r7DMs51BFbmF6wXcJy9Fv4LomxDI2 inkFurlFlPlvANplh8dPusXv26zU00fMIRq+HoL+GrZvRs0gUAITZQYuk2ArNdAA03hf jvjI4EB6p4v1C/LJ84SXcqg5pQst0B1iw5w0OJgJbbcf74dVF9OLHHiq6/NeEDD3ZppT Z1BojAox4+3u6vwTiTSlxHSnXWGN8RG9N4FmJgC6hLF8Z3J94awiU2J4dhOSk8f7YgAR w3hQ7AZK0LW512ajBf8Hl4McgRMsIv90BPSVjhVhvmFDMS2RmU0Q2vV1M1eX+nyHgGdB huOg== 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=60FRG1UCehXR9RVqOp/tlWBQN3HfQ5aZoRCiX8zUt+5vDczunmtuwKHnJYfgjEo+Je KYdEao2U5wYKHCDqK8HLcIMWg2HBg/vH9hTxjbNTa2/Y59N5cdOw9i+j1znscqzwLT2o y13yH7hl0QlFn1Zodo30NpNEwNLsVpe9lUtxajwvWgpnlamke5HcqsM5i8sYHl1gGkff 6U1iTcnXTTv/vIofRsTYVvskfZNVIqj0SJPztldwOEWE8EaNk/afWtYo66gY7hKQYCmy UmYaXPPjWZhOlWW9ECGFDZQdLtkpsIDo/uGMdeAsq9vooZ68iXP5irAspvuh3EHGdmhP bm+w== X-Gm-Message-State: AOAM532wYN1zdkk0KQn9ibNsULRqUnluH53ufwRGN0ch8P/DKbBzt6v+ 6Utju1ut4Qqa5oz40bKVKJSj22WO5LA= X-Google-Smtp-Source: ABdhPJzwiaR/oypjvebBF5+0KBDSMubKv+RxebyKJRPhM9tLEW7liypsvHSwz/DqVrhItnONhcLmRw== X-Received: by 2002:a17:906:fad6:b0:6f3:9ea7:1d49 with SMTP id lu22-20020a170906fad600b006f39ea71d49mr7013789ejb.635.1651922542196; Sat, 07 May 2022 04:22:22 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id gz12-20020a170906f2cc00b006f3ef214de8sm2898577ejb.78.2022.05.07.04.22.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 May 2022 04:22:21 -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 12:22:12 +0100 Message-Id: <20220507112212.16408-4-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220507112212.16408-1-alex.kiernan@gmail.com> References: <20220507112212.16408-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 11:22:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165363 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)} \