sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Dynamically determine which ramdisk to use

Browse source 
.Also, rename ext2_ramdisk to ramdisk_ext2.
This commit is contained in:
Thomas Veerman 2012-06-06 11:49:36 +00:00
parent f09c2e014f
commit 03ea1c1676
7 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/Makefile
View file

@ -14,8 +14,13 @@ SUBDIR= at_wini floppy log tty pci ext2_ramdisk ramdisk memory
SUBDIR+= ahci amddev atl2 at_wini audio dec21140A dp8390 dpeth \ SUBDIR+= ahci amddev atl2 at_wini audio dec21140A dp8390 dpeth \
e1000 fbd filter floppy fxp hello lance log orinoco pci printer \ e1000 fbd filter floppy fxp hello lance log orinoco pci printer \
random readclock rtl8139 rtl8169 ti1225 tty vbox acpi \ random readclock rtl8139 rtl8169 ti1225 tty vbox acpi \
ext2_ramdisk ramdisk memory memory
.endif
.if ${MKBUILDEXT2RD} != "yes"
SUBDIR+= ramdisk
.else
SUBDIR+= ramdisk_ext2
.endif .endif
.include <bsd.subdir.mk> .include <bsd.subdir.mk>

8
drivers/memory/Makefile
View file

@ -1,9 +1,15 @@
# Makefile for memory driver (MEMORY) # Makefile for memory driver (MEMORY)
PROG= memory PROG= memory
SRCS= memory.c imgrd.mfs SRCS= memory.c imgrd.mfs
OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS= ${SRCS:N*.h:R:S/$/.o/g}
MKBUILDEXT2RD?= no
RAMDISK_PATH?= ${NETBSDSRCDIR}/drivers/ramdisk .if ${MKBUILDEXT2RD} != "yes"
RAMDISK_PATH= ${NETBSDSRCDIR}/drivers/ramdisk
.else
RAMDISK_PATH= ${NETBSDSRCDIR}/drivers/ramdisk_ext2
.endif
DPADD+= ${LIBBLOCKDRIVER} ${LIBCHARDRIVER} ${LIBSYS} DPADD+= ${LIBBLOCKDRIVER} ${LIBCHARDRIVER} ${LIBSYS}
LDADD+= -lblockdriver -lchardriver -lsys LDADD+= -lblockdriver -lchardriver -lsys

26
drivers/ext2_ramdisk/Makefile → drivers/ramdisk_ext2/Makefile
View file

@ -5,7 +5,7 @@
BINFILES = dev2name mount sh service \ BINFILES = dev2name mount sh service \
sysenv sysenv
SBINFILES = ahci at_wini ext2 floppy mfs procfs \ SBINFILES = ahci at_wini ext2 floppy procfs \
fsck.mfs fsck.mfs
ETCFILES = system.conf mtab passwd pwd.db spwd.db master.passwd \ ETCFILES = system.conf mtab passwd pwd.db spwd.db master.passwd \
@ -22,18 +22,18 @@ all:
# we have to make sure they are already installed # we have to make sure they are already installed
# (that's a little bit to coarse grain though...) # (that's a little bit to coarse grain though...)
install_files: install_files:
${MAKE} -C ${MINIXSRCDIR}/commands install ${MAKE} -C ${NETBSDSRCDIR}/commands install
${MAKE} -C ${MINIXSRCDIR}/usr.bin install ${MAKE} -C ${NETBSDSRCDIR}/usr.bin install
${MAKE} -C ${MINIXSRCDIR}/usr.sbin install ${MAKE} -C ${NETBSDSRCDIR}/usr.sbin install
${MAKE} -C ${MINIXSRCDIR}/usr.bin install ${MAKE} -C ${NETBSDSRCDIR}/usr.bin install
${MAKE} -C ${MINIXSRCDIR}/sbin install ${MAKE} -C ${NETBSDSRCDIR}/sbin install
${MAKE} -C ${MINIXSRCDIR}/bin install ${MAKE} -C ${NETBSDSRCDIR}/bin install
${MAKE} -C ${MINIXSRCDIR}/servers install ${MAKE} -C ${NETBSDSRCDIR}/servers install
${MAKE} -C ${MINIXSRCDIR}/drivers/acpi install ${MAKE} -C ${NETBSDSRCDIR}/drivers/acpi install
${MAKE} -C ${MINIXSRCDIR}/drivers/ahci install ${MAKE} -C ${NETBSDSRCDIR}/drivers/ahci install
${MAKE} -C ${MINIXSRCDIR}/drivers/at_wini install ${MAKE} -C ${NETBSDSRCDIR}/drivers/at_wini install
${MAKE} -C ${MINIXSRCDIR}/drivers/floppy install ${MAKE} -C ${NETBSDSRCDIR}/drivers/floppy install
${MAKE} -C ${MINIXSRCDIR}/drivers/pci install ${MAKE} -C ${NETBSDSRCDIR}/drivers/pci install
image.d: install_files image.d: install_files

0
drivers/ext2_ramdisk/device_table.txt → drivers/ramdisk_ext2/device_table.txt
View file

0
drivers/ext2_ramdisk/mtab → drivers/ramdisk_ext2/mtab
View file

0
drivers/ext2_ramdisk/rc → drivers/ramdisk_ext2/rc
View file

2
share/mk/bsd.own.mk
View file

@ -759,7 +759,7 @@ _MKVARS.no= \
MKUNPRIVED MKUPDATE MKX11 MKZFS MKBSDTAR MKUNPRIVED MKUPDATE MKX11 MKZFS MKBSDTAR
#MINIX-specific vars #MINIX-specific vars
_MKVARS.no+= \ _MKVARS.no+= \
MKIMAGEONLY MKSMALL MKIMAGEONLY MKSMALL MKBUILDEXT2RD
.for var in ${_MKVARS.no} .for var in ${_MKVARS.no}
${var}?=no ${var}?=no
.endfor .endfor