From 5955c7b34496a4da6142bb7a85bdab015975afce Mon Sep 17 00:00:00 2001 From: hosokawa Date: Fri, 14 Jan 2000 02:17:57 +0000 Subject: Eliminate PC-card installation floppy and add PC-card support for generic installation floppy. --- release/Makefile | 29 +---------------------------- release/boot_crunch.conf.generic | 4 +++- release/boot_crunch.conf.pccard | 22 ---------------------- release/sysinstall/Makefile | 13 ++----------- release/sysinstall/main.c | 3 --- release/sysinstall/pccard.c | 22 +++++++++++++--------- release/sysinstall/sysinstall.h | 3 +++ 7 files changed, 22 insertions(+), 74 deletions(-) delete mode 100644 release/boot_crunch.conf.pccard (limited to 'release') diff --git a/release/Makefile b/release/Makefile index cff48ce..24e4932 100644 --- a/release/Makefile +++ b/release/Makefile @@ -25,15 +25,6 @@ BUILDNAME?=${BASE}-${DATE}-SNAP # If this is a -stable snapshot, then set #RELEASETAG=RELENG_3 -PCCARD?=NO - -.if ${PCCARD} == "YES" -CARDDEV=card0 card1 card2 card3 -.else -CARDDEV= -.endif - -# We now use GENERIC for the pccard kernel. KERNCONF=GENERIC # If you are using a local CVS repository with components stored in @@ -278,9 +269,6 @@ release.1: rm -rf ${_R}/* mkdir ${RD} mkdir ${RD}/floppies -.if ${MACHINE_ARCH} == "i386" - mkdir ${RD}/floppies/pccard -.endif mkdir ${RD}/trees mkdir ${RD}/dists mkdir ${RD}/kernels @@ -330,11 +318,7 @@ release.3: # Tcl and Perl APIs. See also /usr/src/usr.bin/vi/Makefile. release.4: @mkdir -p /stand -.if ${PCCARD} == "YES" - cp ${.CURDIR}/boot_crunch.conf.pccard ${.OBJDIR}/boot_crunch.conf -.else cp ${.CURDIR}/boot_crunch.conf.generic ${.OBJDIR}/boot_crunch.conf -.endif cd ${.CURDIR}/sysinstall && make obj depend all install rm -rf ${RD}/crunch mkdir -p ${RD}/crunch @@ -464,14 +448,12 @@ release.8: write_mfs_in_kernel @cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=boot \ DIR=${RD}/mfsfd/stand ZIP=false ( cd ${RD}/trees/bin/dev && \ - ls console tty bpf0 ttyv0 ttyv1 ttyv2 ttyv3 null zero ${CARDDEV} | \ + ls console tty bpf0 ttyv0 ttyv1 ttyv2 ttyv3 null zero card0 card1 card2 card3 | \ cpio -dump ${RD}/mfsfd/dev ) ( cd ${RD}/mfsfd/dev && rm -f *[swo]d*[bdefgh] ) ( cd ${RD}/mfsfd && mkdir -p bin sbin && ln -s /stand/sh bin/sh ) cp /sbin/dhclient-script ${RD}/mfsfd/sbin -.if ${PCCARD} == "YES" cp ${.CURDIR}/../etc/pccard.conf.sample ${RD}/mfsfd/etc/pccard.conf -.endif cd ${RD}/trees/bin && ls ${BOOT1} | cpio -dump ${RD}/mfsfd/stand echo "nameserver 42/tcp name" > ${RD}/mfsfd/stand/etc/services echo "ftp 21/tcp" >> ${RD}/mfsfd/stand/etc/services @@ -535,10 +517,6 @@ release.9: # Do our last minute floppies directory setup in a convenient place. @cp ${.CURDIR}/texts/FLOPPIES.TXT ${RD}/floppies/README.TXT @(cd ${RD}/floppies; md5 README.TXT *.flp > CHECKSUM.MD5) -.if ${MACHINE_ARCH} == "i386" - @cp ${.CURDIR}/texts/PCCARD.TXT ${RD}/floppies/pccard/README.TXT - @(cd ${RD}/floppies/pccard; md5 *.flp > CHECKSUM.MD5) -.endif touch release.9 # @@ -648,11 +626,6 @@ doRELEASE: release.1 release.2 ${DOCREL} release.3 release.4 release.5 \ @echo "Release done" floppies: -.if ${MACHINE_ARCH} == "i386" - @cd ${.CURDIR} && ${MAKE} PCCARD=YES boot.flp - mv ${RD}/floppies/boot.flp ${RD}/floppies/kern.flp \ - ${RD}/floppies/mfsroot.flp ${RD}/floppies/pccard -.endif @cd ${.CURDIR} && ${MAKE} boot.flp @cd ${.CURDIR} && ${MAKE} fixit.flp @cd ${RD} && find floppies -print | cpio -dumpl ${FD} diff --git a/release/boot_crunch.conf.generic b/release/boot_crunch.conf.generic index 5796566..0831785 100644 --- a/release/boot_crunch.conf.generic +++ b/release/boot_crunch.conf.generic @@ -2,12 +2,14 @@ srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin /usr/src/sbin/i386 +srcdirs /usr/src/usr.sbin/pccard -progs sh find sed test +progs sh find sed test rm progs pwd ppp progs sysinstall newfs minigzip cpio fsck ifconfig route slattach progs mount_nfs progs dhclient arp hostname +progs pccardc pccardd wicontrol ln minigzip gzip ln minigzip gunzip ln minigzip zcat diff --git a/release/boot_crunch.conf.pccard b/release/boot_crunch.conf.pccard deleted file mode 100644 index 5b40509..0000000 --- a/release/boot_crunch.conf.pccard +++ /dev/null @@ -1,22 +0,0 @@ -# $FreeBSD$ - -srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin -srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin /usr/src/sbin/i386 -srcdirs /usr/src/usr.sbin/pccard - -progs sh find sed test rm -progs pwd ppp -progs sysinstall newfs minigzip cpio fsck ifconfig route slattach -progs mount_nfs -progs dhclient arp hostname -progs pccardc pccardd -progs wicontrol -ln minigzip gzip -ln minigzip gunzip -ln minigzip zcat -ln sh -sh -ln test [ -ln newfs mount_mfs - -libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lz -lnetgraph -libs -ldialog -lncurses -lmytinfo -L/usr/src/release/libdisk/obj -ldisk -lipx diff --git a/release/sysinstall/Makefile b/release/sysinstall/Makefile index f6dc252..00c3be2 100644 --- a/release/sysinstall/Makefile +++ b/release/sysinstall/Makefile @@ -5,7 +5,7 @@ BINDIR=/stand NOSHARED=YES CLEANFILES+= makedevs.c rtermcap rtermcap.tmp dumpnlist -CLEANFILES+= keymap.tmp keymap.h pccard_conf.h +CLEANFILES+= keymap.tmp keymap.h .PATH: ${.CURDIR}/../disklabel ${.CURDIR}/../../usr.bin/cksum @@ -15,23 +15,14 @@ SRCS= anonFTP.c cdrom.c command.c config.c devices.c dhcp.c kget.c \ label.c lndir.c main.c makedevs.c media.c menus.c misc.c mouse.c \ msg.c network.c nfs.c options.c package.c pccard.c \ system.c tape.c tcpip.c termcap.c ufs.c user.c variable.c wizard.c \ - keymap.h pccard_conf.h + keymap.h CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR} CFLAGS+= -I${.CURDIR}/../../sys -PCCARD?= NO - DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO} LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio -pccard_conf.h: -.if ${PCCARD} == "YES" - echo "#define PCCARD 1" > pccard_conf.h -.else - echo "#undef PCCARD" > pccard_conf.h -.endif - makedevs.c: Makefile rtermcap keymap.h rm -f makedevs.tmp echo '#include ' > makedevs.tmp diff --git a/release/sysinstall/main.c b/release/sysinstall/main.c index ad454ee..86f6bd3 100644 --- a/release/sysinstall/main.c +++ b/release/sysinstall/main.c @@ -35,7 +35,6 @@ */ #include "sysinstall.h" -#include "pccard_conf.h" #include #include @@ -88,10 +87,8 @@ main(int argc, char **argv) if (DebugFD) dup2(DebugFD, 2); -#ifdef PCCARD /* Initialize PC-card */ pccardInitialize(); -#endif /* Probe for all relevant devices on the system */ deviceGetAll(); diff --git a/release/sysinstall/pccard.c b/release/sysinstall/pccard.c index db18ab4..8d8c3ea 100644 --- a/release/sysinstall/pccard.c +++ b/release/sysinstall/pccard.c @@ -15,13 +15,10 @@ */ #include "sysinstall.h" -#include "pccard_conf.h" #include #include #include -#ifdef PCCARD - int pccard_mode = 0; DMenu MenuPCICMem = { @@ -83,6 +80,19 @@ pccardInitialize(void) return; } + sprintf(card_device, CARD_DEVICE, 0); + + if ((fd = open(card_device, O_RDWR)) < 0) { + msgDebug("Can't open PC-card controller %s.\n", + card_device); + return; + } + else if (msgYesNo("Found PC-card slot(s).\n" + "Use PC-card device as installation media?\n")) { + return; + } + close(fd); + dmenuOpenSimple(&MenuPCICMem, FALSE); spcic_mem = variable_get("_pcicmem"); dmenuOpenSimple(&MenuCardIRQ, FALSE); @@ -122,8 +132,6 @@ pccardInitialize(void) break; } - sprintf(card_device, CARD_DEVICE, 0); - w = savescr(); dialog_clear_norefresh(); msgConfirm("Now we start initializing PC-card controller and cards.\n" @@ -163,7 +171,3 @@ pccardInitialize(void) vsystem(pccardd_cmd); restorescr(w); } - -#endif /* PCCARD */ - - diff --git a/release/sysinstall/sysinstall.h b/release/sysinstall/sysinstall.h index 2a4c618..43eeab0 100644 --- a/release/sysinstall/sysinstall.h +++ b/release/sysinstall/sysinstall.h @@ -691,6 +691,9 @@ extern int package_add(char *name); extern int package_extract(Device *dev, char *name, Boolean depended); extern Boolean package_exists(char *name); +/* pccard.c */ +extern void pccardInitialize(void); + /* system.c */ extern void systemInitialize(int argc, char **argv); extern void systemShutdown(int status); -- cgit v1.1