Step 0: mk/ Update Minix platform definition

We are transitionning from a full platform to a NetBSD variant, per the project policy of having a NetBSD userland. There is then little meaning in adapting all the NetBSD tests to also be true for Minix. This means the following is set as: * OPSYS = NetBSD * OS_VARIANT = Minix This also has the consequence of obsoleting a few files in pkgtools/bootstrap-mk-files.
2013-10-07 16:06:08 +02:00
parent 9d819b6d54
commit bc17d767a5
11 changed files with 50 additions and 1332 deletions
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -342,10 +342,14 @@ OS_VARIANT=		SCOOSR6
 .  endif

 .elif ${OPSYS} == "Minix"
-LOWER_VENDOR?=		pc
-LOWER_OPSYS:=		${OPSYS:tl}
-LDFLAGS+=		-lcompat_minix -lminlib
+LOWER_VENDOR?=		elf32
+OPSYS:=			NetBSD
+LOWER_OPSYS:=		netbsd
+OS_VARIANT:=		Minix
+ROOT_GROUP:=		operator

+NATIVE_MACHINE_GNU_PLATFORM=	${NATIVE_MACHINE_GNU_ARCH}-elf32-minix
+MACHINE_GNU_PLATFORM=		${MACHINE_GNU_ARCH}-elf32-minix
 .elif !defined(LOWER_OPSYS)
 LOWER_OPSYS:=		${OPSYS:tl}
 .endif
@@ -389,6 +393,17 @@ PKGPATH?=		${.CURDIR:C|.*/([^/]*/[^/]*)$|\1|}
 # Load the settings from MAKECONF, which is /etc/mk.conf by default.
 .include <bsd.own.mk>

+.if ${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix"
+# Minix: For now we differ from NetBSD on the following, but the
+#        way it is set in platform/NetBSD.mk prevents us from
+#        setting it in the system-wide mk.conf
+.undef PKG_HAVE_KQUEUE
+_OPSYS_MAX_CMDLEN_CMD=	echo 262144
+_OPSYS_SHLIB_TYPE=	ELF	# ELF shared libraries on Minix
+_OPSYS_HAS_OSSAUDIO=	no	# libossaudio is available
+_OPSYS_HAS_INET6=	no	# IPv6 is not standard
+.endif # ${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix"
+
 .if ${OPSYS} == "OpenBSD"
 .  if defined(ELF_TOOLCHAIN) && ${ELF_TOOLCHAIN} == "yes"
 OBJECT_FMT?=	ELF
@@ -446,7 +461,8 @@ SHAREMODE?=		${DOCMODE}

 # Load the OS-specific definitions for program variables.  Default to loading
 # the NetBSD ones if an OS-specific file doesn't exist.
-.if exists(${_PKGSRC_TOPDIR}/mk/platform/${OPSYS}.mk)
+
+.if  exists(${_PKGSRC_TOPDIR}/mk/platform/${OPSYS}.mk)
 .  include "${_PKGSRC_TOPDIR}/mk/platform/${OPSYS}.mk"
 .else
 .  include "${_PKGSRC_TOPDIR}/mk/platform/NetBSD.mk"
--- a/mk/gnu-config/config.guess
+++ b/mk/gnu-config/config.guess
@@ -895,8 +895,8 @@ EOF
 	# other systems with GNU libc and userland
 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
+    *:Minix:*:*)
+	echo ${UNAME_MACHINE}-elf32-minix
 	exit ;;
    aarch64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
--- a/mk/install/bin-install.mk
+++ b/mk/install/bin-install.mk
@@ -30,11 +30,13 @@
 # List of sites carrying binary pkgs. Variables "rel" and "arch" are
 # replaced with OS release ("1.5", ...) and architecture ("mipsel", ...)
 .if ${OPSYS} == "NetBSD"
+.  if ${OS_VARIANT} != "Minix"
 BINPKG_SITES?= \
 	ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$${arch}/$${rel}
