4 Commits

Author SHA1 Message Date
9b43b0cf47 build: fix python frozen modules generation
The problem was due to duplicate modules present both in the base frozen
modules and also in the extra modules list file.

This commit should allow us to import gdb and pygments again.
2025-01-20 21:03:32 +02:00
1d6af45cac build: Build make build and make pack sequentially
Building multiple targets in parallel may cause docker race conditions.
2025-01-15 23:43:41 +02:00
a7efcb729e build: delete package dir before redownloading it 2025-01-15 23:43:41 +02:00
8baaffdcbf build: always download and extract tars
This caused failures in our ci-cd. Always downloading & extracting the
tars makes sure we will redownload them & extract if the previous
download / extraction was faulty.
2025-01-15 23:43:41 +02:00
3 changed files with 6 additions and 13 deletions

View File

@ -13,6 +13,8 @@ BUILD_PACKAGES_DIR := "build/packages"
.PHONY: clean help download_packages build build-docker-image $(ALL_TARGETS) $(ALL_PACK_TARGETS) .PHONY: clean help download_packages build build-docker-image $(ALL_TARGETS) $(ALL_PACK_TARGETS)
.NOTPARALLEL: build pack
help: help:
@echo "Usage:" @echo "Usage:"
@echo " make build" @echo " make build"

View File

@ -64,11 +64,6 @@ function download_package() {
local url="$1" local url="$1"
local output="$2" local output="$2"
if [[ -f "$output" ]]; then
>&2 echo "Skipping download: $output already exists"
return 0
fi
wget "$url" -O "$output" wget "$url" -O "$output"
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
>&2 echo "Error: failed to download $url" >&2 echo "Error: failed to download $url"
@ -98,11 +93,6 @@ function extract_package() {
return 1 return 1
fi fi
if [[ -d "$output_dir" ]]; then
>&2 echo "Skipping extraction: $output_dir already exists"
return 0
fi
pushd "$temp_dir" > /dev/null pushd "$temp_dir" > /dev/null
unpack_tarball "$tarball_realpath" unpack_tarball "$tarball_realpath"
@ -113,6 +103,10 @@ function extract_package() {
popd > /dev/null popd > /dev/null
# Make sure output dir is empty, so we could move content into it.
# The directory might not exist, so we need to pass || true so that set -e won't fail us.
rm -rf "$output_dir" || true
mv "$temp_dir/$package_dir" "$output_dir" mv "$temp_dir/$package_dir" "$output_dir"
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
return 1 return 1

View File

@ -1,4 +1,3 @@
abc
_aix_support _aix_support
antigravity antigravity
argparse argparse
@ -8,7 +7,6 @@ bdb
bisect bisect
calendar calendar
cmd cmd
codecs
codeop codeop
code code
<collections.**.*> <collections.**.*>
@ -54,7 +52,6 @@ hmac
imaplib imaplib
<importlib.**.*> <importlib.**.*>
inspect inspect
io
ipaddress ipaddress
<json.**.*> <json.**.*>
keyword keyword