diff --git a/etc/cron.hourly/65-openmamba-autobuild-autoport b/etc/cron.hourly/65-openmamba-autobuild-autoport index 0bac387..14ee140 100755 --- a/etc/cron.hourly/65-openmamba-autobuild-autoport +++ b/etc/cron.hourly/65-openmamba-autobuild-autoport @@ -33,6 +33,7 @@ pid_check for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do [ "${AUTOPORT_ARCH[$i]}" ] || continue + [ "${AUTOPORT_DISABLE[$i]}" -a "${AUTOPORT_DISABLE[$i]}" != "0" ] && continue if [ "$HOST_IS_X86_64" -a "${AUTOPORT_ARCH[$i]}" != "x86_64" ]; then CMD_PREFIX=linux32 @@ -40,10 +41,6 @@ for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do CMD_PREFIX= fi - echo "ARCH=${AUTOPORT_ARCH[$i]} CHROOT=${AUTOPORT_CHROOT[$i]} \ -CROSS=${AUTOPORT_CROSS[$i]} NATIVE=${AUTOPORT_NATIVE[$i]} \ -REPOSITORIES=${AUTOPORT_REPOSITORIES[$i]} CMD_PREFIX=$CMD_PREFIX" - for r in ${AUTOPORT_REPOSITORIES[$i]}; do echo "Autoport start at `date`" > /var/autodist/log/autoport-$r.log echo "========================" >> /var/autodist/log/autoport-$r.log @@ -59,8 +56,8 @@ REPOSITORIES=${AUTOPORT_REPOSITORIES[$i]} CMD_PREFIX=$CMD_PREFIX" for r in ${AUTOPORT_REPOSITORIES[$i]}; do echo "Working on $r($a) in chroot mode..." >> /var/autodist/log/autoport-$r.log [[ "`/usr/bin/tty`" != "not a tty" ]] && echo "Working on $r($a) in chroot mode" > $local_ftp/$r/autoport-$a.log - $CMD_PREFIX /usr/sbin/chroot /var/autoport/$a su -l sdk -c "autoport -b -r $r" >> $local_ftp/$r/autoport-$a.log - cat /var/autoport/$a/home/sdk/.autoport/${AUTOPORT_ARCH[$i]}/log >> $local_ftp/$r/autoport-$a.log + $CMD_PREFIX /usr/sbin/chroot /var/autoport/$a su -l ${AUTOPORT_CHROOT_USER[$i]} -c "autoport -b -r $r" >> $local_ftp/$r/autoport-$a.log + cat /var/autoport/$a/home/${AUTOPORT_CHROOT_USER[$i]}/.autoport/${AUTOPORT_ARCH[$i]}/log >> $local_ftp/$r/autoport-$a.log echo >> $local_ftp/$r/autoport-$a.log done fi diff --git a/etc/sysconfig/autoport b/etc/sysconfig/autoport index e488bef..a74c7da 100644 --- a/etc/sysconfig/autoport +++ b/etc/sysconfig/autoport @@ -5,13 +5,17 @@ local_ftp=/var/ftp/pub/openmamba/ #AUTOPORT_ENABLE=1 #AUTOPORT_ARCH[0]=x86_64 +#AUTOPORT_DISABLE[0]= #AUTOPORT_CHROOT[0]=devel-x86_64 +#AUTOPORT_CHROOT_USER[0]=sdk #AUTOPORT_CROSS[0]= #AUTOPORT_NATIVE[0]= #AUTOPORT_REPOSITORIES[0]="devel-makedist" #AUTOPORT_ARCH[1]=i586 +#AUTOPORT_DISABLE[1]= #AUTOPORT_CHROOT[1]=milestone2-i586 +#AUTOPORT_CHROOT_USER[1]=sdk #AUTOPORT_CROSS[1]= #AUTOPORT_NATIVE[1]= #AUTOPORT_REPOSITORIES[1]="milestone2-makedist"