diff --git a/adoptium.py b/adoptium.py index 83694ce..a51a07d 100755 --- a/adoptium.py +++ b/adoptium.py @@ -118,25 +118,13 @@ if __name__ == "__main__": ], check=True) print("APT finished", flush=True) - # =================== YUM repos ========================== - # "$yum_sync" "${BASE_URL}/rpm/centos/@{os_ver}/@{arch}" 7 Adopitum x86_64,aarch64 "centos@{os_ver}-@{arch}" "$BASE_PATH/rpm" - sp.run([str(here/"yum-sync.py"), - BASE_URL+'/rpm/centos/@{os_ver}/@{arch}', - "--download-repodata", - '7', - 'Adoptium', - 'x86_64,aarch64', - "centos@{os_ver}-@{arch}", - f"{BASE_PATH}/rpm" - ], - check=True) # =================== YUM repos ========================== # "$yum_sync" "${BASE_URL}/rpm/rhel/@{os_ver}/@{arch}" 7-9 Adopitum x86_64,aarch64 "rhel@{os_ver}-@{arch}" "$BASE_PATH/rpm" sp.run([str(here/"yum-sync.py"), BASE_URL+'/rpm/rhel/@{os_ver}/@{arch}', "--download-repodata", - '7-9', + '9', 'Adoptium', 'x86_64,aarch64', "rhel@{os_ver}-@{arch}", diff --git a/apt-sync.py b/apt-sync.py index d010bb9..5005798 100755 --- a/apt-sync.py +++ b/apt-sync.py @@ -30,7 +30,7 @@ if USE_ADDR_FAMILY != '': OS_TEMPLATE = { 'ubuntu-lts': ["focal", "jammy", "noble"], - 'debian-current': ["buster", "bullseye", "bookworm"], + 'debian-current': ["bullseye", "bookworm"], 'debian-latest2': ["bullseye", "bookworm"], 'debian-latest': ["bookworm"], } diff --git a/chef.sh b/chef.sh index 51ab110..4fecbaf 100755 --- a/chef.sh +++ b/chef.sh @@ -13,7 +13,7 @@ YUM_PATH="${BASE_PATH}/yum/stable" APT_PATH="${BASE_PATH}/apt/stable" export REPO_SIZE_FILE=/tmp/reposize.$RANDOM -"$yum_sync" "${UPSTREAM}/yum/stable/el/@{os_ver}/@{arch}" 7 chef x86_64 "stable-el@{os_ver}-@{arch}" "$YUM_PATH" +"$yum_sync" "${UPSTREAM}/yum/stable/el/@{os_ver}/@{arch}" 9 chef x86_64 "stable-el@{os_ver}-@{arch}" "$YUM_PATH" echo "YUM finished" "$apt_sync" --delete "${UPSTREAM}/apt/stable" @ubuntu-lts,@debian-current main amd64,i386,aarch64 "$APT_PATH" diff --git a/erlang.sh b/erlang.sh index 4a6c02c..9ad1bdb 100755 --- a/erlang.sh +++ b/erlang.sh @@ -16,7 +16,7 @@ export REPO_SIZE_FILE=/tmp/reposize.$RANDOM # generate codenames for repos ubuntu_os=(jammy) -debian_os=(buster bullseye) +debian_os=(bullseye) deb_suffixes=( mongooseim-5 mongooseim-6 @@ -25,6 +25,7 @@ deb_suffixes=( esl-erlang-26 elixir-1.14 elixir-1.15 + elixir-1.16 ) function join_by { local IFS="$1"; shift; echo "$*"; } diff --git a/gitlab-ce.sh b/gitlab-ce.sh index a8ff348..7a211c0 100755 --- a/gitlab-ce.sh +++ b/gitlab-ce.sh @@ -15,7 +15,7 @@ UBUNTU_PATH="${BASE_PATH}/ubuntu/" DEBIAN_PATH="${BASE_PATH}/debian/" export REPO_SIZE_FILE=/tmp/reposize.$RANDOM -"$yum_sync" "${UPSTREAM}/el/@{os_ver}/@{arch}/" 7,9 "gitlab" x86_64 "el@{os_ver}" "$YUM_PATH" +"$yum_sync" "${UPSTREAM}/el/@{os_ver}/@{arch}/" 9 "gitlab" x86_64 "el@{os_ver}" "$YUM_PATH" echo "YUM finished" "$apt_sync" --delete "${UPSTREAM}/ubuntu" @ubuntu-lts main amd64,i386 "$UBUNTU_PATH" diff --git a/gitlab-runner.sh b/gitlab-runner.sh index 1547e40..818c324 100755 --- a/gitlab-runner.sh +++ b/gitlab-runner.sh @@ -15,7 +15,7 @@ UBUNTU_PATH="${BASE_PATH}/ubuntu/" DEBIAN_PATH="${BASE_PATH}/debian/" export REPO_SIZE_FILE=/tmp/reposize.$RANDOM -"$yum_sync" "${UPSTREAM}/el/@{os_ver}/@{arch}" 7,9 gitlab-runner x86_64,aarch64 "el@{os_ver}-@{arch}" "$YUM_PATH" +"$yum_sync" "${UPSTREAM}/el/@{os_ver}/@{arch}" 9 gitlab-runner x86_64,aarch64 "el@{os_ver}-@{arch}" "$YUM_PATH" echo "YUM finished" "$apt_sync" --delete "${UPSTREAM}/ubuntu" @ubuntu-lts main amd64,i386,arm64 "$UBUNTU_PATH" diff --git a/influxdata.sh b/influxdata.sh index f55c856..192eb62 100755 --- a/influxdata.sh +++ b/influxdata.sh @@ -27,7 +27,7 @@ echo "Debian/Ubuntu finished" # =================== YUM/DNF repos ========================== -"$yum_sync" "${BASE_URL}/rhel/@{os_ver}/@{arch}/stable/" 7 influxdata x86_64 "el@{os_ver}-@{arch}" "$YUM_PATH" +"$yum_sync" "${BASE_URL}/rhel/@{os_ver}/@{arch}/stable/" 9 influxdata x86_64 "el@{os_ver}-@{arch}" "$YUM_PATH" echo "YUM finished" "${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE --rm diff --git a/llvm-apt.sh b/llvm-apt.sh index 2cc05f6..5c57084 100755 --- a/llvm-apt.sh +++ b/llvm-apt.sh @@ -10,7 +10,7 @@ BASE_URL=${TUNASYNC_UPSTREAM_URL:-"https://apt.llvm.org"} export REPO_SIZE_FILE=/tmp/reposize.$RANDOM -for os in "jammy" "noble" "buster" "bullseye" "bookworm"; do +for os in "jammy" "noble" "bullseye" "bookworm"; do prefix=llvm-toolchain-$os "$apt_sync" --delete "$BASE_URL/$os" $prefix,$prefix-9,$prefix-10,$prefix-11,$prefix-12,$prefix-13,$prefix-14,$prefix-15,$prefix-16,$prefix-17,$prefix-18 main amd64,arm64 "$BASE_PATH/$os" done diff --git a/mongodb.sh b/mongodb.sh index 0513e1e..b715b5d 100755 --- a/mongodb.sh +++ b/mongodb.sh @@ -19,7 +19,7 @@ export REPO_SIZE_FILE=/tmp/reposize.$RANDOM components=$(printf ",%s" "${MONGO_VERSIONS[@]}") components=${components:1} -"$yum_sync" "${BASE_URL}/yum/redhat/@{os_ver}/mongodb-org/@{comp}/@{arch}/" 7,9 "$components" x86_64 "el@{os_ver}-@{comp}" "$YUM_PATH" +"$yum_sync" "${BASE_URL}/yum/redhat/@{os_ver}/mongodb-org/@{comp}/@{arch}/" 9 "$components" x86_64 "el@{os_ver}-@{comp}" "$YUM_PATH" pushd "${YUM_PATH}" for stable in el*-${STABLE_VERSION}; do # e.g. "el8" -> "el8-4.2" diff --git a/virtualbox.sh b/virtualbox.sh index 10e4093..b05a1ce 100755 --- a/virtualbox.sh +++ b/virtualbox.sh @@ -19,7 +19,7 @@ export REPO_SIZE_FILE=/tmp/reposize.$RANDOM # === download rhel packages ==== -"$yum_sync" "${BASE_URL}/rpm/el/@{os_ver}/@{arch}" 7 VirtualBox x86_64 "el@{os_ver}" "$YUM_PATH" +"$yum_sync" "${BASE_URL}/rpm/el/@{os_ver}/@{arch}" 9 VirtualBox x86_64 "el@{os_ver}" "$YUM_PATH" echo "YUM finished" # === download deb packages ====