File project1.diff of Package e2fsprogs

Overview Repositories Revisions Requests Users Attributes Meta

File project1.diff of Package e2fsprogs

--- STAGE1.diff.orig
+++ STAGE1.diff
@@ -0,0 +1,13 @@
+diff -Naur _e2fsprogs-1.41.1//misc/base_device.c e2fsprogs-1.41.1/misc/base_device.c
+--- _e2fsprogs-1.41.1//misc/base_device.c	2008-08-28 16:26:31.000000000 +0200
++++ e2fsprogs-1.41.1/misc/base_device.c	2009-02-02 15:51:38.179068207 +0100
+@@ -30,6 +30,9 @@
+ 
+ #include "fsck.h"
+ 
++#include <sys/stat.h>
++#include <errno.h>
++
+ /*
+  * Required for the uber-silly devfs /dev/ide/host1/bus2/target3/lun3
+  * pathames.
--- e2fsprogs.spec.orig
+++ e2fsprogs.spec
@@ -62,6 +62,7 @@ Patch33:        libcom_err-mutex.patch
 Patch34:        libcom_err-compile_et_permissions.patch
 # Do not suppress make commands
 Patch99:        e2fsprogs-no_cmd_hiding.patch
+Patch999:       STAGE1.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -269,7 +270,7 @@ Authors:
 # e2fsprogs patches
 %patch1
 %patch2 -p1
-%patch3 -p1
+###%patch3 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
@@ -281,8 +282,14 @@ Authors:
 %patch33 -p1
 %patch34 -p1
 %if %{no_command_hiding}
-%patch99 -p1
+###%patch99 -p1
 %endif
+%if 0%{stage1}
+%patch999 -p1
+# fix includes
+%else
+%endif
+
 cp %{SOURCE2} %{SOURCE5} .
 
 %build
@@ -321,7 +328,12 @@ rm -f $RPM_BUILD_ROOT/usr/share/man/man8
 rm -f $RPM_BUILD_ROOT/usr/share/man/man8/fsck.ext4.8
 
 %check
+%if 0%{stage1}
+%else
 make check
+# disable checks in stage1 build
+%endif
+
 make gcc-wall
 
 %clean
@@ -496,6 +508,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/com_err.3.gz
 
 %changelog
+* Mon Feb 02 2009 dl9pf@gmx.de
+- fix for arm-crossbuild stage1
 * Tue Jan 13 2009 olh@suse.de
 - obsolete old -XXbit packages (bnc#437293)
 * Thu Dec 04 2008 mkoenig@suse.de

Places

File project1.diff of Package e2fsprogs

Places