From 5350f5931edb3508fb4624b2392ad187e0d2f5f7 Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Wed, 15 Aug 2007 15:47:51 +0000 Subject: [PATCH] Sync volume_id version to 0.79.0 matching udev-114 --- package/udev/udev.mk | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/package/udev/udev.mk b/package/udev/udev.mk index 0dbb2f5e36..44cfec46f9 100644 --- a/package/udev/udev.mk +++ b/package/udev/udev.mk @@ -4,6 +4,8 @@ # ############################################################# UDEV_VERSION:=114 +UDEV_VOLUME_ID_VERSION:=0.79.0 + UDEV_SOURCE:=udev-$(UDEV_VERSION).tar.bz2 UDEV_SITE:=ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ UDEV_CAT:=$(BZCAT) @@ -73,20 +75,20 @@ udev-dirclean: $(UDEV_DIRCLEAN_DEPS) .PHONY: udev-volume_id udev-volume_id-clean ifeq ($(strip $(BR2_PACKAGE_UDEV_VOLUME_ID)),y) -$(STAGING_DIR)/usr/lib/libvolume_id.so.0.72.0: +$(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION): $(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \ USE_LOG=false USE_SELINUX=false \ udevdir=$(UDEV_ROOT) EXTRAS="extras/volume_id" -C $(UDEV_DIR) $(INSTALL) -m 0644 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.h $(STAGING_DIR)/usr/include/libvolume_id.h - $(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.so.0.72.0 $(STAGING_DIR)/usr/lib/libvolume_id.so.0.72.0 - -ln -sf libvolume_id.so.0.72.0 $(STAGING_DIR)/usr/lib/libvolume_id.so.0 + $(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) + -ln -sf libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(STAGING_DIR)/usr/lib/libvolume_id.so.0 -ln -sf libvolume_id.so.0 $(STAGING_DIR)/usr/lib/libvolume_id.so -$(TARGET_DIR)/lib/udev/vol_id: $(STAGING_DIR)/usr/lib/libvolume_id.so.0.72.0 +$(TARGET_DIR)/lib/udev/vol_id: $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/vol_id $(TARGET_DIR)/lib/udev/vol_id - $(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.so.0.72.0 $(TARGET_DIR)/usr/lib/libvolume_id.so.0.72.0 - -ln -sf libvolume_id.so.0.72.0 $(TARGET_DIR)/usr/lib/libvolume_id.so.0 - $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libvolume_id.so.0.72.0 + $(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(TARGET_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) + -ln -sf libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(TARGET_DIR)/usr/lib/libvolume_id.so.0 + $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) udev-volume_id: udev $(TARGET_DIR)/lib/udev/vol_id udev-volume_id-dirclean @@ -108,7 +110,7 @@ endif .PHONY: udev-scsi_id udev-scsi_id-clean udev-scsi_id-dirclean ifeq ($(strip $(BR2_PACKAGE_UDEV_SCSI_ID)),y) -$(TARGET_DIR)/lib/udev/scsi_id: $(STAGING_DIR)/usr/lib/libvolume_id.so.0.72.0 +$(TARGET_DIR)/lib/udev/scsi_id: $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \ USE_LOG=false USE_SELINUX=false \ udevdir=$(UDEV_ROOT) EXTRAS="extras/scsi_id" -C $(UDEV_DIR) -- 2.30.2