- added original authors on top of LGPL'd sources ported from Qemu

- added LICENSE file to clarify the Bochs license - TODO: fix source files ported from Qemu with MIT license
2012-08-30 20:41:25 +00:00 · 2012-08-30 20:41:25 +00:00 · 48042499cf
commit 48042499cf
parent 4e878a1ef9
9 changed files with 54 additions and 13 deletions
--- a/bochs/LICENSE
+++ b/bochs/LICENSE
@ -0,0 +1,7 @@
+The following points clarify the Bochs license:
+
+1) Bochs as a whole is released under the GNU Lesser General Public License
+
+2) Parts of Bochs have specific licenses which are compatible with the
+   GNU Lesser General Public License. Hence each source file contains its
+   own licensing information.
--- a/bochs/Makefile.in
+++ b/bochs/Makefile.in
@ -43,7 +43,7 @@ REL_STRING=@REL_STRING@
 MAN_PAGE_1_LIST=bochs bximage bxcommit bochs-dlx
 MAN_PAGE_5_LIST=bochsrc
 INSTALL_LIST_SHARE=bios/BIOS-bochs-* bios/VGABIOS* @INSTALL_LIST_FOR_PLATFORM@
-INSTALL_LIST_DOC=CHANGES COPYING README TODO
+INSTALL_LIST_DOC=CHANGES COPYING LICENSE README TODO
 INSTALL_LIST_BIN=bochs@EXE@ bximage@EXE@ bxcommit@EXE@
 INSTALL_LIST_BIN_OPTIONAL=bochsdbg@EXE@
 INSTALL_LIST_WIN32=$(INSTALL_LIST_SHARE) $(INSTALL_LIST_DOC) $(INSTALL_LIST_BIN) $(INSTALL_LIST_BIN_OPTIONAL) niclist@EXE@
--- a/bochs/README
+++ b/bochs/README
@ -22,14 +22,14 @@ the emulator on your workstation, much like you have a machine
 inside of a machine.  Bochs will allow you to run Windows
 applications on a Solaris machine with X11, for example.

-Bochs is distributed under the GNU LGPL.  See COPYING for details.
+Bochs is distributed under the GNU LGPL. See LICENSE and COPYING for details.

 GETTING CURRENT SOURCE CODE

 Source code for Bochs is available from the Bochs home page at
 http://bochs.sourceforge.net.  You can download the most recent
 release, use SVN to get the latest sources, or grab a SVN
-snapshot which is updated nightly.  The releases contain the most
+snapshot which is updated frequently. The releases contain the most
 stable code, but if you want the very newest features try the
 SVN version instead.

--- a/bochs/iodev/network/e1000.cc
+++ b/bochs/iodev/network/e1000.cc
@ -2,6 +2,16 @@
 // $Id$
 /////////////////////////////////////////////////////////////////////////
 //
+//  Intel(R) 82540EM Gigabit Ethernet support (ported from QEMU)
+//  Software developer's manual:
+//  http://download.intel.com/design/network/manuals/8254x_GBe_SDM.pdf
+//
+//  Nir Peleg, Tutis Systems Ltd. for Qumranet Inc.
+//  Copyright (c) 2008 Qumranet
+//  Based on work done by:
+//  Copyright (c) 2007 Dan Aloni
+//  Copyright (c) 2004 Antony T Curtis
+//
 //  Copyright (C) 2011  The Bochs Project
 //
 //  This library is free software; you can redistribute it and/or
@ -19,8 +29,6 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 /////////////////////////////////////////////////////////////////////////

-// Intel(R) 82540EM Gigabit Ethernet support ported from Qemu
-
 // Define BX_PLUGGABLE in files that can be compiled into plugins.  For
 // platforms that require a special tag on exported symbols, BX_PLUGGABLE
 // is used to know when we are exporting symbols and when we are importing.
--- a/bochs/iodev/network/e1000.h
+++ b/bochs/iodev/network/e1000.h
@ -2,6 +2,16 @@
 // $Id$
 /////////////////////////////////////////////////////////////////////////
 //
