diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-12-01 12:40:06 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-12-01 12:40:06 +0000 |
| commit | c7615f858c584d967342831b494c0e665ba01537 (patch) | |
| tree | a7ce2f54907a67393a75056473f9373daabb7552 /package/utils | |
| parent | b759373524ee98afb11f67b6f03791d231403f5a (diff) | |
| download | master-187ad058-c7615f858c584d967342831b494c0e665ba01537.tar.gz master-187ad058-c7615f858c584d967342831b494c0e665ba01537.tar.bz2 master-187ad058-c7615f858c584d967342831b494c0e665ba01537.zip | |
util-linux: package libsmartcols
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43459 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/utils')
| -rw-r--r-- | package/utils/util-linux/Makefile | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index 421b881afc..8c2cadf234 100644 --- a/package/utils/util-linux/Makefile +++ b/package/utils/util-linux/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=util-linux PKG_VERSION:=2.25.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.25 @@ -49,6 +49,7 @@ define Build/InstallDev $(INSTALL_DIR) $(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)/libsmartcols/smartcols.pc $(1)/usr/lib/pkgconfig $(CP) $(PKG_BUILD_DIR)/libuuid/uuid.pc $(1)/usr/lib/pkgconfig $(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 $(INSTALL_DIR) $(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 $(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/libuuid.{a,so*} $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/.libs/libsmartcols.{a,so*} $(1)/usr/lib endef define Package/libblkid @@ -106,6 +110,17 @@ define Package/libuuid/description Foundation (OSF) Distributed Computing Environment (DCE) utility. 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 $(call Package/util-linux/Default) TITLE:=alternative Linux getty @@ -163,7 +178,7 @@ endef define Package/fdisk $(call Package/util-linux/Default) TITLE:=manipulate disk partition table - DEPENDS:= +libblkid + DEPENDS:= +libblkid +libsmartcols SUBMENU=disc endef @@ -243,7 +258,7 @@ endef define Package/lsblk $(call Package/util-linux/Default) TITLE:=list block devices - DEPENDS:= +libblkid +libmount + DEPENDS:= +libblkid +libmount +libsmartcols SUBMENU=disc endef @@ -415,6 +430,11 @@ define Package/libmount/install $(CP) $(PKG_BUILD_DIR)/.libs/libmount.so.* $(1)/usr/lib/ 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 $(INSTALL_DIR) $(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,libmount)) +$(eval $(call BuildPackage,libsmartcols)) $(eval $(call BuildPackage,libuuid)) $(eval $(call BuildPackage,agetty)) $(eval $(call BuildPackage,blkid)) |