-.elif ${OPSYS} == "Minix"
+.  else
 BINPKG_SITES?= \
-	ftp://ftp.minix3.org/pub/minix/packages/$$(${UNAME} -r)/$${arch}
+	http://www.minix3.org/pkgsrc/packages/$$(${UNAME} -r)/$${arch}
+.  endif
 .elif ${OPSYS} == "DragonFly"
 BINPKG_SITES?= \
 	http://mirror-master.dragonflybsd.org/packages/$${arch}/DragonFly-$${rel}/stable
--- a/mk/platform/Minix.mk
+++ b/mk/platform/Minix.mk
@@ -1,52 +0,0 @@
-# $NetBSD: Minix.mk,v 1.5 2013/04/28 12:53:56 obache Exp $
-#
-# Variable definitions for the Minix operating system.
-
-ECHO_N?=	${ECHO} -n
-X11_TYPE?=	native
-IMAKE_MAKE?=	${MAKE}	# program which gets invoked by imake
-IMAKEOPTS+=	-DBuildHtmlManPages=NO
-PKGLOCALEDIR?=	share
-PS?=		/usr/bin/ps
-SU?=		/usr/bin/su
-TYPE?=		type			# Shell builtin
-
-CPP_PRECOMP_FLAGS?=	# unset
-DEF_UMASK?=		022
-DEFAULT_SERIAL_DEVICE?=	/dev/null
-EXPORT_SYMBOLS_LDFLAGS?=	# Don't add symbols to the dynamic symbol table
-GROUPADD?=		/usr/sbin/groupadd
-NOLOGIN?=		/bin/false
-PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
-ROOT_CMD?=		${SU} - root -c
-ROOT_GROUP?=	operator
-ROOT_USER?=		root
-SERIAL_DEVICES?=	/dev/null
-USERADD?=		/usr/sbin/useradd
-ULIMIT_CMD_datasize?=	: 
-ULIMIT_CMD_stacksize?=	: 
-
-_OPSYS_SYSTEM_RPATH?=	/usr/lib
-_OPSYS_LIB_DIRS?=	/usr/lib
-_OPSYS_INCLUDE_DIRS?=	/usr/include
-
-_OPSYS_HAS_INET6=	no	# IPv6 is not standard
-_OPSYS_HAS_JAVA=	no	# Java is not standard
-_OPSYS_HAS_MANZ=	no	# no MANZ for gzipping of man pages
-_OPSYS_HAS_OSSAUDIO=	no	# libossaudio is available
-_OPSYS_PERL_REQD=		# no base version of perl required
-_OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
-_OPSYS_SHLIB_TYPE=	ELF	# ELF shared libraries on Minix
-_PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
-_PATCH_BACKUP_ARG?= 	-b -V simple --suffix	# switch to patch(1) for backup suffix
-_USE_RPATH=		yes	# add rpath to LDFLAGS
-
-# flags passed to the linker to extract all symbols from static archives.
-# this is GNU ld.
-_OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
-
-_STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-s}	# cc(1) option to strip
-_STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
-
-_OPSYS_CAN_CHECK_SHLIBS=	yes
--- a/mk/tools/tools.Minix.mk
+++ b/mk/tools/tools.Minix.mk
@@ -1,75 +0,0 @@
-# $NetBSD: tools.Minix.mk,v 1.4 2014/03/06 07:34:20 uebayasi Exp $
-#
-# System-supplied tools for the Minix operating system.
-
-#System supplied tools
-TOOLS_PLATFORM.[?=		/bin/[
-TOOLS_PLATFORM.awk?=		/usr/bin/awk
-TOOLS_PLATFORM.basename?=	/usr/bin/basename
-TOOLS_PLATFORM.bsdtar?=		/bin/tar
-TOOLS_PLATFORM.bzcat?=		/usr/bin/bzcat
-TOOLS_PLATFORM.bzip2?=		/usr/bin/bzip2
-TOOLS_PLATFORM.cat?=		/bin/cat
-TOOLS_PLATFORM.chgrp?=		/usr/bin/chgrp
-TOOLS_PLATFORM.chmod?=		/bin/chmod
-TOOLS_PLATFORM.chown?=		/usr/bin/chown
-TOOLS_PLATFORM.cmp?=		/usr/bin/cmp
-TOOLS_PLATFORM.cp?=		/bin/cp 
-TOOLS_PLATFORM.cut?=		/usr/bin/cut
-TOOLS_PLATFORM.date?=		/bin/date
-TOOLS_PLATFORM.diff?=		/usr/bin/diff
-TOOLS_PLATFORM.dirname?=	/usr/bin/dirname
-TOOLS_PLATFORM.echo?=		/bin/echo
-TOOLS_PLATFORM.egrep?=		/usr/bin/egrep
-TOOLS_PLATFORM.env?=		/usr/bin/env
-TOOLS_PLATFORM.expr?=		/bin/expr
-TOOLS_PLATFORM.false?=		/bin/false
-TOOLS_PLATFORM.fetch?=		/usr/bin/fetch
-TOOLS_PLATFORM.fgrep?=		/usr/bin/fgrep
-TOOLS_PLATFORM.file?=		/usr/bin/file
-TOOLS_PLATFORM.find?=		/usr/bin/find
-TOOLS_PLATFORM.flex?=		/usr/bin/flex
-TOOLS_PLATFORM.ftp?=		/usr/bin/ftp
-TOOLS_PLATFORM.grep?=		/usr/bin/grep
-TOOLS_PLATFORM.gunzip?=		/usr/bin/gunzip -f
-TOOLS_PLATFORM.gzcat?=		/usr/bin/gzcat
-TOOLS_PLATFORM.gzip?=		/usr/bin/gzip -nf ${GZIP}
-TOOLS_PLATFORM.head?=		/usr/bin/head
-TOOLS_PLATFORM.hostname?=	/bin/hostname
-TOOLS_PLATFORM.id?=		/usr/bin/id
-TOOLS_PLATFORM.install?=	/usr/bin/install
-TOOLS_PLATFORM.ksh?=		/bin/ksh
-TOOLS_PLATFORM.lex?=		/usr/bin/lex
-TOOLS_PLATFORM.ln?=		/bin/ln
-TOOLS_PLATFORM.ls?=		/bin/ls
-TOOLS_PLATFORM.m4?=		/usr/bin/m4
-TOOLS_PLATFORM.mail?=		/usr/bin/mail
-TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
-TOOLS_PLATFORM.mktemp?=		/usr/bin/mktemp
-TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
-TOOLS_PLATFORM.mv?=		/bin/mv
-TOOLS_PLATFORM.nice?=		/usr/bin/nice
-TOOLS_PLATFORM.nroff?=		/usr/bin/nroff
-TOOLS_PLATFORM.patch?=		/usr/bin/patch
-TOOLS_PLATFORM.pax?=		/bin/pax
-TOOLS_PLATFORM.printf?=		/usr/bin/printf
-TOOLS_PLATFORM.pwd?=		/bin/pwd
-TOOLS_PLATFORM.rm?=		/bin/rm
-TOOLS_PLATFORM.rmdir?=		/bin/rmdir
-TOOLS_PLATFORM.sed?=		/usr/bin/sed
-TOOLS_PLATFORM.sh?=		/bin/sh
-TOOLS_PLATFORM.sleep?=		/usr/bin/sleep
-TOOLS_PLATFORM.sort?=		/usr/bin/sort
-TOOLS_PLATFORM.strip?=		/usr/bin/strip
-TOOLS_PLATFORM.tail?=		/usr/bin/tail
-TOOLS_PLATFORM.tar?=		/bin/tar
-TOOLS_PLATFORM.tee?=		/usr/bin/tee
-TOOLS_PLATFORM.test?=		/bin/test
-TOOLS_PLATFORM.touch?=		/usr/bin/touch
-TOOLS_PLATFORM.tr?=		/usr/bin/tr
-TOOLS_PLATFORM.true?=		/bin/true
-TOOLS_PLATFORM.tsort?=		/usr/bin/tsort
-TOOLS_PLATFORM.uniq?=		/usr/bin/uniq
-TOOLS_PLATFORM.wc?=		/usr/bin/wc
-TOOLS_PLATFORM.xargs?=		/usr/bin/xargs
-TOOLS_PLATFORM.yacc?=		/usr/bin/yacc
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -20,7 +20,9 @@ TOOLS_PLATFORM.csh?=		/bin/csh
 TOOLS_PLATFORM.cut?=		/usr/bin/cut
 TOOLS_PLATFORM.date?=		/bin/date
 TOOLS_PLATFORM.diff?=		/usr/bin/diff
+.if exists(/usr/bin/diff3)
 TOOLS_PLATFORM.diff3?=		/usr/bin/diff3
+.endif
 TOOLS_PLATFORM.dirname?=	/usr/bin/dirname
 TOOLS_PLATFORM.echo?=		echo			# shell builtin
 TOOLS_PLATFORM.egrep?=		/usr/bin/egrep
@@ -36,7 +38,9 @@ TOOLS_PLATFORM.ftp?=		/usr/bin/ftp
 TOOLS_PLATFORM.gettext?=	/usr/bin/gettext
 .endif
 TOOLS_PLATFORM.grep?=		/usr/bin/grep
+.if exists(/usr/bin/groff)
 TOOLS_PLATFORM.groff?=		/usr/bin/groff
+.endif
 TOOLS_PLATFORM.gsoelim?=	${TOOLS_PLATFORM.soelim}	# GNUish
 TOOLS_PLATFORM.gunzip?=		/usr/bin/gunzip -f
 TOOLS_PLATFORM.gzcat?=		/usr/bin/gzcat
@@ -44,7 +48,9 @@ TOOLS_PLATFORM.gzip?=		/usr/bin/gzip -nf ${GZIP}
 TOOLS_PLATFORM.head?=		/usr/bin/head
 TOOLS_PLATFORM.hostname?=	/bin/hostname
 TOOLS_PLATFORM.id?=		/usr/bin/id
+.if exists(/usr/bin/ident)
 TOOLS_PLATFORM.ident?=		/usr/bin/ident
+.endif
 .if empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 TOOLS_PLATFORM.install?=	/usr/bin/install
 .else
@@ -86,7 +92,9 @@ TOOLS_PLATFORM.pax?=		/bin/pax
 TOOLS_PLATFORM.printf?=		/usr/bin/printf
 TOOLS_PLATFORM.pwd?=		/bin/pwd
 .if empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+.if exists(/usr/bin/readelf)
 TOOLS_PLATFORM.readelf?=	/usr/bin/readelf
+.endif
 .else
 TOOLS_PLATFORM.readelf?=	${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-readelf
 .endif
@@ -101,7 +109,9 @@ TOOLS_PLATFORM.sleep?=		/bin/sleep
 TOOLS_PLATFORM.soelim?=		/usr/bin/soelim
 TOOLS_PLATFORM.sort?=		/usr/bin/sort
 .if empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+.if exists(/usr/bin/strip)
 TOOLS_PLATFORM.strip?=		/usr/bin/strip
+.endif
 .else
 TOOLS_PLATFORM.strip?=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-strip
 .endif
@@ -112,7 +122,9 @@ TOOLS_PLATFORM.tar?=		/bin/tar
 .elif exists(/usr/bin/tar)
 TOOLS_PLATFORM.tar?=		/usr/bin/tar
 .endif
+.if exists(/usr/bin/tbl)
 TOOLS_PLATFORM.tbl?=		/usr/bin/tbl
+.endif
 TOOLS_PLATFORM.tee?=		/usr/bin/tee
 TOOLS_PLATFORM.test?=		test			# shell builtin
 TOOLS_PLATFORM.touch?=		/usr/bin/touch