From 92246206dc9b5120dcbb8b903576038941fc0a27 Mon Sep 17 00:00:00 2001 From: Silvan Date: Wed, 16 Aug 2023 18:38:48 +0200 Subject: [PATCH] Update repository from devel to base and other changes for devel to rolling distribution --- autodist-upstream-updates | 6 +++--- autoport | 4 ++-- autospec-conf | 6 +++--- etc/autodist/config | 18 +++++++----------- etc/cron.hourly/60-autodist-update | 2 +- etc/sysconfig/autoport | 4 ++-- telegram/openmamba_bot.py | 4 ++-- webbuild/webbuild-cgi | 10 +++++----- 8 files changed, 25 insertions(+), 29 deletions(-) diff --git a/autodist-upstream-updates b/autodist-upstream-updates index e0522ae..2fcbd84 100755 --- a/autodist-upstream-updates +++ b/autodist-upstream-updates @@ -1,7 +1,7 @@ #!/bin/bash # # autodist upstream updates - find upstream packages updates from different internet resources -# Copyright (c) 2004-2021 by Silvan Calarco +# Copyright (c) 2004-2023 by Silvan Calarco # #[ -r /etc/sysconfig/openmamba-central ] || { @@ -10,7 +10,7 @@ #} . /etc/autodist/config DISTROMATIC_PREFIX=/distribution/distromatic.html? -DISTROMATIC_REPOSITORY=devel +DISTROMATIC_REPOSITORY=base DISTDB=/etc/autodist/distdb BLACKLISTDB=/etc/autodist/blacklist DISTDBDIR=/etc/autodist/distdb.d @@ -36,7 +36,7 @@ function usage() echo " -s: skip fetching and parsing upstream updates" echo " -u: output not up-to-date packages only" 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 } diff --git a/autoport b/autoport index 0a5175b..6eea7ea 100755 --- a/autoport +++ b/autoport @@ -7,8 +7,8 @@ VERSION=1.2 BASE_ARCH=i586 -BASE_REPOSITORY=devel -PORT_REPOSITORY=devel +BASE_REPOSITORY=base +PORT_REPOSITORY=base . /etc/autodist/config diff --git a/autospec-conf b/autospec-conf index b12556a..3bce646 100644 --- a/autospec-conf +++ b/autospec-conf @@ -20,9 +20,9 @@ source_dir="/var/autodist/RPM/SOURCES" build_dir="/var/autodist/RPM/BUILD" tmppath_dir="/var/tmp/autodist" -ftp_alias[0]="devel" -ftpurl_ro_rpms[0]="ftp://ftp.openmamba.org/pub/openmamba/devel/RPMS.@arch@" -ftpurl_ro_srpms[0]="ftp://ftp.openmamba.org/pub/openmamba/devel/SRPMS.base" +ftp_alias[0]="base" +ftpurl_ro_rpms[0]="ftp://ftp.openmamba.org/pub/openmamba/base/RPMS.@arch@" +ftpurl_ro_srpms[0]="ftp://ftp.openmamba.org/pub/openmamba/base/SRPMS.base" ftp_rw_server[0]="ftp://ftp.openmamba.org" ftp_rw_port[0]= ftp_rw_passive_mode[0]=on diff --git a/etc/autodist/config b/etc/autodist/config index e8a3f30..24c881b 100644 --- a/etc/autodist/config +++ b/etc/autodist/config @@ -17,7 +17,7 @@ AUTOBUILD_SKIP_DAYS=28 AUTOBUILD_SUCCESS_DAYS=3 AUTODIST_REPOSITORY=devel-autodist 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_STAGEVARS="--define stage1=1" AUTOPORT_MAX_STEPS=10 @@ -27,26 +27,22 @@ AUTODIST_REBUILDOLD_FROMDATE=20090101 # # Set to disable autodist-repository and use local list # -WEBBUILD_REPOSITORIES=(devel devel-games devel-kernel devel-kde4 devel-xorg devel-gnome devel-makedist \ - devel-java devel-misc devel-autodist devel-future devel-past \ +WEBBUILD_REPOSITORIES=(base devel-kernel devel-makedist devel-misc devel-autodist devel-future devel-past \ milestone1 milestone1-updates milestone1-games milestone1-1.1 milestone1-makedist \ milestone2 milestone2-games milestone2-updates milestone2-kernel milestone2-kde4 \ milestone2-xorg milestone2-makedist milestone2-java \ - devel-contrib devel-silvan devel-stefano devel-aleph0 devel-skiver devel-fabiog devel-gil \ - devel-distservers devel-the_packagizers devel-ercolinux \ - devel-contrib-java devel-michiamophil milestone1-java milestone1-contrib) + milestone1-java milestone1-contrib) # # 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 \ -# devel-java devel-misc devel-autodist devel-future devel-past devel-embedded devel-silvan \ +#AUTODIST_REPOSITORIES_LOCAL_REPS=(base devel-kernel devel-makedist devel-misc devel-autodist \ +# devel-future devel-past \ # milestone3 milestone3-games milestone3-updates milestone3-makedist \ # milestone2 milestone2-games milestone2-updates milestone2-kernel milestone2-kde4 \ # milestone2-xorg milestone2-makedist milestone2-java milestone2-kernel-next \ # 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 \ -# devel-distservers devel-the_packagizers devel-ercolinux \ -# devel-contrib-java devel-michiamophil milestone1-java milestone1-contrib) +#AUTODIST_REPOSITORIES_REMOTE_REPS=(devel-contrib \ +# milestone1-java milestone1-contrib) #AUTODIST_REPOSITORIES_TRANSITIONAL_REP=devel-makedist #AUTODIST_REPOSITORIES_REMOTE_FTPUSER= #AUTODIST_REPOSITORIES_REMOTE_FTPPASS= diff --git a/etc/cron.hourly/60-autodist-update b/etc/cron.hourly/60-autodist-update index 7705882..630e08c 100755 --- a/etc/cron.hourly/60-autodist-update +++ b/etc/cron.hourly/60-autodist-update @@ -8,7 +8,7 @@ # FIXME: parametrize automaint call 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 for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do diff --git a/etc/sysconfig/autoport b/etc/sysconfig/autoport index 8f43e35..6b14d6e 100644 --- a/etc/sysconfig/autoport +++ b/etc/sysconfig/autoport @@ -12,8 +12,8 @@ AUTOPORT_UPDATE_NO_DISTROMATIC=1 #AUTOPORT_WEBBUILD_HOST=http://localhost/webbuild.html #ICECREAM_MONITOR_HOST=localhost -AUTOPORT_DEVEL_IMPORT_REPOSITORIES="devel-makedist devel devel-games devel-autodist devel-gnome \ -devel-kde4 devel-xorg devel-kernel devel-misc devel-java devel-future devel-past devel-contrib devel-contrib-java" +AUTOPORT_DEVEL_IMPORT_REPOSITORIES="devel-makedist base devel-autodist \ +devel-kernel devel-misc devel-future devel-past" AUTOPORT_DEVEL_RELEASE_REPOSITORIES="milestone2-makedist milestone2-kernel milestone2-kernel-next" diff --git a/telegram/openmamba_bot.py b/telegram/openmamba_bot.py index 859812a..32e40ac 100755 --- a/telegram/openmamba_bot.py +++ b/telegram/openmamba_bot.py @@ -3,7 +3,7 @@ # # openmamba bot for Telegram # -# Copyright (C) 2016-2022 by Silvan Calarco +# Copyright (C) 2016-2023 by Silvan Calarco # # GPL v3 license @@ -25,7 +25,7 @@ logger = logging.getLogger(__name__) timers = 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): diff --git a/webbuild/webbuild-cgi b/webbuild/webbuild-cgi index 01fc103..a8396d9 100755 --- a/webbuild/webbuild-cgi +++ b/webbuild/webbuild-cgi @@ -1,7 +1,7 @@ #!/bin/bash # # webbuild cgi script -# Copyright (c) 2012-2020 by Silvan Calarco +# Copyright (c) 2012-2023 by Silvan Calarco # . /usr/share/autodist/webbuild-functions . /usr/share/autodist/webbuild-functions-private @@ -481,8 +481,8 @@ if [ "$REQUEST" = "repsearch" ]; then echo -n "
Search results for \"$REPSEARCHTEXT\":
" # echo -n "
"
    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\
