From 965b9d9f46de481673f54745f447d9f8a73fc0a7 Mon Sep 17 00:00:00 2001
From: Michael-Luke Jones <mlj28@cam.ac.uk>
Date: Sun, 17 Dec 2006 15:14:57 +0000
Subject: reiserfsprogs: update to build with >=2.6.18 kernel headers  * steal
 a patch from fedora to remove requirement for asm/unaligned.h

---
 .../reiserfsprogs-3.6.19/.mtn2git_empty            |  0
 .../reiserfsprogs-3.6.19/header-fix.patch          | 33 ++++++++++++++++++++++
 packages/reiserfsprogs/reiserfsprogs_3.6.19.bb     |  6 +++-
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 packages/reiserfsprogs/reiserfsprogs-3.6.19/.mtn2git_empty
 create mode 100644 packages/reiserfsprogs/reiserfsprogs-3.6.19/header-fix.patch

(limited to 'packages')

diff --git a/packages/reiserfsprogs/reiserfsprogs-3.6.19/.mtn2git_empty b/packages/reiserfsprogs/reiserfsprogs-3.6.19/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/reiserfsprogs/reiserfsprogs-3.6.19/header-fix.patch b/packages/reiserfsprogs/reiserfsprogs-3.6.19/header-fix.patch
new file mode 100644
index 0000000000..a117f2c19b
--- /dev/null
+++ b/packages/reiserfsprogs/reiserfsprogs-3.6.19/header-fix.patch
@@ -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)
diff --git a/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb b/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb
index 7738f5370c..6a5c01f0fd 100644
--- a/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb
+++ b/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb
@@ -2,8 +2,12 @@ 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 \
+	  file://header-fix.patch;patch=1 \
+	  "
 
-SRC_URI = "ftp://ftp.namesys.com/pub/reiserfsprogs/reiserfsprogs-${PV}.tar.gz"
 S = "${WORKDIR}/reiserfsprogs-${PV}"
 
 inherit autotools
-- 
cgit v1.2.3