OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 6... Line 6...
6 # 6 #
Line 7... Line 7...
7   7  
Line 8... Line 8...
8 include $(TOPDIR)/rules.mk 8 include $(TOPDIR)/rules.mk
9   9  
-   10 PKG_NAME:=e2fsprogs
10 PKG_NAME:=e2fsprogs 11 PKG_VERSION:=1.44.1
Line 11... Line 12...
11 PKG_VERSION:=1.44.5 12 PKG_HASH:=0ca164c1c87724df904c918b2d7051ef989b51de725db66c67514dbe6dd2b9ef
12 PKG_RELEASE:=1 13 PKG_RELEASE:=1
13   -  
14 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -  
15 PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/ 14  
16 PKG_HASH:=ba5eb3069d69160d96818bb9700de9ab5a8458d9add1fd85d427c0000d34c5b9 -  
17   15 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
Line 18... Line 16...
18 PKG_LICENSE:=GPL-2.0 16 PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/
19 PKG_LICENSE_FILES:=NOTICE 17 PKG_LICENSE:=GPL-2.0
Line 45... Line 43...
45 SECTION:=libs 43 SECTION:=libs
46 CATEGORY:=Libraries 44 CATEGORY:=Libraries
47 TITLE:=ext2/3/4 filesystem library 45 TITLE:=ext2/3/4 filesystem library
48 URL:=http://e2fsprogs.sourceforge.net/ 46 URL:=http://e2fsprogs.sourceforge.net/
49 DEPENDS:=+libuuid +libblkid +libss +libcomerr 47 DEPENDS:=+libuuid +libblkid +libss +libcomerr
50 ABI_VERSION:=2 -  
51 endef 48 endef
Line 52... Line 49...
52   49  
53 define Package/libext2fs/description 50 define Package/libext2fs/description
54 libext2fs is a library which can access ext2, ext3 and ext4 filesystems. 51 libext2fs is a library which can access ext2, ext3 and ext4 filesystems.
Line 58... Line 55...
58 SECTION:=libs 55 SECTION:=libs
59 CATEGORY:=Libraries 56 CATEGORY:=Libraries
60 TITLE:=command-line interface parsing library 57 TITLE:=command-line interface parsing library
61 URL:=http://e2fsprogs.sourceforge.net/ 58 URL:=http://e2fsprogs.sourceforge.net/
62 DEPENDS:=+libcomerr 59 DEPENDS:=+libcomerr
63 ABI_VERSION:=2 -  
64 endef 60 endef
Line 65... Line 61...
65   61  
66 define Package/libss/description 62 define Package/libss/description
67 This pacakge contains libss, a command-line interface parsing library 63 This pacakge contains libss, a command-line interface parsing library
Line 72... Line 68...
72 SECTION:=libs 68 SECTION:=libs
73 CATEGORY:=Libraries 69 CATEGORY:=Libraries
74 TITLE:=common error description library 70 TITLE:=common error description library
75 URL:=http://e2fsprogs.sourceforge.net/ 71 URL:=http://e2fsprogs.sourceforge.net/
76 DEPENDS:=+libuuid 72 DEPENDS:=+libuuid
77 ABI_VERSION:=0 -  
78 endef 73 endef
Line 79... Line 74...
79   74  
80 define Package/libcomerr/description 75 define Package/libcomerr/description
81 This package contains libcom_err, the common error description library 76 This package contains libcom_err, the common error description library
Line 110... Line 105...
110 $(call Package/e2fsprogs) 105 $(call Package/e2fsprogs)
111 TITLE:=Ext2 Filesystem free space fragmentation information utility 106 TITLE:=Ext2 Filesystem free space fragmentation information utility
112 DEPENDS:= +e2fsprogs 107 DEPENDS:= +e2fsprogs
113 endef 108 endef
Line 114... Line -...
114   -  
115 define Package/e4crypt -  
116 $(call Package/e2fsprogs) -  
117 TITLE:=Ext4 Filesystem encryption utility -  
118 DEPENDS:= +e2fsprogs -  
119 endef -  
120   109  
121 define Package/filefrag 110 define Package/filefrag
122 $(call Package/e2fsprogs) 111 $(call Package/e2fsprogs)
123 TITLE:=Ext2 Filesystem file fragmentation report utility 112 TITLE:=Ext2 Filesystem file fragmentation report utility
124 DEPENDS:= +e2fsprogs 113 DEPENDS:= +e2fsprogs
Line 140... Line 129...
140 $(call Package/e2fsprogs) 129 $(call Package/e2fsprogs)
141 TITLE:=Ext2 Filesystem lsattr utility 130 TITLE:=Ext2 Filesystem lsattr utility
142 DEPENDS:= +e2fsprogs 131 DEPENDS:= +e2fsprogs
143 endef 132 endef
Line 144... Line 133...
144   133  
145 TARGET_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections -flto -  
146   -  
147 TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt) -  
Line 148... Line 134...
148 TARGET_LDFLAGS += -flto 134 TARGET_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections
149   135  
150 CONFIGURE_ARGS += \ 136 CONFIGURE_ARGS += \
151 --disable-testio-debug \ 137 --disable-testio-debug \
152 --enable-elf-shlibs \ 138 --enable-elf-shlibs \
153 --disable-libuuid \ 139 --disable-libuuid \
154 --disable-libblkid \ 140 --disable-libblkid \
155 --disable-uuidd \ 141 --disable-uuidd \
156 --disable-tls \ 142 --disable-tls \
-   143 --disable-nls \
157 --disable-nls \ 144 --disable-rpath \
Line 158... Line 145...
158 --disable-rpath \ 145 --disable-threads \
159 --disable-fuse2fs 146 --disable-fuse2fs
160   147  
Line 243... Line 230...
243 $(INSTALL_DATA) ./files/e2fsck.conf $(1)/etc/e2fsck.conf 230 $(INSTALL_DATA) ./files/e2fsck.conf $(1)/etc/e2fsck.conf
244 endef 231 endef
Line 245... Line 232...
245   232  
246 define Package/libcomerr/install 233 define Package/libcomerr/install
247 $(INSTALL_DIR) $(1)/usr/lib 234 $(INSTALL_DIR) $(1)/usr/lib
248 $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcom_err.so.* $(1)/usr/lib/ 235 $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcom_err.so* $(1)/usr/lib/
Line 249... Line 236...
249 endef 236 endef
250   237  
251 define Package/libss/install 238 define Package/libss/install
252 $(INSTALL_DIR) $(1)/usr/lib 239 $(INSTALL_DIR) $(1)/usr/lib
Line 253... Line 240...
253 $(CP) $(PKG_INSTALL_DIR)/usr/lib/libss.so.* $(1)/usr/lib/ 240 $(CP) $(PKG_INSTALL_DIR)/usr/lib/libss.so* $(1)/usr/lib/
254 endef 241 endef
255   242  
Line 287... Line 274...
287 define Package/e2freefrag/install 274 define Package/e2freefrag/install
288 $(INSTALL_DIR) $(1)/usr/sbin 275 $(INSTALL_DIR) $(1)/usr/sbin
289 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/e2freefrag $(1)/usr/sbin/ 276 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/e2freefrag $(1)/usr/sbin/
290 endef 277 endef
Line 291... Line -...
291   -  
292 define Package/e4crypt/install -  
293 $(INSTALL_DIR) $(1)/usr/sbin -  
294 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/e4crypt $(1)/usr/sbin/ -  
295 endef -  
296   278  
297 define Package/filefrag/install 279 define Package/filefrag/install
298 $(INSTALL_DIR) $(1)/usr/sbin 280 $(INSTALL_DIR) $(1)/usr/sbin
299 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/filefrag $(1)/usr/sbin/ 281 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/filefrag $(1)/usr/sbin/
Line 322... Line 304...
322 $(eval $(call BuildPackage,tune2fs)) 304 $(eval $(call BuildPackage,tune2fs))
323 $(eval $(call BuildPackage,resize2fs)) 305 $(eval $(call BuildPackage,resize2fs))
324 $(eval $(call BuildPackage,badblocks)) 306 $(eval $(call BuildPackage,badblocks))
325 $(eval $(call BuildPackage,dumpe2fs)) 307 $(eval $(call BuildPackage,dumpe2fs))
326 $(eval $(call BuildPackage,e2freefrag)) 308 $(eval $(call BuildPackage,e2freefrag))
327 $(eval $(call BuildPackage,e4crypt)) -  
328 $(eval $(call BuildPackage,filefrag)) 309 $(eval $(call BuildPackage,filefrag))
329 $(eval $(call BuildPackage,debugfs)) 310 $(eval $(call BuildPackage,debugfs))
330 $(eval $(call BuildPackage,chattr)) 311 $(eval $(call BuildPackage,chattr))
331 $(eval $(call BuildPackage,lsattr)) 312 $(eval $(call BuildPackage,lsattr))
332 $(eval $(call HostBuild)) 313 $(eval $(call HostBuild))