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:23:12
Branch: HEAD Handle: 2006062812231101
Modified files:
openpkg-src/openpkg HISTORY build.sh openpkg.spec
Log:
allow "openpkg build" emulation script to gracefully handle platform
changes
Summary:
Revision Changes Path
1.343 +1 -0 openpkg-src/openpkg/HISTORY
1.5 +14 -5 openpkg-src/openpkg/build.sh
1.495 +1 -1 openpkg-src/openpkg/openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.342 -r1.343 HISTORY
--- openpkg-src/openpkg/HISTORY 25 Jun 2006 17:25:24 -0000 1.342
+++ openpkg-src/openpkg/HISTORY 28 Jun 2006 11:23:11 -0000 1.343
@@ -2,6 +2,7 @@
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.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/build.sh
============================================================================
$ cvs diff -u -r1.4 -r1.5 build.sh
--- openpkg-src/openpkg/build.sh 22 Jun 2006 08:51:06 -0000 1.4
+++ openpkg-src/openpkg/build.sh 28 Jun 2006 11:23:12 -0000 1.5
@@ -56,17 +56,16 @@
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
@@ -108,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/openpkg.spec
============================================================================
$ cvs diff -u -r1.494 -r1.495 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 25 Jun 2006 17:25:24 -0000 1.494
+++ openpkg-src/openpkg/openpkg.spec 28 Jun 2006 11:23:12 -0000 1.495
@@ -38,7 +38,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20060625
+%define V_openpkg 20060628
# the used software versions
%define V_rpm 4.2.1
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
