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

Update repository from devel to base and other changes for devel to rolling distribution

Browse Source
This commit is contained in:
Silvan 2023-08-16 18:38:48 +02:00
parent 519f8d5656
commit 92246206dc
8 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
autodist-upstream-updates
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# #
# autodist upstream updates - find upstream packages updates from different internet resources # autodist upstream updates - find upstream packages updates from different internet resources
# Copyright (c) 2004-2021 by Silvan Calarco <silvan.calarco@mambasoft.it> # Copyright (c) 2004-2023 by Silvan Calarco <silvan.calarco@mambasoft.it>
# #
#[ -r /etc/sysconfig/openmamba-central ] || { #[ -r /etc/sysconfig/openmamba-central ] || {
@ -10,7 +10,7 @@
#} #}
. /etc/autodist/config . /etc/autodist/config
DISTROMATIC_PREFIX=/distribution/distromatic.html? DISTROMATIC_PREFIX=/distribution/distromatic.html?
DISTROMATIC_REPOSITORY=devel DISTROMATIC_REPOSITORY=base
DISTDB=/etc/autodist/distdb DISTDB=/etc/autodist/distdb
BLACKLISTDB=/etc/autodist/blacklist BLACKLISTDB=/etc/autodist/blacklist
DISTDBDIR=/etc/autodist/distdb.d DISTDBDIR=/etc/autodist/distdb.d
@ -36,7 +36,7 @@ function usage()
echo " -s: skip fetching and parsing upstream updates" echo " -s: skip fetching and parsing upstream updates"
echo " -u: output not up-to-date packages only" echo " -u: output not up-to-date packages only"
echo " -q: produces quite output" echo " -q: produces quite output"
echo " -r repository: specify the distromatic base (default: devel)" echo " -r repository: specify the distromatic base (default: base)"
echo " -o repository: specify the repository for output data (default: same as base repository)" echo " -o repository: specify the repository for output data (default: same as base repository)"
echo echo
} }

4
autoport
View File

@ -7,8 +7,8 @@
VERSION=1.2 VERSION=1.2
BASE_ARCH=i586 BASE_ARCH=i586
BASE_REPOSITORY=devel BASE_REPOSITORY=base
PORT_REPOSITORY=devel PORT_REPOSITORY=base
. /etc/autodist/config . /etc/autodist/config

6
autospec-conf
View File

@ -20,9 +20,9 @@ source_dir="/var/autodist/RPM/SOURCES"
build_dir="/var/autodist/RPM/BUILD" build_dir="/var/autodist/RPM/BUILD"
tmppath_dir="/var/tmp/autodist" tmppath_dir="/var/tmp/autodist"
ftp_alias[0]="devel" ftp_alias[0]="base"
ftpurl_ro_rpms[0]="ftp://ftp.openmamba.org/pub/openmamba/devel/RPMS.@arch@" ftpurl_ro_rpms[0]="ftp://ftp.openmamba.org/pub/openmamba/base/RPMS.@arch@"
ftpurl_ro_srpms[0]="ftp://ftp.openmamba.org/pub/openmamba/devel/SRPMS.base" ftpurl_ro_srpms[0]="ftp://ftp.openmamba.org/pub/openmamba/base/SRPMS.base"
ftp_rw_server[0]="ftp://ftp.openmamba.org" ftp_rw_server[0]="ftp://ftp.openmamba.org"
ftp_rw_port[0]= ftp_rw_port[0]=
ftp_rw_passive_mode[0]=on ftp_rw_passive_mode[0]=on

18
etc/autodist/config
View File

