hrev54523 adds 1 changeset to branch 'master'
old head: d4b7d64b8186b2444b7b36c46501621cbe88362f
new head: 48099e3e486be2293f0432c1595b6309f3945aaf
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=48099e3e486b+%5Ed4b7d64b8186
----------------------------------------------------------------------------
48099e3e486b: m68k: don't take CD boot stuff in floppy image
Note it is not enough to fit, you also need to disable USB boot.
Change-Id: I5159c9ddebb242c4d4874d70430da6852073fdb4
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3102
Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxx>
[ François Revol <revol@xxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev54523
Commit: 48099e3e486be2293f0432c1595b6309f3945aaf
URL: https://git.haiku-os.org/haiku/commit/?id=48099e3e486b
Author: François Revol <revol@xxxxxxx>
Date: Mon Jul 27 01:26:59 2020 UTC
Committer: Alex von Gluck IV <kallisti5@xxxxxxxxxxx>
Commit-Date: Wed Aug 19 13:39:53 2020 UTC
----------------------------------------------------------------------------
1 file changed, 1 insertion(+), 1 deletion(-)
build/jam/images/FloppyBootImage | 2 +-
----------------------------------------------------------------------------
diff --git a/build/jam/images/FloppyBootImage b/build/jam/images/FloppyBootImage
index 1ffa2ed371..8f27b360d4 100644
--- a/build/jam/images/FloppyBootImage
+++ b/build/jam/images/FloppyBootImage
@@ -30,7 +30,7 @@ SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures
isa@x86,x86_64 scsi $(USB_ONLY)usb fdt@arm
] ;
SYSTEM_ADD_ONS_FILE_SYSTEMS =
- attribute_overlay bfs iso9660 packagefs write_overlay
+ attribute_overlay@!m68k bfs iso9660@!m68k packagefs write_overlay@!m68k
;
# modules
