From patchwork Mon May 16 19:49:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 8097 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 0F6CFC433EF for ; Mon, 16 May 2022 19:49:32 +0000 (UTC) Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by mx.groups.io with SMTP id smtpd.web08.955.1652730566264792995 for ; Mon, 16 May 2022 12:49:26 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=QBVrp0dH; spf=pass (domain: gmail.com, ip: 209.85.218.47, mailfrom: alex.kiernan@gmail.com) Received: by mail-ej1-f47.google.com with SMTP id ks9so30672808ejb.2 for ; Mon, 16 May 2022 12:49:26 -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=HFgsiGvqKSpoGsUsuNSyHKVL8l9Q+Yp07NpQy27aPns=; b=QBVrp0dHmQly+lhXPcMIcuQvtNpaA+P87vrMPe0e8eQ+Lsq7NBz3lkch0tRD5PL05y Av/UkspGJ2N7gzPv/0KBkUFdm32QEDfQhibYK4KMibwUNihP6LIyqaI/LNXA9VD6Lqc5 BC1scYSioD9S00SEfEbIpzYKPlmUP/PPtZCEZnqhJUYp2AQqDVDgU9Z8MtO1JhKU4lBJ /pbZNmyNmr+fX/lUWtItCdiYSn8czawultTvzLxO0+ZgX8uSHN/kxqteDkoahinGK6cq pZ3U8+TFqyOqc+7puUBMspw881WBX541hmB46BsfbxXFT8XsEwY4BKBuzkCBkTnTvxHy YSMQ== 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=HFgsiGvqKSpoGsUsuNSyHKVL8l9Q+Yp07NpQy27aPns=; b=wzHLBvnFRUkyggJrNUgrzxMovbK1C1VAoc28nWoXvBTp0Y4C7Y/SfBDlV+k+QRsZrO bVyF86dVI/IrZ3amo+owRDk9UerDD8igHxU/4xmzApuAC4GIwMf1MCdfO7yo2dRzC0HW IBm5PwBrLtV8FxJMVCgrR2p505NAbr/vY1R0x3QnGtaxXKBRS2npqrePwONwqKgeyWYS JpxRTiAp7Qc85X3FYJbfr3a5iUUmUgi70aeWkl45ymhcjy20MbSCnXuppXIMY3IOuGFy 8/R8FW0vF2ECvn9qyCZn9qgbVXoEc+MDaaQY8wT7RWjwMf42QnXiblNJYfJlLI3ES1M5 DXXQ== X-Gm-Message-State: AOAM531rKEkr3z56Q61kyTiSzRyfgUJuPVoSFdn4+Iu44qUeMs/SG6l7 ybT9Dbr9WBByq+XJ2PxmbOLl53QJcYg= X-Google-Smtp-Source: ABdhPJxReR1G14kl4SausiaPzYMmcQ5Unty1S2P0ub7W/KrJ02Lv+6xNKOzklj0T1VTt4wyAp1epfw== X-Received: by 2002:a17:906:559:b0:6f3:8ba6:39c8 with SMTP id k25-20020a170906055900b006f38ba639c8mr16831880eja.486.1652730564705; Mon, 16 May 2022 12:49:24 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id o23-20020aa7dd57000000b0042abfe32ac8sm533125edw.30.2022.05.16.12.49.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 12:49:24 -0700 (PDT) From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan , Alex Kiernan Subject: [OE-Core][PATCH 1/3] eudev: Convert dependencies to PACKAGECONFIG Date: Mon, 16 May 2022 20:49:13 +0100 Message-Id: <20220516194915.29231-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 ; Mon, 16 May 2022 19:49:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165695 GObject support was dropped in 252150e181c5 ("src/gudev: remove Gobject libudev support."), but some gir support appears to still exist. Fill out PACKAGECONFIG options. Signed-off-by: Alex Kiernan Signed-off-by: Alex Kiernan --- meta/recipes-core/udev/eudev_3.2.11.bb | 9 ++++++--- 1 file changed, 6 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 841039f6d745..0fd1b6ab2283 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 util-linux" +DEPENDS = "gperf-native" 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 manpages +inherit autotools update-rc.d qemu pkgconfig features_check manpages gobject-introspection CONFLICT_DISTRO_FEATURES = "systemd" @@ -30,11 +30,14 @@ EXTRA_OECONF = " \ --with-rootprefix= \ " -PACKAGECONFIG ?= "hwdb \ +PACKAGECONFIG ?= "blkid hwdb kmod \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ " +PACKAGECONFIG[blkid] = "--enable-blkid,--disable-blkid,util-linux" PACKAGECONFIG[hwdb] = "--enable-hwdb,--disable-hwdb" +PACKAGECONFIG[kmod] = "--enable-kmod,--disable-kmod,kmod" PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages" +PACKAGECONFIG[rule-generator] = "--enable-rule-generator,--disable-rule-generator" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" do_install:append() { From patchwork Mon May 16 19:49:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 8096 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 12A38C4332F for ; Mon, 16 May 2022 19:49:32 +0000 (UTC) Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) by mx.groups.io with SMTP id smtpd.web08.957.1652730567110149245 for ; Mon, 16 May 2022 12:49:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=duK3qir3; spf=pass (domain: gmail.com, ip: 209.85.208.54, mailfrom: alex.kiernan@gmail.com) Received: by mail-ed1-f54.google.com with SMTP id s3so4558571edr.9 for ; Mon, 16 May 2022 12:49:26 -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=Kog/RupLHUi4gVzHdls/wU9LQOQ4JD3vL5IHm1Ec0+4=; b=duK3qir3o2YkmP6mmybtIF1OZqBA1i4j7+LyY3zQx5NXSoYricz+/oRYAX2/l5EfAX uo39F5Njwe4XqPLtUTHpsen+PYUlFqdeRSdecn5Hq/aMxvohV8Gq6/RusbgDx082iXHN hWD7jsiXD4FLxDg/RNcJ0t4vxVru4qO5JvWCWSt4yrjFWCMmpz0bmp7BwwQWzYvdiOk7 2HVKTmhX74BZvNcbsQn41HHjNZXatq8N/UiXLL5i4xeuw7V67WzgFlJXrh2CD2Ppk4I/ f+t8n8v51AYSH3x+1DLc1QAEiyFtsJ2jOw89WfxrpzP+kvoIp04XlzgZmc8oGReRVP3Y 8/eg== 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=Kog/RupLHUi4gVzHdls/wU9LQOQ4JD3vL5IHm1Ec0+4=; b=JLxeGMSudYFVCwZ6e/RCNhz1v6oJb+dTFbCVDdtfUVl5E5lAcfV/QYsjLLDapB7Gzq plDTnsLrZDxC/JQ0I5aASxSDmQ+u5m0LkY78mujmbEQ1MNBG6uA8ZdvIv6pYWJo86Hts MzEcW2q1qtybb4ydorrJLMjIdOyX5LKXLzzbpXDkhzNhV0STUOv3rD1qlDxGRBFGX1fO C6hRgd7IA7B7mm9nJxHiyBnvn5N45STCF6NFRbvpXvdgigLvOGJcnTSPEg571gze4VdQ AsUR32oIo6vJUgSe7MaiZp5ChWtcc3PuHeZC/02x6cJylJKFOexAo/w0H0DX97o9vYIH H7OA== X-Gm-Message-State: AOAM530dFe81P6mAZI9X9F/z15xUf7J9mJt4KmDnTOWEJJf8rGHgK6PH QREg0snkxSF5Lu9hbfzhXtjaxHKTmhU= X-Google-Smtp-Source: ABdhPJyIy2qYalvMzq+HxqNQlSEeIYYeaVQUwWNeo2I3GNFZRQzcT7DcvbAaHw3sJtVSzDYHsn2aEQ== X-Received: by 2002:a05:6402:3452:b0:42a:6266:3f16 with SMTP id l18-20020a056402345200b0042a62663f16mr14884356edc.419.1652730565462; Mon, 16 May 2022 12:49:25 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id o23-20020aa7dd57000000b0042abfe32ac8sm533125edw.30.2022.05.16.12.49.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 12:49:25 -0700 (PDT) From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan , Alex Kiernan Subject: [OE-Core][PATCH 2/3] eudev: Cleanup redundant configuration Date: Mon, 16 May 2022 20:49:14 +0100 Message-Id: <20220516194915.29231-2-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220516194915.29231-1-alex.kiernan@gmail.com> References: <20220516194915.29231-1-alex.kiernan@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 16 May 2022 19:49:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165696 hid2hci moved to bluez4 in 2011. The FILES changes for ${PN} and ${PN}-dev only added existing defaults into the set. Signed-off-by: Alex Kiernan Signed-off-by: Alex Kiernan --- meta/recipes-core/udev/eudev_3.2.11.bb | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/meta/recipes-core/udev/eudev_3.2.11.bb b/meta/recipes-core/udev/eudev_3.2.11.bb index 0fd1b6ab2283..fc17e119bc68 100644 --- a/meta/recipes-core/udev/eudev_3.2.11.bb +++ b/meta/recipes-core/udev/eudev_3.2.11.bb @@ -50,9 +50,6 @@ do_install:append() { # Use classic network interface naming scheme touch ${D}${sysconfdir}/udev/rules.d/80-net-name-slot.rules - - # hid2hci has moved to bluez4. removed in udev as of version 169 - rm -f ${D}${base_libdir}/udev/hid2hci } do_install:prepend:class-target () { @@ -67,11 +64,7 @@ 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 \ - ${includedir}/udev.h ${libdir}/libudev.la \ - ${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc" +FILES:${PN} += "${nonarch_base_libdir}/udev" FILES:libudev = "${base_libdir}/libudev.so.*" FILES:eudev-hwdb = "${sysconfdir}/udev/hwdb.d" From patchwork Mon May 16 19:49:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 8098 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 035B9C433F5 for ; Mon, 16 May 2022 19:49:32 +0000 (UTC) Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by mx.groups.io with SMTP id smtpd.web09.949.1652730567989514900 for ; Mon, 16 May 2022 12:49:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=P9qpTzCV; spf=pass (domain: gmail.com, ip: 209.85.218.41, mailfrom: alex.kiernan@gmail.com) Received: by mail-ej1-f41.google.com with SMTP id ch13so30596682ejb.12 for ; Mon, 16 May 2022 12:49:27 -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=y9/N0l0kbpwj5WOfd6oS8v0HRW0ZurOme01HGXcBfIA=; b=P9qpTzCVsAGZ+DaAf6XYzNZLGXgFJpLSkdontGgtKHzXnKa5DrJic88scWKUWfM/zF f4npOal/Dg7Pe6cvlKyCfjHEmmndffkgYNmcA0gmxtPzhPQNO2SW6zP9E4oSlZwSPKfk jzw2aNHdr9P7SUFZ9unBto14zzQpSixa7qzfc6n54h4Ljntx4O/yg2aqZPUhh/fJqQvU Q3pqNIGkPARd60TMKy8WlwQ/ZsQMCH4aTKMGRNmO3vCwxtygXcJPraa3admerLvLEjhW 88YZCw93oPdtOWj4EqratLAwMyRKwvC4V3ff3NaKSU4RKAKHABkCjrLndXvbPPrp6PRm 1QPw== 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=y9/N0l0kbpwj5WOfd6oS8v0HRW0ZurOme01HGXcBfIA=; b=oWz/1ipOA15tK8ZDLfQHMxQQMAMy6Rl3lbr7vkT+fD9w4itFhIySSUZ9UdOpNCi+mE IymOkQgtk0g+fNfgifzX9w/sB5F3B94VLTYf9Akq6oRe0fjw16Gl9M7szPJFc5u2aO19 X5jHCmboZ5tDeuFNnhJeVjV+8ouZWUUkx8k/a4AfnD8SfcTbNeCKeac+mQF1JotvwmdF FL/TBgCHUwuRwQgK92Fj782Y1q8MwCqp9uzpIRa+YMMCwBqyqimJpH+pQTzdiX3RbQ4a GMdKew0jgQ/RqQ0zNlPJnfdJKePOwtWRaRTwMxpcLc3ocaGYixte830uljXtayYWqJr0 oJ1A== X-Gm-Message-State: AOAM532EPEwlnE/F9hCjLkFrdzkFt2AOysgnduTlOWia28yTojUn54jC 6t9fczEwKbstGsabvlgN76hevcsEk4s= X-Google-Smtp-Source: ABdhPJzRJiVk5dTf3igdLoKSaQOsWrjkXg1FujWY2n7D53JldryiOAypJAHBQc67l4pXdjqZ3KhFoQ== X-Received: by 2002:a17:907:d8b:b0:6f4:99e5:78f with SMTP id go11-20020a1709070d8b00b006f499e5078fmr16414629ejc.37.1652730566284; Mon, 16 May 2022 12:49:26 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id o23-20020aa7dd57000000b0042abfe32ac8sm533125edw.30.2022.05.16.12.49.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 12:49:25 -0700 (PDT) From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan , Alex Kiernan Subject: [OE-Core][PATCH 3/3] eudev: Use PACKAGE_BEFORE_PN/${PN} Date: Mon, 16 May 2022 20:49:15 +0100 Message-Id: <20220516194915.29231-3-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220516194915.29231-1-alex.kiernan@gmail.com> References: <20220516194915.29231-1-alex.kiernan@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 16 May 2022 19:49:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165697 Use PACKAGE_BEFORE_PN for packages which need to capture files early, switch to idiomatic ${PN} for additional packages. Signed-off-by: Alex Kiernan Signed-off-by: Alex Kiernan --- meta/recipes-core/udev/eudev_3.2.11.bb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/meta/recipes-core/udev/eudev_3.2.11.bb b/meta/recipes-core/udev/eudev_3.2.11.bb index fc17e119bc68..f12cc250fbdf 100644 --- a/meta/recipes-core/udev/eudev_3.2.11.bb +++ b/meta/recipes-core/udev/eudev_3.2.11.bb @@ -61,20 +61,19 @@ do_install:prepend:class-target () { INITSCRIPT_NAME = "udev" INITSCRIPT_PARAMS = "start 04 S ." -PACKAGES =+ "libudev" -PACKAGES =+ "eudev-hwdb" +PACKAGE_BEFORE_PN = "libudev ${PN}-hwdb" FILES:${PN} += "${nonarch_base_libdir}/udev" FILES:libudev = "${base_libdir}/libudev.so.*" -FILES:eudev-hwdb = "${sysconfdir}/udev/hwdb.d" +FILES:${PN}-hwdb = "${sysconfdir}/udev/hwdb.d" -RDEPENDS:eudev-hwdb += "eudev" +RDEPENDS:${PN}-hwdb += "${PN}" RPROVIDES:${PN} = "hotplug udev" -RPROVIDES:eudev-hwdb += "udev-hwdb" +RPROVIDES:${PN}-hwdb += "udev-hwdb" PACKAGE_WRITE_DEPS += "qemu-native" -pkg_postinst:eudev-hwdb () { +pkg_postinst:${PN}-hwdb () { if test -n "$D"; then $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} else @@ -82,6 +81,6 @@ pkg_postinst:eudev-hwdb () { fi } -pkg_prerm:eudev-hwdb () { +pkg_prerm:${PN}-hwdb () { rm -f $D${sysconfdir}/udev/hwdb.bin }