diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/e2fsprogs | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/e2fsprogs')
| -rw-r--r-- | package/e2fsprogs/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index b1020141f..a93185c31 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= e2fsprogs PKG_VERSION:= 1.42.9 PKG_RELEASE:= 2 PKG_MD5SUM:= 3f8e41e63b432ba114b33f58674563f7 -PKG_DESCR:= Ext2/3/4 filesystem utilities -PKG_SECTION:= fs +PKG_DESCR:= ext2/3/4 filesystem utilities +PKG_SECTION:= sys/fs PKG_DEPENDS:= libpthread PKG_BUILDDEP:= util-linux PKG_URL:= http://e2fsprogs.sourceforge.net/ @@ -20,22 +20,22 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_SUBPKGS:= LIBE2FS LIBCOM_ERR LIBSS PKG_SUBPKGS+= RESIZE2FS TUNE2FS E2FSCK MKE2FS PKGSD_LIBE2FS:= e2fsprogs library -PKGSC_LIBE2FS:= libs +PKGSC_LIBE2FS:= libs/misc PKGSD_LIBCOM_ERR:= common error library -PKGSC_LIBCOM_ERR:= libs +PKGSC_LIBCOM_ERR:= libs/misc PKGSD_LIBSS:= subsystem command parsing library -PKGSC_LIBSS:= libs +PKGSC_LIBSS:= libs/misc PKGSD_RESIZE2FS:= ext2/3/4 resize utility -PKGSC_RESIZE2FS:= fs +PKGSC_RESIZE2FS:= sys/fs PKGSS_RESIZE2FS:= libe2fs libcom-err libblkid PKGSD_TUNE2FS:= ext2/3/4 tune utility -PKGSC_TUNE2FS:= fs +PKGSC_TUNE2FS:= sys/fs PKGSS_TUNE2FS:= libe2fs libcom-err libblkid libuuid PKGSD_E2FSCK:= ext2/3/4 filesystem check utility -PKGSC_E2FSCK:= fs +PKGSC_E2FSCK:= sys/fs PKGSS_E2FSCK:= libe2fs libcom-err libblkid libuuid PKGSD_MKE2FS:= ext2/3/4 filesystem creation utility -PKGSC_MKE2FS:= fs +PKGSC_MKE2FS:= sys/fs PKGSS_MKE2FS:= libe2fs libcom-err libblkid libuuid libncurses include ${TOPDIR}/mk/package.mk |