@ -17,7 +17,7 @@ AUTOBUILD_SKIP_DAYS=28
AUTOBUILD_SUCCESS_DAYS=3 AUTOBUILD_SUCCESS_DAYS=3
AUTODIST_REPOSITORY=devel-autodist AUTODIST_REPOSITORY=devel-autodist
AUTODIST_DELAYED_REPOSITORY=devel-future AUTODIST_DELAYED_REPOSITORY=devel-future
AUTODIST_REPOSITORIES=(devel devel-games devel-makedist devel-kernel devel-xorg devel-kde4 devel-autodist) AUTODIST_REPOSITORIES=(base devel-makedist devel-kernel devel-autodist devel-misc)
AUTOPORT_UNSTAGE_ARCHS="i586" AUTOPORT_UNSTAGE_ARCHS="i586"
AUTOPORT_STAGEVARS="--define stage1=1" AUTOPORT_STAGEVARS="--define stage1=1"
AUTOPORT_MAX_STEPS=10 AUTOPORT_MAX_STEPS=10
@ -27,26 +27,22 @@ AUTODIST_REBUILDOLD_FROMDATE=20090101
# #
# Set to disable autodist-repository and use local list # Set to disable autodist-repository and use local list
# #
WEBBUILD_REPOSITORIES=(devel devel-games devel-kernel devel-kde4 devel-xorg devel-gnome devel-makedist \ WEBBUILD_REPOSITORIES=(base devel-kernel devel-makedist devel-misc devel-autodist devel-future devel-past \
devel-java devel-misc devel-autodist devel-future devel-past \
milestone1 milestone1-updates milestone1-games milestone1-1.1 milestone1-makedist \ milestone1 milestone1-updates milestone1-games milestone1-1.1 milestone1-makedist \
milestone2 milestone2-games milestone2-updates milestone2-kernel milestone2-kde4 \ milestone2 milestone2-games milestone2-updates milestone2-kernel milestone2-kde4 \
milestone2-xorg milestone2-makedist milestone2-java \ milestone2-xorg milestone2-makedist milestone2-java \
devel-contrib devel-silvan devel-stefano devel-aleph0 devel-skiver devel-fabiog devel-gil \ milestone1-java milestone1-contrib)
devel-distservers devel-the_packagizers devel-ercolinux \
devel-contrib-java devel-michiamophil milestone1-java milestone1-contrib)
# #
# Set to enable autodist-repository (you also need to disable WEBBUILD_REPOSITORIES above) # Set to enable autodist-repository (you also need to disable WEBBUILD_REPOSITORIES above)
# #
#AUTODIST_REPOSITORIES_LOCAL_REPS=(devel devel-games devel-kernel devel-kde4 devel-xorg devel-gnome devel-makedist \ #AUTODIST_REPOSITORIES_LOCAL_REPS=(base devel-kernel devel-makedist devel-misc devel-autodist \
# devel-java devel-misc devel-autodist devel-future devel-past devel-embedded devel-silvan \ # devel-future devel-past \
# milestone3 milestone3-games milestone3-updates milestone3-makedist \ # milestone3 milestone3-games milestone3-updates milestone3-makedist \
# milestone2 milestone2-games milestone2-updates milestone2-kernel milestone2-kde4 \ # milestone2 milestone2-games milestone2-updates milestone2-kernel milestone2-kde4 \
# milestone2-xorg milestone2-makedist milestone2-java milestone2-kernel-next \ # milestone2-xorg milestone2-makedist milestone2-java milestone2-kernel-next \
# milestone1 milestone1-updates milestone1-games milestone1-1.1 milestone1-makedist) # milestone1 milestone1-updates milestone1-games milestone1-1.1 milestone1-makedist)
#AUTODIST_REPOSITORIES_REMOTE_REPS=(devel-contrib devel-stefano devel-aleph0 devel-skiver devel-fabiog devel-gil \ #AUTODIST_REPOSITORIES_REMOTE_REPS=(devel-contrib \
# devel-distservers devel-the_packagizers devel-ercolinux \ # milestone1-java milestone1-contrib)
# devel-contrib-java devel-michiamophil milestone1-java milestone1-contrib)
#AUTODIST_REPOSITORIES_TRANSITIONAL_REP=devel-makedist #AUTODIST_REPOSITORIES_TRANSITIONAL_REP=devel-makedist
#AUTODIST_REPOSITORIES_REMOTE_FTPUSER= #AUTODIST_REPOSITORIES_REMOTE_FTPUSER=
#AUTODIST_REPOSITORIES_REMOTE_FTPPASS= #AUTODIST_REPOSITORIES_REMOTE_FTPPASS=

