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: 26-Aug-2003 12:08:10
Branch: OPENPKG_UPGRADE_RPM42 Handle: 2003082611080900
Modified files: (Branch: OPENPKG_UPGRADE_RPM42)
openpkg-src/openpkg openpkg.spec
Log:
add a bunch of verbose headers to the build process to allow easier
following
Summary:
Revision Changes Path
1.192.2.19 +71 -1 openpkg-src/openpkg/openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.192.2.18 -r1.192.2.19 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 26 Aug 2003 08:50:56 -0000 1.192.2.18
+++ openpkg-src/openpkg/openpkg.spec 26 Aug 2003 10:08:09 -0000 1.192.2.19
@@ -165,8 +165,16 @@
echo >>.buildenv ' echo "%{_sourcedir}/$1"'
echo >>.buildenv ' fi'
echo >>.buildenv '}'
+ echo >>.buildenv 'VERBOSE () {'
+ echo >>.buildenv ' set +x'
+ echo >>.buildenv ' echo "$*" | sh %{_specdir}/rpmtool msg'
+ echo >>.buildenv ' set -x'
+ echo >>.buildenv '}'
. ./.buildenv
+ # display verbosity header
+ VERBOSE "PREPARATION: Determine Build Tool Paths"
+
# determine path to shtool
shtool=`SOURCE shtool`
echo "shtool=$shtool" >>./.buildenv
@@ -213,6 +221,9 @@
usrgrp=`SOURCE aux.usrgrp.sh`
echo "usrgrp=$usrgrp" >>./.buildenv
+ # display verbosity header
+ VERBOSE "PREPERATION: Determine OpenPKG User/Group Name/Id Pairs"
+
# determine user/group name/id pairs
# - bootstrapping: %{l_[smrn]{usr,grp}} is set via sed(1)
# - upgrading new: %{l_[smrn]{usr,grp}} is set via rpmmacros
@@ -264,6 +275,9 @@
echo "nuid=\"$nuid\"; export nuid" >>.buildenv
echo "ngid=\"$ngid\"; export ngid" >>.buildenv
+ # display verbosity header
+ VERBOSE "PREPERATION: Determine OpenPKG Instance Environment"
+
# determine installation location id
if [ ".%{?l_location:set}" = .set ]; then
loc="%{l_location}"
@@ -307,6 +321,9 @@
echo "l_build_ldlp=\"$l_build_ldlp\"; export l_build_ldlp" >>.buildenv
echo "l_build_ulim=\"$l_build_ulim\"; export l_build_ulim" >>.buildenv
+ # display verbosity header
+ VERBOSE "PREPERATION: Build GNU gzip (Compression Tool)"
+
# bootstrap GNU zip tool
${l_tar} xf `SOURCE gzip-%{V_gzip}.tar` 2>/dev/null || true
( cd gzip-%{V_gzip}
@@ -319,6 +336,9 @@
l_gzip="`pwd`/gzip-%{V_gzip}/gzip"; export l_gzip
echo "l_gzip=\"$l_gzip\"; export l_gzip" >>.buildenv
+ # display verbosity header
+ VERBOSE "PREPERATION: Unpack Distribution Tarballs"
+
# unpack distribution tarballs
${l_gzip} -dc `SOURCE rpm-%{V_rpm}.tar.gz` | ${l_tar} xf -
2>/dev/null || true
${l_gzip} -dc `SOURCE zlib-%{V_zlib}.tar.gz` | ${l_tar} xf -
2>/dev/null || true
@@ -339,6 +359,9 @@
cp `SOURCE config.sub` $dir/
done
+ # display verbosity header
+ VERBOSE "PREPERATION: Build GNU patch (Source Patching Tool)"
+
# bootstrap GNU patch tool
( cd patch-%{V_patch}
echo 'ac_cv_func_setmode=${ac_cv_func_setmode=no}' >config.cache
@@ -354,6 +377,9 @@
l_patch="`pwd`/patch-%{V_patch}/patch"; export l_patch
echo "l_patch=\"$l_patch\"; export l_patch" >>.buildenv
+ # display verbosity header
+ VERBOSE "PREPERATION: Apply OpenPKG Patches to Distibutions"
+
# apply OpenPKG patches to distribution trees
( cd rpm-%{V_rpm}
sed -e "s;@l_prefix@;%{l_prefix};g" <`SOURCE rpm.patch.bugfix` | ${l_patch}
-p0
@@ -366,6 +392,9 @@
${l_patch} -p0 <`SOURCE make.patch`
) || exit $?
+ # display verbosity header
+ VERBOSE "PREPERATION: Build GNU make (Build Tool)"
+
# bootstrap GNU make tool
( cd make-%{V_make}
CC="${l_cc}" \
@@ -386,6 +415,9 @@
cd openpkg-%{version}
. ./.buildenv
+ # display verbosity header
+ VERBOSE "BUILD: Build GNU bash (Bourne-Again Shell)"
+
# build GNU bash tool
( cd bash-%{V_bash}
( # force disabled wide-character support
@@ -412,6 +444,9 @@
( mv bash ..; ${l_make} clean || true; mv ../bash . ) || exit $?
) || exit $?
+ # display verbosity header
+ VERBOSE "BUILD: Build GNU tar (Archiving Tool)"
+
# build GNU tar tool
( cd tar-%{V_tar}
echo 'am_cv_func_iconv=${am_cv_func_iconv=no}' >config.cache
@@ -429,11 +464,17 @@
( mv src/tar ..; ${l_make} clean || true; mv ../tar src/ ) || exit $?
) || exit $?
+ # display verbosity header
+ VERBOSE "BUILD: Build GNU bzip2 (Compression Library)"
+
# build BZIP2 library
( cd bzip2-%{V_bzip2}
${l_make} CC="${l_cc}" CFLAGS="-O" libbz2.a bzip2 || exit $?
) || exit $?
+ # display verbosity header
+ VERBOSE "BUILD: Build Zlib (Compression Library)"
+
# build ZLIB library
( cd zlib-%{V_zlib}
CC="${l_cc}" CFLAGS="-O" ./configure
@@ -452,6 +493,9 @@
cp .libs/libbeecrypt.a .
) || exit $?
+ # display verbosity header
+ VERBOSE "BUILD: Build cURL (URL Fetching Library)"
+
# build cURL tool
( cd curl-%{V_curl}
( echo 'ac_cv_header_openssl_engine_h=no'
@@ -473,6 +517,9 @@
( mv src/curl ..; ${l_make} clean || true; mv ../curl ./src ) || exit $?
) || exit $?
+ # display verbosity header
+ VERBOSE "BUILD: Build RPM (RedHat Package Manager)"
+
# build RPM
( br=`pwd`
cd rpm-%{V_rpm}
@@ -527,7 +574,6 @@
# build the package
${l_make}
-
) || exit $?
%install
@@ -538,6 +584,9 @@
cd openpkg-%{version}
. ./.buildenv
+ # display verbosity header
+ VERBOSE "INSTALL: Create Installation Filesystem Hierarchy"
+
# create installation hierarchy
rm -rf $RPM_BUILD_ROOT
sh $shtool mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}
@@ -568,11 +617,17 @@
mkdir $RPM_BUILD_ROOT%{l_prefix}/RPM/$dir
done
+ # display verbosity header
+ VERBOSE "INSTALL: Installation of RPM"
+
# install RPM into installation hierarchy
( cd rpm-%{V_rpm}
${l_make} DESTDIR="$RPM_BUILD_ROOT" install
) || exit $?
+ # display verbosity header
+ VERBOSE "INSTALL: Stripping Down Installation"
+
# strip RPM installation
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* \
$RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/* >/dev/null 2>&1 || true
@@ -601,12 +656,18 @@
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/$file >/dev/null 2>&1 || true
done
+ # display verbosity header
+ VERBOSE "INSTALL: Install Additional Files"
+
# add additional development files
cp zlib-%{V_zlib}/zlib.h $RPM_BUILD_ROOT%{l_prefix}/include/rpm/
cp zlib-%{V_zlib}/libz.a $RPM_BUILD_ROOT%{l_prefix}/lib/librpmz.a
cp bzip2-%{V_bzip2}/bzlib.h $RPM_BUILD_ROOT%{l_prefix}/include/rpm/
cp bzip2-%{V_bzip2}/libbz2.a $RPM_BUILD_ROOT%{l_prefix}/lib/librpmbz2.a
+ # display verbosity header
+ VERBOSE "INSTALL: Post-Adjust Installation"
+
# post-adjust RPM installation (namespace-clean POPT inclusion)
mv $RPM_BUILD_ROOT%{l_prefix}/lib/libpopt.a \
$RPM_BUILD_ROOT%{l_prefix}/lib/librpmpopt.a
@@ -624,6 +685,9 @@
ln $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/rpmb \
$RPM_BUILD_ROOT%{l_prefix}/bin/rpmbuild
+ # display verbosity header
+ VERBOSE "INSTALL: Install Additional Tools"
+
# install lsync tool
sed -e "s:@l_prefix@:%{l_prefix}:g" \
<`SOURCE lsync` \
@@ -688,6 +752,9 @@
cp `SOURCE config.sub` $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/
chmod a+x $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/config.sub
+ # display verbosity header
+ VERBOSE "INSTALL: Install Configuration Files"
+
# install a few README files
sed -e "s:@l_prefix@:%{l_prefix}:g" \
<`SOURCE root.README` \
@@ -763,6 +830,9 @@
>$RPM_BUILD_ROOT%{l_prefix}/etc/openpkg/rpmmacros
cp `SOURCE openpkg.pgp` \
$RPM_BUILD_ROOT%{l_prefix}/etc/openpkg/openpkg.pgp
+
+ # display verbosity header
+ VERBOSE "INSTALL: Done. Thank you for flying OpenPKG..."
%files
%defattr(-,%{?l_musr}%{!?l_musr:%{l_fsusr}},%{?l_mgrp}%{!?l_mgrp:%{l_fsgrp}})
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
