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

Fix ChangeLog version check

Browse Source 
Additionally turn any problem with the ChangeLog into a fatal error.
This commit is contained in:
Tom G. Christensen 2012-05-27 11:18:10 +02:00
parent 3aae9488ab
commit 8a92bf85d5
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildpkg.functions
View File

@ -173,6 +173,8 @@ E_BAD_LIBS=47
E_SVR4_PKG_OVERFLOW=48 E_SVR4_PKG_OVERFLOW=48
E_SVR4_NAME_OVERFLOW=49 E_SVR4_NAME_OVERFLOW=49
E_MISSING_EXE=50 E_MISSING_EXE=50
E_MISSING_CHGLOG=51
E_MISSING_CHGLOGV=52
error_txt[$E_BAD_FILE]="File not found" error_txt[$E_BAD_FILE]="File not found"
error_txt[$E_PATCH_FAILED]="Patch failed" error_txt[$E_PATCH_FAILED]="Patch failed"
@ -192,6 +194,8 @@ error_txt[$E_BAD_LIBS]="config.log defines obsolete libraries!"
error_txt[$E_SVR4_PKG_OVERFLOW]="PKG field exceeds 9 char limit" error_txt[$E_SVR4_PKG_OVERFLOW]="PKG field exceeds 9 char limit"
error_txt[$E_SVR4_NAME_OVERFLOW]="NAME field exceeds 256 char limit" error_txt[$E_SVR4_NAME_OVERFLOW]="NAME field exceeds 256 char limit"
error_txt[$E_MISSING_EXE]="Executable is missing" error_txt[$E_MISSING_EXE]="Executable is missing"
error_txt[$E_MISSING_CHGLOG]="ChangeLog is missing"
error_txt[$E_MISSING_CHGLOGV]="Did not find ChangeLog entry for ${version}-${pkgver}"
##################################################### #####################################################
# Helper functions # Helper functions

6
buildpkg.packaging.irix
View File

@ -1132,13 +1132,13 @@ auto_rel()
if [ -r $metadir/ChangeLog ]; then if [ -r $metadir/ChangeLog ]; then
echo "auto_rel: Adding ChangeLog to relnotes" echo "auto_rel: Adding ChangeLog to relnotes"
# See if we can find an entry for this build otherwise complain # See if we can find an entry for this build otherwise complain
if [ -z "${__grep} ${version}-${pkgver}$" ]; then if [ -z "$(${__grep} ${version}-${pkgver}$ $metadir/ChangeLog)" ]; then
echo "autorel: WARNING: Did not find ChangeLog entry for ${version}-${pkgver}!" error $E_MISSING_CHGLOGV auto_rel
fi fi
echo >> "$relmetadir/${topdir}.txt" echo >> "$relmetadir/${topdir}.txt"
cat $metadir/ChangeLog >> "$relmetadir/${topdir}.txt" cat $metadir/ChangeLog >> "$relmetadir/${topdir}.txt"
else else
echo "auto_rel: WARNING: ChangeLog is missing!" error $E_MISSING_CHGLOG auto_rel
fi fi
} }

6
buildpkg.packaging.solaris
View File

@ -430,13 +430,13 @@ auto_rel()
if [ -r $metadir/ChangeLog ]; then if [ -r $metadir/ChangeLog ]; then
echo "auto_rel: Adding ChangeLog to relnotes" echo "auto_rel: Adding ChangeLog to relnotes"
# See if we can find an entry for this build otherwise complain # See if we can find an entry for this build otherwise complain
if [ -z "${__grep} ${version}-${pkgver}$" ]; then if [ -z "$(${__grep} ${version}-${pkgver}$ $metadir/ChangeLog)" ]; then
echo "autorel: WARNING: Did not find ChangeLog entry for ${version}-${pkgver}!" error $E_MISSING_CHGLOGV auto_rel
fi fi
echo >> "$relmetadir/${secname}.txt" echo >> "$relmetadir/${secname}.txt"
cat $metadir/ChangeLog >> "$relmetadir/${secname}.txt" cat $metadir/ChangeLog >> "$relmetadir/${secname}.txt"
else else
echo "auto_rel: WARNING: ChangeLog is missing!" error $E_MISSING_CHGLOG auto_rel
fi fi
### Add the relnotes to the prototype file ### Add the relnotes to the prototype file