OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Aug-2006 09:58:46
Branch: OPENPKG_2_STABLE Handle: 2006081119403947887
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/openpkg HISTORY install.sh openpkg.spec uuid.sh
Removed files: (Branch: OPENPKG_2_STABLE)
openpkg-src/openpkg build.sh
Log:
MFC: all recent changes (except the removal of the l_openpkg_release
sed hack -- which is still required on 2-STABLE)
Summary:
Revision Changes Path
1.337.2.5 +12 -0 openpkg-src/openpkg/HISTORY
1.6 +0 -128 openpkg-src/openpkg/build.sh
1.9.2.3 +2 -88 openpkg-src/openpkg/install.sh
1.490.2.5 +22 -10 openpkg-src/openpkg/openpkg.spec
1.8.2.1 +1 -1 openpkg-src/openpkg/uuid.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.337.2.4 -r1.337.2.5 HISTORY
--- openpkg-src/openpkg/HISTORY 26 Jul 2006 09:00:57 -0000
1.337.2.4
+++ openpkg-src/openpkg/HISTORY 12 Aug 2006 07:58:45 -0000
1.337.2.5
@@ -2,6 +2,18 @@
2006
====
+20060812 **** RELEASE AS PART OF OPENPKG 2.20060812 ***
+20060811 let old "openpkg install" command use the "openpkg build" command
+20060811 replace "openpkg build" wrapper with a copy of the real "openpkg
build" command
+20060808 make "openpkg uuid update" processing more robust by detecting
empty UUID_REGISTRY
+20060808 upgrade to openpkg-registry 0.7.2 improve user visible error
handling
+20060808 upgrade to openpkg-registry 0.7.1 (server changes only)
+20060808 upgrade to openpkg-registry 0.7.0 link feature
+20060807 upgrade to cURL 7.15.5
+20060803 upgrade to openpkg-registry 0.6.4, 0.6.5 (server changes only)
+20060801 upgrade to OSSP uuid 1.5.1
+20060728 upgrade to OSSP uuid 1.5.0
+
20060726 **** RELEASE AS PART OF OPENPKG 2.20060726 ***
20060725 upgrade to openpkg-registry 0.6.3 which comes with prerendered
manual page
20060725 upgrade to openpkg-registry 0.6.2 fixes broken URL rewriting code
and
@@ .
rm -f openpkg-src/openpkg/build.sh <<'@@ .'
Index: openpkg-src/openpkg/build.sh
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/install.sh
============================================================================
$ cvs diff -u -r1.9.2.2 -r1.9.2.3 install.sh
--- openpkg-src/openpkg/install.sh 28 Jun 2006 11:57:26 -0000 1.9.2.2
+++ openpkg-src/openpkg/install.sh 12 Aug 2006 07:58:45 -0000 1.9.2.3
@@ -40,92 +40,6 @@
exit 1
fi
-# determine OpenPKG distribution URLs
-url_raw=`$OPENPKG_PREFIX/bin/openpkg release --fmt="%u"`
-url_src=""
-url_upd=""
-case "$url_raw" in
- */SRC ) ;;
- */ ) url_src="${url_raw}SRC"; url_upd="${url_raw}UPD" ;;
- * ) url_src="${url_raw}/SRC"; url_upd="${url_raw}/UPD" ;;
-esac
-
-# determine path to binary RPMs
-rpmdir=`$OPENPKG_PREFIX/bin/openpkg rpm --eval '%{_rpmdir}'`
-rpmtag=`$OPENPKG_PREFIX/bin/openpkg rpm --eval '%{l_platform -p}-%{l_tag}'`
-
-# iterate through package installation in dependency order
-for pkg in openpkg make binutils gcc perl openpkg-tools; do
- # determine latest package version and URL
- pkg_srpm=""
- pkg_name=""
- for url in $url_upd $url_src $url_raw; do
- if [ ".$url" = . ]; then
- continue
- fi
- pkg_name=`$OPENPKG_PREFIX/lib/openpkg/curl -s "$url/00INDEX.rdf.bz2"
|\
- $OPENPKG_PREFIX/lib/openpkg/bzip2 -d |\
- egrep "rdf:Description about=\"${pkg}-[0-9]" |\
- sed -e 's;^.*rdf:Description about="\([^"]*\)".*$;\1;' |\
- sed -e "s;^;X;" \
- -e "s;^X${pkg}-\\([0-9][^-]*\\)-\\([^-][^-]*\\);\\2:\\1;" \
- -e "s;^X.*;;" |\
- sort -r | sed -e 'q' |\
- sed -e "s;^\\([^:]*\\):\\(.*\\);${pkg}-\\2-\\1;"`
- if [ ".$pkg_name" != . ]; then
- pkg_srpm="$url/$pkg_name.src.rpm"
- break
- fi
- done
- if [ ".$pkg_name" = . ]; then
- echo "openpkg:ERROR: package \"$pkg\" not found under URLs:" 1>&2
- if [ ".$url_upd" != . ]; then
- echo "openpkg:ERROR: $url_upd" 1>&2
- fi
- if [ ".$url_src" != . ]; then
- echo "openpkg:ERROR: $url_src" 1>&2
- fi
- echo "openpkg:ERROR: $url_raw" 1>&2
- exit 1
- fi
-
- # check whether package is already installed
- if [ ".`$OPENPKG_PREFIX/bin/openpkg rpm -q $pkg_name | grep -v 'is not
installed'`" != . ]; then
- continue
- fi
-
- # build binary package from source package
- if [ ! -f "$rpmdir/$pkg_name.$rpmtag.rpm" ]; then
- echo "++ fetching and building source package \"$pkg_name.src.rpm\""
- $OPENPKG_PREFIX/bin/openpkg rpm --rebuild $pkg_srpm
- if [ $? -ne 0 ]; then
- echo "openpkg:ERROR: failed to build package \"$pkg_name\" (RPM
returned with $?)" 1>&2
- exit 1
- fi
- if [ ! -f "$rpmdir/$pkg_name.$rpmtag.rpm" ]; then
- echo "openpkg:ERROR: failed to build package \"$pkg_name\" (RPM
returned successfully but there is no $rpmdir/$pkg_name.$rpmtag.rpm)" 1>&2
- exit 1
- fi
- fi
-
- # install binary package
- echo "++ installing binary package \"$pkg_name.$rpmtag.rpm\""
- $OPENPKG_PREFIX/bin/openpkg rpm -Uvh "$rpmdir/$pkg_name.$rpmtag.rpm"
- if [ $? -ne 0 ]; then
- echo "openpkg:ERROR: failed to install package \"$pkg_name\" (RPM
returned with $?)" 1>&2
- exit 1
- fi
-done
-
-# display final result message
-if [ -d "$OPENPKG_PREFIX/lib/openpkg-tools" ]; then
- ( echo "Congratulations, you have bootstrapped the OpenPKG Tool Chain."
- echo "You now have additional management commands available. Run"
- echo " \$ $OPENPKG_PREFIX/bin/openpkg --help"
- echo "for more details on the actual list of available commands."
- ) | $OPENPKG_PREFIX/lib/openpkg/rpmtool msg -b -t notice
-else
- echo "openpkg:ERROR: failed to install package \"openpkg-tools\"" 1>&2
- exit 1
-fi
+# pass-through operation to "openpkg build" tool
+$OPENPKG_PREFIX/bin/openpkg build openpkg-tools | sh
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.490.2.4 -r1.490.2.5 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 26 Jul 2006 09:00:57 -0000
1.490.2.4
+++ openpkg-src/openpkg/openpkg.spec 12 Aug 2006 07:58:45 -0000
1.490.2.5
@@ -38,24 +38,25 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 2.20060726
+%define V_openpkg 2.20060812
# the used software versions
%define V_rpm 4.2.1
%define V_zlib 1.2.3
%define V_bzip2 1.0.3
%define V_beecrypt 4.1.2
-%define V_curl 7.15.4
+%define V_curl 7.15.5
%define V_make 3.81
%define V_gzip 1.3.5
%define V_patch 2.5.9
%define V_tar 1.15.1
%define V_bash 3.1
-%define V_uuid 1.4.2
+%define V_uuid 1.5.1
%define V_config 20060310
-%define V_registry 0.6.3
+%define V_registry 0.7.2
%define V_perl 5.8.8
%define V_openssl 0.9.8b
+%define V_tools 0.8.66
# package information
Name: openpkg
@@ -135,7 +136,7 @@
Source61: uuid.pod
Source62: uuid.sh
Source63:
ftp://ftp.openpkg.org/sources/CPY/openpkg-registry/openpkg-registry-%{V_registry}.tar.gz
-Source64: build.sh
+Source64:
ftp://ftp.openpkg.org/sources/CPY/openpkg-tools/openpkg-tools-%{V_tools}.tar.gz
Source65:
ftp://ftp.openpkg.org/sources/CPY/perl/perl-%{V_perl}-mini.tar.gz
Source66: ftp://ftp.openssl.org/source/openssl-%{V_openssl}.tar.gz
Source67: perl.patch
@@ -150,7 +151,7 @@
AutoReq: no
AutoReqProv: no
Provides: OpenPKG
-Provides: openpkg = 20060622-20060622
+Provides: openpkg = 20060812-20060812
%description
This is the bootstrap package for the RPM-based Unix Software
@@ -251,6 +252,11 @@
url = ftp://ftp.openssl.org/source/
regex = openssl-(\d+\.\d+\.\d+[a-z]?)\.tar\.gz
}
+ prog openpkg:openpkg-tools = {
+ version = %{V_tools}
+ url = ftp://ftp.openpkg.org/sources/CPY/openpkg-tools/
+ regex = openpkg-tools-(__VER__)\.tar\.gz
+ }
%prep
# skip in bootstrap phase 2 (see openpkg.boot)
@@ -574,6 +580,7 @@
${l_gzip} -dc `SOURCE openpkg-registry-%{V_registry}.tar.gz` | ${l_tar}
xf - 2>/dev/null || true
${l_gzip} -dc `SOURCE perl-%{V_perl}-mini.tar.gz` | ${l_tar} xf -
2>/dev/null || true
${l_gzip} -dc `SOURCE openssl-%{V_openssl}.tar.gz` | ${l_tar} xf -
2>/dev/null || true
+ ${l_gzip} -dc `SOURCE openpkg-tools-%{V_tools}.tar.gz` | ${l_tar} xf -
2>/dev/null || true
# update config.guess/config.sub
for dir in rpm-%{V_rpm} rpm-%{V_rpm}/popt beecrypt-%{V_beecrypt} \
@@ -1122,6 +1129,13 @@
cp register.8 $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/register.8
) || exit $?
+ # install OpenPKG Tool Chain command subset
+ ( cd openpkg-tools-%{V_tools}
+ cp cmd/build.pl $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/build.pl
+ chmod 644 $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/build.pl
+ cp cmd/build.8 $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/build.8
+ ) || exit $?
+
# install RPM extension
( cd rpm-%{V_rpm}
cp file/file $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/file
@@ -1197,9 +1211,6 @@
<`SOURCE install.sh`
>$RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/install
chmod a+x $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/install
sed -e "s;@l_prefix@;%{l_prefix};g" \
- <`SOURCE build.sh` >$RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/build
- chmod a+x $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/build
- sed -e "s;@l_prefix@;%{l_prefix};g" \
<`SOURCE man.sh` >$RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/man
chmod a+x $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/man
@@ -1423,7 +1434,8 @@
%{l_prefix}/libexec/openpkg/uuid
%{l_prefix}/libexec/openpkg/uuid.8
%{l_prefix}/libexec/openpkg/man
- %{l_prefix}/libexec/openpkg/build
+ %{l_prefix}/libexec/openpkg/build.pl
+ %{l_prefix}/libexec/openpkg/build.8
%{l_prefix}/libexec/openpkg/install
%{l_prefix}/libexec/openpkg/lsync
%{l_prefix}/libexec/openpkg/lsync.8
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/uuid.sh
============================================================================
$ cvs diff -u -r1.8 -r1.8.2.1 uuid.sh
--- openpkg-src/openpkg/uuid.sh 17 May 2006 13:12:56 -0000 1.8
+++ openpkg-src/openpkg/uuid.sh 12 Aug 2006 07:58:46 -0000 1.8.2.1
@@ -164,7 +164,7 @@
# Update UUIDs
do_update () {
# update registry UUID
- if [ ".$UUID_REGISTRY" = ".$UUID_NIL" ]; then
+ if [ ".$UUID_REGISTRY" = ".$UUID_NIL" -o ".$UUID_REGISTRY" = . ]; then
opt=""
if [ ".$opt_m" = .yes ]; then
opt="-m"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
