summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorViacheslav Hletenko <v.gletenko@vyos.io>2026-06-10 15:21:22 +0300
committerGitHub <noreply@github.com>2026-06-10 15:21:22 +0300
commitec0afde14627494f5c92f0cef3cd9f6a0041342e (patch)
tree7034c961fc6e510ef19e3cee92537a4b1a39ec7c /scripts
parent705aa421028e37a5e1255a69b72eb6d6f1e66481 (diff)
parentc598a125544d27ebd1011086111bcba271eee161 (diff)
downloadvyos-build-ec0afde14627494f5c92f0cef3cd9f6a0041342e.tar.gz
vyos-build-ec0afde14627494f5c92f0cef3cd9f6a0041342e.zip
Merge pull request #1221 from c-po/salt-removal
salt: T8973: remove package build due to feature removal
Diffstat (limited to 'scripts')
-rw-r--r--scripts/package-build/salt/.gitignore1
l---------scripts/package-build/salt/build.py1
-rwxr-xr-xscripts/package-build/salt/build.sh76
-rw-r--r--scripts/package-build/salt/package.toml25
4 files changed, 0 insertions, 103 deletions
diff --git a/scripts/package-build/salt/.gitignore b/scripts/package-build/salt/.gitignore
deleted file mode 100644
index 5c783a52..00000000
--- a/scripts/package-build/salt/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/salt/
diff --git a/scripts/package-build/salt/build.py b/scripts/package-build/salt/build.py
deleted file mode 120000
index 3c76af73..00000000
--- a/scripts/package-build/salt/build.py
+++ /dev/null
@@ -1 +0,0 @@
-../build.py \ No newline at end of file
diff --git a/scripts/package-build/salt/build.sh b/scripts/package-build/salt/build.sh
deleted file mode 100755
index 70b3f73a..00000000
--- a/scripts/package-build/salt/build.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-
-# ==============================================================================
-# Script to build Salt (Onedir) for VyOS
-# ==============================================================================
-
-# Exit immediately on error
-set -e
-
-# Configuration
-ARCH=$(dpkg --print-architecture)
-
-# Uncomment SALT_REPO and ALT_VERSION variable to build Salt manually
-#SALT_REPO="https://github.com/saltstack/salt.git"
-#SALT_VERSION="v3006.19"
-TOOLS_REPO="https://github.com/saltstack/python-tools-scripts"
-
-# Check this page to find a correct relenv/python combination.
-# https://github.com/saltstack/relenv/releases
-RELENV_VERSION="0.22.3"
-RELENV_PYTHON_VERSION="3.11.14"
-
-# Specify the platform parameter, use x86_64 for amd64, arm64 for arm64
-if [ "${ARCH}" = "arm64" ]; then
- BUILD_ARCH=${ARCH}
-else
- BUILD_ARCH="x86_64"
-fi
-
-# Specify the Python version currently used by VyOS. This version will be used to specify the correct requirements list,
-# for example: requirements/static/pkg/py3.11/tools.tx
-PYTHON_VERSION="3.11"
-
-BUILD_DIR="salt"
-OUTPUT_DIR="$BUILD_DIR/artifacts"
-
-# Prepare Build Directory
-mkdir -p "$BUILD_DIR"
-cd "$BUILD_DIR"
-
-if [ ! -d "python-tools-scripts" ]; then
- git clone ${TOOLS_REPO}
-fi
-
-# Setup Python Build Environment
-echo "Setting up build virtual environment..."
-if [ ! -d "venv-build" ]; then
- python3 -m venv venv-build
-fi
-
-# Install Python build requirements
-echo "Installing Python build requirements..."
-venv-build/bin/python3 -m pip install --upgrade pip
-
-# Install all required build tools
-venv-build/bin/python3 -m pip install relenv build packaging jinja2 pyyaml msgpack-python python-tools-scripts ppbt setuptools tornado
-
-# Install repo-specific tools if found
-if [ -f "requirements/static/pkg/py${PYTHON_VERSION}/tools.txt" ]; then
- venv-build/bin/python3 -m pip install -r requirements/static/pkg/py${PYTHON_VERSION}/tools.txt
-fi
-
-# Build the package
-echo "Starting Build..."
-export PYTHONPATH=$PYTHONPATH:$(pwd)
-
-# The build script below handles fetching the correct runtime version.
-venv-build/bin/python3 -m tools.pkg.build deb
-
-# Example: tools pkg build deb --relenv-version=0.22.2 --python-version=3.10.19 --arch=x86_64
-venv-build/bin/tools pkg build deb --relenv-version=${RELENV_VERSION} --python-version=${RELENV_PYTHON_VERSION} --arch=${BUILD_ARCH}
-
-echo "List artifacts..."
-find ../ -name "*.deb"
-
-echo "Build finished successfully"
diff --git a/scripts/package-build/salt/package.toml b/scripts/package-build/salt/package.toml
deleted file mode 100644
index 9cdac168..00000000
--- a/scripts/package-build/salt/package.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-[[packages]]
-name = "salt"
-commit_id = "v3006.21"
-scm_url = "https://github.com/saltstack/salt.git"
-build_cmd = "cd ..; ./build.sh"
-
-[dependencies]
-packages = [
- "libssl-dev",
- "libffi-dev",
- "python3-dev",
- "python3-pip",
- "python3-venv",
- "patchelf",
- "fakeroot",
- "dpkg-dev",
- "cargo",
- "dh-make",
- "libgdbm-dev",
- "liblzma-dev",
- "libzmq3-dev",
- "patchelf",
- "pkg-config",
- "python3-venv"
-]