Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (c9405afefbe648656b0b84f93b5df01b9876632c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (c9405afefbe648656b0b84f93b5df01b9876632c)
  • Date: Wed, 12 Jan 2011 17:52:50 -0600

GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

kernels/kqemu/HISTORY | 5 +++++
kernels/kqemu/PRE_BUILD | 3 ++-
kernels/kqemu/kqemu-1.4.0_pre1-init_MUTEX.patch | 16 ++++++++++++++++
3 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit c9405afefbe648656b0b84f93b5df01b9876632c
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

kernels/kqemu: added patch to build with 2.6.37 kernel

diff --git a/kernels/kqemu/HISTORY b/kernels/kqemu/HISTORY
index 96bf38e..de346b0 100644
--- a/kernels/kqemu/HISTORY
+++ b/kernels/kqemu/HISTORY
@@ -1,3 +1,8 @@
+2011-01-12 Pol Vinogradov <vin.public AT gmail.com>
+ * PRE_BUILD, kqemu-1.4.0_pre1-init_MUTEX.patch: patch to build with
+ kernel 2.6.37, was taken from
+ http://bugs.gentoo.org/show_bug.cgi?id=350746
+
2010-04-09 Ismael Luceno <ismael AT sourcemage.org>
* BUILD: use the standard way to find kernel sources

diff --git a/kernels/kqemu/PRE_BUILD b/kernels/kqemu/PRE_BUILD
index fd3e2d1..de99ba4 100755
--- a/kernels/kqemu/PRE_BUILD
+++ b/kernels/kqemu/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/ftbfs-linux-2.6.22.patch"
+patch -p0 < "$SPELL_DIRECTORY/ftbfs-linux-2.6.22.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/kqemu-1.4.0_pre1-init_MUTEX.patch"
diff --git a/kernels/kqemu/kqemu-1.4.0_pre1-init_MUTEX.patch
b/kernels/kqemu/kqemu-1.4.0_pre1-init_MUTEX.patch
new file mode 100644
index 0000000..0827e72
--- /dev/null
+++ b/kernels/kqemu/kqemu-1.4.0_pre1-init_MUTEX.patch
@@ -0,0 +1,16 @@
+Common subdirectories: kqemu-1.4.0pre1-orig/common and kqemu-1.4.0pre1/common
+diff -u kqemu-1.4.0pre1-orig/kqemu-linux.c kqemu-1.4.0pre1/kqemu-linux.c
+--- kqemu-1.4.0pre1-orig/kqemu-linux.c 2008-05-30 16:33:34.000000000 -0400
++++ kqemu-1.4.0pre1/kqemu-linux.c 2011-01-05 16:51:45.407394748 -0500
+@@ -53,6 +53,10 @@
+ #define PAGE_KERNEL_EXEC PAGE_KERNEL
+ #endif
+
++/* init_MUTEX macro was removed in 2.6.37 */
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 36) && !defined(init_MUTEX)
++#define init_MUTEX(sem) sema_init(sem, 1)
++#endif
+ //#define DEBUG
+
+ #ifdef DEBUG
+Common subdirectories: kqemu-1.4.0pre1-orig/tests and kqemu-1.4.0pre1/tests



  • [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (c9405afefbe648656b0b84f93b5df01b9876632c), Pol Vinogradov, 01/12/2011

Archive powered by MHonArc 2.6.24.

Top of Page