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

makedist/defs.inc.sh, config: better configuration of REPODATA_URL as array for each repository

Browse Source
This commit is contained in:
Silvan Calarco 2022-07-03 17:50:34 +02:00
parent 3d4d3031c8
commit 2e7ad83798
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
config/config
View File

@ -1,26 +1,33 @@
# #
# makedist global configuration file # makedist global configuration file
# #
# Copyright (c) by Silvan Calarco <silvan.calarco@mambasoft.it> # Copyright (c) 2003-2022 by Silvan Calarco <silvan.calarco@mambasoft.it>
# #
DISTRONAME="openmamba" DISTRONAME="openmamba"
PORT_FROM_ARCH="i586" #PORT_FROM_ARCH="i586"
PORT_DEST_REPOSITORY="devel" #PORT_DEST_REPOSITORY="devel"
PORT_AUTODIST_USER="silvan" #PORT_AUTODIST_USER="nobody"
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-makedist REPODATA_URL=(
http://hetzner3.mambasoft.it/pub/openmamba/devel
)
elif [ "$ARCH" = "x86_64" ]; then elif [ "$ARCH" = "x86_64" ]; then
REPOSITORY=( REPOSITORY=(
/var/ftp/pub/openmamba/devel /var/ftp/pub/openmamba/devel
) )
REPODATA_URL=(
http://hetzner3.mambasoft.it/pub/openmamba/devel
)
else else
REPOSITORY=( REPOSITORY=(
/var/ftp/pub/openmamba/devel /var/ftp/pub/openmamba/devel
) )
REPODATA_URL=(
http://hetzner3.mambasoft.it/pub/openmamba/devel
)
fi fi

2
makedist/Makefile
View File

@ -1,6 +1,6 @@
# makedist Makefile # makedist Makefile
# Copyright (c) 2003-2004 by Davide Madrisan <davide.madrisan@gmail.com> # Copyright (c) 2003-2004 by Davide Madrisan <davide.madrisan@gmail.com>
# Copyright (c) 2003-2011 by Silvan Calarco <silvan.calarco@mambasoft.it> # Copyright (c) 2003-2022 by Silvan Calarco <silvan.calarco@mambasoft.it>
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without # but WITHOUT ANY WARRANTY, to the extent permitted by law; without

4
makedist/defs.inc.sh
View File

@ -127,7 +127,7 @@ for c in `seq 0 $ALTREPNUM`; do
[makedist${c}] [makedist${c}]
DESCRIPTION = makedist repository ${c} DESCRIPTION = makedist repository ${c}
REPOSITORY_DIR = ${REPOSITORY[$c]} REPOSITORY_DIR = ${REPOSITORY[$c]}
REPODATA_URL = ${REPODATA_URL_PREFIX}/`basename ${REPOSITORY[$c]}`" >> $LOCALSTATEDIR/distromatic/distromatic.conf REPODATA_URL = ${REPODATA_URL[$c]}" >> $LOCALSTATEDIR/distromatic/distromatic.conf
done done
cat >> $LOCALSTATEDIR/distromatic/distromatic.conf << _EOF cat >> $LOCALSTATEDIR/distromatic/distromatic.conf << _EOF
@ -135,7 +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]}` REPODATA_URL = ${REPODATA_URL[${#REPOSITORY[*]}-1]}
_EOF _EOF
for c in `seq 0 $ALTREPNUM`; do for c in `seq 0 $ALTREPNUM`; do

4
makedist/makedist
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# makedist - main program # makedist - main program
# Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it> # Copyright (c) 2007-2022 by Silvan Calarco <silvan.calarco@mambasoft.it>
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
@ -48,7 +48,7 @@ done
copyleft="\ copyleft="\
makedist media (CD/DVD/Images) creator for RPM based distributions makedist media (CD/DVD/Images) creator for RPM based distributions
version $makedist_version version $makedist_version
Copyright (c) 2003-2011 by Silvan Calarco <silvan.calarco@mambasoft.it> Copyright (c) 2003-2022 by Silvan Calarco <silvan.calarco@mambasoft.it>
Copyright (c) 2003-2005 by Davide Madrisan <davide.madrisan@gmail.com> Copyright (c) 2003-2005 by Davide Madrisan <davide.madrisan@gmail.com>
" "