Solaris/buildpkg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a bug in ignore_deps processing

Browse Source 
Fix a bug in prereq processing when creating the specfile. This avoids
adding spurious leftovers from previous subsystems to later subsystems.
Add support for adding sha1sum of all source[x] entries to relnotes.
This commit is contained in:
Tom G. Christensen 2005-12-03 18:21:11 +00:00
parent 814f59f42a
commit 8de6f05906
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
buildpkg.packaging.irix
View File

@ -107,7 +107,7 @@ cpu=mips3
configure_args='--prefix=$prefix' configure_args='--prefix=$prefix'
META_CLEAN="$topdir.spec $topdir.idb files.tmp ${depends##*/}_auto ${depends##*/}_all" META_CLEAN="$topdir.spec $topdir.idb files.tmp ${depends##*/}_auto ${depends##*/}_all sums"
# Host specific configuration # Host specific configuration
[ -r $buildpkgbase/scripts/config.$($HOSTNAME -s).irix ] && . $buildpkgbase/scripts/config.$($HOSTNAME -s).irix [ -r $buildpkgbase/scripts/config.$($HOSTNAME -s).irix ] && . $buildpkgbase/scripts/config.$($HOSTNAME -s).irix
@ -430,7 +430,7 @@ fetch_depends()
for j in $ignore_deps for j in $ignore_deps
do do
cmd="$(echo $j | $SED -e 's;\.;\\\.;g')" cmd="$(echo $j | $SED -e 's;\.;\\\.;g')"
$GSED -i "/$j/d" ${depends}_all $GSED -i "/$cmd/d" ${depends}_all
done done
fi fi
if [ -r ${depends}_all ]; then if [ -r ${depends}_all ]; then
@ -625,6 +625,7 @@ create_spec()
spec_header $pkgname "$name $version-${pkgver}${shortdesc}" > $specfile spec_header $pkgname "$name $version-${pkgver}${shortdesc}" > $specfile
local pcsize=${#pc[@]} local pcsize=${#pc[@]}
local pctopsize=${#pctop[@]} local pctopsize=${#pctop[@]}
local reqidlist
for ((i=0; i < $pctopsize; i++)) for ((i=0; i < $pctopsize; i++))
do do
local pcidx=0 local pcidx=0
@ -635,7 +636,7 @@ create_spec()
if [ ! "$rv" -eq 0 ]; then # We got a hit! if [ ! "$rv" -eq 0 ]; then # We got a hit!
spec_subsys_header ${pctop[$i]} `echo ${pc[$pcidx]}|$CUT -d . -f 2` "${pd[$pcidx]}" "${ps[$pcidx]}" >> $specfile spec_subsys_header ${pctop[$i]} `echo ${pc[$pcidx]}|$CUT -d . -f 2` "${pd[$pcidx]}" "${ps[$pcidx]}" >> $specfile
reqsize=${#reqs[@]} reqsize=${#reqs[@]}
declare -a reqidlist unset reqidlist # Zero the array
reqidlidx=0 reqidlidx=0
for ((j=0; j < $reqsize; j++)) for ((j=0; j < $reqsize; j++))
do do
@ -644,7 +645,7 @@ create_spec()
let "reqidlidx=$reqidlidx + 1" let "reqidlidx=$reqidlidx + 1"
fi fi
done done
reqidlsize=${#reqidlist[@]} reqidlsize=$reqidlidx
if [ "$reqidlsize" -ge 1 ]; then if [ "$reqidlsize" -ge 1 ]; then
spec_subsys_req_header >> $specfile spec_subsys_req_header >> $specfile
for ((j=0; j < $reqidlsize; j++)) for ((j=0; j < $reqidlsize; j++))
@ -945,16 +946,29 @@ auto_rel()
local vendor_temp=$($GREP 'pkgvendor=' $metadir/pkgdef) local vendor_temp=$($GREP 'pkgvendor=' $metadir/pkgdef)
local vendor=$(_upls ${vendor_temp#pkgvendor=*}) local vendor=$(_upls ${vendor_temp#pkgvendor=*})
local packager="${pkgedby} <${email}>" local packager="${pkgedby} <${email}>"
# A little snip from buildpkg.functions:unpack # Compute SHA1 sums for all source entries
if [ "${source[0]:0:1}" != "/" ]; then # We have a relative pathname local s
# expand to absolute local path
source[0]=$srcfiles/${source[0]} local file
fi # We are now sure that ${source[0]} contains file with absolute path local source_sha1sum
# To avoid recording an absolute path in the sha1sum output that gets inserted local temp_source_sha1sum
# into relnotes we cd first then run sha1sum for ((s=0; $s < ${#source[@]}; s++))
local path="${source[0]%/*}" # Extract path part do
local file="${source[0]##*/}" # Extract filename part # A little snip from buildpkg.functions:unpack
local source_sha1sum="`(cd "$path"; $SHA1SUM "$file")`" if [ "${source[$s]:0:1}" != "/" ]; then # We have a relative pathname
# expand to absolute
[ -r "$srcdir/${source[$s]}" ] && source[$s]="$srcdir/${source[$s]}"
[ -r "$srcfiles/${source[$s]}" ] && source[$s]="$srcfiles/${source[$s]}"
fi # We are now sure that ${source[$s]} contains file with absolute path
# To avoid recording an absolute path in the sha1sum output that gets inserted
# into relnotes we cd first then run sha1sum
path="${source[$s]%/*}" # Extract path part
file="${source[$s]##*/}" # Extract filename part
(cd "$path"; $SHA1SUM "$file") >> $metadir/sums
done
temp_source_sha1sum="$(cat $metadir/sums | $AWK '{ printf "%s\\n",$0 }')"
source_sha1sum="${temp_source_sha1sum%\\*}"
# End of SHA1 sum computing
local temp_extracted_env="$($SED -e 's/export /echo ENV /g' ${buildpkgbase}/${pkgdir}/build.sh >> /tmp/env.sh; bash /tmp/env.sh|$GREP ^ENV|$SED -e 's/ENV //g'|$AWK '{ printf "%s\\n",$0 }' && $RM -f /tmp/env.sh)" local temp_extracted_env="$($SED -e 's/export /echo ENV /g' ${buildpkgbase}/${pkgdir}/build.sh >> /tmp/env.sh; bash /tmp/env.sh|$GREP ^ENV|$SED -e 's/ENV //g'|$AWK '{ printf "%s\\n",$0 }' && $RM -f /tmp/env.sh)"
# Remove trailing \n # Remove trailing \n
local extracted_env="${temp_extracted_env%\\*}" local extracted_env="${temp_extracted_env%\\*}"