Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lvm2: don't use -normal suffix for non-SELinux variants

Browse source 
This was probably a work-around for an issue with dependencies which
was fixed by
988ed00802

Remove it as all other packages with `-selinux` variants do provide
a non-SELinux-variant without any suffix and that works now, see
procd vs. procd-selinux
busybox vs. busybox-selinux

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2021-04-10 11:54:50 +01:00
parent ec20e9df96
commit 43597b918a
No known key found for this signature in database
GPG key ID: 5A8F39C31C3217CA
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
utils/lvm2/Makefile
View file

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