diff options
| author | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-05 10:12:53 +0000 |
|---|---|---|
| committer | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-05 10:12:53 +0000 |
| commit | 5c105d9f3fd086aff195d3849dcf847d6b0bd927 (patch) | |
| tree | 1229a11f725bfa58aa7c57a76898553bb5f6654a /tools/e2fsprogs | |
| download | openwrt-5c105d9f3fd086aff195d3849dcf847d6b0bd927.tar.gz openwrt-5c105d9f3fd086aff195d3849dcf847d6b0bd927.zip | |
branch Attitude Adjustment
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@33625 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/e2fsprogs')
| -rw-r--r-- | tools/e2fsprogs/Makefile | 47 | ||||
| -rw-r--r-- | tools/e2fsprogs/patches/001-exit_0_on_corrected_errors.patch | 11 | ||||
| -rw-r--r-- | tools/e2fsprogs/patches/002-dont-build-e4defrag.patch | 11 |
3 files changed, 69 insertions, 0 deletions
diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile new file mode 100644 index 000000000..9f5bcc4b8 --- /dev/null +++ b/tools/e2fsprogs/Makefile @@ -0,0 +1,47 @@ +# +# Copyright (C) 2010-2012 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=e2fsprogs +PKG_VERSION:=1.42.4 +PKG_MD5SUM:=b6e296f210d642361b7394437ff0f318 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/e2fsprogs + +HOST_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/host-build.mk + +HOST_CFLAGS += $(FPIC) +HOST_LDFLAGS += $(HOST_STATIC_LINKING) + +HOST_CONFIGURE_ARGS += \ + --disable-shared \ + --disable-elf-shlibs \ + --enable-static \ + --enable-dynamic-e2fsck \ + --disable-tls \ + --disable-nls + +define Host/Install + $(Host/Install/Default) + $(MAKE) -C $(HOST_BUILD_DIR)/lib/uuid install + mkdir -p $(STAGING_DIR_HOST)/include/e2fsprogs + $(CP) $(STAGING_DIR_HOST)/include/uuid $(STAGING_DIR_HOST)/include/e2fsprogs/ + rm -rf $(STAGING_DIR_HOST)/include/uuid + $(INSTALL_DATA) $(HOST_BUILD_DIR)/lib/uuid/libuuid.a $(STAGING_DIR_HOST)/lib/ +endef + +define Host/Clean + rm -f $(STAGING_DIR_HOST)/bin/e2fsck + rm -f $(STAGING_DIR_HOST)/bin/tune2fs +endef + +$(eval $(call HostBuild)) diff --git a/tools/e2fsprogs/patches/001-exit_0_on_corrected_errors.patch b/tools/e2fsprogs/patches/001-exit_0_on_corrected_errors.patch new file mode 100644 index 000000000..67a30f610 --- /dev/null +++ b/tools/e2fsprogs/patches/001-exit_0_on_corrected_errors.patch @@ -0,0 +1,11 @@ +--- a/e2fsck/e2fsck.h ++++ b/e2fsck/e2fsck.h +@@ -73,7 +73,7 @@ + * Exit codes used by fsck-type programs + */ + #define FSCK_OK 0 /* No errors */ +-#define FSCK_NONDESTRUCT 1 /* File system errors corrected */ ++#define FSCK_NONDESTRUCT 0 /* File system errors corrected */ + #define FSCK_REBOOT 2 /* System should be rebooted */ + #define FSCK_UNCORRECTED 4 /* File system errors left uncorrected */ + #define FSCK_ERROR 8 /* Operational error */ diff --git a/tools/e2fsprogs/patches/002-dont-build-e4defrag.patch b/tools/e2fsprogs/patches/002-dont-build-e4defrag.patch new file mode 100644 index 000000000..9f6e7b1ce --- /dev/null +++ b/tools/e2fsprogs/patches/002-dont-build-e4defrag.patch @@ -0,0 +1,11 @@ +--- a/misc/Makefile.in ++++ b/misc/Makefile.in +@@ -11,7 +11,7 @@ INSTALL = @INSTALL@ + + @MCONFIG@ + +-@DEFRAG_CMT@@LINUX_CMT@E4DEFRAG_PROG= e4defrag ++@DEFRAG_CMT@@LINUX_CMT@E4DEFRAG_PROG= + @DEFRAG_CMT@@LINUX_CMT@E4DEFRAG_MAN= e4defrag.8 + + @IMAGER_CMT@E2IMAGE_PROG= e2image |