openmamba/autodist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

autodist, autoport: update to current production code

Browse Source
This commit is contained in:
Silvan Calarco 2022-10-02 12:47:45 +02:00
parent 193a41413a
commit 4902ab352f
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
autodist
View File

@ -123,13 +123,6 @@ for ((i=1; i<=$#; i++)); do
do_build=1; do_build=1;
do_send=1; do_send=1;
SEVERITY=1 SEVERITY=1
[ -e $PIDFILE ] && {
PIDCHECK=`cat $PIDFILE`
[ "$PIDCHECK" -a -e /proc/$PIDCHECK -a ! "$DISABLE_PID_CHECK" ] && {
echo "Error: autodist -a already running with PID=$PIDCHECK.Aborting."
exit 1
}
}
;; ;;
-c|--cleanlogs) do_cleanlogs=1 ;; -c|--cleanlogs) do_cleanlogs=1 ;;
-h|--help) usage -h|--help) usage
@ -236,6 +229,16 @@ for ((i=1; i<=$#; i++)); do
esac esac
done done
if [ "$do_autobuild" ]; then
if [ -e $PIDFILE ]; then
PIDCHECK=`cat $PIDFILE`
if [ "$PIDCHECK" -a -e /proc/$PIDCHECK -a ! "$DISABLE_PID_CHECK" ]; then
echo "Error: autodist -a already running with PID=$PIDCHECK.Aborting."
exit 0
fi
fi
fi
[ "$AUTODIST_REPOSITORY" ] || AUTODIST_REPOSITORY=devel-autodist [ "$AUTODIST_REPOSITORY" ] || AUTODIST_REPOSITORY=devel-autodist
[ "$SEND_SERVER" ] || SEND_SERVER=$AUTODIST_REPOSITORY [ "$SEND_SERVER" ] || SEND_SERVER=$AUTODIST_REPOSITORY
@ -1133,8 +1136,8 @@ if [ "$do_autobuild" = "1" ]; then
[ $AUTOBUILD_NUMADDED -ge $AUTOBUILD_MAXNUM ] && break [ $AUTOBUILD_NUMADDED -ge $AUTOBUILD_MAXNUM ] && break
# FIXME: hardcoded skipped packages # FIXME: hardcoded skipped packages
[ "${PKGNAME:0:5}" = "java-" -o "${PKGNAME:0:7}" = "apache-" -o \ #[ "${PKGNAME:0:5}" = "java-" -o "${PKGNAME:0:7}" = "apache-" -o \
"${PKGNAME:0:8}" = "jakarta-" -o "${PKGNAME:0:6}" = "compiz" ] && continue # "${PKGNAME:0:8}" = "jakarta-" -o "${PKGNAME:0:6}" = "compiz" ] && continue
if [ $BUILDDATE -ge $AUTOBUILD_DATEFROM -o $BUILDDATE -eq 0 ]; then if [ $BUILDDATE -ge $AUTOBUILD_DATEFROM -o $BUILDDATE -eq 0 ]; then
AUTOBUILD_NUMADDED=`expr $AUTOBUILD_NUMADDED + 1` AUTOBUILD_NUMADDED=`expr $AUTOBUILD_NUMADDED + 1`

4
autoport
View File

@ -400,7 +400,7 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
port_pkg_version=$pkg_version port_pkg_version=$pkg_version
port_pkg_release=$pkg_release port_pkg_release=$pkg_release
currrebuild= currrebuild=
currjobsscriptargs= currjobscriptargs=
JOBNUM=0 JOBNUM=0
for p in ${port_pkg_list}; do for p in ${port_pkg_list}; do
if [ "${p/@*}" != "$currrebuild" ]; then if [ "${p/@*}" != "$currrebuild" ]; then
@ -589,7 +589,7 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
echo -n "update" echo -n "update"
if [ "$REBUILD_DEPENDANT_MODE" ]; then if [ "$REBUILD_DEPENDANT_MODE" ]; then
SCRIPT_ARGS="${JOB_SCRIPTARGS[$JOB_NUM-1]}" SCRIPT_ARGS="${JOB_SCRIPTARGS[$JOB_NUM-1]}"
changelogadd="`echo ${SCRIPT_ARGS} | sed "s|--buildreq|,|;s| ||g;s|^,||g"`" changelogadd="`echo ${SCRIPT_ARGS} | sed "s|--buildreq|,|g;s| ||g;s|^,||g"`"
REBUILD_CHANGELOG="rebuilt by autoport with build requirements: '${changelogadd}'" REBUILD_CHANGELOG="rebuilt by autoport with build requirements: '${changelogadd}'"
fi fi
[ "$VERBOSE_MODE" ] && echo " [ "$VERBOSE_MODE" ] && echo "