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: 17-Feb-2004 20:53:36
Branch: HEAD Handle: 2004021719533600
Modified files:
openpkg-src/openpkg HISTORY aux.wrapbin.sh aux.wrapsrc.sh
Log:
added -t|--tar option to *.sh scripts for convinient extracting
embedded tarball
Summary:
Revision Changes Path
1.140 +1 -0 openpkg-src/openpkg/HISTORY
1.17 +24 -8 openpkg-src/openpkg/aux.wrapbin.sh
1.14 +19 -10 openpkg-src/openpkg/aux.wrapsrc.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.139 -r1.140 HISTORY
--- openpkg-src/openpkg/HISTORY 17 Feb 2004 09:49:57 -0000 1.139
+++ openpkg-src/openpkg/HISTORY 17 Feb 2004 19:53:36 -0000 1.140
@@ -2,6 +2,7 @@
2004
====
+20040217 added -t|--tar option to *.sh scripts for convinient extracting embedded
tarball
20040217 provide <prefix>/bin/rpm2cpio for convinience reasons
20040216 change filesystem layout for final OpenPKG 2.0 namespace clean layout
20040216 config.{guess,sub} scripts are no longer installed
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/aux.wrapbin.sh
============================================================================
$ cvs diff -u -r1.16 -r1.17 aux.wrapbin.sh
--- openpkg-src/openpkg/aux.wrapbin.sh 16 Feb 2004 21:06:51 -0000 1.16
+++ openpkg-src/openpkg/aux.wrapbin.sh 17 Feb 2004 19:53:36 -0000 1.17
@@ -28,6 +28,7 @@
l_me="$0"
o_help=no
o_version=no
+o_tar=no
l_prefix='@l_prefix@'
l_musr='@MUSR@'
l_mgrp='@MGRP@'
@@ -50,6 +51,7 @@
case $opt in
-h | --help ) o_help=yes ;;
-v | --version ) o_version=yes ;;
+ -t | --tar ) o_tar=yes ;;
--prefix=* ) l_prefix=$arg ;;
* ) o_help=yes ;;
esac
@@ -58,18 +60,12 @@
o_help=yes
fi
if [ ".$o_help" = .yes ]; then
- echo "Usage: sh $l_me [--prefix=<prefix>]" 2>&1
+ echo "Usage: sh $l_me" 2>&1
+ echo " [--prefix=<prefix>] [-t|--tar]" 2>&1
echo " [-h|--help] [-v|--version]" 2>&1
exit 1
fi
-# display version and copyright header
-echo "OpenPKG ${l_release} Binary Bootstrap Package, version ${l_version}"
-echo "Built for prefix ${l_prefix} on target platform ${l_platform}"
-if [ ".$o_version" = .yes ]; then
- exit 0
-fi
-
# make sure all essential installation tools are available
for tool in sed mkdir dd tar chown chgrp; do
found=no
@@ -93,6 +89,26 @@
exit 1
fi
done
+
+# optionally extract the embedded tarball only
+if [ ".$o_tar" = .yes ]; then
+ tmpdir="${TMPDIR-/tmp}/openpkg.$$"
+ ( umask 077 && mkdir $tmpdir) || exit 1
+ dd if=$l_me bs=8192 skip=8 2>/dev/null |\
+ ( cd $tmpdir || exit 1
+ tar xf - 2>/dev/null || exit 1
+ ./openpkg.bzip2 -d -c openpkg.tar.bz2
+ ) || exit 1
+ rm -rf $tmpdir
+ exit 0
+fi
+
+# display version and copyright header
+echo "OpenPKG ${l_release} Binary Bootstrap Package, version ${l_version}"
+echo "Built for prefix ${l_prefix} on target platform ${l_platform}"
+if [ ".$o_version" = .yes ]; then
+ exit 0
+fi
# determine current username
cusr=`(id -un) 2>/dev/null ||\
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/aux.wrapsrc.sh
============================================================================
$ cvs diff -u -r1.13 -r1.14 aux.wrapsrc.sh
--- openpkg-src/openpkg/aux.wrapsrc.sh 23 Jan 2004 12:46:08 -0000 1.13
+++ openpkg-src/openpkg/aux.wrapsrc.sh 17 Feb 2004 19:53:36 -0000 1.14
@@ -28,6 +28,7 @@
l_me="$0"
o_help=no
o_version=no
+o_tar=no
l_prefix=''
l_dir='@l_dir@'
l_release="@l_release@"
@@ -48,28 +49,23 @@
case $opt in
-h | --help ) o_help=yes ;;
-v | --version ) o_version=yes ;;
+ -t | --tar ) o_tar=yes ;;
--prefix=* ) l_prefix=$arg ;;
esac
done
-if [ ".$o_version" = .no -a ".$l_prefix" = . ]; then
+if [ ".$o_version" = .no ] && [ ".$o_tar" = .no ] && [ ".$l_prefix" = . ]; then
o_help=yes
fi
if [ ".$o_help" = .yes ]; then
- echo "Usage: sh $l_me --prefix=<prefix>" 2>&1
+ echo "Usage: sh $l_me" 2>&1
+ echo " [--prefix=<prefix>]" 2>&1
echo " [--user=<usr>] [--group=<grp>] [--tag=<str>]" 2>&1
echo " [--{s,m,r,n}usr=<usr>] [--{s,m,r,n}grp=<grp>]" 2>&1
echo " [--{s,m,r,n}uid=<uid>] [--{s,m,r,n}gid=<gid>]" 2>&1
- echo " [-h|--help] [-v|--version]" 2>&1
+ echo " [-t|--tar] [-h|--help] [-v|--version]" 2>&1
exit 1
fi
-# display version and copyright header
-echo "OpenPKG ${l_release} Source Bootstrap Package, version ${l_version}"
-if [ ".$o_version" = .yes ]; then
- exit 0
-fi
-echo "Building for prefix ${l_prefix} on current platform"
-
# make sure all essential unpacking tools are available
# (the build tools are checked later from within openpkg.spec)
for tool in /bin/sh mkdir cat tar rm chown chgrp sed dd; do
@@ -94,6 +90,19 @@
exit 1
fi
done
+
+# optionally extract the embedded tarball only
+if [ ".$o_tar" = .yes ]; then
+ dd if=$l_me bs=8192 skip=8 2>/dev/null
+ exit 0
+fi
+
+# display version and copyright header
+echo "OpenPKG ${l_release} Source Bootstrap Package, version ${l_version}"
+if [ ".$o_version" = .yes ]; then
+ exit 0
+fi
+echo "Building for prefix ${l_prefix} on current platform"
# determine current user/group
cusr=`(id -un) 2>/dev/null ||\
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
