diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/e2fsprogs/Makefile | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/e2fsprogs/Makefile')
| -rw-r--r-- | package/e2fsprogs/Makefile | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 2677e327b..12abd583a 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -6,16 +6,24 @@ include ${TOPDIR}/rules.mk PKG_NAME:= e2fsprogs -PKG_VERSION:= 1.41.3 +PKG_VERSION:= 1.41.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= b21d26fc46c584021dc9c444933ee1c2 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/} +PKG_MD5SUM:= e218df6c84fc17c1126d31de9472a76c +PKG_DESCR:= Ext2/3/4 filesystem utilities +PKG_SECTION:= admin +PKG_URL:= http://e2fsprogs.sourceforge.net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/} + +PKG_DESCR_1:= UUID library +PKG_SECTION_1:= libs +PKG_DESCR_2:= Common error library +PKG_SECTION_2:= libs include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,E2FSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,E2FSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION_1})) +$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_2},${PKG_SECTION_2})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --enable-elf-shlibs \ @@ -34,8 +42,7 @@ pre-build: subst post-install: - ${INSTALL_DIR} ${IDIR_E2FSPROGS}/usr/lib - ${INSTALL_DIR} ${IDIR_E2FSPROGS}/usr/sbin + ${INSTALL_DIR} ${IDIR_E2FSPROGS}/usr/lib ${IDIR_E2FSPROGS}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck ${IDIR_E2FSPROGS}/usr/sbin/ ${INSTALL_BIN} ${WRKINST}/usr/sbin/mke2fs ${IDIR_E2FSPROGS}/usr/sbin/ ${INSTALL_BIN} ${WRKINST}/usr/sbin/tune2fs ${IDIR_E2FSPROGS}/usr/sbin/ |