diff --git a/utils/lvm2/Makefile b/utils/lvm2/Makefile index 1ac865253..75111a2a2 100644 --- a/utils/lvm2/Makefile +++ b/utils/lvm2/Makefile @@ -35,10 +35,9 @@ define Package/libdevmapper/Default endef -define Package/libdevmapper-normal +define Package/libdevmapper $(call Package/libdevmapper/Default) VARIANT := normal - PROVIDES := libdevmapper endef define Package/libdevmapper-selinux @@ -48,13 +47,13 @@ define Package/libdevmapper-selinux PROVIDES := libdevmapper endef -define Package/libdevmapper-normal/description +define Package/libdevmapper/description The device-mapper is a component of the 2.6 linux kernel that supports logical volume management. It is required by LVM2 and EVMS. endef define Package/libdevmapper-selinux/description -$(call Package/libdevmapper-normal/description) +$(call Package/libdevmapper/description) This variant supports SELinux endef @@ -68,11 +67,10 @@ define Package/lvm2/default DEPENDS:=+libreadline +libncurses +libaio endef -define Package/lvm2-normal +define Package/lvm2 $(call Package/lvm2/default) VARIANT := normal - DEPENDS += +libdevmapper-normal - PROVIDES := lvm2 + DEPENDS += +libdevmapper endef define Package/lvm2-selinux @@ -82,14 +80,14 @@ define Package/lvm2-selinux PROVIDES := lvm2 endef -define Package/lvm2-normal/description +define Package/lvm2/description LVM2 refers to a new userspace toolset that provide logical volume management facilities on linux. It is reasonably backwards-compatible with the original LVM toolset. endef define Package/lvm2-selinux/description -$(call Package/lvm2-normal/description) +$(call Package/lvm2/description) This variant supports SELinux endef @@ -125,14 +123,14 @@ define Build/InstallDev $(CP) $(PKG_BUILD_DIR)/libdm/libdevmapper.pc $(1)/usr/lib/pkgconfig endef -define Package/libdevmapper-normal/install +define Package/libdevmapper/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdevmapper.so.* $(1)/usr/lib endef -Package/libdevmapper-selinux/install = $(Package/libdevmapper-normal/install) +Package/libdevmapper-selinux/install = $(Package/libdevmapper/install) -define Package/lvm2-normal/install +define Package/lvm2/install $(INSTALL_DIR) $(1)/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/lvm $(1)/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dmsetup $(1)/sbin @@ -149,15 +147,15 @@ define Package/lvm2-normal/install $(FIND) $(PKG_INSTALL_DIR)/usr/sbin/ -type l -exec $(CP) -a {} $(1)/sbin/ \; endef -Package/lvm2-selinux/install = $(Package/lvm2-normal/install) +Package/lvm2-selinux/install = $(Package/lvm2/install) -define Package/lvm2-normal/conffiles +define Package/lvm2/conffiles /etc/lvm/lvm.conf endef Package/lvm2-selinux/conffiles = $(Package/lvm2/conffiles) -$(eval $(call BuildPackage,libdevmapper-normal)) +$(eval $(call BuildPackage,libdevmapper)) $(eval $(call BuildPackage,libdevmapper-selinux)) -$(eval $(call BuildPackage,lvm2-normal)) +$(eval $(call BuildPackage,lvm2)) $(eval $(call BuildPackage,lvm2-selinux))