[Armadeus-commitlog] armadeus branch, master, updated. latestrelease-27-g9f38ed1
Brought to you by:
sszy
|
From: jorasse <jo...@us...> - 2009-08-10 20:46:22
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 9f38ed15da88743af6c2133b31694568c5764211 (commit)
from a402d10e7d48db062a0cf712e8b69b4164148e4d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9f38ed15da88743af6c2133b31694568c5764211
Author: jorasse <jo...@ar...>
Date: Mon Aug 10 22:44:54 2009 +0200
[BUILDROOT] make ubifs patch apply after update of git local view
-----------------------------------------------------------------------
Summary of changes:
buildroot/target/ubifs/mkfs-ubifs-head.patch | 43 ++++++++++++++++++++++++
patches/076-buildroot-ubifs.diff | 46 --------------------------
2 files changed, 43 insertions(+), 46 deletions(-)
create mode 100644 buildroot/target/ubifs/mkfs-ubifs-head.patch
diff --git a/buildroot/target/ubifs/mkfs-ubifs-head.patch b/buildroot/target/ubifs/mkfs-ubifs-head.patch
new file mode 100644
index 0000000..07f3bab
--- /dev/null
+++ b/buildroot/target/ubifs/mkfs-ubifs-head.patch
@@ -0,0 +1,43 @@
+diff -purN mkfs-ubifs-HEAD/mkfs.ubifs.h mkfs-ubifs-HEAD.new/mkfs.ubifs.h
+--- mkfs-ubifs-HEAD/mkfs.ubifs.h 2008-08-12 10:34:49.000000000 +0200
++++ mkfs-ubifs-HEAD.new/mkfs.ubifs.h 2009-06-07 11:53:18.000000000 +0200
+@@ -35,6 +35,7 @@
+ #include <byteswap.h>
+ #include <linux/types.h>
+ #include <linux/fs.h>
++#include <linux/ext2_fs.h>
+
+ #include <getopt.h>
+ #include <sys/types.h>
+@@ -70,6 +71,31 @@
+ #error MKFS_UBIFS_COMPR_ZLIB != UBIFS_COMPR_ZLIB
+ #endif
+
++#ifndef FS_COMPR_FL
++#define FS_COMPR_FL EXT2_COMPR_FL
++#endif
++
++#ifndef FS_SYNC_FL
++#define FS_SYNC_FL EXT2_SYNC_FL
++#endif
++
++#ifndef FS_IMMUTABLE_FL
++#define FS_IMMUTABLE_FL EXT2_IMMUTABLE_FL
++#endif
++
++#ifndef FS_APPEND_FL
++#define FS_APPEND_FL EXT2_APPEND_FL
++#endif
++
++#ifndef FS_DIRSYNC_FL
++#define FS_DIRSYNC_FL EXT2_DIRSYNC_FL
++#endif
++
++#ifndef FS_IOC_GETFLAGS
++#define FS_IOC_GETFLAGS EXT2_IOC_GETFLAGS
++#endif
++
++
+ extern int verbose;
+ extern int debug_level;
+
diff --git a/patches/076-buildroot-ubifs.diff b/patches/076-buildroot-ubifs.diff
index b357c06..a575e51 100644
--- a/patches/076-buildroot-ubifs.diff
+++ b/patches/076-buildroot-ubifs.diff
@@ -25,49 +25,3 @@
ifneq ($(UBIFS_ROOTFS_COMPRESSOR),)
$(UBIFS_BASE).$(UBIFS_ROOTFS_COMPRESSOR_EXT): $(UBIFS_ROOTFS_COMPRESSOR_PREREQ) $(UBIFS_BASE)
---- buildrootref/target/ubifs/mkfs-ubifs-head.patch 1970-01-01 01:00:00.000000000 +0100
-+++ buildroot/target/ubifs/mkfs-ubifs-head.patch 2009-06-07 11:57:11.000000000 +0200
-@@ -0,0 +1,43 @@
-+diff -purN mkfs-ubifs-HEAD/mkfs.ubifs.h mkfs-ubifs-HEAD.new/mkfs.ubifs.h
-+--- mkfs-ubifs-HEAD/mkfs.ubifs.h 2008-08-12 10:34:49.000000000 +0200
-++++ mkfs-ubifs-HEAD.new/mkfs.ubifs.h 2009-06-07 11:53:18.000000000 +0200
-+@@ -35,6 +35,7 @@
-+ #include <byteswap.h>
-+ #include <linux/types.h>
-+ #include <linux/fs.h>
-++#include <linux/ext2_fs.h>
-+
-+ #include <getopt.h>
-+ #include <sys/types.h>
-+@@ -70,6 +71,31 @@
-+ #error MKFS_UBIFS_COMPR_ZLIB != UBIFS_COMPR_ZLIB
-+ #endif
-+
-++#ifndef FS_COMPR_FL
-++#define FS_COMPR_FL EXT2_COMPR_FL
-++#endif
-++
-++#ifndef FS_SYNC_FL
-++#define FS_SYNC_FL EXT2_SYNC_FL
-++#endif
-++
-++#ifndef FS_IMMUTABLE_FL
-++#define FS_IMMUTABLE_FL EXT2_IMMUTABLE_FL
-++#endif
-++
-++#ifndef FS_APPEND_FL
-++#define FS_APPEND_FL EXT2_APPEND_FL
-++#endif
-++
-++#ifndef FS_DIRSYNC_FL
-++#define FS_DIRSYNC_FL EXT2_DIRSYNC_FL
-++#endif
-++
-++#ifndef FS_IOC_GETFLAGS
-++#define FS_IOC_GETFLAGS EXT2_IOC_GETFLAGS
-++#endif
-++
-++
-+ extern int verbose;
-+ extern int debug_level;
-+
hooks/post-receive
--
armadeus
|