OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 10-Oct-2003 15:53:37
Branch: HEAD Handle: 2003101014533502
Modified files:
openpkg-src/openpkg HISTORY aux.prereq.sh openpkg.boot openpkg.spec
openpkg-web news.txt
Log:
working off the aux.prereq.sh script for adjusted platform checks and
additional disk space checks
Summary:
Revision Changes Path
1.67 +1 -0 openpkg-src/openpkg/HISTORY
1.11 +66 -95 openpkg-src/openpkg/aux.prereq.sh
1.35 +1 -1 openpkg-src/openpkg/openpkg.boot
1.229 +2 -1 openpkg-src/openpkg/openpkg.spec
1.6954 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.66 -r1.67 HISTORY
--- openpkg-src/openpkg/HISTORY 8 Oct 2003 18:10:00 -0000 1.66
+++ openpkg-src/openpkg/HISTORY 10 Oct 2003 13:53:37 -0000 1.67
@@ -2,6 +2,7 @@
2003
====
+20031010 working off the aux.prereq.sh script for adjusted platform checks and
additional disk space checks
20031008 make sure RPM does not pick up headers of a vendor BeeCrypt package under
RedHat Linux
20031008 fix --makeproxy command after recent OpenPKG branding in "rpm --version"
output
20031006 add 'Provides: openpkg = 1.3.1-1.3.1' for easier mixing with OpenPKG 1.3
release packages
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/aux.prereq.sh
============================================================================
$ cvs diff -u -r1.10 -r1.11 aux.prereq.sh
--- openpkg-src/openpkg/aux.prereq.sh 15 Jul 2003 10:08:26 -0000 1.10
+++ openpkg-src/openpkg/aux.prereq.sh 10 Oct 2003 13:53:37 -0000 1.11
@@ -26,129 +26,100 @@
## Usage: aux.prereq.sh source|binary
##
-mode=$1
+mode="$1"
-# determine platform id
-platform=`sh ./shtool guessos`
+# determine platform ids
+platform_prod=`sh ./platform -n -L -S "" -C "+" -F "%<ap>-%<sp>"`
+platform_tech=`sh ./platform -n -L -S "" -C "+" -F "%<at>-%<st>"`
#
# CHECK: amount of platform support
#
support=no
-case $platform in
- *-solaris* )
- case $platform in
- *-solaris2.[67] )
- support=maybe
- ;;
- *-solaris2.[89] )
- support=yes
- ;;
- esac
- ;;
- *-linux* )
- if [ -f /etc/redhat-release ]; then
- redhat=`cat /etc/redhat-release | sed -e 's;^.*\([0-9]\.[0-9]*\).*$;\1;'`
- case "$redhat" in
- 7.[123] )
- support=maybe
- ;;
- 8.0 )
- support=yes
- ;;
- esac
- elif [ -f /etc/debian_version ]; then
- debian=`cat /etc/debian_version`
- case "$debian" in
- 2.2|3.0 )
- support=yes
- ;;
- esac
- elif [ -f /etc/gentoo-release ]; then
- gentoo=`cat /etc/gentoo-release | sed -e 's;^.*version
\([0-9]\..*\)$;\1;'`
- case "$gentoo" in
- 1.4.2.* )
- support=maybe
- ;;
- esac
- fi
- ;;
- *-freebsd* )
- case $platform in
- *-freebsd4.[789] )
- support=yes
- ;;
- *-freebsd5.0 )
- support=yes
- ;;
- *-freebsd4.[0123456] )
- support=maybe
- ;;
- esac
- ;;
- *-netbsd* )
- support=maybe
- ;;
- *-osf* )
- support=maybe
- ;;
- *-hpux* )
- support=maybe
- ;;
- *-darwin* )
- support=maybe
- ;;
- *-64-sgi-irix* )
- support=maybe
- ;;
+case "$platform_prod:$product_tech" in
+ # platforms known to be fully supported
+ *-freebsd4.[789]:* | *-freebsd5.[01]:* |\
+ *-solaris2.6:* | *-solaris[89]:* |\
+ *-redhat9:* | *-suse8.2:* | *-debian2.2:* | *-debian3.0:* )
+ support=yes
+ ;;
+ # platforms which are similar and so maybe supported
+ *-freebsd*:* | *-solaris*:* | *:*-linux* )
+ support=maybe
+ ;;
+ # platforms which could be still or already support
+ *-unixware*:* | *-tru64*:* | *-hpux*:* | *-darwin*:* )
+ support=maybe
+ ;;
+ # platforms which are known to be not supported
+ *:* )
+ support=no
+ ;;
esac
-case $support in
- yes ) support="Congratulations: officially supported" ;;
- maybe ) support="Good luck: unofficially supported" ;;
- no ) support="Sorry: not supported" ;;
+case "$support" in
+ yes ) support="Congratulations, definitely supported" ;;
+ maybe ) support="Good luck, maybe supported" ;;
+ no ) support="Sorry, not known to be supported" ;;
esac
-echo "++ platform: $platform ($support)"
-case $support in
- no ) exit 1 ;;
+echo "++ platform product: $platform_prod"
+echo "++ platform technology: $platform_tech"
+echo "++ platform support: [$support]"
+case "$support" in
+ no )
+ echo "ERROR: platform not supported" 1>&2
+ exit 1
+ ;;
esac
#
# CHECK: diskspace requirement
#
-case $platform in
- *-solaris* )
- ;;
- *-linux* )
- ;;
- *-freebsd* )
- ;;
- *-osf* )
+if [ ".$mode" = .source ]; then
+ fs_path="${TMPDIR-/tmp}"
+ fs_need=150000
+else
+ fs_path="" # FIXME
+ fs_need="" # FIXME
+fi
+fs_free=""
+case "$platform_tech" in
+ *-freebsd* | *-linux* | *-sunos* )
+ fs_free=`/bin/df -k /tmp | tail -1 | awk '{ print $4; }'`
;;
esac
+if [ ".$fs_free" != . ]; then
+ if [ $fs_free -lt $fs_need ]; then
+ if [ ".$mode" = .source ]; then
+ echo "ERROR: temporary directory \"$fs_path\" has to reside on a
partition" 1>&2
+ echo " with at least $fs_need KB of free disk space. Set \$TMPDIR
to" 1>&2
+ echo " a directory on a partition with enough free disk space,
please." 1>&2
+ else
+ echo "ERROR: installation directory \"$fs_path\" has to reside on a
partition" 1>&2
+ echo " with at least $fs_need KB of free disk space. Make
\"$fs_path\" a" 1>&2
+ echo " symbolic link to a directory on a partition with enough
free" 1>&2
+ echo " disk space, please." 1>&2
+ fi
+ exit 1
+ fi
+fi
#
# CHECK: available vendor packages
#
-case $platform in
- *-solaris* )
- ;;
- *-linux* )
- ;;
- *-freebsd* )
- ;;
- *-osf* )
- ;;
-esac
+# ...FIXME...
#
# CHECK: available tools in $PATH
#
+# ...FIXME...
#
# CHECK: available devices /dev/random, etc.
#
+# ...FIXME...
#
-# CHECK: consistency check for /cw (symlink!)
+# CHECK: consistency check for /prefix (symlink!)
#
+# ...FIXME...
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.boot
============================================================================
$ cvs diff -u -r1.34 -r1.35 openpkg.boot
--- openpkg-src/openpkg/openpkg.boot 18 Sep 2003 11:45:07 -0000 1.34
+++ openpkg-src/openpkg/openpkg.boot 10 Oct 2003 13:53:37 -0000 1.35
@@ -211,7 +211,7 @@
## perform prerequisite checks
##
-sh ./aux.prereq.sh source
+sh ./aux.prereq.sh source || exit $?
##
## find reasonable run-time paths and tools
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.228 -r1.229 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 8 Oct 2003 10:06:48 -0000 1.228
+++ openpkg-src/openpkg/openpkg.spec 10 Oct 2003 13:53:37 -0000 1.229
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20031008
+%define V_openpkg 20031010
# the used software versions
%define V_rpm 4.2.1
@@ -343,6 +343,7 @@
./configure \
--cache-file=./config.cache
${l_make}
+ ( mv gzip ..; ${l_make} clean || true; mv ../gzip . ) || exit $?
) || exit $?
l_gzip="`pwd`/gzip-%{V_gzip}/gzip"; export l_gzip
echo "l_gzip=\"$l_gzip\"; export l_gzip" >>.buildenv
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6953 -r1.6954 news.txt
--- openpkg-web/news.txt 10 Oct 2003 09:38:43 -0000 1.6953
+++ openpkg-web/news.txt 10 Oct 2003 13:53:35 -0000 1.6954
@@ -1,3 +1,4 @@
+10-Oct-2003: Upgraded package: P<openpkg-20031010-20031010>
10-Oct-2003: Upgraded package: P<gxmame-0.33-20031010>
10-Oct-2003: Upgraded package: P<sysmon-0.91.20-20031010>
10-Oct-2003: Upgraded package: P<ghostscript-esp-7.07.1-20031010>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
