add PKG_CPE_ID ids to package and tools

[openwrt/openwrt.git] / package / utils / e2fsprogs / Makefile

diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile
index cf84c260c7dc9c99c8d0a69c26652e9469ea7a2f..141bdf38f82a19bcc81b84901bd1dc0ddfb96d7a 100644 (file)
--- a/package/utils/e2fsprogs/Makefile
+++ b/package/utils/e2fsprogs/Makefile
@@ -8,12 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=e2fsprogs
-PKG_VERSION:=1.43.3
-PKG_MD5SUM:=ce8ef1bbb0d4730f170167284fda156ac9d6bf18db2750eb94af619a81b19927
-PKG_RELEASE:=2
+PKG_VERSION:=1.43.6
+PKG_HASH:=c9b226234ee878a8d89951f3b155cec7416dd0ec09c932c855f1b1df8ad93402
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/e2fsprogs
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/
+PKG_LICENSE:=GPL-2.0
+PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs
 
 PKG_BUILD_DEPENDS:=util-linux
 PKG_INSTALL:=1
@@ -44,7 +46,7 @@ define Package/libext2fs
 $(call Package/e2fsprogs/Default)
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libuuid
+  DEPENDS:=+libuuid +libblkid
   TITLE:=ext2/3/4 filesystem library
 endef
 
@@ -108,18 +110,17 @@ endef
 
 TARGET_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections
 
-CONFIGURE_VARS += \
-       ac_cv_lib_pthread_sem_init=no
-
 CONFIGURE_ARGS += \
        --disable-testio-debug \
        --enable-elf-shlibs     \
        --disable-libuuid       \
-       --enable-libblkid       \
+       --disable-libblkid      \
        --disable-uuidd         \
        --disable-tls           \
        --disable-nls           \
-       --disable-rpath
+       --disable-rpath         \
+       --disable-threads       \
+       --disable-fuse2fs
 
 define Build/Prepare
        $(call Build/Prepare/Default)
@@ -138,7 +139,6 @@ define Build/Compile
                LDFLAGS=-Wl,--gc-sections \
                BUILDCC="$(HOSTCC)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
-               LIBBLKID="$(PKG_BUILD_DIR)/lib/libblkid.a -luuid" \
                ELF_OTHER_LIBS="$(TARGET_LDFLAGS) -luuid" \
                SYSLIBS="$(TARGET_LDFLAGS) -ldl -L$(PKG_BUILD_DIR)/lib/ -l:libcom_err.so.0.0" \
                V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1,) \