From 6f1867ac50e36eaa2527ea0ed836ef8a585fde55 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Tue, 13 Jun 2023 13:46:20 +0100 Subject: eudev: Upgrade 3.2.11 -> 3.2.12 Drop upstreamed remove dead g-i-r configuration. (From OE-Core rev: 8a9d0ffeec89f3772e2786917db92b267c050ada) Signed-off-by: Alex Kiernan Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ...001-build-Remove-dead-g-i-r-configuration.patch | 155 --------------------- meta/recipes-core/udev/eudev_3.2.11.bb | 88 ------------ meta/recipes-core/udev/eudev_3.2.12.bb | 87 ++++++++++++ 3 files changed, 87 insertions(+), 243 deletions(-) delete mode 100644 meta/recipes-core/udev/eudev/0001-build-Remove-dead-g-i-r-configuration.patch delete mode 100644 meta/recipes-core/udev/eudev_3.2.11.bb create mode 100644 meta/recipes-core/udev/eudev_3.2.12.bb diff --git a/meta/recipes-core/udev/eudev/0001-build-Remove-dead-g-i-r-configuration.patch b/meta/recipes-core/udev/eudev/0001-build-Remove-dead-g-i-r-configuration.patch deleted file mode 100644 index 2836f30c3a..0000000000 --- a/meta/recipes-core/udev/eudev/0001-build-Remove-dead-g-i-r-configuration.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 520c4d451efc488573746f169d8e47d5a131afc2 Mon Sep 17 00:00:00 2001 -From: Alex Kiernan -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 -Signed-off-by: Alex Kiernan ---- - 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 - diff --git a/meta/recipes-core/udev/eudev_3.2.11.bb b/meta/recipes-core/udev/eudev_3.2.11.bb deleted file mode 100644 index eba36c2f91..0000000000 --- a/meta/recipes-core/udev/eudev_3.2.11.bb +++ /dev/null @@ -1,88 +0,0 @@ -SUMMARY = "eudev is a fork of systemd's udev" -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" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -DEPENDS = "gperf-native" - -PROVIDES = "udev" - -SRC_URI = "${GITHUB_BASE_URI}/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" - -GITHUB_BASE_URI = "https://github.com/eudev-project/eudev/releases" - -inherit autotools update-rc.d qemu pkgconfig features_check manpages github-releases - -CONFLICT_DISTRO_FEATURES = "systemd" - -EXTRA_OECONF = " \ - --sbindir=${base_sbindir} \ - --with-rootlibdir=${base_libdir} \ - --with-rootlibexecdir=${nonarch_base_libdir}/udev \ - --with-rootprefix= \ -" - -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() { - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev - sed -i s%@UDEVD@%${base_sbindir}/udevd% ${D}${sysconfdir}/init.d/udev - sed -i s%@KMOD@%${base_bindir}/kmod% ${D}${sysconfdir}/init.d/udev - - install -d ${D}${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules - - # Use classic network interface naming scheme - touch ${D}${sysconfdir}/udev/rules.d/80-net-name-slot.rules -} - -do_install:prepend:class-target () { - # Remove references to buildmachine - sed -i -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ - ${B}/src/udev/keyboard-keys-from-name.h -} - -INITSCRIPT_NAME = "udev" -INITSCRIPT_PARAMS = "start 04 S ." - -PACKAGE_BEFORE_PN = "libudev ${PN}-hwdb" - -FILES:${PN} += "${nonarch_base_libdir}/udev" -FILES:libudev = "${base_libdir}/libudev.so.*" -FILES:${PN}-hwdb = "${sysconfdir}/udev/hwdb.d" - -RDEPENDS:${PN}-hwdb += "eudev" -RDEPENDS:${PN} += "kmod" - -RPROVIDES:${PN} = "hotplug udev" -RPROVIDES:${PN}-hwdb += "udev-hwdb" - -PACKAGE_WRITE_DEPS += "qemu-native" -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:${PN}-hwdb () { - rm -f $D${sysconfdir}/udev/hwdb.bin -} diff --git a/meta/recipes-core/udev/eudev_3.2.12.bb b/meta/recipes-core/udev/eudev_3.2.12.bb new file mode 100644 index 0000000000..572ccecafd --- /dev/null +++ b/meta/recipes-core/udev/eudev_3.2.12.bb @@ -0,0 +1,87 @@ +SUMMARY = "eudev is a fork of systemd's udev" +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" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "gperf-native" + +PROVIDES = "udev" + +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ + file://init \ + file://local.rules \ +" + +SRC_URI[sha256sum] = "ccdd64ec3c381d3c3ed0e99d2e70d1f62988c7763de89ca7bdffafa5eacb9ad8" + +GITHUB_BASE_URI = "https://github.com/eudev-project/eudev/releases" + +inherit autotools update-rc.d qemu pkgconfig features_check manpages github-releases + +CONFLICT_DISTRO_FEATURES = "systemd" + +EXTRA_OECONF = " \ + --sbindir=${base_sbindir} \ + --with-rootlibdir=${base_libdir} \ + --with-rootlibexecdir=${nonarch_base_libdir}/udev \ + --with-rootprefix= \ +" + +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() { + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev + sed -i s%@UDEVD@%${base_sbindir}/udevd% ${D}${sysconfdir}/init.d/udev + sed -i s%@KMOD@%${base_bindir}/kmod% ${D}${sysconfdir}/init.d/udev + + install -d ${D}${sysconfdir}/udev/rules.d + install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules + + # Use classic network interface naming scheme + touch ${D}${sysconfdir}/udev/rules.d/80-net-name-slot.rules +} + +do_install:prepend:class-target () { + # Remove references to buildmachine + sed -i -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ + ${B}/src/udev/keyboard-keys-from-name.h +} + +INITSCRIPT_NAME = "udev" +INITSCRIPT_PARAMS = "start 04 S ." + +PACKAGE_BEFORE_PN = "libudev ${PN}-hwdb" + +FILES:${PN} += "${nonarch_base_libdir}/udev" +FILES:libudev = "${base_libdir}/libudev.so.*" +FILES:${PN}-hwdb = "${sysconfdir}/udev/hwdb.d" + +RDEPENDS:${PN}-hwdb += "eudev" +RDEPENDS:${PN} += "kmod" + +RPROVIDES:${PN} = "hotplug udev" +RPROVIDES:${PN}-hwdb += "udev-hwdb" + +PACKAGE_WRITE_DEPS += "qemu-native" +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:${PN}-hwdb () { + rm -f $D${sysconfdir}/udev/hwdb.bin +} -- cgit v1.2.3-54-g00ecf