2
etc/cron.hourly/60-autodist-update
View File

@ -8,7 +8,7 @@
# FIXME: parametrize automaint call # FIXME: parametrize automaint call
if [ ! "$AUTOPORT_UPDATE_NO_AUTOMAINT" ]; then if [ ! "$AUTOPORT_UPDATE_NO_AUTOMAINT" ]; then
automaint -s devel-autodist -d devel -p devel-makedist automaint -s devel-autodist -d base -p devel-makedist
fi fi
for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do

4
etc/sysconfig/autoport
View File

@ -12,8 +12,8 @@ AUTOPORT_UPDATE_NO_DISTROMATIC=1
#AUTOPORT_WEBBUILD_HOST=http://localhost/webbuild.html #AUTOPORT_WEBBUILD_HOST=http://localhost/webbuild.html
#ICECREAM_MONITOR_HOST=localhost #ICECREAM_MONITOR_HOST=localhost
AUTOPORT_DEVEL_IMPORT_REPOSITORIES="devel-makedist devel devel-games devel-autodist devel-gnome \ AUTOPORT_DEVEL_IMPORT_REPOSITORIES="devel-makedist base devel-autodist \
devel-kde4 devel-xorg devel-kernel devel-misc devel-java devel-future devel-past devel-contrib devel-contrib-java" devel-kernel devel-misc devel-future devel-past"
AUTOPORT_DEVEL_RELEASE_REPOSITORIES="milestone2-makedist milestone2-kernel milestone2-kernel-next" AUTOPORT_DEVEL_RELEASE_REPOSITORIES="milestone2-makedist milestone2-kernel milestone2-kernel-next"

4
telegram/openmamba_bot.py
View File

@ -3,7 +3,7 @@
# #
# openmamba bot for Telegram # openmamba bot for Telegram
# #
# Copyright (C) 2016-2022 by Silvan Calarco <silvan.calarco@mambasoft.it> # Copyright (C) 2016-2023 by Silvan Calarco <silvan.calarco@mambasoft.it>
# #
# GPL v3 license # GPL v3 license
@ -25,7 +25,7 @@ logger = logging.getLogger(__name__)
timers = dict() timers = dict()
social_log_last_ids = dict() social_log_last_ids = dict()
reps = [ 'devel', 'devel-makedist', 'devel-autodist', 'devel-kernel', 'devel-misc' ] reps = [ 'base', 'devel-makedist', 'devel-autodist', 'devel-kernel', 'devel-misc', 'devel-future', 'devel-past' ]
def start(update: Update, context: CallbackContext): def start(update: Update, context: CallbackContext):

