KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

util-linux: package libsmartcols

Browse source 
Packages fdisk and lsblk were missing dependency for libsmartcols.so.1

Add package for libsmartcols and add dependency from fdisk and lsblk.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 43459
This commit is contained in:
Luka Perkov 2014-12-01 12:40:06 +00:00
parent c3a7057e43
commit 36063edf53
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
package/utils/util-linux/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=util-linux PKG_NAME:=util-linux
PKG_VERSION:=2.25.2 PKG_VERSION:=2.25.2
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.25 PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.25
@ -49,6 +49,7 @@ define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_BUILD_DIR)/libblkid/blkid.pc $(1)/usr/lib/pkgconfig $(CP) $(PKG_BUILD_DIR)/libblkid/blkid.pc $(1)/usr/lib/pkgconfig
$(CP) $(PKG_BUILD_DIR)/libmount/mount.pc $(1)/usr/lib/pkgconfig $(CP) $(PKG_BUILD_DIR)/libmount/mount.pc $(1)/usr/lib/pkgconfig
$(CP) $(PKG_BUILD_DIR)/libsmartcols/smartcols.pc $(1)/usr/lib/pkgconfig
$(CP) $(PKG_BUILD_DIR)/libuuid/uuid.pc $(1)/usr/lib/pkgconfig $(CP) $(PKG_BUILD_DIR)/libuuid/uuid.pc $(1)/usr/lib/pkgconfig
$(INSTALL_DIR) $(1)/usr/include/blkid $(INSTALL_DIR) $(1)/usr/include/blkid
@ -57,11 +58,14 @@ define Build/InstallDev
$(CP) $(PKG_BUILD_DIR)/libmount/src/libmount.h $(1)/usr/include/libmount $(CP) $(PKG_BUILD_DIR)/libmount/src/libmount.h $(1)/usr/include/libmount
$(INSTALL_DIR) $(1)/usr/include/uuid $(INSTALL_DIR) $(1)/usr/include/uuid
$(CP) $(PKG_BUILD_DIR)/libuuid/src/uuid.h $(1)/usr/include/uuid $(CP) $(PKG_BUILD_DIR)/libuuid/src/uuid.h $(1)/usr/include/uuid
$(INSTALL_DIR) $(1)/usr/include/smartcols
$(CP) $(PKG_BUILD_DIR)/libsmartcols/src/libsmartcols.h $(1)/usr/include/smartcols
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/.libs/libblkid.{a,so*} $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/.libs/libblkid.{a,so*} $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/.libs/libmount.{a,so*} $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/.libs/libmount.{a,so*} $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/.libs/libuuid.{a,so*} $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/.libs/libuuid.{a,so*} $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/.libs/libsmartcols.{a,so*} $(1)/usr/lib
endef endef
define Package/libblkid define Package/libblkid
@ -106,6 +110,17 @@ define Package/libuuid/description
Foundation (OSF) Distributed Computing Environment (DCE) utility. Foundation (OSF) Distributed Computing Environment (DCE) utility.
endef endef
define Package/libsmartcols
$(call Package/util-linux/Default)
TITLE:=table or tree library
SECTION:=libs
CATEGORY:=Libraries
endef
define Package/libsmartcols/description
The smartcols library is used to print tables and trees in a pretty way.
endef
define Package/agetty define Package/agetty
$(call Package/util-linux/Default) $(call Package/util-linux/Default)
TITLE:=alternative Linux getty TITLE:=alternative Linux getty
@ -163,7 +178,7 @@ endef
define Package/fdisk define Package/fdisk
$(call Package/util-linux/Default) $(call Package/util-linux/Default)
TITLE:=manipulate disk partition table TITLE:=manipulate disk partition table
DEPENDS:= +libblkid DEPENDS:= +libblkid +libsmartcols
SUBMENU=disc SUBMENU=disc
endef endef
@ -243,7 +258,7 @@ endef
define Package/lsblk define Package/lsblk
$(call Package/util-linux/Default) $(call Package/util-linux/Default)
TITLE:=list block devices TITLE:=list block devices
DEPENDS:= +libblkid +libmount DEPENDS:= +libblkid +libmount +libsmartcols
SUBMENU=disc SUBMENU=disc
endef endef
@ -415,6 +430,11 @@ define Package/libmount/install
$(CP) $(PKG_BUILD_DIR)/.libs/libmount.so.* $(1)/usr/lib/ $(CP) $(PKG_BUILD_DIR)/.libs/libmount.so.* $(1)/usr/lib/
endef endef
define Package/libsmartcols/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/.libs/libsmartcols.so.* $(1)/usr/lib/
endef
define Package/libuuid/install define Package/libuuid/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/.libs/libuuid.so.* $(1)/usr/lib/ $(CP) $(PKG_BUILD_DIR)/.libs/libuuid.so.* $(1)/usr/lib/
@ -568,6 +588,7 @@ endef
$(eval $(call BuildPackage,libblkid)) $(eval $(call BuildPackage,libblkid))
$(eval $(call BuildPackage,libmount)) $(eval $(call BuildPackage,libmount))
$(eval $(call BuildPackage,libsmartcols))
$(eval $(call BuildPackage,libuuid)) $(eval $(call BuildPackage,libuuid))
$(eval $(call BuildPackage,agetty)) $(eval $(call BuildPackage,agetty))
$(eval $(call BuildPackage,blkid)) $(eval $(call BuildPackage,blkid))