From: Ben Gras <ben@minix3.org>
Date: Sat, 13 Sep 2014 20:22:51 +0000 (+0200)
Subject: set reasonable packages list
X-Git-Tag: v3.3.0~1
X-Git-Url: http://zhaoyanbai.com/repos/cppcheck-error.log?a=commitdiff_plain;h=5457987d13f27c0334a6223021faee1398e0b526;p=minix.git

set reasonable packages list

	. clang, binutils and git and dependencies on CD
	. don't bzip .iso

Change-Id: If43324b46289de5fd1ca7b64785f8ae6e97fd6b7
---

diff --git a/releasetools/packages.install b/releasetools/packages.install
index 6ce6eb3db..5defcedad 100644
--- a/releasetools/packages.install
+++ b/releasetools/packages.install
@@ -1,70 +1,63 @@
-9e-
-apr-1
-apr-util-
-autoconf-
-automake-
-bash-2
-bash-4
-bchunk-
-bcrypt-
-binutils-
-bison-
-curl-
-diffutils-
-digest-
-expat-
-f2c-
-figlet-2
-flex-
-gawk-
+openssl-
+perl-
+pth-
+p5-Net-SSLeay-
 gettext-lib-
-gettext-tools-
-gmake-
-gmp-
-grep-
-gsed-
-gtexinfo-
-gzip-
-lcov-
-libiberty-
-libiconv-
 libidn-
-libtool-base-
-lua-
-m4-
-mdf2iso-
-mpfr-
-naim-
-nano-
-nawk-
-ncurses-
-neon-
-netdrv_tg3-
-openssh-
-openssl-
-p5-Digest-SHA1-
+p5-Net-LibIDN-
+p5-Net-IP-
+heimdal-
+p5-GSSAPI-
+p5-Digest-HMAC-
+p5-Net-DNS-0
+p5-TimeDate-
+p5-IO-Socket-SSL-
+xmlcatmgr-
+libffi-
+p5-Net-SMTP-SSL-
+p5-MailTools-
 p5-Error-
-p5-enum-
-p5-pkgsrc-Dewey-
-patch-
-pax-
-pdksh-
-perl-5
-pkg-config-
-pkg_install-info-
-pkg_leaves-
-pkgdep-
-pkgdepgraph-
-pkgdiff-
-pkglint-
-png-
-pth-
+p5-Email-Valid-1
+p5-Authen-SASL-2
+expat-
+curl-
+python27-
+libxml2-
+tcp_wrappers-
+git-base-
+clang-
+binutils-
+openssh-
+libfontenc-
+freetype2-
+mkfontscale-
+mkfontdir-
+encodings-
+roboto-fonts-
+rtf2latex-
+sign-
+tcl-8
+tcl-tls-
+tds-
+tegaki-zinnia-japanese-kyoiku-
+ucon64-
+unzoo-
+zoo-
+wwwcount-
+z80-asm-
+zombies-
+bootstrap-mk-files-
+bmake-
+digest-
+libfetch-
+zsh-
+zsync-
+zzuf-
+buffer-
+p5-XML-Parser-2
+intltool-
 readline-
-rsync-
-scmgit-base-
-sqlite3-
-unzip-
-url2pkg-
-vim-7
-vim-share-
-zip-
+libtool-base-
+gmake-
+gettext-tools-
+bash-2
diff --git a/releasetools/release.functions b/releasetools/release.functions
index fde32d4a3..8c0e4a4b3 100644
--- a/releasetools/release.functions
+++ b/releasetools/release.functions
@@ -45,6 +45,9 @@ retrieve()
 	do	pkgname="`fgrep PKGNAME=${name} $SUMMARY | sed 's/PKGNAME=//g'`"
 		if [ `echo $pkgname | wc -w` -ne 1 ]
 		then	echo " *** Could not resolve $name (not found or too many matches: $pkgname) ***"
+			echo Matches:
+			echo $pkgname
+			exit 1
 		else	echo Getting $pkgname
 			fetch -r ${PACKAGEURL}/${pkgname}.tgz
 		fi
diff --git a/releasetools/release.sh b/releasetools/release.sh
index e111ebd02..38343ce3e 100755
--- a/releasetools/release.sh
+++ b/releasetools/release.sh
@@ -349,9 +349,6 @@ partition -m $IMG 0 81:$isosects 81:$ROOTSECTS 81:$USRSECTS
 # Clean up: RELEASEDIR no longer needed
 rm -r $RELEASEDIR
 
-echo "${ZIP}ping $IMG"
-$ZIP -f $IMG
-
 if [ "$FILENAMEOUT" ]
 then	echo "$IMG" >$FILENAMEOUT
 fi