mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-29 13:55:31 +02:00
a60f2af2c7
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14567 3c298f89-4303-0410-b956-a3cf2f4a3e73
115 lines
3.5 KiB
Diff
115 lines
3.5 KiB
Diff
--- a/yaffs2/utils/Makefile
|
|
+++ b/yaffs2/utils/Makefile
|
|
@@ -16,12 +16,11 @@
|
|
|
|
#KERNELDIR = /usr/src/kernel-headers-2.4.18
|
|
|
|
-CFLAGS = -I/usr/include -I.. -O2 -Wall -DCONFIG_YAFFS_UTIL
|
|
-CFLAGS+= -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-declarations
|
|
-CFLAGS+= -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline
|
|
+CPPFLAGS = -I.. -DCONFIG_YAFFS_UTIL
|
|
+CFLAGS = -O2
|
|
|
|
## Change if you are using a cross-compiler
|
|
-MAKETOOLS =
|
|
+MAKETOOLS =
|
|
|
|
CC=$(MAKETOOLS)gcc
|
|
|
|
@@ -41,7 +40,7 @@ $(COMMONLINKS) $(MKYAFFSLINKS) $(MKYAFFS
|
|
ln -s ../$@ $@
|
|
|
|
$(COMMONOBJS) $(MKYAFFSIMAGEOBJS) $(MKYAFFS2IMAGEOBJS) : %.o: %.c
|
|
- $(CC) -c $(CFLAGS) $< -o $@
|
|
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
|
|
|
|
mkyaffsimage: $(COMMONOBJS) $(MKYAFFSIMAGEOBJS)
|
|
$(CC) -o $@ $(COMMONOBJS) $(MKYAFFSIMAGEOBJS)
|
|
--- a/yaffs2/utils/mkyaffs2image.c
|
|
+++ b/yaffs2/utils/mkyaffs2image.c
|
|
@@ -32,8 +32,6 @@
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
-#include <private/android_filesystem_config.h>
|
|
-
|
|
#include "yaffs_ecc.h"
|
|
#include "yaffs_guts.h"
|
|
|
|
@@ -69,10 +67,12 @@ static int outFile;
|
|
|
|
static int error;
|
|
|
|
-#ifdef HAVE_BIG_ENDIAN
|
|
+#if BYTE_ORDER == BIG_ENDIAN
|
|
static int convert_endian = 1;
|
|
-#elif defined(HAVE_LITTLE_ENDIAN)
|
|
+#elif BYTE_ORDER == LITTLE_ENDIAN
|
|
static int convert_endian = 0;
|
|
+#else
|
|
+#error Unknown endian type
|
|
#endif
|
|
|
|
static int obj_compare(const void *a, const void * b)
|
|
@@ -298,8 +298,8 @@ static int write_object_header(int objId
|
|
|
|
static void fix_stat(const char *path, struct stat *s)
|
|
{
|
|
- path += source_path_len;
|
|
- fs_config(path, S_ISDIR(s->st_mode), &s->st_uid, &s->st_gid, &s->st_mode);
|
|
+ s->st_uid = 0;
|
|
+ s->st_gid = 0;
|
|
}
|
|
|
|
static int process_directory(int parent, const char *path, int fixstats)
|
|
@@ -342,9 +342,8 @@ static int process_directory(int parent,
|
|
newObj = obj_id++;
|
|
nObjects++;
|
|
|
|
- if (fixstats) {
|
|
+ if (fixstats)
|
|
fix_stat(full_name, &stats);
|
|
- }
|
|
|
|
//printf("Object %d, %s is a ",newObj,full_name);
|
|
|
|
@@ -473,13 +472,13 @@ int main(int argc, char *argv[])
|
|
fprintf(stderr," -f fix file stat (mods, user, group) for device\n");
|
|
fprintf(stderr," dir the directory tree to be converted\n");
|
|
fprintf(stderr," image_file the output file to hold the image\n");
|
|
- fprintf(stderr," 'convert' produce a big-endian image from a little-endian machine\n");
|
|
+ fprintf(stderr," 'convert' produce a big-endian image\n");
|
|
exit(1);
|
|
}
|
|
|
|
if ((argc == 4) && (!strncmp(argv[3], "convert", strlen("convert"))))
|
|
{
|
|
- convert_endian = 1;
|
|
+ convert_endian = !convert_endian;
|
|
}
|
|
|
|
if(stat(argv[1],&stats) < 0)
|
|
@@ -503,20 +502,9 @@ int main(int argc, char *argv[])
|
|
exit(1);
|
|
}
|
|
|
|
- if (fixstats) {
|
|
- int len = strlen(argv[1]);
|
|
-
|
|
- if((len >= 4) && (!strcmp(argv[1] + len - 4, "data"))) {
|
|
- source_path_len = len - 4;
|
|
- } else if((len >= 7) && (!strcmp(argv[1] + len - 6, "system"))) {
|
|
- source_path_len = len - 6;
|
|
- } else {
|
|
- fprintf(stderr,"Fixstats (-f) option requested but filesystem is not data or android!\n");
|
|
- exit(1);
|
|
- }
|
|
+ if (fixstats)
|
|
fix_stat(argv[1], &stats);
|
|
- }
|
|
-
|
|
+
|
|
//printf("Processing directory %s into image file %s\n",argv[1],argv[2]);
|
|
error = write_object_header(1, YAFFS_OBJECT_TYPE_DIRECTORY, &stats, 1,"", -1, NULL);
|
|
if(error)
|