diff options
| author | Florian Fainelli <florian@openwrt.org> | 2011-07-05 12:40:56 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2011-07-05 12:40:56 +0000 |
| commit | 42a78d909ed71b79fa75b3b2fcd2facaba334bf8 (patch) | |
| tree | 6bac1d395efec77f263b91b92542e80dfe772865 /package/e2fsprogs | |
| parent | adeb9ef829e59b1eda382503ab75685b6dbbb79c (diff) | |
| download | upstream-42a78d909ed71b79fa75b3b2fcd2facaba334bf8.tar.gz upstream-42a78d909ed71b79fa75b3b2fcd2facaba334bf8.tar.bz2 upstream-42a78d909ed71b79fa75b3b2fcd2facaba334bf8.zip | |
e2fsprogs: fix blkid dependencies (#9377)
SVN-Revision: 27459
Diffstat (limited to 'package/e2fsprogs')
| -rw-r--r-- | package/e2fsprogs/Makefile | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 3a6a966937..aac0c5e5be 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=e2fsprogs PKG_VERSION:=1.41.12 PKG_MD5SUM:=1b24a21fc0c2381ef420961cbfec733f -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/e2fsprogs @@ -29,7 +29,7 @@ $(call Package/e2fsprogs/Default) SECTION:=utils CATEGORY:=Utilities TITLE:=Ext2/3/4 filesystem utilities - DEPENDS:=+libblkid +libuuid +libext2fs +libpthread + DEPENDS:=+libblkid +libuuid +libext2fs +libpthread +libcom_err endef define Package/e2fsprogs/description @@ -85,6 +85,17 @@ define Package/libext2fs/description libext2fs is a library which can access ext2, ext3 and ext4 filesystems. endef +define Package/libcom_err +$(call Package/e2fsprogs/Default) + SECTION:=libs + CATEGORY:=Libraries + TITLE:=Common error description library +endef + +define Package/libcom_err/description +libcom_err is a library providing common error descriptions +endef + define Package/tune2fs $(call Package/e2fsprogs) TITLE:=Ext2 Filesystem tune utility @@ -106,7 +117,7 @@ endef define Package/blkid $(call Package/e2fsprogs) TITLE:=Command-line utility to locate/print block device attributes - DEPENDS:=+libuuid +libblkid + DEPENDS:=+libuuid +libblkid +libext2fs +libcom_err +libpthread endef TARGET_CFLAGS += $(FPIC) @@ -156,13 +167,18 @@ define Package/e2fsprogs/install ln -sf mke2fs $(1)/usr/sbin/mkfs.ext3 ln -sf mke2fs $(1)/usr/sbin/mkfs.ext4 $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(foreach lib,com_err e2p,$(PKG_INSTALL_DIR)/usr/lib/lib$(lib).so.*) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libe2p.so.* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/lib/functions/fsck $(INSTALL_DATA) ./files/e2fsck.sh $(1)/lib/functions/fsck/ $(INSTALL_DATA) ./files/e2fsck.conf $(1)/etc/e2fsck.conf endef +define Package/libcom_err/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcom_err.so.* $(1)/usr/lib/ +endef + define Package/libuuid/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuuid.so.* $(1)/usr/lib/ @@ -208,6 +224,7 @@ $(eval $(call BuildPackage,libuuid)) $(eval $(call BuildPackage,uuidgen)) $(eval $(call BuildPackage,libblkid)) $(eval $(call BuildPackage,libext2fs)) +$(eval $(call BuildPackage,libcom_err)) $(eval $(call BuildPackage,tune2fs)) $(eval $(call BuildPackage,resize2fs)) $(eval $(call BuildPackage,badblocks)) |