- i'm uploading the patch on behalf of Robert Milan
- this patch adds fhs compatibility when installing Bochs
This commit is contained in:
Christophe Bothamy
parent
cd10b68d0a
commit
5f3dbfb47a
144
bochs/patches/patch.fhs
Normal file
144
bochs/patches/patch.fhs
Normal file
@ -0,0 +1,144 @@
|
||||
----------------------------------------------------------------------
|
||||
Patch name: patch.fhs
|
||||
Author: Robert Millan
|
||||
Date: May, 4th 2002
|
||||
|
||||
Detailed description:
|
||||
see patch [ 551811 ]
|
||||
Location of some files on Bochs installation breaks the
|
||||
Filesystem Hierrachy Standard, to be found at:
|
||||
|
||||
http://www.pathname.com/fhs/
|
||||
|
||||
It is important to comply with FHS because most
|
||||
distributions require it in order to accept packages.
|
||||
|
||||
Patch was created with:
|
||||
diff -u
|
||||
Apply patch to what version:
|
||||
Seems to be Bochs v1.4
|
||||
Instructions:
|
||||
To patch, go to main bochs directory.
|
||||
Type "patch -p1 < THIS_PATCH_FILE".
|
||||
----------------------------------------------------------------------
|
||||
diff -ur bochs-1.4rel.old/Makefile.in bochs-1.4rel/Makefile.in
|
||||
--- bochs-1.4rel.old/Makefile.in Thu Mar 28 01:28:42 2002
|
||||
+++ bochs-1.4rel/Makefile.in Fri May 3 08:59:37 2002
|
||||
@@ -30,16 +30,19 @@
|
||||
bindir = @bindir@
|
||||
mandir = @mandir@
|
||||
man1dir = $(mandir)/man1
|
||||
+docdir = $(prefix)/share/doc/bochs
|
||||
+sharedir = $(prefix)/share/bochs
|
||||
|
||||
DESTDIR =
|
||||
|
||||
VERSION=@VERSION@
|
||||
VER_STRING=@VER_STRING@
|
||||
REL_STRING=@REL_STRING@
|
||||
-BOCHSDIR=$(prefix)/bochs
|
||||
-VERSIONDIR=$(BOCHSDIR)/$(VERSION)
|
||||
MAN_PAGE_LIST=bochs bochsrc bximage bochs-dlx
|
||||
-INSTALL_LIST=bios/BIOS-* CHANGES COPYING README bios/VGABIOS* bochs bochsdbg bximage @INSTALL_LIST_FOR_PLATFORM@
|
||||
+INSTALL_LIST_SHARE=bios/BIOS-* bios/VGABIOS* @INSTALL_LIST_FOR_PLATFORM@
|
||||
+INSTALL_LIST_DOC=CHANGES COPYING README
|
||||
+INSTALL_LIST_BIN=bochs bochsdbg bximage
|
||||
+INSTALL_LIST=$(INSTALL_LIST_SHARE) $(INSTALL_LIST_DOC) $(INSTALL_LIST_BIN)
|
||||
INSTALL_LIST_X11=install-x11-fonts test-x11-fonts
|
||||
INSTALL_LIST_SED=DOC-linux.html
|
||||
BOCHS_SCRIPTS=bochs-docs
|
||||
@@ -58,7 +61,7 @@
|
||||
RMDIR=rmdir
|
||||
TAR=tar
|
||||
CHMOD=chmod
|
||||
-GZIP=gzip
|
||||
+GZIP=gzip -9
|
||||
GUNZIP=gunzip
|
||||
ZIP=zip
|
||||
UNIX2DOS=unix2dos
|
||||
@@ -286,35 +289,32 @@
|
||||
# install target for unix
|
||||
#####################################################################
|
||||
|
||||
-install_unix: install_bin install_man install_fonts unpack_dlx install_dlx
|
||||
-
|
||||
-install_fonts::
|
||||
- -srcdir=$(srcdir) $(VERSIONDIR)/install-x11-fonts
|
||||
+install_unix: install_bin install_man install_share install_doc
|
||||
|
||||
install_bin::
|
||||
- -mkdir -p $(DESTDIR)$(BOCHSDIR)
|
||||
- -mkdir -p $(DESTDIR)$(VERSIONDIR)
|
||||
- -mkdir -p $(DESTDIR)$(bindir)
|
||||
- test -d $(DESTDIR)$(VERSIONDIR)
|
||||
- test -w $(DESTDIR)$(VERSIONDIR)
|
||||
- for i in bochs-docs; do cp $(srcdir)/build/linux/$$i $(DESTDIR)$(bindir)/$$i; $(CHMOD) 755 $(DESTDIR)$(bindir)/$$i; done
|
||||
- for i in $(INSTALL_LIST_SED); do cp $(srcdir)/build/linux/$$i $(DESTDIR)$(VERSIONDIR)/$$i; $(CHMOD) 644 $(DESTDIR)$(VERSIONDIR)/$$i; done
|
||||
+ for i in $(DESTDIR)$(bindir); do mkdir -p $$i && test -d $$i && test -w $$i; done
|
||||
$(CHMOD) a+x install-x11-fonts test-x11-fonts
|
||||
- for i in $(INSTALL_LIST); do if test -f $$i; then cp $$i $(DESTDIR)$(VERSIONDIR); else cp $(srcdir)/$$i $(DESTDIR)$(VERSIONDIR); fi; done
|
||||
- $(LN_S) $(VERSIONDIR)/bochs $(DESTDIR)$(bindir)/bochs
|
||||
- $(LN_S) $(VERSIONDIR)/bximage $(DESTDIR)$(bindir)/bximage
|
||||
- $(CP) -r $(srcdir)/docs-html $(DESTDIR)$(VERSIONDIR)
|
||||
- $(CP) -r $(srcdir)/gui/keymaps $(DESTDIR)$(VERSIONDIR)
|
||||
- $(RM) -f $(DESTDIR)$(VERSIONDIR)/README
|
||||
- $(CAT) $(srcdir)/build/linux/README.linux-binary $(srcdir)/README > $(DESTDIR)$(VERSIONDIR)/README
|
||||
- $(CP) $(srcdir)/font/vga.pcf $(DESTDIR)$(VERSIONDIR)
|
||||
- $(CP) $(srcdir)/.bochsrc $(DESTDIR)$(VERSIONDIR)/bochsrc-sample.txt
|
||||
- $(RM) -f $(DESTDIR)$(BOCHSDIR)/latest
|
||||
- $(LN_S) $(VERSION) $(DESTDIR)$(BOCHSDIR)/latest
|
||||
+ for i in $(INSTALL_LIST_BIN); do if test -f $$i; then cp $$i $(DESTDIR)$(bindir); else cp $(srcdir)/$$i $(DESTDIR)$(bindir); fi; done
|
||||
+
|
||||
+install_share::
|
||||
+ for i in $(DESTDIR)$(sharedir); do mkdir -p $$i && test -d $$i && test -w $$i; done
|
||||
+ for i in $(INSTALL_LIST_SHARE); do if test -f $$i; then cp $$i $(DESTDIR)$(sharedir); else cp $(srcdir)/$$i $(DESTDIR)$(sharedir); fi; done
|
||||
+ $(CP) -r $(srcdir)/gui/keymaps $(DESTDIR)$(sharedir)
|
||||
+ $(CP) $(srcdir)/font/vga.pcf $(DESTDIR)$(sharedir)/vga.pcf
|
||||
+
|
||||
+install_doc::
|
||||
+ for i in $(DESTDIR)$(docdir); do mkdir -p $$i && test -d $$i && test -w $$i; done
|
||||
+ for i in bochs-docs; do install -m755 $(srcdir)/build/linux/$$i $(DESTDIR)$(docdir)/$$i; done
|
||||
+ for i in $(INSTALL_LIST_SED); do install -m644 $(srcdir)/build/linux/$$i $(DESTDIR)$(docdir)/$$i; done
|
||||
+ for i in $(INSTALL_LIST_DOC); do if test -f $$i; then cp $$i $(DESTDIR)$(docdir); else cp $(srcdir)/$$i $(DESTDIR)$(docdir); fi; done
|
||||
+ $(CP) -r $(srcdir)/docs-html $(DESTDIR)$(docdir)
|
||||
+ $(RM) -f $(DESTDIR)$(docdir)/README
|
||||
+ $(CAT) $(srcdir)/build/linux/README.linux-binary $(srcdir)/README > $(DESTDIR)$(docdir)/README
|
||||
+ $(CP) $(srcdir)/.bochsrc $(DESTDIR)$(docdir)/bochsrc-sample.txt
|
||||
|
||||
install_man::
|
||||
-mkdir -p $(DESTDIR)$(man1dir)
|
||||
- for i in $(MAN_PAGE_LIST); do cat $(srcdir)/doc/man/$$i.1 | $(SED) -e 's/@VERSION@/$(VERSION)/g' > $(DESTDIR)$(man1dir)/$$i.1; chmod 644 $(DESTDIR)$(man1dir)/$$i.1; done
|
||||
+ for i in $(MAN_PAGE_LIST); do cat $(srcdir)/doc/man/$$i.1 | $(SED) -e 's/@VERSION@/$(VERSION)/g' | $(GZIP) -c > $(DESTDIR)$(man1dir)/$$i.1.gz; chmod 644 $(DESTDIR)$(man1dir)/$$i.1.gz; done
|
||||
|
||||
download_dlx: $(DLXLINUX_TAR)
|
||||
|
||||
@@ -330,20 +330,18 @@
|
||||
(cd dlxlinux; $(MV) bochsrc.txt bochsrc.txt.orig; $(SED) -e "s/1\.1\.2/$(VERSION)/g" -e 's,/usr/local,$(prefix),g' < bochsrc.txt.orig > bochsrc.txt; rm -f bochsrc.txt.orig)
|
||||
|
||||
install_dlx:
|
||||
- $(RM) -rf $(BOCHSDIR)/dlxlinux
|
||||
- cp -r dlxlinux $(BOCHSDIR)/dlxlinux
|
||||
- $(CHMOD) 755 $(BOCHSDIR)/dlxlinux
|
||||
- $(GZIP) $(BOCHSDIR)/dlxlinux/hd10meg.img
|
||||
- $(CHMOD) 644 $(BOCHSDIR)/dlxlinux/*
|
||||
- for i in bochs-dlx; do cp $(srcdir)/build/linux/$$i $(bindir)/$$i; $(CHMOD) 755 $(bindir)/$$i; done
|
||||
+ $(RM) -rf $(DESTDIR)$(sharedir)/dlxlinux
|
||||
+ cp -r dlxlinux $(DESTDIR)$(sharedir)/dlxlinux
|
||||
+ $(CHMOD) 755 $(DESTDIR)$(sharedir)/dlxlinux
|
||||
+ $(GZIP) $(DESTDIR)$(sharedir)/dlxlinux/hd10meg.img
|
||||
+ $(CHMOD) 644 $(DESTDIR)$(sharedir)/dlxlinux/*
|
||||
+ for i in bochs-dlx; do cp $(srcdir)/build/linux/$$i $(bindir)/$$i; $(CHMOD) 755 $(DESTDIR)$(bindir)/$$i; done
|
||||
|
||||
uninstall::
|
||||
- $(RM) -rf $(VERSIONDIR)
|
||||
- $(RM) -rf $(BOCHSDIR)/dlxlinux
|
||||
- $(RM) -rf $(BOCHSDIR)/latest
|
||||
- -$(RMDIR) $(BOCHSDIR)
|
||||
+ $(RM) -rf $(DESTDIR)$(sharedir)
|
||||
+ $(RM) -rf $(DESTDIR)$(docdir)
|
||||
for i in bochs bximage bochs-dlx $(BOCHS_SCRIPTS); do rm -f $(DESTDIR)$(bindir)/$$i; done
|
||||
- for i in $(MAN_PAGE_LIST); do $(RM) -f $(man1dir)/$$i.1; done
|
||||
+ for i in $(MAN_PAGE_LIST); do $(RM) -f $(man1dir)/$$i.1.gz; done
|
||||
|
||||
V6WORKSPACE_ZIP=build/win32/workspace.zip
|
||||
V6WORKSPACE_FILES=bochs.dsw bochs.dsp bochs.opt cpu/cpu.dsp \
|
||||
Loading…
x
Reference in New Issue
Block a user