From 49a0179e21506b9d6876e56c8dcd845a144169b9 Mon Sep 17 00:00:00 2001
From: Imre Kaloz <kaloz@openwrt.org>
Date: Mon, 22 Nov 2010 11:26:45 +0000
Subject: add e2fsprogs to tools and use that instead of libuuid

SVN-Revision: 24078
---
 tools/e2fsprogs/Makefile                           | 66 ++++++++++++++++++++++
 .../patches/001-exit_0_on_corrected_errors.patch   | 11 ++++
 2 files changed, 77 insertions(+)
 create mode 100644 tools/e2fsprogs/Makefile
 create mode 100644 tools/e2fsprogs/patches/001-exit_0_on_corrected_errors.patch

(limited to 'tools/e2fsprogs')

diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
new file mode 100644
index 0000000000..2a7eb6a4e7
--- /dev/null
+++ b/tools/e2fsprogs/Makefile
@@ -0,0 +1,66 @@
+#
+# Copyright (C) 2010 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.41.10
+PKG_MD5SUM:=f9c7bb5c036a119453ce02fa871038da
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/e2fsprogs
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Configure
+	( cd $(HOST_BUILD_DIR); \
+		./configure \
+			--target=$(GNU_HOST_NAME) \
+			--host=$(GNU_HOST_NAME) \
+			--build=$(GNU_HOST_NAME) \
+			--program-prefix="" \
+			--program-suffix="" \
+			--prefix=/usr \
+			--exec-prefix=/usr \
+			--bindir=/usr/bin \
+			--sbindir=/usr/sbin \
+			--libexecdir=/usr/lib \
+			--sysconfdir=/etc \
+			--datadir=/usr/share \
+			--localstatedir=/var \
+			--mandir=/usr/man \
+			--infodir=/usr/info \
+	)
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--disable-rpath \
+	--enable-elf-shlibs \
+	--enable-dynamic-e2fsck \
+	--disable-tls
+
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR) \
+		CFLAGS="$(HOST_CFLAGS)" all
+endef
+
+define Host/Install
+	install -m0755 $(HOST_BUILD_DIR)/e2fsck/e2fsck $(STAGING_DIR_HOST)/bin/
+	install -m0755 $(HOST_BUILD_DIR)/misc/tune2fs $(STAGING_DIR_HOST)/bin/
+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 0000000000..4dbece5cef
--- /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
+@@ -65,7 +65,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 */
-- 
cgit v1.2.3