[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-149-g4390180

[Julien B a. A. <ar...@us...>]

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  4390180f144d377a829102c086ad2b7072b0d116 (commit)
       via  82167cc51545b1442e7938ec200b5350323b4d82 (commit)
       via  e28b6ddb1e6dec7c7d346a9257dee890978176c7 (commit)
      from  880ac84384eb614e4f25a9fbe27dcc16220c7f28 (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 4390180f144d377a829102c086ad2b7072b0d116
Merge: 82167cc 880ac84
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Mar 16 17:50:33 2012 +0100

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 82167cc51545b1442e7938ec200b5350323b4d82
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Mar 16 17:39:07 2012 +0100

    [BUILDROOT] 2012.02: Add patch to fix e2fsprogs build on old systems

commit e28b6ddb1e6dec7c7d346a9257dee890978176c7
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Mar 15 22:37:53 2012 +0100

    Makes scripts/quiltify.sh more error proof

-----------------------------------------------------------------------

Summary of changes:
 ...e4defrag_build_against_old_kernel_headers.patch |   81 ++++++++++++++++++++
 patches/buildroot/2012.02/cleanup_buildroot.sh     |    1 +
 scripts/quiltify.sh                                |    4 +
 3 files changed, 86 insertions(+), 0 deletions(-)
 create mode 100644 patches/buildroot/2012.02/179-e2fsprog-allow_e4defrag_build_against_old_kernel_headers.patch

diff --git a/patches/buildroot/2012.02/179-e2fsprog-allow_e4defrag_build_against_old_kernel_headers.patch b/patches/buildroot/2012.02/179-e2fsprog-allow_e4defrag_build_against_old_kernel_headers.patch
new file mode 100644
index 0000000..4de6cb4
--- /dev/null
+++ b/patches/buildroot/2012.02/179-e2fsprog-allow_e4defrag_build_against_old_kernel_headers.patch
@@ -0,0 +1,81 @@
+Otherwise e2fsprogs package fails to build on old distributions.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/e2fsprogs/e2fsprogs-allow-e4defrag-build-against-old-kernel-headers.patch
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/e2fsprogs/e2fsprogs-allow-e4defrag-build-against-old-kernel-headers.patch	2012-03-16 12:02:41.000000000 +0100
+@@ -0,0 +1,71 @@
++Building e2fsprogs with older userspace with old kernel headers may
++not define the __NR_fallocate and __NR_sync_file_range system calls,
++even if a newer kernel is installed on the system.
++
++Avoid e4defrag build failures for e2fsprogs on older systems, but may
++result in the e4defrag command failing at runtime due to the actual
++lack of these system calls, as opposed to just old kernel headers
++on a system running a new kernel.
++---
++ misc/e4defrag.c |   31 +++++++++++++++++++++++--------
++ 1 files changed, 23 insertions(+), 8 deletions(-)
++
++diff --git a/misc/e4defrag.c b/misc/e4defrag.c
++index 82e3868..d739da2 100644
++--- a/misc/e4defrag.c
+++++ b/misc/e4defrag.c
++@@ -304,12 +304,6 @@ static int posix_fadvise(int fd, loff_t offset, size_t len, int advise)
++ #ifndef HAVE_SYNC_FILE_RANGE
++ #warning Using locally defined sync_file_range interface.
++ 
++-#ifndef __NR_sync_file_range
++-#ifndef __NR_sync_file_range2 /* ppc */
++-#error Your kernel headers dont define __NR_sync_file_range
++-#endif
++-#endif
++-
++ /*
++  * sync_file_range() -	Sync file region.
++  *
++@@ -322,8 +316,19 @@ int sync_file_range(int fd, loff_t offset, loff_t length, unsigned int flag)
++ {
++ #ifdef __NR_sync_file_range
++ 	return syscall(__NR_sync_file_range, fd, offset, length, flag);
++-#else
+++#elif defined(__NR_sync_file_range2)
++ 	return syscall(__NR_sync_file_range2, fd, flag, offset, length);
+++#else
+++	return fsync(fd);
+++#ifndef SYNC_FILE_RANGE_WAIT_BEFORE
+++#define SYNC_FILE_RANGE_WAIT_BEFORE 0
+++#endif
+++#ifndef SYNC_FILE_RANGE_WRITE
+++#define SYNC_FILE_RANGE_WRITE 0
+++#endif
+++#ifndef SYNC_FILE_RANGE_WAIT_AFTER
+++#define SYNC_FILE_RANGE_WAIT_AFTER 0
+++#endif
++ #endif
++ }
++ #endif /* ! HAVE_SYNC_FILE_RANGE */
++@@ -332,7 +337,17 @@ int sync_file_range(int fd, loff_t offset, loff_t length, unsigned int flag)
++ #warning Using locally defined fallocate syscall interface.
++ 
++ #ifndef __NR_fallocate
++-#error Your kernel headers dont define __NR_fallocate
+++# if defined(__x86_64__)
+++#  define __NR_fallocate 285
+++# elif defined(__i386__)
+++#  define __NR_fallocate 324
+++# elif defined(__powerpc__)
+++#  define __NR_fallocate 309
+++# else
+++/* fallback position might be posix_fallocate(), but I suspect any kernel
+++ * that doesn't have fallocate will also not have EXT4_IOC_MOVE_EXT */
+++#  error Your kernel headers dont define __NR_fallocate
+++# endif
++ #endif
++ 
++ /*
++-- 
++1.4.4.2
+\ No newline at end of file
diff --git a/patches/buildroot/2012.02/cleanup_buildroot.sh b/patches/buildroot/2012.02/cleanup_buildroot.sh
index 174cf55..1ce2d7c 100755
--- a/patches/buildroot/2012.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2012.02/cleanup_buildroot.sh
@@ -65,3 +65,4 @@ rm -rf buildroot/package/python
 rm -rf buildroot/package/gsmmux
 rm -rf buildroot/package/imx-lib/
 rm -rf buildroot/package/imx-test/
+rm -rf buildroot/package/e2fsprogs/
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index d0e6dd9..15af09b 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -149,6 +149,10 @@ fi
 
 # Import patches
 pushd $QUILT_TARGET_DIR
+if [ "$?" != 0 ]; then
+	echo "Please correct that ($QUILT_TARGET_DIR)"
+	exit 1
+fi
 mkdir patches
 if [ "$QUILT_PATCH_FILTER" != "" ]; then
 	PATCHES=`ls -ar $QUILT_TARGET_PATCH_DIR/*.patch | grep $QUILT_PATCH_FILTER`


hooks/post-receive
-- 
armadeus