From 734931bb931f41b9556585ddaa1d292b2279a529 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sun, 3 Jul 2022 16:29:23 +0200 Subject: [PATCH] defs.in.sh, config: support for REPODATA_URL in distromatic configuration --- config/config | 4 +--- makedist/defs.inc.sh | 6 ++++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/config b/config/config index d206f95..f6893b3 100644 --- a/config/config +++ b/config/config @@ -8,21 +8,19 @@ PORT_FROM_ARCH="i586" PORT_DEST_REPOSITORY="devel" PORT_AUTODIST_USER="silvan" RPM_GPG_KEY=/etc/pki/rpm-gpg/RPM-GPG-KEY-Mambasoft +REPODATA_URL_PREFIX=http://hetzner3.mambasoft.it/pub/openmamba if [ "$ARCH" = "i586" ]; then REPOSITORY=( /var/ftp/pub/openmamba/devel -/var/ftp/pub/openmamba/devel-games ) #/var/ftp/pub/openmamba/devel-makedist elif [ "$ARCH" = "x86_64" ]; then REPOSITORY=( /var/ftp/pub/openmamba/devel -/var/ftp/pub/openmamba/devel-games ) else REPOSITORY=( /var/ftp/pub/openmamba/devel -/var/ftp/pub/openmamba/devel-games ) fi diff --git a/makedist/defs.inc.sh b/makedist/defs.inc.sh index cc3afa9..9b4b359 100644 --- a/makedist/defs.inc.sh +++ b/makedist/defs.inc.sh @@ -1,7 +1,7 @@ # # makedist definitions include script # -# Copyright (c) 2007-2011 by Silvan Calarco +# Copyright (c) 2007-2022 by Silvan Calarco # PASSED_TARGET=$1 PASSED_PLATFORM=$2 @@ -126,7 +126,8 @@ for c in `seq 0 $ALTREPNUM`; do echo " [makedist${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 cat >> $LOCALSTATEDIR/distromatic/distromatic.conf << _EOF @@ -134,6 +135,7 @@ cat >> $LOCALSTATEDIR/distromatic/distromatic.conf << _EOF [distromatic] DESCRIPTION = makedist repository REPOSITORY_DIR = ${REPOSITORY[${#REPOSITORY[*]}-1]} +REPODATA_URL = ${REPODATA_URL_PREFIX}/`basename ${REPOSITORY[${#REPOSITORY[*]}-1]}` _EOF for c in `seq 0 $ALTREPNUM`; do