Fix picobsd builds. Changes include:

- use proper make configuration for the build, using
  ${BINMAKE} as evaluated by ${VERSION}/src/Makefile
- remove -lmytinfo from crunch.conf
- remove support for login_access in tinyware/login
- remove "machine i386" from the kernel config file

It might actually be interesting to extend the script to do
a cross build for !i386 ...

MFC after: 3 days

5 files changed, 14 insertions, 12 deletions

diff --git a/release/picobsd/bridge/PICOBSD b/release/picobsd/bridge/PICOBSD
index caf2bc9..e0c2833 100644
--- a/release/picobsd/bridge/PICOBSD
+++ b/release/picobsd/bridge/PICOBSD
@@ -7,7 +7,6 @@
 options MD_ROOT_SIZE=3200      # same as def_sz
 
 hints	"PICOBSD.hints"
-machine		i386
 cpu		I486_CPU
 cpu		I586_CPU
 cpu		I686_CPU
diff --git a/release/picobsd/bridge/crunch.conf b/release/picobsd/bridge/crunch.conf
index aedcea9..080eedb 100644
--- a/release/picobsd/bridge/crunch.conf
+++ b/release/picobsd/bridge/crunch.conf
@@ -177,6 +177,7 @@ libs -ll       # used by sh
 libs -lufs     # used by mount
 ### ee uses ncurses instead of curses
 libs -ledit -lutil -lmd -lcrypt -lmp -lm -lkvm
-libs -lmytinfo -lz -lpcap -lwrap
+# libs -lmytinfo
+libs -lz -lpcap -lwrap
 libs -ltermcap -lgnuregex # -lcurses
 libs -lgeom
diff --git a/release/picobsd/build/Makefile.conf b/release/picobsd/build/Makefile.conf
index c4f048b..22077b0 100644
--- a/release/picobsd/build/Makefile.conf
+++ b/release/picobsd/build/Makefile.conf
@@ -9,6 +9,7 @@
 # When building a kernel, also need ${name} from the environment
 # and CONFIG may indicate an alternate config program
 
+BINMAKE?=make
 SRC?=/usr/src
 CONFIG?=config
 MODULES?=-DNO_MODULES	# do not build them as a default
@@ -38,11 +39,11 @@ ${BUILDDIR}/kernel: ${KERNFILE}
 ${KERNFILE}: ${COMPILE} do_a_make_in_the_kernel_directory_anyways
 
 do_a_make_in_the_kernel_directory_anyways:
-	(cd ${COMPILE}; make KERNEL=kernel ${MODULES} )
+	(cd ${COMPILE}; ${BINMAKE} KERNEL=kernel ${MODULES} )
 
 ${COMPILE}: ${CONF}/${CONFFILE}
 	(cd ${CONF}; ${CONFIG} -d ${COMPILE} ${CONFFILE}; \
-	cd ${COMPILE}; make KERNEL=kernel ${MODULES} depend )
+	cd ${COMPILE}; ${BINMAKE} KERNEL=kernel ${MODULES} depend )
 
 ${CONF}/${CONFFILE}: PICOBSD
 	# -mkdir -p ${CONF}		# XXX not needed yet.
diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd
index 974316d..42ee329 100755
--- a/release/picobsd/build/picobsd
+++ b/release/picobsd/build/picobsd
@@ -282,8 +282,9 @@ build_image() {
     if [ ${OSVERSION} -ge 500035 ] ; then
 	MAKEOBJDIRPREFIX=${l_objtree}
 	export MAKEOBJDIRPREFIX
+	eval "export BINMAKE=\"`cd ${SRC}; make -f Makefile -V BINMAKE`\""
 	log `cd ${SRC}; make -f Makefile.inc1 -V WMAKEENV`
-	eval export `cd ${SRC}; make -f Makefile.inc1 -V WMAKEENV`
+	eval export `cd ${SRC}; ${BINMAKE} -f Makefile.inc1 -V WMAKEENV`
     fi
     # create build directory and subtree
     mkdir -p ${BUILDDIR}/crunch
@@ -463,7 +464,7 @@ do_kernel() {		# OK
 		MODULES=""
 		export MODULES
 	fi
-	make -m ${SRC}/share/mk -v -f ${PICO_TREE}/build/Makefile.conf ) || \
+	${BINMAKE} -v -f ${PICO_TREE}/build/Makefile.conf ) || \
 	fail $? missing_kernel
 }
 
@@ -491,8 +492,8 @@ populate_floppy_fs() {		# OK
 
     excl=${MY_TREE}/floppy.tree.exclude
     if [ -f ${excl} ] ; then
-	excl="--exclude-from ${excl}"
 	log "Files excluded from generic tree: `echo;cat ${excl}`"
+	excl="--exclude-from ${excl}"
     else
 	excl=""
     fi
@@ -561,13 +562,13 @@ populate_mfs_tree() {
     log "Making and installing crunch1 from `pwd` src ${SRC}..."
     a=${BUILDDIR}/crunch1.conf
     ( export BUILDDIR SRC MY_TREE PICO_OBJ ;
-	make -m ${SRC}/share/mk \
+	${BINMAKE} \
 		-v -f ${PICO_TREE}/build/Makefile.conf ${BUILDDIR}/crunch.mk )
     log "Libs are ${LIBS} "
     export SRC # used by crunch.mk
     # export LIBS CFLAGS
     log "Now make -f crunch.mk"
-    make -m ${SRC}/share/mk ${o_makeopts} -f ${BUILDDIR}/crunch.mk
+    ${BINMAKE} ${o_makeopts} -f ${BUILDDIR}/crunch.mk
     strip --remove-section=.note --remove-section=.comment crunch1
     mv crunch1 ${dst}/stand/crunch
     chmod 555 ${dst}/stand/crunch
diff --git a/release/picobsd/tinyware/login/Makefile b/release/picobsd/tinyware/login/Makefile
index 01e01bb..a86fff4 100644
--- a/release/picobsd/tinyware/login/Makefile
+++ b/release/picobsd/tinyware/login/Makefile
@@ -6,10 +6,10 @@
 .PATH: ${.CURDIR}/../../../../usr.bin/login
 
 PROG=	login
-SRCS=	pico-login.c login_access.c login_fbtab.c
-MAN=	login.1 login.access.5
+SRCS=	pico-login.c login_fbtab.c
+MAN=	login.1
 
-CFLAGS+=-DLOGIN_ACCESS -DLOGALL
+CFLAGS+=-DLOGALL
 
 DPADD=	${LIBUTIL} ${LIBCRYPT}
 LDADD=	-lutil -lcrypt