sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Thomas Orgis (522be9cc90422e28c9992801b7a1dfebe9763734)
- From: Thomas Orgis <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (522be9cc90422e28c9992801b7a1dfebe9763734)
- Date: Fri, 17 Aug 2007 15:27:44 -0500
GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:
kernels/kqemu/HISTORY | 4 ++++
kernels/kqemu/PRE_BUILD | 2 ++
kernels/kqemu/kqemu-1.3.0pre11_linux-2.6.22.patch | 16 ++++++++++++++++
3 files changed, 22 insertions(+)
New commits:
commit db06bc24f41bd9277b42183172c543a0bc935182
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
kqemu: make it work with linux-2.6.22 (trivial patch)
diff --git a/kernels/kqemu/HISTORY b/kernels/kqemu/HISTORY
index 014cec2..3aeaacb 100644
--- a/kernels/kqemu/HISTORY
+++ b/kernels/kqemu/HISTORY
@@ -1,3 +1,7 @@
+2007-08-17 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, kqemu-1.3.0pre11_linux-2.6.22.patch: make it work with
+ newer kernels; patch from Debian package
+
2007-06-16 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* INSTALL: ifed the udev rule echo... not everyone uses udev
diff --git a/kernels/kqemu/PRE_BUILD b/kernels/kqemu/PRE_BUILD
index f751273..98f551b 100755
--- a/kernels/kqemu/PRE_BUILD
+++ b/kernels/kqemu/PRE_BUILD
@@ -1,3 +1,5 @@
default_pre_build
&&
+cd "$SOURCE_DIRECTORY"
&&
+patch -Np1 < "$SCRIPT_DIRECTORY/kqemu-1.3.0pre11_linux-2.6.22.patch"
&&
sedit "s:\`uname -r\`:$(get_kernel_version):" $SOURCE_DIRECTORY/install.sh
&&
sedit "s:depmod -a:& $(get_kernel_version):" $SOURCE_DIRECTORY/install.sh
diff --git a/kernels/kqemu/kqemu-1.3.0pre11_linux-2.6.22.patch
b/kernels/kqemu/kqemu-1.3.0pre11_linux-2.6.22.patch
new file mode 100644
index 0000000..9735d2c
--- /dev/null
+++ b/kernels/kqemu/kqemu-1.3.0pre11_linux-2.6.22.patch
@@ -0,0 +1,16 @@
+## From Debian's kqemu-source package:
+## 03-2.5.22.dpatch by Samuel Tardieu <sam AT rfc1149.net>
+##
+## DP: Fix FTBFS with linux 2.6.22 (Closes: #434031).
+
+diff -Naur kqemu-1.3.0pre11.orig/kqemu-linux.c kqemu-1.3.0pre11/kqemu-linux.c
+--- kqemu-1.3.0pre11.orig/kqemu-linux.c 2007-02-06 21:02:00.000000000
+0000
++++ kqemu-1.3.0pre11/kqemu-linux.c 2007-07-24 05:41:14.000000000 +0000
+@@ -26,6 +26,7 @@
+ #include <linux/ioctl.h>
+ #include <linux/smp_lock.h>
+ #include <linux/miscdevice.h>
++#include <linux/sched.h>
+ #include <asm/atomic.h>
+ #include <asm/processor.h>
+ #include <asm/uaccess.h>
- [SM-Commit] GIT changes to master grimoire by Thomas Orgis (522be9cc90422e28c9992801b7a1dfebe9763734), Thomas Orgis, 08/17/2007
Archive powered by MHonArc 2.6.24.