Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

branch for 24.10.2 #804

Merged
merged 2 commits into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 38 additions & 38 deletions conf/build.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -330,14 +330,14 @@ iso-packages:
sources:
- name: openssl
repo: https://github.com/truenas/openssl
branch: stable/electriceel
branch: release/24.10.2
generate_version: false
predepscmd:
- "apt install -y wget xz-utils"
- "./pull.sh"
- name: kernel
repo: https://github.com/truenas/linux
branch: stable/electriceel
branch: release/24.10.2
batch_priority: 0
supports_ccache: true
env:
Expand Down Expand Up @@ -385,11 +385,11 @@ sources:
- "make -j$(nproc) bindeb-pkg"
- name: nfs4xdr_acl_tools
repo: https://github.com/truenas/nfs4xdr-acl-tools
branch: stable/electriceel
branch: release/24.10.2
- name: openzfs
repo: https://github.com/truenas/zfs
batch_priority: 0
branch: stable/electriceel
branch: release/24.10.2
env:
KVERS: "$(shell apt info linux-headers-truenas-production-amd64 | awk '/Source:/ { print $$2}' | sed 's/linux-//')"
KSRC: "/usr/src/linux-headers-$(KVERS)"
Expand Down Expand Up @@ -442,14 +442,14 @@ sources:
generate_version: false
- name: truenas_samba
repo: https://github.com/truenas/samba
branch: stable/electriceel
branch: release/24.10.2
generate_version: false
batch_priority: 0
explicit_deps:
- openzfs
- name: truenas_sssd
repo: https://github.com/truenas/sssd
branch: stable/electriceel
branch: release/24.10.2
generate_version: false
predepscmd:
- "apt install -y wget xz-utils systemd-dev truenas-samba"
Expand All @@ -458,7 +458,7 @@ sources:
- truenas_samba
- name: truenas_ipaclient
repo: https://github.com/truenas/freeipa
branch: stable/electriceel
branch: release/24.10.2
generate_version: false
predepscmd:
- "apt install -y pkg-config truenas-samba truenas-sssd"
Expand All @@ -470,19 +470,19 @@ sources:
- truenas_sssd
- name: avahi
repo: https://github.com/truenas/avahi
branch: stable/electriceel
branch: release/24.10.2
generate_version: false
- name: py_libzfs
repo: https://github.com/truenas/py-libzfs
branch: stable/electriceel
branch: release/24.10.2
explicit_deps:
- openzfs
- name: zettarepl
repo: https://github.com/truenas/zettarepl
branch: stable/electriceel
branch: release/24.10.2
- name: truenas_installer
repo: https://github.com/truenas/truenas-installer
branch: stable/electriceel
branch: release/24.10.2
- name: scst
repo: https://github.com/truenas/scst
generate_version: false
Expand All @@ -499,7 +499,7 @@ sources:
explicit_deps:
- kernel
- kernel-dbg
branch: stable/electriceel
branch: release/24.10.2
subpackages:
- name: scst-dbg
generate_version: false
Expand All @@ -522,7 +522,7 @@ sources:
- kernel-dbg
- name: truenas_binaries
repo: https://github.com/truenas/binaries
branch: stable/electriceel
branch: release/24.10.2
- name: truenas_webui
repo: https://github.com/truenas/webui
predepscmd:
Expand All @@ -532,54 +532,54 @@ sources:
- "yarn install --network-timeout 100000"
- "tar cvzf node_files.tgz node_modules/"
- "rm -rf node_modules"
branch: stable/electriceel
branch: release/24.10.2
- name: sedutil
repo: https://github.com/truenas/sedutil
branch: stable/electriceel
branch: release/24.10.2
- name: python_netsnmpagent
repo: https://github.com/truenas/python-netsnmpagent
branch: stable/electriceel
branch: release/24.10.2
- name: python_truenas_requirements
repo: https://github.com/truenas/python-truenas-requirements
branch: stable/electriceel
branch: release/24.10.2
- name: licenselib
repo: https://github.com/truenas/licenselib
branch: stable/electriceel
branch: release/24.10.2
- name: zectl
repo: https://github.com/truenas/zectl
branch: stable/electriceel
branch: release/24.10.2
predepscmd:
- "cp -a packaging/debian ."
deps_path: packaging/debian
explicit_deps:
- openzfs
- name: ixdiagnose
repo: https://github.com/truenas/ixdiagnose
branch: stable/electriceel
branch: release/24.10.2
- name: ixhardware
repo: https://github.com/truenas/ixhardware
branch: stable/electriceel
branch: release/24.10.2
- name: apps_validation
repo: https://github.com/truenas/apps_validation
branch: stable/electriceel
branch: release/24.10.2
- name: py_cryptit
repo: https://github.com/truenas/py-cryptit
branch: stable/electriceel
branch: release/24.10.2
- name: py_sgio
repo: https://github.com/truenas/py-sgio
branch: stable/electriceel
branch: release/24.10.2
- name: py_fenced
repo: https://github.com/truenas/py-fenced
branch: stable/electriceel
branch: release/24.10.2
- name: py_nvme
repo: https://github.com/truenas/py-nvme
branch: stable/electriceel
branch: release/24.10.2
- name: swagger
repo: https://github.com/truenas/swagger
branch: stable/electriceel
branch: release/24.10.2
- name: truenas
repo: https://github.com/truenas/middleware
branch: stable/electriceel
branch: release/24.10.2
subdir: debian
subpackages:
- name: middlewared
Expand All @@ -591,16 +591,16 @@ sources:
subdir: src/freenas
- name: truenas_api_client
repo: https://github.com/truenas/api_client
branch: stable/electriceel
branch: release/24.10.2
- name: truenas_verify
repo: https://github.com/truenas/truenas_verify
branch: stable/electriceel
branch: release/24.10.2
- name: midcli
repo: https://github.com/truenas/midcli
branch: stable/electriceel
branch: release/24.10.2
- name: grub2
repo: https://github.com/truenas/grub2
branch: stable/electriceel
branch: release/24.10.2
debian_fork: true
predepscmd:
- "apt install -y wget xz-utils"
Expand All @@ -611,7 +611,7 @@ sources:
batch_priority: 150
- name: parted
repo: https://github.com/truenas/parted
branch: stable/electriceel
branch: release/24.10.2
debian_fork: true
predepscmd:
- "apt install -y wget xz-utils"
Expand All @@ -620,20 +620,20 @@ sources:
generate_version: false
- name: rclone
repo: https://github.com/truenas/rclone
branch: stable/electriceel
branch: release/24.10.2
deoptions: nocheck
generate_version: false
- name: restic
repo: https://github.com/truenas/restic
branch: stable/electriceel
branch: release/24.10.2
deoptions: nocheck
generate_version: false
- name: py_sg3
repo: https://github.com/truenas/py-sg3
branch: stable/electriceel
branch: release/24.10.2
- name: smartmontools
repo: https://github.com/truenas/smartmontools
branch: master
branch: release/24.10.2
debian_fork: true
predepscmd:
- "apt install -y wget xz-utils"
Expand All @@ -642,7 +642,7 @@ sources:
generate_version: false
- name: python3
repo: https://github.com/truenas/python.git
branch: master
branch: release/24.10.2
deoptions: nocheck
generate_version: false
predepscmd:
Expand Down
2 changes: 1 addition & 1 deletion scale_build/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from datetime import datetime

IDENTITY_FILE_PATH_OVERRIDE_SUFFIX = '_OVERRIDE_IDENTITY_FILE_PATH'
_VERS = '24.10.3-MASTER'
_VERS = '24.10.2-MASTER'


def get_env_variable(key, _type, default_value=None):
Expand Down
Loading