瀏覽代碼

package/eudev: remove HOST_EUDEV_SYSCONFDIR

The HOST_EUDEV_SYSCONFDIR is a leftover from before eudev, when udev was
still built from systemd sources. Now that we have a separate file for
eudev and systemd, there's no need any more to have a condition there.
In addition, its usage in systemd.mk has been removed.

Remove the HOST_EUDEV_SYSCONFDIR variable and instead use /etc directly
in eudev.mk.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Arnout Vandecappelle (Essensium/Mind) 3 年之前
父節點
當前提交
4e2567861a
共有 1 個文件被更改,包括 2 次插入3 次删除
  1. 2 3
      package/eudev/eudev.mk

+ 2 - 3
package/eudev/eudev.mk

@@ -57,13 +57,12 @@ endef
 
 
 HOST_EUDEV_DEPENDENCIES = host-gperf host-pkgconf
 HOST_EUDEV_DEPENDENCIES = host-gperf host-pkgconf
 
 
-HOST_EUDEV_SYSCONFDIR = $(if $(BR2_PACKAGE_SYSTEMD),/usr/lib,/etc)
 HOST_EUDEV_CONF_OPTS = \
 HOST_EUDEV_CONF_OPTS = \
 	--prefix=/usr \
 	--prefix=/usr \
 	--sbindir=/sbin \
 	--sbindir=/sbin \
 	--libexecdir=/lib \
 	--libexecdir=/lib \
 	--with-rootlibdir=/lib \
 	--with-rootlibdir=/lib \
-	--sysconfdir=$(HOST_EUDEV_SYSCONFDIR) \
+	--sysconfdir=/etc \
 	--disable-blkid \
 	--disable-blkid \
 	--disable-introspection \
 	--disable-introspection \
 	--disable-kmod \
 	--disable-kmod \
@@ -86,7 +85,7 @@ HOST_EUDEV_TARGET_FINALIZE_HOOKS += HOST_EUDEV_BUILD_HWDB
 # of tharget/, not the real one, so the files are still available on
 # of tharget/, not the real one, so the files are still available on
 # re-builds (foo-rebuild, etc...)
 # re-builds (foo-rebuild, etc...)
 define HOST_EUDEV_RM_HWDB_SRC
 define HOST_EUDEV_RM_HWDB_SRC
-	rm -rf $(TARGET_DIR)/$(HOST_EUDEV_SYSCONFDIR)/udev/hwdb.d/
+	rm -rf $(TARGET_DIR)/etc/udev/hwdb.d/
 endef
 endef
 HOST_EUDEV_ROOTFS_PRE_CMD_HOOKS += HOST_EUDEV_RM_HWDB_SRC
 HOST_EUDEV_ROOTFS_PRE_CMD_HOOKS += HOST_EUDEV_RM_HWDB_SRC