-&search_i586=true&search_x86_64=true&search_arm=true&search_sources=true&query_compact=true&replyplain=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_aarch64=true&search_sources=true&query_compact=true&replyplain=true" | \
    sed "s| \(href=.\)/| \1${SITE_BASE_URL}/|g"
 #   $SUDO_WRAPPER 0 local "$USER" "" "autodist-repository search -i ${REPSEARCHTEXT/-/\-}" | \
 #      parse_search_output ${AUTOPORT_ARCH[$ENVIRONMENT]}
@@ -1067,7 +1067,7 @@ if [ "$REQUEST" = "prepare" -o "$REQUEST" = "updatespec" -o "$REQUEST" = "speccr
                     RET=$?
                     ;;
       "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
                           echo -n "
"
                           echo "ERROR: package already exists, please update from appropriate version:"
@@ -1903,7 +1903,7 @@ $PACKAGE.spec $RPMFORCEADD && $AUTOSPEC_CMD -u $PACKAGE -a10 --server $SENDREPOS
                         fi
                         echo -ne "
Patch$NEWPATCHNUM:        $PACKAGE-${SPECVAR_Version}-$ADDPATCHNAME.patch
"
                         echo -n "2) in %prep section after %setup:
"
-                        echo -ne "
%patch$NEWPATCHNUM -p$l -b .${ADDPATCHNAME}
"
+                        echo -ne "
%patch $NEWPATCHNUM -p$l -b .${ADDPATCHNAME}
"
                         RET=-1
                      }
                   else