Module Name: src
Committed By: pooka
Date: Mon Aug 24 23:21:51 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libmiiphy: Makefile
src/sys/rump/dev/lib/libpci: Makefile
src/sys/rump/dev/lib/libpci_usbhc: Makefile
src/sys/rump/dev/lib/libscsipi: Makefile
src/sys/rump/dev/lib/libumass: Makefile
Added Files:
src/sys/rump/include/opt: atapibus.h scsibus.h wd.h
Removed Files:
src/sys/rump/dev/lib/libmiiphy/opt: opt_mii.h
src/sys/rump/dev/lib/libpci/opt: opt_pci.h opt_pciide.h
src/sys/rump/dev/lib/libscsipi/opt: atapibus.h opt_compat_freebsd.h
opt_scsi.h scsibus.h wd.h
Log Message:
opt files were nop't
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libmiiphy/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libmiiphy/opt/opt_mii.h
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/libpci/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libpci/opt/opt_pci.h \
src/sys/rump/dev/lib/libpci/opt/opt_pciide.h
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libpci_usbhc/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libscsipi/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libscsipi/opt/atapibus.h \
src/sys/rump/dev/lib/libscsipi/opt/opt_compat_freebsd.h \
src/sys/rump/dev/lib/libscsipi/opt/opt_scsi.h \
src/sys/rump/dev/lib/libscsipi/opt/scsibus.h \
src/sys/rump/dev/lib/libscsipi/opt/wd.h
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/dev/lib/libumass/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/include/opt/atapibus.h \
src/sys/rump/include/opt/scsibus.h src/sys/rump/include/opt/wd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/dev/lib/libmiiphy/Makefile
diff -u src/sys/rump/dev/lib/libmiiphy/Makefile:1.2 src/sys/rump/dev/lib/libmiiphy/Makefile:1.3
--- src/sys/rump/dev/lib/libmiiphy/Makefile:1.2 Mon May 26 19:55:53 2014
+++ src/sys/rump/dev/lib/libmiiphy/Makefile Mon Aug 24 23:21:50 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/05/26 19:55:53 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2015/08/24 23:21:50 pooka Exp $
#
RUMPTOP=${TOPRUMP}
@@ -16,7 +16,7 @@ SRCS+= acphy.c amhphy.c atphy.c bmtphy.c
inphy.c iophy.c lxtphy.c makphy.c nsphy.c nsphyter.c pnaphy.c \
qsphy.c rdcphy.c rgephy.c rlphy.c sqphy.c tlphy.c tqphy.c urlphy.c
-CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${.CURDIR}/opt
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
.include "${RUMPTOP}/Makefile.rump"
.include <bsd.lib.mk>
Index: src/sys/rump/dev/lib/libpci/Makefile
diff -u src/sys/rump/dev/lib/libpci/Makefile:1.6 src/sys/rump/dev/lib/libpci/Makefile:1.7
--- src/sys/rump/dev/lib/libpci/Makefile:1.6 Mon Jun 15 15:38:52 2015
+++ src/sys/rump/dev/lib/libpci/Makefile Mon Aug 24 23:21:50 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/06/15 15:38:52 pooka Exp $
+# $NetBSD: Makefile,v 1.7 2015/08/24 23:21:50 pooka Exp $
#
RUMPTOP= ${TOPRUMP}
@@ -22,7 +22,7 @@ SRCS+= rumpdev_bus_dma.c
SRCS+= pci_at_mainbus.c
-CPPFLAGS+= -I${.CURDIR}/opt -I${RUMPTOP}/librump/rumpkern
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
.if ${RUMP_PCI_IOSPACE:Uno} == "yes"
Index: src/sys/rump/dev/lib/libpci_usbhc/Makefile
diff -u src/sys/rump/dev/lib/libpci_usbhc/Makefile:1.1 src/sys/rump/dev/lib/libpci_usbhc/Makefile:1.2
--- src/sys/rump/dev/lib/libpci_usbhc/Makefile:1.1 Wed May 20 12:21:38 2015
+++ src/sys/rump/dev/lib/libpci_usbhc/Makefile Mon Aug 24 23:21:51 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/05/20 12:21:38 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2015/08/24 23:21:51 pooka Exp $
#
RUMPTOP=${TOPRUMP}
@@ -15,7 +15,6 @@ SRCS+= ehci_pci.c ehci.c
SRCS+= usb_pci.c
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/../dev
-CPPFLAGS+= -I${.CURDIR}/../libusb/opt
.include "${RUMPTOP}/Makefile.rump"
.include <bsd.lib.mk>
Index: src/sys/rump/dev/lib/libscsipi/Makefile
diff -u src/sys/rump/dev/lib/libscsipi/Makefile:1.2 src/sys/rump/dev/lib/libscsipi/Makefile:1.3
--- src/sys/rump/dev/lib/libscsipi/Makefile:1.2 Thu Mar 13 01:58:20 2014
+++ src/sys/rump/dev/lib/libscsipi/Makefile Mon Aug 24 23:21:51 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/03/13 01:58:20 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2015/08/24 23:21:51 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/scsipi
@@ -16,7 +16,7 @@ SRCS+= scsipi_verbose.c
SRCS+= scsipi_component.c
-CPPFLAGS+= -I${.CURDIR}/opt -I${RUMPTOP}/librump/rumpvfs
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
.include <bsd.lib.mk>
.include <bsd.klinks.mk>
Index: src/sys/rump/dev/lib/libumass/Makefile
diff -u src/sys/rump/dev/lib/libumass/Makefile:1.8 src/sys/rump/dev/lib/libumass/Makefile:1.9
--- src/sys/rump/dev/lib/libumass/Makefile:1.8 Sat Jun 13 23:33:20 2015
+++ src/sys/rump/dev/lib/libumass/Makefile Mon Aug 24 23:21:51 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/06/13 23:33:20 pooka Exp $
+# $NetBSD: Makefile,v 1.9 2015/08/24 23:21:51 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/usb
@@ -14,7 +14,5 @@ SRCS+= umass_component.c
SRCS= dummy.c
.endif
-CPPFLAGS+= -I${.CURDIR}/../libscsipi/opt# -I${RUMPTOP}/librump/rumpvfs
-
.include <bsd.lib.mk>
.include <bsd.klinks.mk>
Added files:
Index: src/sys/rump/include/opt/atapibus.h
diff -u /dev/null src/sys/rump/include/opt/atapibus.h:1.1
--- /dev/null Mon Aug 24 23:21:51 2015
+++ src/sys/rump/include/opt/atapibus.h Mon Aug 24 23:21:51 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: atapibus.h,v 1.1 2015/08/24 23:21:51 pooka Exp $ */
+
+#define NATAPIBUS 1
Index: src/sys/rump/include/opt/scsibus.h
diff -u /dev/null src/sys/rump/include/opt/scsibus.h:1.1
--- /dev/null Mon Aug 24 23:21:51 2015
+++ src/sys/rump/include/opt/scsibus.h Mon Aug 24 23:21:51 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: scsibus.h,v 1.1 2015/08/24 23:21:51 pooka Exp $ */
+
+#define NSCSIBUS 1
Index: src/sys/rump/include/opt/wd.h
diff -u /dev/null src/sys/rump/include/opt/wd.h:1.1
--- /dev/null Mon Aug 24 23:21:51 2015
+++ src/sys/rump/include/opt/wd.h Mon Aug 24 23:21:51 2015
@@ -0,0 +1 @@
+/* $NetBSD: wd.h,v 1.1 2015/08/24 23:21:51 pooka Exp $ */
