From f011d59d6753a23237b03f75946c84ae83e38ee3 Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Tue, 7 Jun 2011 14:34:14 +0200 Subject: [PATCH] release.sh, tell_config: variables from /usr/src --- tools/release.sh | 11 ++++++----- tools/tell_config | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/release.sh b/tools/release.sh index 90f1277f0..d780d4366 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -4,11 +4,14 @@ set -e . release.functions +version_pretty="`sh tell_config OS_RELEASE . OS_VERSION | tr -dc 0-9.`" +version="`echo $version_pretty | tr . _`" +PACKAGEDIR=/usr/pkgsrc/packages/$version_pretty/`uname -m` + XBIN=usr/xbin SRC=src REPO=git://git.minix3.org/minix -PACKAGEDIR=/usr/pkgsrc/packages/`uname -r`/`uname -m` # List of packages included on installation media PACKAGELIST=packages.install secs=`expr 32 '*' 64` @@ -23,7 +26,7 @@ fi # Packages we have to pre-install, and url to use PREINSTALLED_PACKAGES="pkgin-0.3.3.4.tgz pkg_install-20101212 bmake-20100808" -PACKAGEURL=ftp://ftp.minix3.org/pub/minix/packages/`uname -r`/`uname -m`/All/ +PACKAGEURL=ftp://ftp.minix3.org/pub/minix/packages/$version_pretty/`uname -m`/All/ RELEASERC=$HOME/.releaserc @@ -44,8 +47,6 @@ IMAGE=../boot/cdbootblock/cdbootblock ROOTIMAGE=rootimage CDFILES=/usr/tmp/cdreleasefiles sh tell_config OS_RELEASE . OS_VERSION >/tmp/rel.$$ -version_pretty=`sed 's/[" ]//g;/^$/d' +#include \"../common/include/minix/config.h\" $* " >/tmp/tell.$$ exec