eudev: Convert dependencies to PACKAGECONFIG
PATCH v4 1/3 eudev: Convert dependencies to PACKAGECONFIG
GObject support was dropped in 252150e181c5 ("src/gudev: remove Gobject libudev support."), drop all g-i-r support which appears to be dead upstream.
Fill out PACKAGECONFIG options.
--- ...uild-Remove-dead-g-i-r-configuration.patch | 155 ++++++++++++++++++ meta/recipes-core/udev/eudev_3.2.11.bb | 8 +- 2 files changed, 161 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/udev/eudev/0001-build-Remove-dead-g-i-r-configuration.patch
meta/recipes-core/udev/eudev/0001-build-Remove-dead-g-i-r-configuration.patch new file +155 -0
@@ -0,0 +1,155 @@ +From 520c4d451efc488573746f169d8e47d5a131afc2 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <[email protected]> +Date: Fri, 20 May 2022 09:35:08 +0100 +Subject: [PATCH] build: Remove dead g-i-r configuration + +g-i-r support was removed in 2015 as part of removal of Gobject libudev +support, but the autoconf support wasn't removed but is dead. + +Fixes: 252150e181c5 ("src/gudev: remove Gobject libudev support.") +Upstream-Status: Submitted [https://github.com/eudev-project/eudev/pull/231] +Signed-off-by: Alex Kiernan <[email protected]> +Signed-off-by: Alex Kiernan <[email protected]> +--- + configure.ac | 12 ------ + m4/introspection.m4 | 96 --------------------------------------------- + 2 files changed, 108 deletions(-) + delete mode 100644 m4/introspection.m4 + +diff --git a/configure.ac b/configure.ac +index 85a524a618ae..987d5037ae77 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -183,17 +183,8 @@ AC_SUBST([udevrulesdir],[${udevlibexecdir}/rules.d]) + AC_SUBST([pkgconfiglibdir], [${libdir}/pkgconfig]) + AC_SUBST([sharepkgconfigdir],[${datadir}/pkgconfig]) + +-# introspection paths +-AC_SUBST([girdir], [${datadir}/gir-1.0]) +-AC_SUBST([typelibsdir], [${libdir}/girepository-1.0]) +- + AC_SUBST([rootrundir],[${with_rootrundir}]) + +-# ------------------------------------------------------------------------------ +- +-GOBJECT_INTROSPECTION_CHECK([1.31.1]) +-AM_CONDITIONAL([HAVE_INTROSPECTION], [test "$enable_introspection" = "yes"]) +- + # ------------------------------------------------------------------------------ + AC_ARG_ENABLE([programs], + AS_HELP_STRING([--disable-programs], [disable programs (udevd, udevadm and helpers)]), +@@ -349,9 +340,6 @@ AC_MSG_RESULT([ + + pkgconfiglibdir: ${libdir}/pkgconfig + sharepkgconfigdir ${datadir}/pkgconfig +- +- girdir ${datadir}/gir-1.0 +- typelibsdir ${libdir}/girepository-1.0 + ]) + + # ------------------------------------------------------------------------------ +diff --git a/m4/introspection.m4 b/m4/introspection.m4 +deleted file mode 100644 +index d89c3d907d9c..000000000000 +--- a/m4/introspection.m4 ++++ /dev/null +@@ -1,96 +0,0 @@ +-dnl -*- mode: autoconf -*- +-dnl Copyright 2009 Johan Dahlin +-dnl +-dnl This file is free software; the author(s) gives unlimited +-dnl permission to copy and/or distribute it, with or without +-dnl modifications, as long as this notice is preserved. +-dnl +- +-# serial 1 +- +-m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], +-[ +- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first +- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first +- AC_BEFORE([LT_INIT],[$0])dnl setup libtool first +- +- dnl enable/disable introspection +- m4_if([$2], [require], +- [dnl +- enable_introspection=yes +- ],[dnl +- AC_ARG_ENABLE(introspection, +- AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], +- [Enable introspection for this build]),, +- [enable_introspection=auto]) +- ])dnl +- +- AC_MSG_CHECKING([for gobject-introspection]) +- +- dnl presence/version checking +- AS_CASE([$enable_introspection], +- [no], [dnl +- found_introspection="no (disabled, use --enable-introspection to enable)" +- ],dnl +- [yes],[dnl +- PKG_CHECK_EXISTS([gobject-introspection-1.0],, +- AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) +- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], +- found_introspection=yes, +- AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) +- ],dnl +- [auto],[dnl +- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) +- dnl Canonicalize enable_introspection +- enable_introspection=$found_introspection +- ],dnl +- [dnl +- AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) +- ])dnl +- +- AC_MSG_RESULT([$found_introspection]) +- +- INTROSPECTION_SCANNER= +- INTROSPECTION_COMPILER= +- INTROSPECTION_GENERATE= +- INTROSPECTION_GIRDIR= +- INTROSPECTION_TYPELIBDIR= +- if test "x$found_introspection" = "xyes"; then +- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` +- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` +- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` +- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` +- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" +- INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` +- INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` +- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection +- fi +- AC_SUBST(INTROSPECTION_SCANNER) +- AC_SUBST(INTROSPECTION_COMPILER) +- AC_SUBST(INTROSPECTION_GENERATE) +- AC_SUBST(INTROSPECTION_GIRDIR) +- AC_SUBST(INTROSPECTION_TYPELIBDIR) +- AC_SUBST(INTROSPECTION_CFLAGS) +- AC_SUBST(INTROSPECTION_LIBS) +- AC_SUBST(INTROSPECTION_MAKEFILE) +- +- AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") +-]) +- +- +-dnl Usage: +-dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) +- +-AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], +-[ +- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) +-]) +- +-dnl Usage: +-dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) +- +- +-AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], +-[ +- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) +-]) +-- +2.35.1 +
meta/recipes-core/udev/eudev_3.2.11.bb +6 -2
@@ -5,13 +5,14 @@ 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" SRC_URI = "https://github.com/eudev-project/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ file://init \ file://local.rules \ + file://0001-build-Remove-dead-g-i-r-configuration.patch \ " SRC_URI[sha256sum] = "19847cafec67897da855fde56f9dc7d92e21c50e450aa79068a7e704ed44558b"
@@ -30,11 +31,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() {
Signature · 1 line
2.35.1
PATCH v4 2/3 eudev: Cleanup redundant configuration
hid2hci moved to bluez4 in 2011. The FILES changes for ${PN} and ${PN}-dev only added existing defaults into the set.
--- meta/recipes-core/udev/eudev_3.2.11.bb | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
meta/recipes-core/udev/eudev_3.2.11.bb +1 -8
@@ -52,9 +52,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 () {
@@ -69,11 +66,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"
Signature · 1 line
2.35.1
PATCH v4 3/3 eudev: Use PACKAGE_BEFORE_PN/${PN}, clean up spaces
In reply to Alex KiernanUse PACKAGE_BEFORE_PN for packages which need to capture files early, switch to idiomatic ${PN} for additional packages. Swap spaces for tabs in shell functions.
--- meta/recipes-core/udev/eudev_3.2.11.bb | 27 +++++++++++++------------- 1 file changed, 13 insertions(+), 14 deletions(-)
meta/recipes-core/udev/eudev_3.2.11.bb +13 -14
@@ -63,28 +63,27 @@ 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:eudev += "kmod" +RDEPENDS:${PN}-hwdb += "eudev" +RDEPENDS:${PN} += "kmod" RPROVIDES:${PN} = "hotplug udev" -RPROVIDES:eudev-hwdb += "udev-hwdb" +RPROVIDES:${PN}-hwdb += "udev-hwdb" PACKAGE_WRITE_DEPS += "qemu-native" -pkg_postinst:eudev-hwdb () { - if test -n "$D"; then - $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} - else - udevadm hwdb --update - fi +pkg_postinst:${PN}-hwdb () { + if test -n "$D"; then + $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} + else + udevadm hwdb --update + fi } -pkg_prerm:eudev-hwdb () { - rm -f $D${sysconfdir}/udev/hwdb.bin +pkg_prerm:${PN}-hwdb () { + rm -f $D${sysconfdir}/udev/hwdb.bin }
Signature · 1 line
2.35.1
Quoted 6 lines · Alex Kiernan
GObject support was dropped in
252150e181c5("src/gudev: remove Gobject libudev support."), drop all g-i-r support which appears to be dead upstream.Fill out PACKAGECONFIG options.
Quoted 7 lines
Signed-off-by Alex Kiernan <[email protected]>Signed-off-by Alex Kiernan <[email protected]>--- ...uild-Remove-dead-g-i-r-configuration.patch | 155 ++++++++++++++++++ meta/recipes-core/udev/eudev_3.2.11.bb | 8 +- 2 files changed, 161 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/udev/eudev/0001-build-Remove-dead-g-i-r-configuration.patch
Thanks, removing dependencies like this does help the build a lot!
Cheers,
Richard