10
webbuild/webbuild-cgi
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# #
# webbuild cgi script # webbuild cgi script
# Copyright (c) 2012-2020 by Silvan Calarco <silvan.calarco@mambasoft.it> # Copyright (c) 2012-2023 by Silvan Calarco <silvan.calarco@mambasoft.it>
# #
. /usr/share/autodist/webbuild-functions . /usr/share/autodist/webbuild-functions
. /usr/share/autodist/webbuild-functions-private . /usr/share/autodist/webbuild-functions-private
@ -481,8 +481,8 @@ if [ "$REQUEST" = "repsearch" ]; then
echo -n "<hr><b>Search results for \"$REPSEARCHTEXT\":</b><div align=left class=\"outputbox\" id=outputtop style=\"font-family:serif;color:black;background-color:#E0F2D0;\">" echo -n "<hr><b>Search results for \"$REPSEARCHTEXT\":</b><div align=left class=\"outputbox\" id=outputtop style=\"font-family:serif;color:black;background-color:#E0F2D0;\">"
# echo -n "<pre><!-- SCROLL -->" # echo -n "<pre><!-- SCROLL -->"
REPSEARCHTEXT_FMT=`echo "${REPSEARCHTEXT}" | sed "s|[[:space:]]|+|g"` REPSEARCHTEXT_FMT=`echo "${REPSEARCHTEXT}" | sed "s|[[:space:]]|+|g"`
curl -L -s "${WEBBUILD_DISTROQUERY_URL}?query=${REPSEARCHTEXT_FMT}&search_milestone2=true&search_milestone3=true&search_devel=true\ curl -L -s "${WEBBUILD_DISTROQUERY_URL}?query=${REPSEARCHTEXT_FMT}&search_rolling=true&search_milestone2=true&search_milestone3=true&search_devel=true\
&search_i586=true&search_x86_64=true&search_arm=true&search_sources=true&query_compact=true&replyplain=true" | \ &search_i586=true&search_x86_64=true&search_arm=true&search_aarch64=true&search_sources=true&query_compact=true&replyplain=true" | \
sed "s| \(href=.\)/| \1${SITE_BASE_URL}/|g" sed "s| \(href=.\)/| \1${SITE_BASE_URL}/|g"
# $SUDO_WRAPPER 0 local "$USER" "" "autodist-repository search -i ${REPSEARCHTEXT/-/\-}" | \ # $SUDO_WRAPPER 0 local "$USER" "" "autodist-repository search -i ${REPSEARCHTEXT/-/\-}" | \
# parse_search_output ${AUTOPORT_ARCH[$ENVIRONMENT]} # parse_search_output ${AUTOPORT_ARCH[$ENVIRONMENT]}
@ -1067,7 +1067,7 @@ if [ "$REQUEST" = "prepare" -o "$REQUEST" = "updatespec" -o "$REQUEST" = "speccr
RET=$? RET=$?
;; ;;
"speccreate") if [ "$SPECCREATEURL" -a "$PACKAGE" ]; then "speccreate") if [ "$SPECCREATEURL" -a "$PACKAGE" ]; then
FOUND_EXISTING=`curl -L -s "${WEBBUILD_DISTROQUERY_URL}?package=$PACKAGE&search_milestone2=true&search_milestone3=true&search_devel=true&search_sources=true&query_compact=true&replyplain=true&searchbox=false"` FOUND_EXISTING=`curl -L -s "${WEBBUILD_DISTROQUERY_URL}?package=$PACKAGE&search_base=true&search_milestone2=true&search_milestone3=true&search_devel=true&search_sources=true&query_compact=true&replyplain=true&searchbox=false"`
if [ "$FOUND_EXISTING" != "" ]; then if [ "$FOUND_EXISTING" != "" ]; then
echo -n "<div align=left class=\"output\" id=outputtop style=\"font-family:serif;color:black;background-color:#E0F2D0;\">" echo -n "<div align=left class=\"output\" id=outputtop style=\"font-family:serif;color:black;background-color:#E0F2D0;\">"
echo "<b><font color=red>ERROR: package already exists, please update from appropriate version:</font><b>" echo "<b><font color=red>ERROR: package already exists, please update from appropriate version:</font><b>"
@ -1903,7 +1903,7 @@ $PACKAGE.spec $RPMFORCEADD && $AUTOSPEC_CMD -u $PACKAGE -a10 --server $SENDREPOS
fi fi
echo -ne "<br><pre>Patch$NEWPATCHNUM: $PACKAGE-${SPECVAR_Version}-$ADDPATCHNAME.patch</pre>" echo -ne "<br><pre>Patch$NEWPATCHNUM: $PACKAGE-${SPECVAR_Version}-$ADDPATCHNAME.patch</pre>"
echo -n "<font color=gold>2) in %prep section after %setup:</font><br>" echo -n "<font color=gold>2) in %prep section after %setup:</font><br>"
echo -ne "<br><pre>%patch$NEWPATCHNUM -p$l -b .${ADDPATCHNAME}</pre>" echo -ne "<br><pre>%patch $NEWPATCHNUM -p$l -b .${ADDPATCHNAME}</pre>"
RET=-1 RET=-1
} }
else else