defs.in.sh, config: support for REPODATA_URL in distromatic configuration

This commit is contained in:
Silvan Calarco 2022-07-03 16:29:23 +02:00
parent feda208e18
commit 734931bb93
2 changed files with 5 additions and 5 deletions

View File

@ -8,21 +8,19 @@ PORT_FROM_ARCH="i586"
PORT_DEST_REPOSITORY="devel" PORT_DEST_REPOSITORY="devel"
PORT_AUTODIST_USER="silvan" PORT_AUTODIST_USER="silvan"
RPM_GPG_KEY=/etc/pki/rpm-gpg/RPM-GPG-KEY-Mambasoft RPM_GPG_KEY=/etc/pki/rpm-gpg/RPM-GPG-KEY-Mambasoft
REPODATA_URL_PREFIX=http://hetzner3.mambasoft.it/pub/openmamba
if [ "$ARCH" = "i586" ]; then if [ "$ARCH" = "i586" ]; then
REPOSITORY=( REPOSITORY=(
/var/ftp/pub/openmamba/devel /var/ftp/pub/openmamba/devel
/var/ftp/pub/openmamba/devel-games
) )
#/var/ftp/pub/openmamba/devel-makedist #/var/ftp/pub/openmamba/devel-makedist
elif [ "$ARCH" = "x86_64" ]; then elif [ "$ARCH" = "x86_64" ]; then
REPOSITORY=( REPOSITORY=(
/var/ftp/pub/openmamba/devel /var/ftp/pub/openmamba/devel
/var/ftp/pub/openmamba/devel-games
) )
else else
REPOSITORY=( REPOSITORY=(
/var/ftp/pub/openmamba/devel /var/ftp/pub/openmamba/devel
/var/ftp/pub/openmamba/devel-games
) )
fi fi

View File

@ -1,7 +1,7 @@
# #
# makedist definitions include script # makedist definitions include script
# #
# Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it> # Copyright (c) 2007-2022 by Silvan Calarco <silvan.calarco@mambasoft.it>
# #
PASSED_TARGET=$1 PASSED_TARGET=$1
PASSED_PLATFORM=$2 PASSED_PLATFORM=$2
@ -126,7 +126,8 @@ for c in `seq 0 $ALTREPNUM`; do
echo " echo "
[makedist${c}] [makedist${c}]
DESCRIPTION = makedist repository ${c} DESCRIPTION = makedist repository ${c}
REPOSITORY_DIR = ${REPOSITORY[$c]}" >> $LOCALSTATEDIR/distromatic/distromatic.conf REPOSITORY_DIR = ${REPOSITORY[$c]}
REPODATA_URL = ${REPODATA_URL_PREFIX}/`basename ${REPOSITORY[$c]}`" >> $LOCALSTATEDIR/distromatic/distromatic.conf
done done
cat >> $LOCALSTATEDIR/distromatic/distromatic.conf << _EOF cat >> $LOCALSTATEDIR/distromatic/distromatic.conf << _EOF
@ -134,6 +135,7 @@ cat >> $LOCALSTATEDIR/distromatic/distromatic.conf << _EOF
[distromatic] [distromatic]
DESCRIPTION = makedist repository DESCRIPTION = makedist repository
REPOSITORY_DIR = ${REPOSITORY[${#REPOSITORY[*]}-1]} REPOSITORY_DIR = ${REPOSITORY[${#REPOSITORY[*]}-1]}
REPODATA_URL = ${REPODATA_URL_PREFIX}/`basename ${REPOSITORY[${#REPOSITORY[*]}-1]}`
_EOF _EOF
for c in `seq 0 $ALTREPNUM`; do for c in `seq 0 $ALTREPNUM`; do