pxcloud/pxvirt
5
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

When building with DSC, an error occurred, but it shouldn't lead to an exit situation.

Browse Source
This commit is contained in:
jiangcuo 2024-11-22 11:20:30 +08:00
parent df00611edf
commit 26f0698842
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/start.sh
View File

@ -20,13 +20,15 @@ exec_build(){
echo "clean "
make clean || echo ok
echo "build deb in `pwd` "
if [ $dscflag == "dsc" ];then
make dsc || errlog "build dsc error"
if [ "$dscflag" == "dsc" ];then
make dsc || echo "dsc build error but it is not fatal error"
cp *.dsc *.tar.* /tmp/$PKGDIR
fi
make deb || errlog "build deb error"
# We need copy deb files first beacuse of deb will be clean when dsc build
cp -r /tmp/$PKGDIR/* ./
if [ "$dscflag" == "dsc" ];then
cp -r /tmp/$PKGDIR/* ./
fi
else
dpkg-buildpackage -b -us -uc ||errlog "build deb error"
mv ../*.deb ../*.buildinfo ../*.changes ../*.dsc ../*.tar.* $PKGDIR

3
packages/common.sh
View File

@ -11,7 +11,7 @@ exec_build_make(){
make clean || echo ok
echo "build deb in `pwd` "
if [ $dscflag == "dsc" ];then
make dsc || errlog "build dsc error"
make dsc || "dsc build error but it is not fatal error"
fi
DEB_BUILD_OPTIONS=nocheck make deb || errlog "build deb error"
}
@ -29,4 +29,3 @@ errlog(){
echo $1;
exit 1;
}