summaryrefslogtreecommitdiff
path: root/package/e2fsprogs
diff options
context:
space:
mode:
Diffstat (limited to 'package/e2fsprogs')
-rw-r--r--package/e2fsprogs/Makefile38
-rw-r--r--package/e2fsprogs/patches/patch-misc_Makefile_in50
2 files changed, 58 insertions, 30 deletions
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 39b3d6674..b0094b9dc 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -5,25 +5,22 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= e2fsprogs
PKG_VERSION:= 1.41.14
-PKG_RELEASE:= 3
+PKG_RELEASE:= 4
PKG_MD5SUM:= 05f70470aea2ef7efbb0845b2b116720
PKG_DESCR:= Ext2/3/4 filesystem utilities
PKG_SECTION:= fs
PKG_DEPENDS:= libcom-err libuuid libblkid libpthread
+PKG_BUILDDEP:= util-linux
PKG_URL:= http://e2fsprogs.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
PKG_CFLINE_E2FSPROGS:= default y if ADK_TARGET_ROOTFS_CF
-PKG_SUBPKGS:= LIBE2FS LIBUUID LIBCOM_ERR LIBSS LIBBLKID E2FSCK_STATIC
-PKG_SUBPKGS+= LIBCOM_ERR_DEV LIBSS_DEV LIBUUID_DEV LIBBLKID_DEV
+PKG_SUBPKGS:= LIBE2FS LIBCOM_ERR LIBSS E2FSCK_STATIC
+PKG_SUBPKGS+= LIBCOM_ERR_DEV LIBSS_DEV
PKG_SUBPKGS+= RESIZE2FS TUNE2FS E2FSCK MKE2FS
PKGSD_LIBE2FS:= e2fsprogs library
PKGSC_LIBE2FS:= libs
-PKGSD_LIBUUID:= UUID library
-PKGSC_LIBUUID:= libs
-PKGSD_LIBUUID_DEV:= UUID headers
-PKGSC_LIBUUID_DEV:= devel
PKGSD_LIBCOM_ERR:= Common error library
PKGSC_LIBCOM_ERR:= libs
PKGSD_LIBCOM_ERR_DEV:= Common error headers
@@ -32,10 +29,6 @@ PKGSD_LIBSS:= Subsystem command parsing library
PKGSC_LIBSS:= libs
PKGSD_LIBSS_DEV:= Subsystem command parsing headers
PKGSC_LIBSS_DEV:= devel
-PKGSD_LIBBLKID:= blkid library
-PKGSC_LIBBLKID:= libs
-PKGSD_LIBBLKID_DEV:= blkid headers
-PKGSC_LIBBLKID_DEV:= devel
PKGSD_E2FSCK_STATIC:= Static build of e2fsck
PKGSC_E2FSCK_STATIC:= fs
PKGSD_RESIZE2FS:= Resize FS utility
@@ -54,32 +47,27 @@ PKGSS_MKE2FS:= libe2fs
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBE2FS,libe2fs,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBE2FS},${PKGSC_LIBE2FS}))
-$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBUUID},${PKGSC_LIBUUID}))
-$(eval $(call PKG_template,LIBUUID_DEV,libuuid-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBUUID_DEV},${PKGSC_LIBUUID_DEV}))
$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBCOM_ERR},${PKGSC_LIBCOM_ERR}))
$(eval $(call PKG_template,LIBCOM_ERR_DEV,libcom-err-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBCOM_ERR_DEV},${PKGSC_LIBCOM_ERR_DEV}))
$(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBSS},${PKGSC_LIBSS}))
$(eval $(call PKG_template,LIBSS_DEV,libss-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBSS_DEV},${PKGSC_LIBSS_DEV}))
-$(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBLKID},${PKGSC_LIBBLKID}))
-$(eval $(call PKG_template,LIBBLKID_DEV,libblkid-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBLKID_DEV},${PKGSC_LIBBLKID_DEV}))
$(eval $(call PKG_template,E2FSCK_STATIC,e2fsck-static,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_E2FSCK_STATIC},${PKGSC_E2FSCK_STATIC}))
$(eval $(call PKG_template,TUNE2FS,tune2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_TUNE2FS),${PKGSD_TUNE2FS},${PKGSC_TUNE2FS}))
$(eval $(call PKG_template,RESIZE2FS,resize2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_RESIZE2FS),${PKGSD_RESIZE2FS},${PKGSC_RESIZE2FS}))
$(eval $(call PKG_template,MKE2FS,mke2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_MKE2FS),${PKGSD_MKE2FS},${PKGSC_MKE2FS}))
$(eval $(call PKG_template,E2FSCK,e2fsck,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_E2FSCK),${PKGSD_E2FSCK},${PKGSC_E2FSCK}))
-CONFIGURE_ARGS+= --enable-elf-shlibs --disable-rpath
+CONFIGURE_ARGS+= --enable-elf-shlibs --disable-rpath \
+ --disable-libuuid
INSTALL_TARGET+= install-libs
TARGET_LDFLAGS+= -lpthread
+TARGET_CFLAGS+= $(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include
MAKE_FLAGS+= BUILD_CC="${CC_FOR_BUILD}" \
BUILD_CFLAGS="${CFLAGS_FOR_BUILD}" \
BUILD_LDFLAGS="${LDFLAGS_FOR_BUILD}" \
BUILD_CPPFLAGS="${CPPFLAGS_FOR_BUILD}"
post-build:
- ${INSTALL_DIR} ${STAGING_DIR}/usr/include/uuid
- ${CP} ${WRKBUILD}/lib/uuid/uuid.h \
- ${STAGING_DIR}/usr/include/uuid
ifneq ($(ADK_PACKAGE_E2FSCK_STATIC),)
${MAKE} -C ${WRKBUILD}/e2fsck e2fsck.static
${INSTALL_DIR} ${WRKINST}/usr/sbin
@@ -88,7 +76,7 @@ endif
libe2fs-install:
${INSTALL_DIR} ${IDIR_LIBE2FS}/etc
- ${INSTALL_DATA} ${WRKINST}/etc/mke2fs.conf ${IDIR_LIBE2FS}/etc
+ ${INSTALL_DATA} ${WRKBUILD}/misc/mke2fs.conf ${IDIR_LIBE2FS}/etc
${INSTALL_DIR} ${IDIR_LIBE2FS}/usr/lib
${CP} ${WRKINST}/usr/lib/lib{e2p,ext2fs}.so.* \
${IDIR_LIBE2FS}/usr/lib
@@ -145,16 +133,6 @@ libss-dev-install:
${CP} ${WRKINST}/usr/include/ss/ss*.h \
${IDIR_LIBSS_DEV}/usr/include/ss
-libuuid-install:
- ${INSTALL_DIR} ${IDIR_LIBUUID}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libuuid.so* \
- ${IDIR_LIBUUID}/usr/lib
-
-libuuid-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBUUID_DEV}/usr/include/uuid
- ${CP} ${WRKBUILD}/lib/uuid/uuid.h \
- ${IDIR_LIBUUID_DEV}/usr/include/uuid
-
e2fsck-static-install:
ifneq ($(ADK_PACKAGE_E2FSCK_STATIC),)
${INSTALL_DIR} ${IDIR_E2FSCK_STATIC}/usr/sbin
diff --git a/package/e2fsprogs/patches/patch-misc_Makefile_in b/package/e2fsprogs/patches/patch-misc_Makefile_in
new file mode 100644
index 000000000..504b975b9
--- /dev/null
+++ b/package/e2fsprogs/patches/patch-misc_Makefile_in
@@ -0,0 +1,50 @@
+--- e2fsprogs-1.41.14.orig/misc/Makefile.in 2010-12-22 16:49:20.000000000 +0100
++++ e2fsprogs-1.41.14/misc/Makefile.in 2011-12-05 19:36:48.078609219 +0100
+@@ -14,9 +14,6 @@ INSTALL = @INSTALL@
+ @IMAGER_CMT@E2IMAGE_PROG= e2image
+ @IMAGER_CMT@E2IMAGE_MAN= e2image.8
+
+-@UUIDD_CMT@UUIDD_PROG= uuidd
+-@UUIDD_CMT@UUIDD_MAN= uuidd.8
+-
+ @BLKID_CMT@BLKID_PROG= blkid
+ @BLKID_CMT@BLKID_MAN= blkid.8
+
+@@ -31,8 +28,8 @@ SMANPAGES= tune2fs.8 mklost+found.8 mke2
+ logsave.8 filefrag.8 e2freefrag.8 e2undo.8 $(UUIDD_MAN) @FSCK_MAN@
+ FMANPAGES= mke2fs.conf.5
+
+-UPROGS= chattr lsattr @UUID_CMT@ uuidgen
+-UMANPAGES= chattr.1 lsattr.1 @UUID_CMT@ uuidgen.1
++UPROGS= chattr lsattr
++UMANPAGES= chattr.1 lsattr.1
+
+ LPROGS= @E2INITRD_PROG@
+
+@@ -41,8 +38,6 @@ MKLPF_OBJS= mklost+found.o
+ MKE2FS_OBJS= mke2fs.o util.o profile.o prof_err.o default_profile.o
+ CHATTR_OBJS= chattr.o
+ LSATTR_OBJS= lsattr.o
+-UUIDGEN_OBJS= uuidgen.o
+-UUIDD_OBJS= uuidd.o
+ DUMPE2FS_OBJS= dumpe2fs.o
+ BADBLOCKS_OBJS= badblocks.o
+ E2IMAGE_OBJS= e2image.o
+@@ -58,8 +53,6 @@ PROFILED_MKE2FS_OBJS= profiled/mke2fs.o
+ profiled/prof_err.o profiled/default_profile.o
+ PROFILED_CHATTR_OBJS= profiled/chattr.o
+ PROFILED_LSATTR_OBJS= profiled/lsattr.o
+-PROFILED_UUIDGEN_OBJS= profiled/uuidgen.o
+-PROFILED_UUIDD_OBJS= profiled/uuidd.o
+ PROFILED_DUMPE2FS_OBJS= profiled/dumpe2fs.o
+ PROFILED_BADBLOCKS_OBJS= profiled/badblocks.o
+ PROFILED_E2IMAGE_OBJS= profiled/e2image.o
+@@ -75,7 +68,7 @@ XTRA_CFLAGS= -I$(srcdir)/../e2fsck -I.
+ SRCS= $(srcdir)/tune2fs.c $(srcdir)/mklost+found.c $(srcdir)/mke2fs.c \
+ $(srcdir)/chattr.c $(srcdir)/lsattr.c $(srcdir)/dumpe2fs.c \
+ $(srcdir)/badblocks.c $(srcdir)/fsck.c $(srcdir)/util.c \
+- $(srcdir)/uuidgen.c $(srcdir)/blkid.c $(srcdir)/logsave.c \
++ $(srcdir)/blkid.c $(srcdir)/logsave.c \
+ $(srcdir)/filefrag.c $(srcdir)/base_device.c \
+ $(srcdir)/ismounted.c $(srcdir)/../e2fsck/profile.c \
+ $(srcdir)/e2undo.c $(srcdir)/e2freefrag.c