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 Date: 07-May-2004 13:37:08
Branch: HEAD Handle: 2004050712370700
Modified files:
openpkg-src/openpkg HISTORY aux.prereq.sh openpkg.spec
Log:
- synchronize aux.prereq.sh platform checks with official list as of OpenPKG 2.0
- fix disk space detection in aux.prereq.sh script
Summary:
Revision Changes Path
1.175 +2 -0 openpkg-src/openpkg/HISTORY
1.17 +52 -28 openpkg-src/openpkg/aux.prereq.sh
1.328 +1 -1 openpkg-src/openpkg/openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.174 -r1.175 HISTORY
--- openpkg-src/openpkg/HISTORY 6 May 2004 15:04:50 -0000 1.174
+++ openpkg-src/openpkg/HISTORY 7 May 2004 11:37:07 -0000 1.175
@@ -2,6 +2,8 @@
2004
====
+20040507 synchronize aux.prereq.sh platform checks with official list as of OpenPKG
2.0
+20040507 fix disk space detection in aux.prereq.sh script
20040506 finally remove <prefix>/bin/{rpm,rpm2cpio} wrappers in preparation to
OpenPKG 2.1
20040505 rc: skip .snap (FreeBSD 5) and .snapshot (NetApp) directories in *.rpmxxx
checking
20040501 use better GCC detection in "rpmtool cflags" (taken over from "gcc"
package)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/aux.prereq.sh
============================================================================
$ cvs diff -u -r1.16 -r1.17 aux.prereq.sh
--- openpkg-src/openpkg/aux.prereq.sh 21 Apr 2004 15:18:06 -0000 1.16
+++ openpkg-src/openpkg/aux.prereq.sh 7 May 2004 11:37:07 -0000 1.17
@@ -35,41 +35,65 @@
#
# CHECK: amount of platform support
#
-support=no
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
+ # official "forecasted" platforms
+ *-macosx*:* |\
+ *-hpux*:* |\
+ *-aix*:* |\
+ *-irix*:* )
+ support=forecasted
;;
- # platforms which are known to be not supported
+ # official "tentative" platforms
+ *-gentoo1.4.3:* |\
+ *-debian3.1:* |\
+ *-solaris10:* )
+ support=tentative
+ ;;
+ # official "supported" platforms
+ *-freebsd4.9:* |\
+ *-freebsd5.2:* |\
+ *-debian3.0:* |\
+ *-fedora1:* |\
+ *-rhel3:* |\
+ *-suse9.0:* |\
+ *-solaris[89]:* )
+ support=supported
+ ;;
+ # official "obsolete" platforms
+ *-debian2.2:* |\
+ *-rhl9:* |\
+ *-suse8.2:* |\
+ *-solaris2.6:* )
+ support=obsolete
+ ;;
+ # official "deprecated" platforms
+ *-unixware*:* |\
+ *-tru64*:* )
+ support=deprecated
+ ;;
+ # auspicious platforms
+ *-freebsd*:* |\
+ *-solaris*:* |\
+ *:*-linux* )
+ support=auspicious
+ ;;
+ # unknown platforms
*:* )
- support=no
+ support=unknown
;;
esac
case "$support" in
- yes ) support="Congratulations, definitely supported" ;;
- maybe ) support="Good luck, maybe supported" ;;
- no ) support="Sorry, not known to be supported" ;;
+ forecasted ) support="forecasted (still not known to work)" ;;
+ tentative ) support="tentative (should already work)" ;;
+ supported ) support="supported" ;;
+ obsolete ) support="obsolete (should still work)" ;;
+ deprecated ) support="deprecated (no longer known to work)" ;;
+ auspicious ) support="auspicious (expect to work)" ;;
+ unknown ) support="unknown (expect not to work)" ;;
esac
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
+echo "++ platform support: $support"
#
# CHECK: diskspace requirement
@@ -79,12 +103,12 @@
fs_need=150000
else
fs_path="" # FIXME
- fs_need="" # FIXME
+ fs_need=0 # FIXME
fi
fs_free=""
case "$platform_tech" in
*-freebsd* | *-linux* | *-sunos* )
- fs_free=`cd $fs_path && /bin/df -k . | sed -n -e '$p' | awk '{ print $4; }'`
+ fs_free=`cd $fs_path && /bin/df -k . | sed -n -e '$p' | sed -e 's;^[^ ]*;;'
-e 's; *;;' | awk '{ print $3; }'`
;;
esac
if [ ".$fs_free" != . ]; then
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.327 -r1.328 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 6 May 2004 15:04:50 -0000 1.327
+++ openpkg-src/openpkg/openpkg.spec 7 May 2004 11:37:07 -0000 1.328
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20040506
+%define V_openpkg 20040507
# the used software versions
%define V_rpm 4.2.1
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]