diff --git a/bin/makedist-announcement b/bin/makedist-announcement index fd049ff..0fcbfba 100755 --- a/bin/makedist-announcement +++ b/bin/makedist-announcement @@ -1,6 +1,6 @@ #!/bin/bash # makedist-announcement -# Copyright (c) 2012-2014 by Silvan Calarco +# Copyright (c) 2012-2020 by Silvan Calarco # . /usr/share/makedist/VERSION diff --git a/config/30-makedist-autobuild-cleanold b/config/30-makedist-autobuild-cleanold index 7673608..57c0387 100755 --- a/config/30-makedist-autobuild-cleanold +++ b/config/30-makedist-autobuild-cleanold @@ -13,7 +13,7 @@ DESTBASEURL=/pub/openmamba/devel/media [ "$TODAYDATE" ] || TODAYDATE=`date +%Y%m%d` GLOBDOWNLOADSFILE=$DESTBASEDIR/downloads.inc LANGS="it en es" -ARCHS="i586 arm x86_64" +ARCHS="i586 arm x86_64 aarch64" tmpfile=`mktemp` @@ -37,6 +37,7 @@ for m in $MILESTONES; do for f in `find $d -maxdepth 1 -type f -a \( -name "*.$a.iso" -o -name "*.$a.cpio.gz" -o -name "*.$a.tar.gz" -o -name "*.$a.tar.xz" -o -name "*.$a.tar.bz2" -o -name "*.$a.img.gz" \)`; do echo `stat -c %Z $f` `basename $f` >> $tmpfile done + # move releases to /old subdir except the current one filecount=0 for f in `cat $tmpfile | sort -r | awk '{ print $2 }' `; do if [ $filecount = 0 ]; then diff --git a/makedist/functions.inc.sh b/makedist/functions.inc.sh index 318f401..721c03a 100644 --- a/makedist/functions.inc.sh +++ b/makedist/functions.inc.sh @@ -173,7 +173,7 @@ $RPM_CHROOT_PREFIX $RPM $RPM_ROOT_APPEND --initdb" > ${LOCALSTATEDIR}/${BUILDSCR $RPM_CHROOT_PREFIX $RPM $RPM_ROOT_APPEND --initdb || { echo "$makedist_me: unable to initialize the RPM database" >&2 { (exit 1); exit 1; }; } - [ -e "$MOUNTDIR/$RPM_GPG_KEY" ] && { + [ -e "$RPM_GPG_KEY" ] && { $RPM_CHROOT_PREFIX $RPM $RPM_ROOT_APPEND --import $RPM_GPG_KEY echo "$RPM_CHROOT_PREFIX $RPM $RPM_ROOT_APPEND --import $RPM_GPG_KEY" >> ${LOCALSTATEDIR}/${BUILDSCRIPT_NAME} }