X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Futils%2Fe2fsprogs%2FMakefile;h=5d5ad901dd11cda6e3e2973529def73967581ca2;hb=252d6734bd28a32e796c123572c5d069e1395254;hp=e40f280b380cc487df897db6183ee28915c3ee93;hpb=cad24d7d5c18c4aa87368fa21925d2c7df3ef11a;p=openwrt.git

diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile
index e40f280b38..5d5ad901dd 100644
--- a/package/utils/e2fsprogs/Makefile
+++ b/package/utils/e2fsprogs/Makefile
@@ -18,6 +18,9 @@ PKG_SOURCE_URL:=@SF/e2fsprogs
 PKG_BUILD_DEPENDS:=util-linux
 PKG_INSTALL:=1
 
+PKG_LICENSE:=GPL-2.0 LGPL-2.0 BSD-3-Clause MIT
+PKG_LICENSE_FILES:=COPYING
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/e2fsprogs/Default
@@ -35,13 +38,11 @@ endef
 
 define Package/e2fsprogs/description
  This package contains essential ext2 filesystem utilities which consists of
- e2fsck, mke2fs, tune2fs, and most of the other core ext2
- filesystem utilities.
+ e2fsck, mke2fs and most of the other core ext2 filesystem utilities.
 endef
 
 define Package/libext2fs
 $(call Package/e2fsprogs/Default)
-  DEPENDS:=+libcom_err
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=ext2/3/4 filesystem library
@@ -51,18 +52,6 @@ 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)
-  DEPENDS:=+libpthread
-  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
@@ -83,6 +72,8 @@ endef
 
 TARGET_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections
 
+CONFIGURE_VARS += \
+	ac_cv_lib_pthread_sem_init=no
 
 CONFIGURE_ARGS += \
 	--disable-testio-debug \
@@ -130,13 +121,14 @@ define Package/e2fsprogs/install
 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/libext2fs/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libext2fs.so.* $(1)/usr/lib/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/libext2fs.so.* \
+		$(PKG_INSTALL_DIR)/usr/lib/libcom_err.so.* \
+		$(1)/usr/lib/
 endef
 
 define Package/libext2fs/install_lib
@@ -161,7 +153,6 @@ endef
 
 $(eval $(call BuildPackage,e2fsprogs))
 $(eval $(call BuildPackage,libext2fs))
-$(eval $(call BuildPackage,libcom_err))
 $(eval $(call BuildPackage,tune2fs))
 $(eval $(call BuildPackage,resize2fs))
 $(eval $(call BuildPackage,badblocks))