diff --git a/CHANGELOG.md b/CHANGELOG.md index aea5977..c731b5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ -## 45drives-tools 4.0.52-1 +## 45drives-tools 4.0.53-1 -* added support for X4 \ No newline at end of file +* fix x4 dmap order \ No newline at end of file diff --git a/manifest.json b/manifest.json index 00da887..1f57b13 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "name": "45drives-tools", "title": "45drives-tools", "description": "cli tools for 45Drives server products", - "version": "4.0.52", + "version": "4.0.53", "build_number": "1", "stable": true, "author": "Brett Kelly ", @@ -28,8 +28,7 @@ "hdparm", "udev", "lsscsi", - "python3-pyudev", - "mpi3mr-dkms" + "python3-pyudev" ], "rocky_common": [ "ipmitool", @@ -40,8 +39,7 @@ "pciutils", "hdparm", "lsscsi", - "python3-pyudev", - "mpi3mr-dkms" + "python3-pyudev" ] }, "builds": [ @@ -82,7 +80,7 @@ ], "changelog": { "urgency": "medium", - "version": "4.0.52", + "version": "4.0.53", "build_number": "1", "date": null, "packager": "Brett Kelly ", diff --git a/packaging/bionic/changelog b/packaging/bionic/changelog deleted file mode 100644 index 6374631..0000000 --- a/packaging/bionic/changelog +++ /dev/null @@ -1,229 +0,0 @@ -45drives-tools (2.0.8-6bionic) bionic; urgency=medium - - * released to 45drives stable repo - * added support for 9600 series HBA cards - * lspci is used over storcli64 to determine HBA card model (9305-16i vs 9305-24i - for example) - * added the mpi3mr dependency for ubuntu, as this driver is not built into the - kernel - * 45drives-tools > 2.0.8 is no longer supported for centos7 and ubuntu-bionic - - -- Mark Hooper Wed, 06 Jul 2022 09:55:54 -0300 - -45drives-tools (2.0.8-5bionic) bionic; urgency=medium - - * updated pci.ids file to report 9405W-16i cards accurately - * updated the hba adapter reported in server_identifier for 9405W-16i cards - - -- Mark Hooper Thu, 30 Jun 2022 10:41:20 -0300 - -45drives-tools (2.0.8-4bionic) bionic; urgency=medium - - * updated postrm script - - -- Mark Hooper Wed, 29 Jun 2022 13:52:21 -0300 - -45drives-tools (2.0.8-3bionic) bionic; urgency=medium - - * added /opt/45drives/tools/pci.ids file for use by lspci when detecting HBA cards - - -- Mark Hooper Wed, 29 Jun 2022 13:15:55 -0300 - -45drives-tools (2.0.8-2bionic) bionic; urgency=medium - - * modified how hba cards are detected using lspci - - -- Mark Hooper Fri, 24 Jun 2022 09:35:59 -0300 - -45drives-tools (2.0.8-1bionic) bionic; urgency=medium - - * added support for 9600-24i and 9600-16i hba cards - - -- Mark Hooper Thu, 23 Jun 2022 11:50:44 -0300 - -45drives-tools (2.0.7-1bionic) bionic; urgency=medium - - * updated virtual machine behavior for server_identifier - - -- Mark Hooper Tue, 17 May 2022 12:18:55 -0300 - -45drives-tools (2.0.6-5bionic) bionic; urgency=medium - - * updated how bus addresses for hba cards are handled in server_identifier - * added support for H12 motherboards - - -- Mark Hooper Wed, 04 May 2022 08:25:49 -0300 - -45drives-tools (2.0.6-4bionic) bionic; urgency=medium - - * added support for Destroyinator servers in dmap, server_identifier and lsdev - - -- Mark Hooper Thu, 28 Apr 2022 12:16:30 -0300 - -45drives-tools (2.0.6-3bionic) bionic; urgency=medium - - * dmap will find and replace the udev rules path in 68-vdev.rules. - * lsdev will tell user to run as root when invoking smartctl. - * updated the smartctl timeout values in lsdev. - - -- Mark Hooper Mon, 04 Apr 2022 11:58:05 -0300 - -45drives-tools (2.0.6-2bionic) bionic; urgency=medium - - * added support for Destroyinator servers in dmap, server_identifier and lsdev - - -- Mark Hooper Wed, 23 Feb 2022 06:43:44 -0400 - -45drives-tools (2.0.6-1bionic) bionic; urgency=medium - - * added support for 2U Stornado - - -- Mark Hooper Wed, 16 Feb 2022 10:15:13 -0400 - -45drives-tools (2.0.5-4bionic) bionic; urgency=medium - - * bugfix for missing smart_status key in lsdev - - -- Mark Hooper Mon, 24 Jan 2022 09:29:03 -0400 - -45drives-tools (2.0.5-3bionic) bionic; urgency=medium - - * bugfix for lsdev when invoking smartctl - - -- Mark Hooper Thu, 13 Jan 2022 10:51:14 -0400 - -45drives-tools (2.0.5-2bionic) bionic; urgency=medium - - * added -d command line argument to generate-osd-vars.sh - - -- Mark Hooper Fri, 26 Nov 2021 09:43:04 -0400 - -45drives-tools (2.0.5-1bionic) bionic; urgency=medium - - * Fixed bug in wipedev where `wipedev -a` skipped slot 1-1 - - -- Joshua Boudreau Wed, 24 Nov 2021 11:03:45 -0400 - -45drives-tools (2.0.4-3bionic) bionic; urgency=medium - - * updated server_identifier to store the controller id of hba cards - * updated lsdev to be able to read temperatures from SAS drives using smartctl - - -- Mark Hooper Wed, 10 Nov 2021 09:09:21 -0400 - -45drives-tools (2.0.4-2bionic) bionic; urgency=medium - - * updated server_identifier to ensure that bus addresses for HBA cards provided - by dmidecode are present in /sys/bus/pci/devices - - -- Mark Hooper Wed, 13 Oct 2021 10:31:32 -0300 - -45drives-tools (2.0.4-1bionic) bionic; urgency=medium - - * simplified generate-osd-vars.sh to be hardware agnostic - - -- Mark Hooper Thu, 07 Oct 2021 10:24:54 -0300 - -45drives-tools (2.0.3-12bionic) bionic; urgency=medium - - * removed systemd-udev dependency - - -- Mark Hooper Fri, 10 Sep 2021 08:55:42 -0300 - -45drives-tools (2.0.3-11bionic) bionic; urgency=medium - - * fixed typo in dmap udev path from last patch - - -- Mark Hooper Fri, 10 Sep 2021 07:48:58 -0300 - -45drives-tools (2.0.3-10bionic) bionic; urgency=medium - - * added packaging for Ubuntu bionic - - -- Mark Hooper Wed, 08 Sep 2021 09:55:39 -0300 - -45drives-tools (2.0.3-9bionic) bionic; urgency=medium - - * removed the preinst script for bionic and reverted postrm - - -- Mark Hooper Wed, 08 Sep 2021 09:37:08 -0300 - -45drives-tools (2.0.3-8bionic) bionic; urgency=medium - - * pushing an update to auto build - - -- Mark Hooper Wed, 08 Sep 2021 09:34:40 -0300 - -45drives-tools (2.0.3-7bionic) bionic; urgency=medium - - * adding preferences file to bionic install - - -- Mark Hooper Wed, 08 Sep 2021 08:29:34 -0300 - -45drives-tools (2.0.3-6bionic) bionic; urgency=medium - - * trying to get specific dependency for smartmontools - - -- Mark Hooper Wed, 08 Sep 2021 07:01:23 -0300 - -45drives-tools (2.0.3-5bionic) bionic; urgency=medium - - * added dep smartmontools (7.0-0ubuntu1~ubuntu18.04.1) - - -- Mark Hooper Wed, 08 Sep 2021 06:53:13 -0300 - -45drives-tools (2.0.3-4bionic) bionic; urgency=medium - - * changed format of Depends in bionic control file - - -- Mark Hooper Wed, 08 Sep 2021 06:22:10 -0300 - -45drives-tools (2.0.3-3bionic) bionic; urgency=medium - - * updated bionic dependencies to require smartmontools from bionic-backports - - -- Mark Hooper Wed, 08 Sep 2021 06:15:39 -0300 - -45drives-tools (2.0.3-2bionic) bionic; urgency=medium - - * updated dmap to look to rules files in /bin/udev if /usr/bin/udev is not found - * added udev as a dependency - * removed hard path of /usr/bin/cp from dmap - - -- Mark Hooper Tue, 07 Sep 2021 13:27:22 -0300 - -45drives-tools (2.0.3-1bionic) bionic; urgency=medium - - * created a package for 45drives-tools for Ubuntu (bionic) - - -- Mark Hooper Tue, 07 Sep 2021 11:13:34 -0300 - -45drives-tools (2.0.2-13bionic) bionic; urgency=medium - - * exported DEB_BUILD_OPTIONS to append nostrip - - -- Mark Hooper Tue, 07 Sep 2021 11:10:52 -0300 - -45drives-tools (2.0.2-12bionic) bionic; urgency=medium - - * override dh_dwz make target - - -- Mark Hooper Tue, 07 Sep 2021 10:44:17 -0300 - -45drives-tools (2.0.2-11bionic) bionic; urgency=medium - - * third build for Ubuntu Bionic - - -- Mark Hooper Tue, 07 Sep 2021 08:04:26 -0300 - -45drives-tools (2.0.2-10bionic) bionic; urgency=medium - - * second build for Ubuntu bionic - - -- Mark Hooper Tue, 07 Sep 2021 08:00:11 -0300 - -45drives-tools (2.0.2-9bionic) bionic; urgency=medium - - * added autopackaging for Ubuntu bionic - - -- Mark Hooper Tue, 07 Sep 2021 07:37:14 -0300 \ No newline at end of file diff --git a/packaging/bionic/control b/packaging/bionic/control deleted file mode 100644 index d9bdb6a..0000000 --- a/packaging/bionic/control +++ /dev/null @@ -1,12 +0,0 @@ -Source: ::package_name:: -Section: ::package_category:: -Priority: ::package_priority:: -Maintainer: ::package_author:: -Build-Depends: debhelper-compat (= 12) -Standards-Version: 4.4.1 -Homepage: ::package_url:: - -Package: ::package_name:: -Architecture: ::package_architecture_deb:: -Depends: ::package_dependencies_deb:: -Description: ::package_description_short:: diff --git a/packaging/bionic/copyright b/packaging/bionic/copyright deleted file mode 100644 index de01342..0000000 --- a/packaging/bionic/copyright +++ /dev/null @@ -1,23 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: ::package_name:: -Upstream-Contact: ::package_author:: -Source: ::package_url:: - -Files: * -Copyright: 2021 Mark Hooper -License: GPL-3.0+ - -License: GPL-3.0+ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with the Onboard package. If not, please have a look at - /usr/share/common-licenses or . diff --git a/packaging/bionic/postrm b/packaging/bionic/postrm deleted file mode 100644 index cfb71b4..0000000 --- a/packaging/bionic/postrm +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -if [ "$1" == "remove" ] || [ "$1" == "purge" ]; then - rm -rf /opt/45drives/tools - rm -rf /etc/45drives/server_info - rm -rf /opt/45drives/dalias - rm -f /usr/bin/cephfs-dir-stats - rm -f /usr/bin/dmap - rm -f /usr/bin/findosd - rm -f /usr/bin/lsdev - rm -f /usr/bin/server_identifier - rm -f /usr/bin/zcreate - rm -f /usr/bin/dalias - rm -f /usr/bin/wipedev - rmdir /etc/45drives --ignore-fail-on-non-empty - rmdir /opt/45drives --ignore-fail-on-non-empty -fi diff --git a/packaging/bionic/rules b/packaging/bionic/rules deleted file mode 100755 index 871d655..0000000 --- a/packaging/bionic/rules +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. -#export DH_VERBOSE = 1 - - -# see FEATURE AREAS in dpkg-buildflags(1) -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all - -# see ENVIRONMENT in dpkg-buildflags(1) -# package maintainers to append CFLAGS -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - -export TOOLS_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ':' | sed "s/^\s*\([^a-zA-Z]\+\).*/\1/") -export DEB_BUILD_OPTIONS := $(DEB_BUILD_OPTIONS) nostrip - -%: - dh $@ - - -# dh_make generated override targets -# This is example for Cmake (See https://bugs.debian.org/641051 ) -#override_dh_auto_configure: -# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) diff --git a/packaging/bionic/source/format b/packaging/bionic/source/format deleted file mode 100644 index d3827e7..0000000 --- a/packaging/bionic/source/format +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/packaging/debian-bookworm/changelog b/packaging/debian-bookworm/changelog index e215982..7935d2f 100644 --- a/packaging/debian-bookworm/changelog +++ b/packaging/debian-bookworm/changelog @@ -1,3 +1,15 @@ +45drives-tools (4.0.53-1bookworm) bookworm; urgency=medium + + * fix x4 dmap order + + -- Rachit Hans Fri, 25 Sep 2026 09:19:42 -0300 + +45drives-tools (4.0.52-2bookworm) bookworm; urgency=medium + + * Change mpi3mr-dkms from dependency to recommends + + -- Joshua Boudreau Fri, 25 Sep 2026 08:38:38 -0300 + 45drives-tools (4.0.52-1bookworm) bookworm; urgency=medium * added support for X4 diff --git a/packaging/debian-bookworm/control.j2 b/packaging/debian-bookworm/control.j2 index 357f791..f190cee 100644 --- a/packaging/debian-bookworm/control.j2 +++ b/packaging/debian-bookworm/control.j2 @@ -10,4 +10,5 @@ Vcs-Git: {{ git_url }} Package: {{ name }} Architecture: {{ architecture.ubuntu }} Depends: {{ dependencies.ubuntu_common | join(',') }} +Recommends: mpi3mr-dkms Description: {{ description }} diff --git a/packaging/debian-trixie/changelog b/packaging/debian-trixie/changelog index ee30f7a..c1ce2e9 100644 --- a/packaging/debian-trixie/changelog +++ b/packaging/debian-trixie/changelog @@ -1,3 +1,15 @@ +45drives-tools (4.0.53-1trixie) trixie; urgency=medium + + * fix x4 dmap order + + -- Rachit Hans Fri, 25 Sep 2026 09:19:42 -0300 + +45drives-tools (4.0.52-2trixie) trixie; urgency=medium + + * Change mpi3mr-dkms from dependency to recommends + + -- Joshua Boudreau Fri, 25 Sep 2026 08:38:38 -0300 + 45drives-tools (4.0.52-1trixie) trixie; urgency=medium * added support for X4 diff --git a/packaging/debian-trixie/control.j2 b/packaging/debian-trixie/control.j2 index 357f791..f190cee 100644 --- a/packaging/debian-trixie/control.j2 +++ b/packaging/debian-trixie/control.j2 @@ -10,4 +10,5 @@ Vcs-Git: {{ git_url }} Package: {{ name }} Architecture: {{ architecture.ubuntu }} Depends: {{ dependencies.ubuntu_common | join(',') }} +Recommends: mpi3mr-dkms Description: {{ description }} diff --git a/packaging/rocky-el8/main.spec.j2 b/packaging/rocky-el8/main.spec.j2 index 447b6d7..251aa41 100644 --- a/packaging/rocky-el8/main.spec.j2 +++ b/packaging/rocky-el8/main.spec.j2 @@ -10,6 +10,7 @@ URL: {{ git_url }} Source0: %{name}-%{version}.tar.gz BuildArch: {{ architecture.rocky }} Requires: {{ dependencies.rocky_common | join(',') }} +Recommends: mpi3mr-dkms BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -77,6 +78,10 @@ fi /usr/lib/udev/rules.d/* %changelog +* Fri Sep 25 2026 Rachit Hans 4.0.53-1 +- fix x4 dmap order +* Fri Sep 25 2026 Joshua Boudreau 4.0.52-2 +- Change mpi3mr-dkms from dependency to recommends * Fri Aug 28 2026 Rachit Hans 4.0.52-1 - added support for X4 * Tue Aug 25 2026 Jordan Keough 4.0.51-2 diff --git a/packaging/rocky-el9/main.spec.j2 b/packaging/rocky-el9/main.spec.j2 index 441e53e..33e56e5 100644 --- a/packaging/rocky-el9/main.spec.j2 +++ b/packaging/rocky-el9/main.spec.j2 @@ -10,6 +10,7 @@ URL: {{ git_url }} Source0: %{name}-%{version}.tar.gz BuildArch: {{ architecture.rocky }} Requires: {{ dependencies.rocky_common | join(',') }} +Recommends: mpi3mr-dkms BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -77,6 +78,10 @@ fi /usr/lib/udev/rules.d/* %changelog +* Fri Sep 25 2026 Rachit Hans 4.0.53-1 +- fix x4 dmap order +* Fri Sep 25 2026 Joshua Boudreau 4.0.52-2 +- Change mpi3mr-dkms from dependency to recommends * Fri Aug 28 2026 Rachit Hans 4.0.52-1 - added support for X4 * Tue Aug 25 2026 Jordan Keough 4.0.51-2 diff --git a/packaging/ubuntu-focal/changelog b/packaging/ubuntu-focal/changelog index 373d208..7c3d614 100644 --- a/packaging/ubuntu-focal/changelog +++ b/packaging/ubuntu-focal/changelog @@ -1,3 +1,15 @@ +45drives-tools (4.0.53-1focal) focal; urgency=medium + + * fix x4 dmap order + + -- Rachit Hans Fri, 25 Sep 2026 09:19:42 -0300 + +45drives-tools (4.0.52-2focal) focal; urgency=medium + + * Change mpi3mr-dkms from dependency to recommends + + -- Joshua Boudreau Fri, 25 Sep 2026 08:38:38 -0300 + 45drives-tools (4.0.52-1focal) focal; urgency=medium * added support for X4 diff --git a/packaging/ubuntu-focal/control.j2 b/packaging/ubuntu-focal/control.j2 index 357f791..f190cee 100644 --- a/packaging/ubuntu-focal/control.j2 +++ b/packaging/ubuntu-focal/control.j2 @@ -10,4 +10,5 @@ Vcs-Git: {{ git_url }} Package: {{ name }} Architecture: {{ architecture.ubuntu }} Depends: {{ dependencies.ubuntu_common | join(',') }} +Recommends: mpi3mr-dkms Description: {{ description }} diff --git a/packaging/ubuntu-jammy/changelog b/packaging/ubuntu-jammy/changelog index dba89bf..a55ddc9 100644 --- a/packaging/ubuntu-jammy/changelog +++ b/packaging/ubuntu-jammy/changelog @@ -1,3 +1,15 @@ +45drives-tools (4.0.53-1jammy) jammy; urgency=medium + + * fix x4 dmap order + + -- Rachit Hans Fri, 25 Sep 2026 09:19:42 -0300 + +45drives-tools (4.0.52-2jammy) jammy; urgency=medium + + * Change mpi3mr-dkms from dependency to recommends + + -- Joshua Boudreau Fri, 25 Sep 2026 08:38:38 -0300 + 45drives-tools (4.0.52-1jammy) jammy; urgency=medium * added support for X4 diff --git a/packaging/ubuntu-jammy/control.j2 b/packaging/ubuntu-jammy/control.j2 index 357f791..f190cee 100644 --- a/packaging/ubuntu-jammy/control.j2 +++ b/packaging/ubuntu-jammy/control.j2 @@ -10,4 +10,5 @@ Vcs-Git: {{ git_url }} Package: {{ name }} Architecture: {{ architecture.ubuntu }} Depends: {{ dependencies.ubuntu_common | join(',') }} +Recommends: mpi3mr-dkms Description: {{ description }} diff --git a/tools/dmap b/tools/dmap index 382c0c2..3985e42 100755 --- a/tools/dmap +++ b/tools/dmap @@ -923,15 +923,15 @@ def sata_controller_has_ata_ports(pci_addr, ports): # Desc: HomeLab X4 - 4 bay unit on the ASRock B860I WiFi board. # The board exposes 8 ATA ports on a single onboard SATA controller # (e.g. 0000:80:17.0) but only ports 5-8 are wired to the drive bays, -# and they map to bays in ascending order: -# bay 1-1 -> ata5, 1-2 -> ata6, 1-3 -> ata7, 1-4 -> ata8 -# This differs from the HL4 (which uses ports 1-4 in descending order), -# so this is kept separate from alias_hl4(). +# and they map to bays in descending order: +# bay 1-1 -> ata8, 1-2 -> ata7, 1-3 -> ata6, 1-4 -> ata5 +# This differs from the HL4 (which uses ports 4-1), so this is kept +# separate from alias_hl4(). ############################################################################### def alias_x4(server=None): vdev_id_str = "" - # Bay 1..4 -> ATA port 5..8 (confirmed against B860I WiFi hardware) - x4_order = [5, 6, 7, 8] + # Bay 1..4 -> ATA port 8..5 (confirmed against B860I WiFi hardware) + x4_order = [8, 7, 6, 5] # Guard against future X4 board revisions with a different SATA topology. # Fail loudly rather than silently emitting aliases for the wrong ports.