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:
Revision Changes 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 -0000
1.337.2.2
+++ openpkg-src/openpkg/HISTORY 28 Jun 2006 11:57:26 -0000
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 -0000 1.2.2.1
+++ openpkg-src/openpkg/build.sh 28 Jun 2006 11:57:26 -0000 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.sh 22 Jun 2006 07:36:31 -0000 1.9.2.1
+++ openpkg-src/openpkg/install.sh 28 Jun 2006 11:57:26 -0000 1.9.2.2
@@ -46,7 +46,8 @@
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" ;;
+ * ) url_src="${url_raw}/SRC"; url_upd="${url_raw}/UPD" ;;
esac
# determine path to binary RPMs
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.490.2.2 -r1.490.2.3 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 22 Jun 2006 07:36:31 -0000
1.490.2.2
+++ openpkg-src/openpkg/openpkg.spec 28 Jun 2006 11:57:26 -0000
1.490.2.3
@@ -38,14 +38,14 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 2.20060622
+%define V_openpkg 2.20060628
# 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.3
+%define V_curl 7.15.4
%define V_make 3.81
%define V_gzip 1.3.5
%define V_patch 2.5.9
@@ -184,7 +184,6 @@
}
prog openpkg:curl = {
version = %{V_curl}
- comment = "cs: cURL 7.15.4 requires some grep(1) not found on
Solaris core installations"
url = http://curl.haxx.se/download/
regex = curl-(__VER__)\.tar\.gz
}
@@ -635,6 +634,8 @@
( cd make-%{V_make}
CC="${l_cc}" \
./configure \
+ --without-libiconv-prefix \
+ --without-libintl-prefix \
--disable-nls \
--disable-largefile
${l_make}
@@ -808,6 +809,7 @@
CFLAGS="-I`pwd`/../zlib-%{V_zlib}" \
CPPFLAGS="-I`pwd`/../zlib-%{V_zlib}" \
LDFLAGS="-L`pwd`/../zlib-%{V_zlib}" \
+ GREP="grep" \
./configure \
--cache-file=./config.cache \
--without-libidn \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
