diff options
Diffstat (limited to 'package/e2fsprogs/Makefile')
| -rw-r--r-- | package/e2fsprogs/Makefile | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 1eb65d222..7b22a922d 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= e2fsprogs PKG_VERSION:= 1.41.14 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 05f70470aea2ef7efbb0845b2b116720 PKG_DESCR:= Ext2/3/4 filesystem utilities PKG_SECTION:= fs @@ -15,7 +15,7 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/} PKG_CFLINE_E2FSPROGS:= default y if ADK_TARGET_ROOTFS_CF -PKG_SUBPKGS:= E2FSPROGS LIBUUID LIBCOM_ERR LIBSS LIBBLKID +PKG_SUBPKGS:= E2FSPROGS LIBUUID LIBCOM_ERR LIBSS LIBBLKID E2FSCK_STATIC PKGSD_LIBUUID:= UUID library PKGSC_LIBUUID:= libs PKGSD_LIBCOM_ERR:= Common error library @@ -24,6 +24,8 @@ PKGSD_LIBSS:= Subsystem command parsing library PKGSC_LIBSS:= libs PKGSD_LIBBLKID:= Libblkid PKGSC_LIBBLKID:= libs +PKGSD_E2FSCK_STATIC:= Static build of e2fsck +PKGSC_E2FSCK_STATIC:= fs include ${TOPDIR}/mk/package.mk @@ -32,9 +34,11 @@ $(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},,${PKGS $(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBCOM_ERR},${PKGSC_LIBCOM_ERR})) $(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBSS},${PKGSC_LIBSS})) $(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBLKID},${PKGSC_LIBBLKID})) +$(eval $(call PKG_template,E2FSCK_STATIC,e2fsck-static,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_E2FSCK_STATIC},${PKGSC_E2FSCK_STATIC})) -CONFIGURE_ARGS+= --enable-elf-shlibs --disable-tls +CONFIGURE_ARGS+= --enable-elf-shlibs --disable-rpath INSTALL_TARGET+= install-libs +TLDFLAGS+= -lpthread pre-build: ${MAKE} -C ${WRKBUILD}/util \ @@ -44,7 +48,14 @@ pre-build: CPPFLAGS="" \ subst +post-build: + ${MAKE} -C ${WRKBUILD}/e2fsck e2fsck.static + ${INSTALL_DIR} ${WRKINST}/usr/sbin + ${INSTALL_BIN} ${WRKBUILD}/e2fsck/e2fsck.static ${WRKINST}/usr/sbin/ + post-install: + ${INSTALL_DIR} ${IDIR_E2FSPROGS}/etc + ${INSTALL_DATA} ${WRKINST}/etc/mke2fs.conf ${IDIR_E2FSPROGS}/etc/ ${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 @@ -73,5 +84,8 @@ post-install: ${CP} ${WRKBUILD}/lib/uuid/uuid.h \ ${STAGING_TARGET_DIR}/usr/include/uuid ${CP} ${WRKINST}/usr/bin/compile_et ${STAGING_HOST_DIR}/bin + ${INSTALL_DIR} ${IDIR_E2FSCK_STATIC}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck.static \ + ${IDIR_E2FSCK_STATIC}/usr/sbin/e2fsck include ${TOPDIR}/mk/pkg-bottom.mk |