From 2510044bd6763a3dc576a6fb6dd65698d15385fa Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Mon, 19 Jun 2017 18:29:53 +0200 Subject: [PATCH] eudev: remove package It's pretty useless as udev cannot run in coexistence with procd. It was added mostly to get packages compiled which depend on libudev, knowing that the udev related functionality will be broken. eudev has now been replaced by libudev-fbsd which does the job much better and may serve as a drop-in replacement with even some working features. In future we may want our own libudev-procd library which can also be a mostly-stub implementation but may query things from procd using ubus in some situations... Signed-off-by: Daniel Golle --- utils/eudev/Config.in | 68 --------- utils/eudev/Makefile | 144 ------------------ .../0001-mtd_probe-uses-stdint_h.patch | 12 -- 3 files changed, 224 deletions(-) delete mode 100644 utils/eudev/Config.in delete mode 100644 utils/eudev/Makefile delete mode 100644 utils/eudev/patches/0001-mtd_probe-uses-stdint_h.patch diff --git a/utils/eudev/Config.in b/utils/eudev/Config.in deleted file mode 100644 index 6cd397002d..0000000000 --- a/utils/eudev/Config.in +++ /dev/null @@ -1,68 +0,0 @@ -# udev package config - -menu "Configuration" - depends on PACKAGE_eudev - -config EUDEV_EXTRA_ata_id - bool "Install eudev ata_id callout" - default y - help - ata_id - udev callout to read product/serial number - from ATA drives - -config EUDEV_EXTRA_blkid - bool "Use blkid to identify block devices" - default y - help - blkid - make use of libblkid to identify block devices - -config EUDEV_EXTRA_cdrom_id - bool "Install eudev cdrom_id callout" - default y - help - cdrom_id - udev callout to determine the capabilities - of optical drives and media - -config EUDEV_EXTRA_collect - bool "Install eudev collect" - default n - help - Adds ID to the list governed by - -config EUDEV_EXTRA_input_id - bool "Install input_id callout" - default y - help - input_id - udev callout to classify input devices - -config EUDEV_EXTRA_kmod - bool "Use kmod for loading kernel modules" - default n - help - kmod - make use of kmod to load kernel modules on demand - -config EUDEV_EXTRA_mtd_probe - bool "Install mtd_probe callout" - default y - help - mtd_probe - udev callout to probe mtd devices - -config EUDEV_EXTRA_rule_generator - bool "Install (legacy) eudev rule_generator" - default n - help - -config EUDEV_EXTRA_scsi_id - bool "Install eudev scsi_id callout" - default y - help - scsi_id - retrieve and generate a unique SCSI identifier - -config EUDEV_EXTRA_v4l_id - bool "Install eudev v4l_id callout" - default y - help - v4l_id - udev callout to identify Video4Linux devices - - -endmenu diff --git a/utils/eudev/Makefile b/utils/eudev/Makefile deleted file mode 100644 index 9c42b74773..0000000000 --- a/utils/eudev/Makefile +++ /dev/null @@ -1,144 +0,0 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=eudev -PKG_VERSION:=3.2 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://dev.gentoo.org/~blueness/eudev/ -PKG_MD5SUM:=7e42d9b9ed8162021665139520676367 -PKG_LICENSE:=GPL-2.0 - -include $(INCLUDE_DIR)/package.mk - -PKG_BUILD_DEPENDS:=gperf/host -PKG_FIXUP:=autoreconf -PKG_INSTALL=1 - -define Package/libudev - SECTION:=libs - CATEGORY:=Libraries - TITLE:=Dynamic device management subsystem - URL:=https://wiki.gentoo.org/wiki/Project:Eudev - MAINTAINER:=Daniel Golle -endef - -define Package/eudev - SECTION:=base - CATEGORY:=Base system - TITLE:=Dynamic device management subsystem - URL:=https://wiki.gentoo.org/wiki/Project:Eudev - MAINTAINER:=Daniel Golle - MENU:=1 - DEPENDS:=+EUDEV_EXTRA_blkid:libblkid +EUDEV_EXTRA_kmod:libkmod +librt +libudev - PROVIDES:=udev - CONFLICTS:=udev -endef - -define Package/eudev/description -udev allows Linux users to have a dynamic /dev directory and it -provides the ability to have persistent device names. -eudev is a fork of systemd-udev with the goal of obtaining better -compatibility with existing software such as OpenRC and Upstart, older -kernels, various toolchains and anything else required by users and -various distributions. -endef - -define Package/eudev/conffiles -/etc/udev/udev.conf -endef - -define Package/eudev/config - source "$(SOURCE)/Config.in" -endef - -CONFIGURE_ARGS += \ - --prefix=/usr --exec-prefix= --sysconfdir=/etc \ - --libexecdir=/lib/udev --sbindir=/sbin \ - --disable-hwdb --disable-introspection --disable-manpages \ - --disable-selinux \ - $(if $(CONFIG_EUDEV_EXTRA_blkid),--enable-blkid,--disable-blkid) \ - $(if $(CONFIG_EUDEV_EXTRA_kmod),--enable-kmod,--disable-kmod) - - -eudev-extra-lib-bin-$(CONFIG_EUDEV_EXTRA_ata_id) += ata_id - -eudev-extra-rules-$(CONFIG_EUDEV_EXTRA_blkid) += 60-persistent-storage.rules - -eudev-extra-lib-bin-$(CONFIG_EUDEV_EXTRA_cdrom_id) += cdrom_id -eudev-extra-rules-$(CONFIG_EUDEV_EXTRA_cdrom_id) += 60-cdrom_id.rules - -eudev-extra-lib-bin-$(CONFIG_EUDEV_EXTRA_collect) += collect - -eudev-extra-rules-$(CONFIG_EUDEV_EXTRA_input_id) += 60-persistent-input.rules - -eudev-extra-lib-bin-$(CONFIG_EUDEV_EXTRA_mtd_probe) += mtd_probe -eudev-extra-rules-$(CONFIG_EUDEV_EXTRA_mtd_probe) += 75-probe_mtd.rules - -eudev-extra-lib-bin-$(CONFIG_EUDEV_EXTRA_scsi_id) += scsi_id - -eudev-extra-lib-bin-$(CONFIG_EUDEV_EXTRA_v4l_id) += v4l_id -eudev-extra-rules-$(CONFIG_EUDEV_EXTRA_v4l_id) += 60-persistent-v4l.rules - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/libudev.h $(1)/usr/include - $(INSTALL_DIR) $(1)/usr/share/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/share/pkgconfig/udev.pc $(1)/usr/share/pkgconfig - $(INSTALL_DIR) $(1)/lib - $(CP) $(PKG_INSTALL_DIR)/lib/libudev.so* $(1)/lib - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/lib/pkgconfig/libudev.pc $(1)/usr/lib/pkgconfig -endef - -define Package/libudev/install - $(INSTALL_DIR) $(1)/lib - $(CP) $(PKG_INSTALL_DIR)/lib/libudev.so* $(1)/lib -endef - -define Package/eudev/install - $(INSTALL_DIR) $(1)/etc/udev/rules.d - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/udev/udev.conf $(1)/etc/udev - - $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/udevadm \ - $(PKG_INSTALL_DIR)/sbin/udevd \ - $(1)/sbin - - $(INSTALL_DIR) $(1)/lib/udev/rules.d - $(INSTALL_DATA) \ - $(addprefix $(PKG_INSTALL_DIR)/lib/udev/rules.d/, \ - $(eudev-extra-rules-y)) \ - $(addprefix $(PKG_INSTALL_DIR)/lib/udev/rules.d/, \ - 50-udev-default.rules \ - 60-block.rules \ - 60-drm.rules \ - 60-evdev.rules \ - 60-persistent-alsa.rules \ - 60-persistent-storage-tape.rules \ - 60-serial.rules \ - 64-btrfs.rules \ - 70-mouse.rules \ - 75-net-description.rules \ - 78-sound-card.rules \ - 80-net-name-slot.rules) \ - $(1)/lib/udev/rules.d - -ifneq ($(eudev-extra-lib-bin-y),) - $(INSTALL_BIN) \ - $(addprefix $(PKG_INSTALL_DIR)/lib/udev/, \ - $(eudev-extra-lib-bin-y)) \ - $(1)/lib/udev/ -endif -endef - -$(eval $(call BuildPackage,eudev)) -$(eval $(call BuildPackage,libudev)) diff --git a/utils/eudev/patches/0001-mtd_probe-uses-stdint_h.patch b/utils/eudev/patches/0001-mtd_probe-uses-stdint_h.patch deleted file mode 100644 index 2ae5634f5e..0000000000 --- a/utils/eudev/patches/0001-mtd_probe-uses-stdint_h.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: eudev-3.1.5/src/mtd_probe/mtd_probe.h -=================================================================== ---- eudev-3.1.5.orig/src/mtd_probe/mtd_probe.h -+++ eudev-3.1.5/src/mtd_probe/mtd_probe.h -@@ -18,6 +18,7 @@ - */ - - #include -+#include - - #include "macro.h" - -- 2.30.2