[oe-commits] org.oe.dev reiserfsprogs: update to build with >=2.6.18 kernel headers

[blaster8 commit]

reiserfsprogs: update to build with >=2.6.18 kernel headers
 * steal a patch from fedora to remove requirement for asm/unaligned.h

Author: blaster8 at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 3640a9bf0088e4fec83fb7c5264e759a5cd6291d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=3640a9bf0088e4fec83fb7c5264e759a5cd6291d
Files:
1
packages/reiserfsprogs/reiserfsprogs-3.6.19
packages/reiserfsprogs/reiserfsprogs-3.6.19/header-fix.patch
packages/reiserfsprogs/reiserfsprogs_3.6.19.bb
Diffs:

#
# mt diff -raf1d7cf6768b5e5205f07a7a63b6767971ccb1b7 -r3640a9bf0088e4fec83fb7c5264e759a5cd6291d
#
# 
# 
# add_dir "packages/reiserfsprogs/reiserfsprogs-3.6.19"
# 
# add_file "packages/reiserfsprogs/reiserfsprogs-3.6.19/header-fix.patch"
#  content [7ff23303cffd4bac0886c52353bab14d34673807]
# 
# patch "packages/reiserfsprogs/reiserfsprogs_3.6.19.bb"
#  from [e9201020d8bcfcd74c20c0da256816fa97a30f09]
#    to [d30ff32bd7b6e7f5499c0f1f370528b89c0a4d20]
# 
============================================================
--- packages/reiserfsprogs/reiserfsprogs-3.6.19/header-fix.patch	7ff23303cffd4bac0886c52353bab14d34673807
+++ packages/reiserfsprogs/reiserfsprogs-3.6.19/header-fix.patch	7ff23303cffd4bac0886c52353bab14d34673807
@@ -0,0 +1,33 @@
+--- reiserfsprogs-3.6.19/include/reiserfs_fs.h~	2006-06-05 19:29:45.240611000 -0400
++++ reiserfsprogs-3.6.19/include/reiserfs_fs.h	2006-06-05 19:30:29.588212000 -0400
+@@ -38,15 +38,22 @@
+ # define extern_inline
+ #endif
+ 
+-#include <asm/unaligned.h>
++#define get_unaligned(ptr)                  \
++({                                             \
++	struct __attribute__((packed)) {        \
++	typeof(*(ptr)) __v;             \
++	}  *__p = (void *)(ptr);                \
++	__p->__v;                               \
++})
++
++#define put_unaligned(val, ptr)             \
++do {                                           \
++	struct __attribute__((packed)) {        \
++	typeof(*(ptr)) __v;             \
++	}  *__p = (void *)(ptr);                \
++	__p->__v = (val);                       \
++} while(0)
+ 
+-#ifndef get_unaligned
+-#if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
+-    defined(__PPC) || defined(powerpc) || defined(__powerpc__)
+-#	define get_unaligned(ptr)	(*(ptr))
+-#	define put_unaligned(val,ptr)	((void)(*(ptr) = (val)))
+-#endif
+-#endif
+ 
+ #define get_leXX(xx,p,field)	(le##xx##_to_cpu ((p)->field))
+ #define set_leXX(xx,p,field,val) do { (p)->field = cpu_to_le##xx(val); } while (0)
============================================================
--- packages/reiserfsprogs/reiserfsprogs_3.6.19.bb	e9201020d8bcfcd74c20c0da256816fa97a30f09
+++ packages/reiserfsprogs/reiserfsprogs_3.6.19.bb	d30ff32bd7b6e7f5499c0f1f370528b89c0a4d20
@@ -1,9 +1,13 @@ RRECOMMENDS_${PN} = "reiserfsprogs-reise
 DESCRIPTION = "User-level tools for ReiserFS filesystems"
 SECTION = "base"
 LICENSE = "GPL"
 RRECOMMENDS_${PN} = "reiserfsprogs-reiserfsck reiserfsprogs-mkreiserfs"
+PR = "r1"
 
-SRC_URI = "ftp://ftp.namesys.com/pub/reiserfsprogs/reiserfsprogs-${PV}.tar.gz"
+SRC_URI ="ftp://ftp.namesys.com/pub/reiserfsprogs/reiserfsprogs-${PV}.tar.gz \
+	  file://header-fix.patch;patch=1 \
+	  "
+
 S = "${WORKDIR}/reiserfsprogs-${PV}"
 
 inherit autotools