OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 27-Jan-2004 12:49:01
Branch: HEAD Handle: 2004012711485802
Added files:
openpkg-src/bochs bochs.patch
Modified files:
openpkg-src/bochs bochs.spec
openpkg-web news.txt
Log:
this world has more than just OSX and Linux so patch to aknowlege that
Summary:
Revision Changes Path
1.3 +11 -0 openpkg-src/bochs/bochs.patch
1.26 +9 -9 openpkg-src/bochs/bochs.spec
1.8325 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.patch
============================================================================
$ cvs diff -u -r0 -r1.3 bochs.patch
--- /dev/null 2004-01-27 12:49:01.000000000 +0100
+++ bochs.patch 2004-01-27 12:49:01.000000000 +0100
@@ -0,0 +1,11 @@
+--- iodev/eth_tap.cc.orig 2004-01-27 12:00:49.921496528 +0100
++++ iodev/eth_tap.cc 2004-01-27 12:02:00.181584599 +0100
+@@ -100,7 +100,7 @@
+ #include <sys/socket.h>
+ #include <sys/uio.h>
+ #include <sys/wait.h>
+-#if defined(__FreeBSD__) || defined(__APPLE__) // Should be fixed for other *BSD
++#if !defined(__LINUX__) // Should be more carefully written
+ #include <net/if.h>
+ #else
+ #include <asm/types.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.spec
============================================================================
$ cvs diff -u -r1.25 -r1.26 bochs.spec
--- openpkg-src/bochs/bochs.spec 23 Jan 2004 13:07:46 -0000 1.25
+++ openpkg-src/bochs/bochs.spec 27 Jan 2004 11:49:00 -0000 1.26
@@ -33,11 +33,12 @@
Group: Misc
License: LGPL
Version: 2.1
-Release: 20040112
+Release: 20040127
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/bochs/bochs-%{version}.tar.gz
Source1: http://osdn.dl.sourceforge.net/sourceforge/bochs/fdos-10meg.tar.gz
+Patch0: bochs.patch
# build information
Prefix: %{l_prefix}
@@ -49,18 +50,17 @@
%description
Bochs is a highly portable open source IA-32 (x86) PC emulator
- written in C++, that runs on most popular platforms. It includes
- emulation of the Intel x86 CPU, common I/O devices, and a custom
- BIOS. Currently, Bochs can be compiled to emulate a 386, 486 or
- Pentium CPU. Bochs is capable of running most Operating Systems
- inside the emulation including Linux, Windows, DOS, etc.
-
- This package also contains a pre-configured FreeDOS 8h1 image
- for Bochs demonstration purposes and to see Bochs running easily.
+ that runs on most popular platforms. It includes emulation of
+ the Intel x86 CPU, common I/O devices, and a custom BIOS. Bochs
+ can be compiled to emulate a 386, 486 or Pentium CPU. It can
+ then run most Operating Systems inside the emulation including
+ Linux, Windows, DOS, and others. This package also contains a
+ pre-configured FreeDOS 8h1 image to demonstrate Bochs in action.
%prep
%setup0 -q
%setup1 -q -T -D -a 1
+ %patch0 -p0
# remove CVS sub-directories because they would be
# picked up by "make install" later.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.8324 -r1.8325 news.txt
--- openpkg-web/news.txt 27 Jan 2004 10:34:03 -0000 1.8324
+++ openpkg-web/news.txt 27 Jan 2004 11:48:58 -0000 1.8325
@@ -1,3 +1,4 @@
+27-Jan-2004: Upgraded package: P<bochs-2.1-20040127>
27-Jan-2004: Upgraded package: P<oracle-20040127-20040127>
27-Jan-2004: Upgraded package: P<vim-6.2.211-20040127>
27-Jan-2004: Upgraded package: P<perl-gtk-20040127-20040127>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]