+//  Intel(R) 82540EM Gigabit Ethernet support (ported from QEMU)
+//  Software developer's manual:
+//  http://download.intel.com/design/network/manuals/8254x_GBe_SDM.pdf
+//
+//  Nir Peleg, Tutis Systems Ltd. for Qumranet Inc.
+//  Copyright (c) 2008 Qumranet
+//  Based on work done by:
+//  Copyright (c) 2007 Dan Aloni
+//  Copyright (c) 2004 Antony T Curtis
+//
 //  Copyright (C) 2011  The Bochs Project
 //
 //  This library is free software; you can redistribute it and/or
@ -17,6 +27,7 @@
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+/////////////////////////////////////////////////////////////////////////

 #ifndef BX_IODEV_E1000_H
 #define BX_IODEV_E1000_H
--- a/bochs/iodev/usb/scsi_device.cc
+++ b/bochs/iodev/usb/scsi_device.cc
@ -2,6 +2,13 @@
 // $Id$
 /////////////////////////////////////////////////////////////////////////
 //
+//  SCSI emulation layer (ported from QEMU)
+//
+//  Copyright (C) 2006 CodeSourcery.
+//  Based on code by Fabrice Bellard
+//
+//  Written by Paul Brook
+//
 //  Copyright (C) 2007-2012  The Bochs Project
 //
 //  This library is free software; you can redistribute it and/or
@ -17,8 +24,7 @@
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-// SCSI emulation layer ported from the Qemu project
+/////////////////////////////////////////////////////////////////////////

 // Define BX_PLUGGABLE in files that can be compiled into plugins.  For
 // platforms that require a special tag on exported symbols, BX_PLUGGABLE
--- a/bochs/iodev/usb/scsi_device.h
+++ b/bochs/iodev/usb/scsi_device.h
@ -2,6 +2,13 @@
 // $Id$
 /////////////////////////////////////////////////////////////////////////
 //
+//  SCSI emulation layer (ported from QEMU)
+//
+//  Copyright (C) 2006 CodeSourcery.
+//  Based on code by Fabrice Bellard
+//
+//  Written by Paul Brook
+//
 //  Copyright (C) 2007-2012  The Bochs Project
 //
 //  This library is free software; you can redistribute it and/or
@ -18,8 +25,6 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA

-// SCSI emulation layer ported from the Qemu project
-
 #ifndef BX_IODEV_SCSI_DEVICE_H
 #define BX_IODEV_SCSI_DEVICE_H

--- a/bochs/iodev/usb/usb_msd.cc
+++ b/bochs/iodev/usb/usb_msd.cc
@ -2,6 +2,10 @@
 // $Id$
 /////////////////////////////////////////////////////////////////////////
 //
+// USB mass storage device support (ported from QEMU)
+//
+//  Copyright (c) 2006 CodeSourcery.
+//  Written by Paul Brook
 //  Copyright (C) 2009-2012  The Bochs Project
 //
 //  This library is free software; you can redistribute it and/or
@ -19,8 +23,6 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 /////////////////////////////////////////////////////////////////////////

-// USB mass storage device support ported from the Qemu project
-
 // Define BX_PLUGGABLE in files that can be compiled into plugins.  For
 // platforms that require a special tag on exported symbols, BX_PLUGGABLE
 // is used to know when we are exporting symbols and when we are importing.
--- a/bochs/iodev/usb/usb_msd.h
+++ b/bochs/iodev/usb/usb_msd.h
@ -2,6 +2,10 @@
 // $Id$
 /////////////////////////////////////////////////////////////////////////
 //
+// USB mass storage device support (ported from QEMU)
+//
+//  Copyright (c) 2006 CodeSourcery.
+//  Written by Paul Brook
 //  Copyright (C) 2009-2012  The Bochs Project
 //
 //  This library is free software; you can redistribute it and/or
@ -19,8 +23,6 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 /////////////////////////////////////////////////////////////////////////

-// USB mass storage device support ported from the Qemu project
-
 #ifndef BX_IODEV_USB_MSD_H
 #define BX_IODEV_USB_MSD_H