Mailinglist Archive: opensuse-commit (1059 mails)

< Previous Next >
commit reiserfs
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 15 Jan 2008 08:57:11 +0100
  • Message-id: <20080115075711.84EC7678182@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package reiserfs
checked in at Tue Jan 15 08:57:11 CET 2008.

--------
--- reiserfs/reiserfs.changes 2008-01-03 21:05:30.000000000 +0100
+++ /mounts/work_src_done/STABLE/reiserfs/reiserfs.changes 2008-01-14
19:32:50.671282000 +0100
@@ -1,0 +2,5 @@
+Mon Jan 14 19:29:51 CET 2008 - jeffm@xxxxxxxx
+
+- Build fixes for big-endian machines.
+
+-------------------------------------------------------------------

New:
----
reiserfsprogs-big-endian-offset_v2
reiserfsprogs-swab-no-brackets

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ reiserfs.spec ++++++
--- /var/tmp/diff_new_pack.k22242/_old 2008-01-15 08:56:01.000000000 +0100
+++ /var/tmp/diff_new_pack.k22242/_new 2008-01-15 08:56:01.000000000 +0100
@@ -15,7 +15,7 @@
Conflicts: libreiserfs-progs
Supplements: filesystem(reiserfs)
Version: 3.6.20
-Release: 6
+Release: 7
Summary: Reiser File System utilities
License: GPL v2 or later
Group: System/Filesystems
@@ -32,6 +32,8 @@
Patch9: reiserfsprogs-progspin.diff
Patch10: reiserfsprogs-better-fsck-a-behavior
Patch11: reiserfsprogs-kill-common-types
+Patch12: reiserfsprogs-swab-no-brackets
+Patch13: reiserfsprogs-big-endian-offset_v2
BuildRoot: %{_tmppath}/%{name}-%{version}-build

%description
@@ -54,6 +56,8 @@
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
+%patch13 -p1

%build
autoreconf
@@ -75,6 +79,8 @@
rm -rf $RPM_BUILD_ROOT

%changelog
+* Mon Jan 14 2008 - jeffm@xxxxxxxx
+- Build fixes for big-endian machines.
* Thu Jan 03 2008 - jeffm@xxxxxxxx
- Removed several common system-defined typedefs that were wrong
for ia64.

++++++ reiserfsprogs-big-endian-offset_v2 ++++++
--- a/libreiserfs/key.c 2006-03-28 07:40:23.000000000 -0500
+++ b/libreiserfs/key.c 2008-01-14 13:16:28.000000000 -0500
@@ -45,7 +45,7 @@
# define set_key_type_v2(key,val) (void)(key->u.k2_offset_v2.k_type = (val))
#elif __BYTE_ORDER == __BIG_ENDIAN
typedef union {
- struct offset_v2 offset_v2;
+ struct reiserfs_koff_v2 offset_v2;
__u64 linear;
} __attribute__ ((__packed__)) offset_v2_esafe_overlay;

++++++ reiserfsprogs-kill-common-types ++++++
--- /var/tmp/diff_new_pack.k22242/_old 2008-01-15 08:56:01.000000000 +0100
+++ /var/tmp/diff_new_pack.k22242/_new 2008-01-15 08:56:01.000000000 +0100
@@ -1,5 +1,5 @@
From: Jeff Mahoney <jeffm@xxxxxxxx>
-Subject: [PATCH] reiserfsprogs: remove __uTYPE
+Subject: [PATCH] reiserfsprogs: fix types using system typedefs

These types are defined in system includes and are wrong for ia64.

@@ -12,15 +12,16 @@

--- a/include/misc/types.h 2006-03-28 14:40:23.000000000 +0200
+++ b/include/misc/types.h 2008-01-03 21:02:42.144492000 +0100
-@@ -8,11 +8,6 @@
+@@ -7,11 +7,8 @@
+ #define MISC_TYPES_H

#include <string.h>
++#include <asm/types.h>

-typedef unsigned char __u8;
-typedef unsigned short int __u16;
-typedef unsigned int __u32;
-typedef unsigned long long int __u64;
--
+
#define INVAL_PTR (void *)-1
#define MAX_INT 2147483647
- #define LONG_LONG_MAX 9223372036854775807LL

++++++ reiserfsprogs-swab-no-brackets ++++++
--- a/include/misc/swab.h 2008-01-14 12:44:29.000000000 -0500
+++ b/include/misc/swab.h 2008-01-14 12:54:34.000000000 -0500
@@ -7,36 +7,27 @@
#define MISC_SWAB_H

#define __swab16(x) \
-({ \
- __u16 __x = (x); \
- ((__u16)( \
- (((__u16)(__x) & (__u16)0x00ffU) << 8) | \
- (((__u16)(__x) & (__u16)0xff00U) >> 8) )); \
-})
+ ((__u16)( \
+ (((__u16)(x) & (__u16)0x00ffU) << 8) | \
+ (((__u16)(x) & (__u16)0xff00U) >> 8) ))

#define __swab32(x) \
-({ \
- __u32 __x = (x); \
- ((__u32)( \
- (((__u32)(__x) & (__u32)0x000000ffUL) << 24) | \
- (((__u32)(__x) & (__u32)0x0000ff00UL) << 8) | \
- (((__u32)(__x) & (__u32)0x00ff0000UL) >> 8) | \
- (((__u32)(__x) & (__u32)0xff000000UL) >> 24) )); \
-})
+ ((__u32)( \
+ (((__u32)(x) & (__u32)0x000000ffUL) << 24) | \
+ (((__u32)(x) & (__u32)0x0000ff00UL) << 8) | \
+ (((__u32)(x) & (__u32)0x00ff0000UL) >> 8) | \
+ (((__u32)(x) & (__u32)0xff000000UL) >> 24) ))

#define __swab64(x) \
-({ \
- __u64 __x = (x); \
- ((__u64)( \
- (__u64)(((__u64)(__x) & (__u64)0x00000000000000ffULL) << 56) |
\
- (__u64)(((__u64)(__x) & (__u64)0x000000000000ff00ULL) << 40) |
\
- (__u64)(((__u64)(__x) & (__u64)0x0000000000ff0000ULL) << 24) |
\
- (__u64)(((__u64)(__x) & (__u64)0x00000000ff000000ULL) << 8) |
\
- (__u64)(((__u64)(__x) & (__u64)0x000000ff00000000ULL) >> 8) |
\
- (__u64)(((__u64)(__x) & (__u64)0x0000ff0000000000ULL) >> 24) |
\
- (__u64)(((__u64)(__x) & (__u64)0x00ff000000000000ULL) >> 40) |
\
- (__u64)(((__u64)(__x) & (__u64)0xff00000000000000ULL) >> 56)
)); \
-})
+ ((__u64)( \
+ (__u64)(((__u64)(x) & (__u64)0x00000000000000ffULL) << 56) | \
+ (__u64)(((__u64)(x) & (__u64)0x000000000000ff00ULL) << 40) | \
+ (__u64)(((__u64)(x) & (__u64)0x0000000000ff0000ULL) << 24) | \
+ (__u64)(((__u64)(x) & (__u64)0x00000000ff000000ULL) << 8) | \
+ (__u64)(((__u64)(x) & (__u64)0x000000ff00000000ULL) >> 8) | \
+ (__u64)(((__u64)(x) & (__u64)0x0000ff0000000000ULL) >> 24) | \
+ (__u64)(((__u64)(x) & (__u64)0x00ff000000000000ULL) >> 40) | \
+ (__u64)(((__u64)(x) & (__u64)0xff00000000000000ULL) >> 56) ))


#ifndef WORDS_BIGENDIAN

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread