From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 19 Sep 2004 20:06:51 +0000 (+0000)
Subject: Explain how to use patch.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=fd1357a71f1c745b487edee9a903136dc8f1c990;p=pintos-anon

Explain how to use patch.
---

diff --git a/src/misc/bochs-2.1.1.patch b/src/misc/bochs-2.1.1.patch
index f470f52..d55d83e 100644
--- a/src/misc/bochs-2.1.1.patch
+++ b/src/misc/bochs-2.1.1.patch
@@ -14,6 +14,12 @@ connect a serial port to stdout and it doesn't work under Solaris
 anyway.  This patch is useful everywhere with `pintos', but may not be
 wanted elsewhere.
 
+To apply all the patches, cd into the Bochs directory, then type
+	patch -p1 < ~/pintos/src/misc/bochs-2.1.1.patch
+You will have to supply the proper path to the patch, of course.  You
+can provide the --dry-run option to patch if you want to test whether
+the patch would apply cleanly before actually patching.
+
 Here's a ./configure invocation for Bochs that works optimally with
 the `pintos' utility:
 	./configure --with-x --with-x11 --with-term --with-nogui