From 49b4d9f3ef11ec47cd9995c740ade420a052597e Mon Sep 17 00:00:00 2001 From: Gleb Chesnokov Date: Sun, 18 Oct 2026 13:00:13 +0300 Subject: [PATCH] scripts: Group release and packaging helpers under release/ Keep RPM artifact creation, archive generation, package release preparation and version updates in one directory. Switch all component archive targets, the top-level RPM target and the RPM workflow to the relocated helpers. Point archive generation at the shared source inventory in source/ while preserving its caller-directory semantics and the existing package inputs. --- .github/workflows/rpm.yml | 2 +- Makefile | 4 ++-- fcst/Makefile | 2 +- iscsi-scst/Makefile | 2 +- qla2x00t-32gbit/Makefile | 2 +- qla2x00t/Makefile | 2 +- scripts/{ => release}/build-rpm-artifacts | 0 scripts/{ => release}/generate-release-archive | 2 +- scripts/{ => release}/prepare-package-release | 0 scripts/{ => release}/update-version | 0 scst/Makefile | 2 +- scst_local/Makefile | 2 +- scstadmin/Makefile | 2 +- srpt/Makefile | 2 +- usr/events/Makefile | 2 +- usr/fileio/Makefile | 2 +- usr/stpgd/Makefile | 2 +- 17 files changed, 15 insertions(+), 15 deletions(-) rename scripts/{ => release}/build-rpm-artifacts (100%) rename scripts/{ => release}/generate-release-archive (91%) rename scripts/{ => release}/prepare-package-release (100%) rename scripts/{ => release}/update-version (100%) diff --git a/.github/workflows/rpm.yml b/.github/workflows/rpm.yml index 68bf5c105..0e9643b31 100644 --- a/.github/workflows/rpm.yml +++ b/.github/workflows/rpm.yml @@ -198,7 +198,7 @@ jobs: env: RPM_MATRIX: ${{ needs.prepare_matrix.outputs.rpm }} RELEASE_OUTPUT_DIR: ${{ runner.temp }}/master-package-release - run: bash scripts/prepare-package-release + run: bash scripts/release/prepare-package-release - name: Publish rolling master snapshot env: diff --git a/Makefile b/Makefile index f0dce7a1e..9279602df 100644 --- a/Makefile +++ b/Makefile @@ -497,7 +497,7 @@ rpm-artifacts: RPM_ARTIFACT_SOURCE_DIR="$(RPM_ARTIFACT_SOURCE_DIR)" \ RPM_ARTIFACT_OUTPUT_DIR="$(RPM_ARTIFACT_OUTPUT_DIR)" \ RPM_ARTIFACT_KERNEL_DEVEL_PACKAGE="$(RPM_ARTIFACT_KERNEL_DEVEL_PACKAGE)" \ - bash "$(CURDIR)/scripts/build-rpm-artifacts" + bash "$(CURDIR)/scripts/release/build-rpm-artifacts" docker-rpm-image: test -n "$(DOCKER_RPM_BASE_IMAGE)" @@ -590,7 +590,7 @@ dpkg: ../scst_$(VERSION).orig.tar.gz release-archive: $(MAKE) 2release - scripts/generate-release-archive scst "$(RELEASE_VERSION)" + scripts/release/generate-release-archive scst "$(RELEASE_VERSION)" md5sum ../scst-$(RELEASE_VERSION).tar.bz2 \ > ../scst-$(RELEASE_VERSION).tar.bz2.md5sum $(MAKE) 2debug diff --git a/fcst/Makefile b/fcst/Makefile index 4c7d241d5..a0652cf13 100644 --- a/fcst/Makefile +++ b/fcst/Makefile @@ -88,6 +88,6 @@ extraclean: clean rm -f *.orig *.rej release-archive: - ../scripts/generate-release-archive fcst "$$(sed -n 's/^#define[[:blank:]]FT_VERSION[[:blank:]]*\"\([^\"]*\)\".*/\1/p' fcst.h)" + ../scripts/release/generate-release-archive fcst "$$(sed -n 's/^#define[[:blank:]]FT_VERSION[[:blank:]]*\"\([^\"]*\)\".*/\1/p' fcst.h)" .PHONY: all install uninstall clean extraclean release-archive diff --git a/iscsi-scst/Makefile b/iscsi-scst/Makefile index 05388f096..70723b1b0 100644 --- a/iscsi-scst/Makefile +++ b/iscsi-scst/Makefile @@ -336,7 +336,7 @@ conftest/use_pre_440_wr_structure/result-$(KVER).txt: \ -DUSE_PRE_440_WR_STRUCTURE)" >"$@" release-archive: - ../scripts/generate-release-archive iscsi-scst "$$(sed -n 's/^#define[[:blank:]]ISCSI_VERSION_STRING[[:blank:]]*\"\([^\"]*\)\".*/\1/p' include/iscsi_scst_ver.h)" + ../scripts/release/generate-release-archive iscsi-scst "$$(sed -n 's/^#define[[:blank:]]ISCSI_VERSION_STRING[[:blank:]]*\"\([^\"]*\)\".*/\1/p' include/iscsi_scst_ver.h)" .PHONY: all mods progs install clean extraclean diff --git a/qla2x00t-32gbit/Makefile b/qla2x00t-32gbit/Makefile index 43d5f7ba5..9136f1863 100644 --- a/qla2x00t-32gbit/Makefile +++ b/qla2x00t-32gbit/Makefile @@ -79,4 +79,4 @@ extraclean: clean endif release-archive: - ../scripts/generate-release-archive qla2x00t-32gbit "$$(sed -n 's/^#define[[:blank:]]Q2T_VERSION_STRING[[:blank:]]*\"\([^\"]*\)\".*/\1/p' qla2x00-target/scst_qla2xxx.h)" + ../scripts/release/generate-release-archive qla2x00t-32gbit "$$(sed -n 's/^#define[[:blank:]]Q2T_VERSION_STRING[[:blank:]]*\"\([^\"]*\)\".*/\1/p' qla2x00-target/scst_qla2xxx.h)" diff --git a/qla2x00t/Makefile b/qla2x00t/Makefile index f7fb1b0c5..a2dabe731 100644 --- a/qla2x00t/Makefile +++ b/qla2x00t/Makefile @@ -77,4 +77,4 @@ extraclean: clean endif release-archive: - ../scripts/generate-release-archive qla2x00t "$$(sed -n 's/^#define[[:blank:]]Q2T_VERSION_STRING[[:blank:]]*\"\([^\"]*\)\".*/\1/p' qla2x00-target/qla2x00t.h)" + ../scripts/release/generate-release-archive qla2x00t "$$(sed -n 's/^#define[[:blank:]]Q2T_VERSION_STRING[[:blank:]]*\"\([^\"]*\)\".*/\1/p' qla2x00-target/qla2x00t.h)" diff --git a/scripts/build-rpm-artifacts b/scripts/release/build-rpm-artifacts similarity index 100% rename from scripts/build-rpm-artifacts rename to scripts/release/build-rpm-artifacts diff --git a/scripts/generate-release-archive b/scripts/release/generate-release-archive similarity index 91% rename from scripts/generate-release-archive rename to scripts/release/generate-release-archive index c94f1be48..c9a725cfb 100755 --- a/scripts/generate-release-archive +++ b/scripts/release/generate-release-archive @@ -16,7 +16,7 @@ name="$1"; shift version="$1"; shift files=("$@") if [ "${#files[@]}" -eq 0 ]; then - file_list="$("$scriptdir/source/list-source-files")" || exit $? + file_list="$("$scriptdir/../source/list-source-files")" || exit $? if [ -z "$file_list" ]; then echo "Error: no source files found." >&2 exit 1 diff --git a/scripts/prepare-package-release b/scripts/release/prepare-package-release similarity index 100% rename from scripts/prepare-package-release rename to scripts/release/prepare-package-release diff --git a/scripts/update-version b/scripts/release/update-version similarity index 100% rename from scripts/update-version rename to scripts/release/update-version diff --git a/scst/Makefile b/scst/Makefile index 2c7d58ffb..b93992cb1 100644 --- a/scst/Makefile +++ b/scst/Makefile @@ -60,7 +60,7 @@ clean extraclean: @$(call set_var,build_mode,BUILD_MODE,PERF) release-archive: - ../scripts/generate-release-archive scst \ + ../scripts/release/generate-release-archive scst \ "$$(sed -n 's/^#define[[:blank:]]SCST_VERSION_NAME[[:blank:]]*\"\([^\"]*\)\".*/\1/p' include/scst_const.h)" build_mode: diff --git a/scst_local/Makefile b/scst_local/Makefile index 56a6b9c7e..9135ee74f 100644 --- a/scst_local/Makefile +++ b/scst_local/Makefile @@ -58,7 +58,7 @@ extraclean: clean rm -f *.orig *.rej release-archive: - ../scripts/generate-release-archive scst_local "$$(sed -n 's/^#define[[:blank:]]SCST_LOCAL_VERSION[[:blank:]]*\"\([^\"]*\)\".*/\1/p' scst_local.c)" + ../scripts/release/generate-release-archive scst_local "$$(sed -n 's/^#define[[:blank:]]SCST_LOCAL_VERSION[[:blank:]]*\"\([^\"]*\)\".*/\1/p' scst_local.c)" .PHONY: all install uninstall clean extraclean diff --git a/scstadmin/Makefile b/scstadmin/Makefile index d37183da5..ffde092a1 100644 --- a/scstadmin/Makefile +++ b/scstadmin/Makefile @@ -181,6 +181,6 @@ extraclean: cd $(SCSTADMIN_DIR) && $(MAKE) $@ release-archive: - ../scripts/generate-release-archive scstadmin "$$(sed -n 's/^my \$$Version[[:blank:]]*=[[:blank:]]*'"'"'SCST Configurator v\([^'"'"']*\)'"'"'.*/\1/p' scstadmin.sysfs/scstadmin)" + ../scripts/release/generate-release-archive scstadmin "$$(sed -n 's/^my \$$Version[[:blank:]]*=[[:blank:]]*'"'"'SCST Configurator v\([^'"'"']*\)'"'"'.*/\1/p' scstadmin.sysfs/scstadmin)" .PHONY: all install uninstall perl-module clean distclean extraclean diff --git a/srpt/Makefile b/srpt/Makefile index f0e0d183c..14e58c993 100644 --- a/srpt/Makefile +++ b/srpt/Makefile @@ -339,7 +339,7 @@ conftest/use_pre_440_wr_structure/result-$(KVER).txt: \ -DUSE_PRE_440_WR_STRUCTURE)" >"$@" release-archive: - ../scripts/generate-release-archive srpt "$$(sed -n 's/^#define[[:blank:]]DRV_VERSION[[:blank:]]*\"\([^\"]*\)\".*/\1/p' src/ib_srpt.c)" + ../scripts/release/generate-release-archive srpt "$$(sed -n 's/^#define[[:blank:]]DRV_VERSION[[:blank:]]*\"\([^\"]*\)\".*/\1/p' src/ib_srpt.c)" kerneldoc.html: $(SRC_FILES) $(KDIR)/scripts/kernel-doc -html $(SRC_FILES) >$@ diff --git a/usr/events/Makefile b/usr/events/Makefile index 023b3a633..bb296ce77 100644 --- a/usr/events/Makefile +++ b/usr/events/Makefile @@ -84,6 +84,6 @@ extraclean: clean -$(MAKE) clean release-archive: - ../../scripts/generate-release-archive events "$$(sed -n 's/^#define[[:blank:]]VERSION_STR[[:blank:]]*\"\([^\"]*\)\".*/\1/p' ../include/version.h)" + ../../scripts/release/generate-release-archive events "$$(sed -n 's/^#define[[:blank:]]VERSION_STR[[:blank:]]*\"\([^\"]*\)\".*/\1/p' ../include/version.h)" .PHONY: all install uninstall clean extraclean 2release 2debug 2perf diff --git a/usr/fileio/Makefile b/usr/fileio/Makefile index a5135e372..7fe2e494c 100644 --- a/usr/fileio/Makefile +++ b/usr/fileio/Makefile @@ -106,6 +106,6 @@ extraclean: clean -$(MAKE) clean release-archive: - ../../scripts/generate-release-archive fileio_tgt "$$(sed -n 's/^#define[[:blank:]]VERSION_STR[[:blank:]]*\"\([^\"]*\)\".*/\1/p' ../include/version.h)" + ../../scripts/release/generate-release-archive fileio_tgt "$$(sed -n 's/^#define[[:blank:]]VERSION_STR[[:blank:]]*\"\([^\"]*\)\".*/\1/p' ../include/version.h)" .PHONY: all install uninstall clean extraclean 2release 2debug 2perf diff --git a/usr/stpgd/Makefile b/usr/stpgd/Makefile index 55dac703a..206e55b44 100644 --- a/usr/stpgd/Makefile +++ b/usr/stpgd/Makefile @@ -88,6 +88,6 @@ extraclean: clean -$(MAKE) clean release-archive: - ../../scripts/generate-release-archive stpgd "$$(sed -n 's/^#define[[:blank:]]VERSION_STR[[:blank:]]*\"\([^\"]*\)\".*/\1/p' ../include/version.h)" + ../../scripts/release/generate-release-archive stpgd "$$(sed -n 's/^#define[[:blank:]]VERSION_STR[[:blank:]]*\"\([^\"]*\)\".*/\1/p' ../include/version.h)" .PHONY: all install uninstall clean extraclean 2release 2debug 2perf