[CVS] OpenPKG: OPENPKG_2_STABLE: openpkg-src/openpkg/ HISTORY build.sh...
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:
RevisionChanges Path
1.337.2.5 +12 -0 openpkg-src/openpkg/HISTORY
1.6 +0 -128openpkg-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 -
1.337.2.4
+++ openpkg-src/openpkg/HISTORY 12 Aug 2006 07:58:45 -
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.sh28 Jun 2006 11:57:26 - 1.9.2.2
+++ openpkg-src/openpkg/install.sh12 Aug 2006 07:58:45 - 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
-e
[CVS] OpenPKG: OPENPKG_2_STABLE: openpkg-src/openpkg/ HISTORY build.sh...
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: 28-Jun-2006 13:57:27
Branch: OPENPKG_2_STABLE Handle: 2006062812572600
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/openpkg HISTORY build.sh install.sh openpkg.spec
Log:
MFC: all recent changes
Summary:
RevisionChanges Path
1.337.2.3 +5 -0 openpkg-src/openpkg/HISTORY
1.2.2.2 +16 -6 openpkg-src/openpkg/build.sh
1.9.2.2 +2 -1 openpkg-src/openpkg/install.sh
1.490.2.3 +5 -3 openpkg-src/openpkg/openpkg.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
$ cvs diff -u -r1.337.2.2 -r1.337.2.3 HISTORY
--- openpkg-src/openpkg/HISTORY 22 Jun 2006 08:05:06 -
1.337.2.2
+++ openpkg-src/openpkg/HISTORY 28 Jun 2006 11:57:26 -
1.337.2.3
@@ -2,6 +2,11 @@
2006
+20060628 allow "openpkg build" emulation script to gracefully handle
platform changes
+20060625 align configure call of GNU make with the "make" package
+20060625 upgrade to cURL 7.15.4 by using the GREP=grep workaround.
+
+20060622 RELEASE AS PART OF OPENPKG 2.20060622 ***
20060622 replace release tag fiddling in openpkg.boot with "openpkg release"
functionality, too.
20060622 do not rely on RPM's smartness to not expand "%x" when we actually
meant "%%x"
20060621 use new "openpkg release" for "openpkg install" and "openpkg build"
commands
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/build.sh
$ cvs diff -u -r1.2.2.1 -r1.2.2.2 build.sh
--- openpkg-src/openpkg/build.sh 22 Jun 2006 07:36:31 - 1.2.2.1
+++ openpkg-src/openpkg/build.sh 28 Jun 2006 11:57:26 - 1.2.2.2
@@ -48,24 +48,24 @@
# determine OpenPKG distribution URLs (part 2)
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" ;;
+* ) url_src="${url_raw}/SRC"; url_upd="${url_raw}/UPD" ;;
esac
# sanity check usage
if [ $# -eq 1 -a ".$1" = ".openpkg-tools" ]; then
:
else
-echo "openpkg:ERROR: still not available functionality \"build $*\""
1>&2
-echo "openpkg:INFO: This functionality is provided by the
\"openpkg-tools\" package only!"1>&2
+echo "openpkg:ERROR: still not available functionality \"build $*\""
1>&2
+echo "openpkg:INFO: This functionality is provided by the
\"openpkg-tools\" package only!" 1>&2
echo "openpkg:INFO: Run the command \"$OPENPKG_PREFIX/bin/openpkg build
openpkg-tools | sh\" to" 1>&2
-echo "openpkg:INFO: bootstrap the \"openpkg-tools\" package for
additional functionality."1>&2
-echo "openpkg:INFO: This bootstrap version only supports this particular
build command."1>&2
+echo "openpkg:INFO: bootstrap the \"openpkg-tools\" package for
additional functionality." 1>&2
+echo "openpkg:INFO: This bootstrap version only supports this particular
build command." 1>&2
exit 1
fi
# 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
@@ -107,6 +107,16 @@
continue
fi
+# determine RPM binary tag
+# (has to be done _INSIDE_ the loop because of potential
+# platform changes during bootstrap upgrading!)
+rpmfilename=`$OPENPKG_PREFIX/bin/openpkg rpm --eval '%{_rpmfilename}'`
+rpmtargetcpu=`$OPENPKG_PREFIX/bin/openpkg rpm --eval '%{_target_cpu}'`
+rpmtargetos=`$OPENPKG_PREFIX/bin/openpkg rpm --eval '%{_target_os}'`
+rpmtag=`echo "$rpmfilename" |\
+sed -e 's;^%{NAME}-%{VERSION}-%{RELEASE}\.\(.*\)\.rpm$;\1;' \
+-e "s;%{ARCH};$rpmtargetcpu;" -e "s;%{OS};$rpmtargetos;"`
+
# output build commands
echo "echo $pkg_srpm "
if [ ! -f "$rpmdir/$pkg_name.$rpmtag.rpm" ]; then
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/install.sh
$ cvs diff -u -r1.9.2.1 -r1.9.2.2 install.sh
--- openpkg-src/openpkg/install.sh22 Jun 2006 07:36:31 -
[CVS] OpenPKG: OPENPKG_2_STABLE: openpkg-src/openpkg/ HISTORY build.sh...
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: 22-Jun-2006 09:36:35
Branch: OPENPKG_2_STABLE Handle: 2006062208363102
Added files: (Branch: OPENPKG_2_STABLE)
openpkg-src/openpkg release.8 release.pod release.sh
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/openpkg HISTORY build.sh install.sh lsync.8 openpkg.1
openpkg.spec pod2man.sh rc rc.8 rpm-config.8
rpmmacros rpmtool.8 uuid.8
Log:
MFC: all changes from CURRENT up to 20060622
Summary:
RevisionChanges Path
1.337.2.1 +5 -0 openpkg-src/openpkg/HISTORY
1.2.2.1 +20 -23 openpkg-src/openpkg/build.sh
1.9.2.1 +12 -17 openpkg-src/openpkg/install.sh
1.6.12.1+6 -6 openpkg-src/openpkg/lsync.8
1.2.10.1+1 -1 openpkg-src/openpkg/openpkg.1
1.490.2.2 +11 -1 openpkg-src/openpkg/openpkg.spec
1.4.12.1+1 -0 openpkg-src/openpkg/pod2man.sh
1.62.2.1+1 -1 openpkg-src/openpkg/rc
1.6.10.1+1 -1 openpkg-src/openpkg/rc.8
1.1.2.2 +219 -0 openpkg-src/openpkg/release.8
1.1.2.2 +122 -0 openpkg-src/openpkg/release.pod
1.1.2.2 +139 -0 openpkg-src/openpkg/release.sh
1.3.12.1+1 -1 openpkg-src/openpkg/rpm-config.8
1.74.2.1+5 -5 openpkg-src/openpkg/rpmmacros
1.9.12.1+1 -1 openpkg-src/openpkg/rpmtool.8
1.1.14.1+1 -1 openpkg-src/openpkg/uuid.8
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
$ cvs diff -u -r1.337 -r1.337.2.1 HISTORY
--- openpkg-src/openpkg/HISTORY 19 Jun 2006 09:54:00 - 1.337
+++ openpkg-src/openpkg/HISTORY 22 Jun 2006 07:36:31 -
1.337.2.1
@@ -2,6 +2,11 @@
2006
+20060622 do not rely on RPM's smartness to not expand "%x" when we actually
meant "%%x"
+20060621 use new "openpkg release" for "openpkg install" and "openpkg build"
commands
+20060621 use new "openpkg release" for %{l_openpkg_release} macro
+20060621 added "openpkg release" command for more precise OpenPKG
distribution tag and URL determination
+20060621 complain also about .rpmsave/.rpmnew files if it is a symbolic link
(usually created manually)
20060619 downgrade to cURL 7.15.3 til a suitable solution for long
line-capable 'grep -e' is found
20060619 backout SMF and revert to classic System V init style on Solaris 10
due to complete brokenness
20060618 support bootstrap "Release:" tags for N-STABLE branches
("N.YYYMMDD")
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/build.sh
$ cvs diff -u -r1.2 -r1.2.2.1 build.sh
--- openpkg-src/openpkg/build.sh 17 May 2006 07:35:30 - 1.2
+++ openpkg-src/openpkg/build.sh 22 Jun 2006 07:36:31 - 1.2.2.1
@@ -28,33 +28,27 @@
## in order to bootstrap the installation of the OpenPKG Tool Chain.
##
-# determine OpenPKG release and download URLs
-release=`$OPENPKG_PREFIX/bin/openpkg rpm --eval '%{l_openpkg_release -F
"%s"}'`
-case "$release" in
-CURRENT )
-url_src="ftp://ftp.openpkg.org/current/SRC";
-url_upd=""
-;;
-[0-9].[0-9] )
-url_src="ftp://ftp.openpkg.org/release/$release/SRC";
-url_upd="ftp://ftp.openpkg.org/release/$release/UPD";
-;;
-* )
-echo "openpkg:ERROR: invalid OpenPKG release \"$release\"" 1>&2
-exit 1
-;;
-esac
+# determine OpenPKG distribution URLs (part 1)
+url_raw=`$OPENPKG_PREFIX/bin/openpkg release --fmt="%u"`
+url_src=""
+url_upd=""
-# mimimum command line option parsing
+# minimum command line option parsing
while [ $# -gt 0 ]; do
case "$1" in
--r ) shift; url_src="$1"; url_upd=""; shift ;;
--r* ) url_src="${1/-r/}"; url_upd="" shift ;;
+-r ) shift; url_raw="$1"; shift ;;
+-r* ) url_raw="${1/-r/}"; shift ;;
* ) break ;;
esac
done
-case "$url_src" in
-/* ) url_src="file://$url_src" ;;
+case "$url_raw" in
+/* ) url_raw="file://$url_raw" ;;
+esac
+
+# determine OpenPKG distribution URLs (part 2)
+case "$url_raw" in
+*/SRC ) ;;
+* ) url_src="$url_raw/SRC"; url_upd="$url_raw/UPD" ;;
esac
# sanity check usage
@@ -78,7 +72,7 @@
# determine latest package version and URL
pkg_srpm=""
pkg_nam
