[BusyBox] [PATCH] e2fsprogs compile patch

Tito farmatito at tiscali.it
Sun May 15 09:34:14 UTC 2005


Hi,
this patch should fix e2fsprogs compile breakage
at least for the lsattr and chattr applets.

Please apply.

Ciao,
Tito
-------------- next part --------------
diff -uNr busybox_orig/e2fsprogs/chattr.c busybox_new/e2fsprogs/chattr.c
--- busybox_orig/e2fsprogs/chattr.c	2005-05-15 08:20:15.000000000 +0200
+++ busybox_new/e2fsprogs/chattr.c	2005-05-15 11:16:10.000000000 +0200
@@ -28,7 +28,7 @@
 #include <errno.h>
 #include <sys/param.h>
 #include <sys/stat.h>
-#include <ext2fs/ext2_fs.h>
+#include "ext2fs/ext2_fs.h"
 
 #ifdef __GNUC__
 # define EXT2FS_ATTR(x) __attribute__(x)
diff -uNr busybox_orig/e2fsprogs/e2p/e2p.h busybox_new/e2fsprogs/e2p/e2p.h
--- busybox_orig/e2fsprogs/e2p/e2p.h	2005-05-15 08:20:14.000000000 +0200
+++ busybox_new/e2fsprogs/e2p/e2p.h	2005-05-15 11:16:46.000000000 +0200
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <dirent.h>
 
-#include <ext2fs/ext2_fs.h>
+#include "../ext2fs/ext2_fs.h"
 
 #define E2P_FEATURE_COMPAT	0
 #define E2P_FEATURE_INCOMPAT	1
diff -uNr busybox_orig/e2fsprogs/e2p/iod.c busybox_new/e2fsprogs/e2p/iod.c
--- busybox_orig/e2fsprogs/e2p/iod.c	2005-05-15 08:20:14.000000000 +0200
+++ busybox_new/e2fsprogs/e2p/iod.c	2005-05-15 11:18:40.000000000 +0200
@@ -18,6 +18,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include "libbb.h"
 
 int iterate_on_dir (const char * dir_name,
 		    int (*func) (const char *, struct dirent *, void *),
diff -uNr busybox_orig/e2fsprogs/ext2fs/ext2_fs.h busybox_new/e2fsprogs/ext2fs/ext2_fs.h
--- busybox_orig/e2fsprogs/ext2fs/ext2_fs.h	2005-05-15 08:20:15.000000000 +0200
+++ busybox_new/e2fsprogs/ext2fs/ext2_fs.h	2005-05-15 11:15:23.000000000 +0200
@@ -16,7 +16,7 @@
 #ifndef _LINUX_EXT2_FS_H
 #define _LINUX_EXT2_FS_H
 
-#include <ext2fs/ext2_types.h>		/* Changed from linux/types.h */
+#include "ext2_types.h"		/* Changed from linux/types.h */
 
 /*
  * The second extended filesystem constants/structures
diff -uNr busybox_orig/e2fsprogs/lsattr.c busybox_new/e2fsprogs/lsattr.c
--- busybox_orig/e2fsprogs/lsattr.c	2005-05-15 08:20:15.000000000 +0200
+++ busybox_new/e2fsprogs/lsattr.c	2005-05-15 11:19:11.000000000 +0200
@@ -29,7 +29,7 @@
 #include <sys/param.h>
 #include <sys/stat.h>
 
-#include <ext2fs/ext2_fs.h>
+#include "ext2fs/ext2_fs.h"
 #include "e2fsbb.h"
 #include "e2p/e2p.h"
 
diff -uNr busybox_orig/e2fsprogs/Makefile.in busybox_new/e2fsprogs/Makefile.in
--- busybox_orig/e2fsprogs/Makefile.in	2005-05-15 08:20:15.000000000 +0200
+++ busybox_new/e2fsprogs/Makefile.in	2005-05-15 11:12:36.000000000 +0200
@@ -17,6 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
+CFLAGS += -DEXT2_FLAT_INCLUDES
 E2FSPROGS_AR:=e2fsprogs.a
 ifndef $(E2FSPROGS_DIR)
 E2FSPROGS_DIR:=$(top_builddir)/e2fsprogs/


More information about the busybox mailing list