changes in upstream
It seems that the changes between pre9 and pre10 for code we already had
are purely non-technical (license change, etc). See attached diff.
Other than this, we just have changes in documentation/makefiles and
replacement of object code with a newer version of its corresponding
source. I think we can provide a much better QA on the latter, even if it
contains new improvements (better x86-64 support) that the non-free object
code didn't have.
Given all this, would still be possible to consider this for etch ?
(CCing -release)
--
Robert Millan
ACK STORM, S.L. - http://www.ackstorm.es/
--- kqemu-1.3.0pre9/kqemu-linux.c 2006-06-23 22:52:34.000000000 +0200
+++ kqemu-1.3.0pre10/kqemu-linux.c 2007-02-05 23:57:37.000000000 +0100
@@ -1,6 +1,20 @@
/*
* Linux kernel wrapper for KQEMU
- * Copyright (c) 2004-2005 Fabrice Bellard
+ *
+ * Copyright (C) 2004-2007 Fabrice Bellard
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <linux/module.h>
#include <linux/types.h>
@@ -323,9 +337,7 @@
int ret, max_locked_pages;
struct sysinfo si;
- printk("QEMU Accelerator Module version %d.%d.%d, Copyright (c) 2005-2006 Fabrice Bellard\n"
- "This is a proprietary product. Read the LICENSE file for more information\n"
- "Redistribution of this module is prohibited without authorization\n",
+ printk("QEMU Accelerator Module version %d.%d.%d, Copyright (c) 2005-2007 Fabrice Bellard\n",
(KQEMU_VERSION >> 16),
(KQEMU_VERSION >> 8) & 0xff,
(KQEMU_VERSION) & 0xff);
@@ -367,4 +379,4 @@
}
}
-MODULE_LICENSE("Proprietary");
+MODULE_LICENSE("GPL");
Reply to: