From: Antoine Leca <Antoine.Leca.1@gmail.com>
Date: Wed, 23 Jan 2013 08:13:24 +0000 (+0000)
Subject: Replace tell_config with NetBSD osrelease.sh
X-Git-Tag: v3.2.1~55
X-Git-Url: http://zhaoyanbai.com/repos/pkcs11-list.html?a=commitdiff_plain;h=40b67629c53a15daceac2c5ea0ee2b07fb98a271;p=minix.git

Replace tell_config with NetBSD osrelease.sh
---

diff --git a/releasetools/mkboot b/releasetools/mkboot
index ec72b3787..169a8c0f3 100755
--- a/releasetools/mkboot
+++ b/releasetools/mkboot
@@ -25,8 +25,6 @@ rotate_oldest() {
 }
 
 
-trap 'e=$?; rm -f /tmp/mkb.$$; exit $e' 0 2
-
 mdec=/usr/mdec	# bootstraps
 # If no DESTDIR specified, then act on / or on the current chroot
 DESTDIR=
@@ -74,8 +72,7 @@ esac
 
 case $action in
 hdboot)
-	sh tell_config OS_RELEASE . OS_VERSION >/tmp/mkb.$$
-	version=`sed 's/[" 	]//g;/^$/d' </tmp/mkb.$$`
+	version=`sh ../sys/conf/osrelease.sh`
 
 	# Retrieve the git revision; this only succeeds
 	# if git is available, it's a git checkout, *and*
@@ -86,18 +83,13 @@ hdboot)
 
 	revision=`cat revision 2>/dev/null`
 
-	if [ -z "$revision" ]
-	then	rrevision=""
-		gitrev=""
-	else	rrevision=r$revision
-	fi
-
 	oldrev=$revision
 
 	if [ -z "$revision" ]
 	then
 		revision=0
 		rrevision=""
+		gitrev=""
 	else
 		revision=`expr $revision + 1`
 		rrevision=r$revision
diff --git a/releasetools/release.sh b/releasetools/release.sh
index 18acc0486..209652c58 100755
--- a/releasetools/release.sh
+++ b/releasetools/release.sh
@@ -4,7 +4,7 @@ set -e
 
 . release.functions
 
-version_pretty="`sh tell_config OS_RELEASE . OS_VERSION | tr -dc 0-9.`"
+version_pretty="`sh ../sys/conf/osrelease.sh`"
 version="`echo $version_pretty | tr . _`"
 PACKAGEDIR=/usr/pkgsrc/packages/$version_pretty/`uname -m`
 
@@ -52,7 +52,6 @@ RELEASEMNTDIR=/usr/r
 IMAGE=/usr/mdec/bootxx_cd9660
 ROOTIMAGE=rootimage
 CDFILES=/usr/tmp/cdreleasefiles
-sh tell_config OS_RELEASE . OS_VERSION >/tmp/rel.$$
 IMG_BASE=minix${version}_ide
 BS=4096
 
diff --git a/releasetools/tell_config b/releasetools/tell_config
index 8a0cc2a41..dcde01ffe 100755
--- a/releasetools/tell_config
+++ b/releasetools/tell_config
@@ -3,11 +3,5 @@
 #	tellconfig - Tell the value of a <minix/config.h> parameter
 #						Author: Kees J. Bot
 
-echo "
-#include \"../include/minix/config.h\"
-$*
-" >/tmp/tell.$$
-exec </tmp/tell.$$
-rm /tmp/tell.$$
-
-exec clang -P -E -
+NETBSDSRCDIR=`dirname $0`/..
+exec sh $NETBSDSRCDIR/sys/conf/osrelease.sh