diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:52:51 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:52:51 +0100 |
| commit | 58d31896056e604185acf3606b99257cea519dd1 (patch) | |
| tree | 3a0fb34da5dbe8dc12326fcd7fbf0c3916028f41 /package/e2fsprogs | |
| parent | 220a96f9926788ed531717f78e44fdf1e7ab3b34 (diff) | |
| parent | 845317b460ee99ad633534cad4de72404af7e30b (diff) | |
resolve merge conflicts
Diffstat (limited to 'package/e2fsprogs')
| -rw-r--r-- | package/e2fsprogs/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 783a197cf..1eb65d222 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -13,6 +13,8 @@ PKG_DEPENDS:= libcom-err libuuid libblkid libpthread PKG_URL:= http://e2fsprogs.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/} +PKG_CFLINE_E2FSPROGS:= default y if ADK_TARGET_ROOTFS_CF + PKG_SUBPKGS:= E2FSPROGS LIBUUID LIBCOM_ERR LIBSS LIBBLKID PKGSD_LIBUUID:= UUID library PKGSC_LIBUUID:= libs @@ -45,6 +47,7 @@ pre-build: post-install: ${INSTALL_DIR} ${IDIR_E2FSPROGS}/usr/lib ${IDIR_E2FSPROGS}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck ${IDIR_E2FSPROGS}/usr/sbin/ + cd $(IDIR_E2FSPROGS)/usr/sbin && ln -sf e2fsck fsck.ext2 ${INSTALL_BIN} ${WRKINST}/usr/sbin/mke2fs ${IDIR_E2FSPROGS}/usr/sbin/ ${INSTALL_BIN} ${WRKINST}/usr/sbin/tune2fs ${IDIR_E2FSPROGS}/usr/sbin/ ${CP} ${WRKINST}/usr/lib/lib{e2p,ext2fs}.so.* \ |