Merge pull request #104 from mcattamoredhat/fix-cs-rust-dep

build: update Makefile and spec with cs9/cs10 rust dependencies

Author: say-paul

.packit.yaml

@@ -25,6 +25,7 @@ actions:
   create-archive:
   - "cargo vendor vendor"
   # Create archive with version for spec compatibility
+  - bash -c "tar -cJf greenboot-rs-${PACKIT_PROJECT_VERSION}-vendor-patched.tar.xz vendor"
   - bash -c "git archive --prefix=greenboot-rs-${PACKIT_PROJECT_VERSION}/ --format=tar HEAD > greenboot-rs-${PACKIT_PROJECT_VERSION}.tar"
   - bash -c "tar -xvf greenboot-rs-${PACKIT_PROJECT_VERSION}.tar"
   - bash -c "tar -czf greenboot-rs-${PACKIT_PROJECT_VERSION}.tar.gz greenboot-rs-${PACKIT_PROJECT_VERSION}"
@@ -48,5 +49,7 @@ jobs:
   - centos-stream-10-x86_64
   - fedora-development-aarch64
   - fedora-development
+  - fedora-eln-aarch64
+  - fedora-eln
 
 

Makefile

@@ -1,13 +1,30 @@
 RELEASE ?= 0
 TARGETDIR ?= target
 SRCDIR ?= .
+VENDOR ?= false
 VERSION = $(shell grep -oP '^Version:\s+\K\S+' greenboot-rs.spec)
 COMMIT = $(shell (cd "$(SRCDIR)" && git rev-parse --short HEAD))
 TIMESTAMP = $(shell date +%Y%m%d%H%M%S)
+PLATFORMS = $(shell (echo {x86_64,aarch64,powerpc64le,s390x}-unknown-linux-gnu))
+GREENBOOT_RUST_DEPENDENCIES = rust-anyhow+default-devel \
+				rust-clap+derive-devel \
+				rust-clap+default-devel \
+				rust-config+default-devel \
+				rust-env_logger+default-devel \
+				rust-glob+default-devel \
+				rust-log+default-devel \
+				rust-nix+default-devel \
+				rust-once_cell+default-devel \
+				rust-pretty_env_logger+default-devel \
+				rust-serde+default-devel \
+				rust-serde_json+default-devel \
+				rust-tempfile+default-devel \
+				rust-thiserror+default-devel
 
 # Create unique filenames with version+commit for build isolation
 RPM_SPECFILE=rpmbuild/SPECS/greenboot-rs-$(VERSION)-$(COMMIT).spec
 RPM_TARBALL=rpmbuild/SOURCES/greenboot-rs-$(VERSION).tar.gz
+VENDOR_TARBALL=greenboot-rs-$(VERSION)-vendor-patched.tar.xz
 
 ifeq ($(RELEASE),1)
 	PROFILE ?= release
@@ -25,10 +42,38 @@ $(RPM_SPECFILE):
 	# Copy spec file as-is, no modifications - let the existing release string be used
 	cp greenboot-rs.spec $(RPM_SPECFILE)
 
-$(RPM_TARBALL):
+$(VENDOR_TARBALL): vendor
+	tar cJf $(VENDOR_TARBALL) vendor; \
+	rm -rf .cargo vendor; \
+
+.PHONY: vendor-tarball
+vendor-tarball: $(VENDOR_TARBALL)
+
+.PHONY: vendor
+vendor:
+	vendor_filterer_cmd=$$(command -v cargo-vendor-filterer||:) \
+	[ -z "$$vendor_filterer_cmd" ] || rm -f $${vendor_filterer_cmd}; \
+	. /etc/os-release; \
+	if [ "$$ID" = "fedora" ]; then \
+		sudo dnf install -y pkgconf-pkg-config openssl-devel; \
+	fi; \
+	cargo install --quiet cargo-vendor-filterer@0.5.16; \
+	for platform in $(PLATFORMS); do  \
+		args+="--platform $${platform} "; \
+	done; \
+	# https://issues.redhat.com/browse/RHEL-65521 \
+	args+="--exclude-crate-path idna#tests "; \
+	rm -rf vendor; \
+	mkdir -p .cargo; \
+	cargo vendor-filterer $${args} > ./.cargo/config.toml; \
+
+RPM_VENDOR_TARBALL=rpmbuild/SOURCES/greenboot-rs-$(VERSION)-vendor-patched.tar.xz
+
+$(RPM_TARBALL): $(VENDOR_TARBALL)
 	mkdir -p $(CURDIR)/rpmbuild/SOURCES
 	# Create tarball with directory name matching spec file expectations: greenboot-rs-<version>/
 	git archive --prefix=greenboot-rs-$(VERSION)/ --format=tar.gz HEAD > $(RPM_TARBALL)
+	mv $(VENDOR_TARBALL) $(RPM_VENDOR_TARBALL);
 
 .PHONY: build
 build:
@@ -52,6 +97,10 @@ srpm: $(RPM_SPECFILE) $(RPM_TARBALL)
 
 .PHONY: rpm
 rpm: $(RPM_SPECFILE) $(RPM_TARBALL)
+	. /etc/os-release; \
+	if [ "$$ID" = "fedora" ]; then \
+		sudo dnf install -y $(GREENBOOT_RUST_DEPENDENCIES); \
+	fi; \
 	rpmbuild -bb $(RPM_SPECFILE) \
 		--define "_topdir $(CURDIR)/rpmbuild" \
 		--define "_sourcedir $(CURDIR)/rpmbuild/SOURCES" \

greenboot-rs.spec

@@ -6,16 +6,21 @@
 
 Name:		greenboot-rs
 Version:	0.16.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Generic Health Check Framework for systemd
 # Aggregated license of statically linked dependencies as per %%cargo_license_summary
 License:	BSD-3-Clause AND ISC AND MIT AND Unicode-DFS-2016 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Unlicense OR MIT)
 URL:		https://github.com/fedora-iot/greenboot-rs
 Source0:	%{url}/releases/download/%{version}/%{name}-%{version}.tar.gz
+Source1:	%{name}-%{version}-vendor-patched.tar.xz
 
 ExcludeArch:	%{ix86}
 
+%if 0%{?eln} || 0%{?centos} || 0%{?rhel}
+BuildRequires:	rust-toolset
+%else
 BuildRequires:	cargo-rpm-macros
+%endif
 BuildRequires:	systemd-rpm-macros
 
 
@@ -51,17 +56,25 @@ Requires:	jq
 This package adds some default healthchecks for greenboot.
 
 %prep
+%if 0%{?eln} || 0%{?centos} || 0%{?rhel}
+%autosetup -p1 -a1 -n %{name}-%{version}
+%cargo_prep -v vendor
+%else
 %autosetup -n %{name}-%{version}
 %cargo_prep
-
 %generate_buildrequires
 %cargo_generate_buildrequires
+%endif
 
 %build
 %cargo_build
 %{cargo_license_summary}
 %{cargo_license} > LICENSE.dependencies
 
+%if 0%{?centos}
+%cargo_vendor_manifest
+%endif
+
 %install
 mkdir -p %{buildroot}%{_libexecdir}
 mkdir -p %{buildroot}%{_libexecdir}/%{pkgname}
@@ -132,6 +145,9 @@ install -DpZm 0644 usr/lib/systemd/system/greenboot-healthcheck.service.d/10-net
 %{_unitdir}/greenboot-healthcheck.service.d/10-network-online.conf
 
 %changelog
+* Mon Sep 01 2025 Mario Cattamo <mcattamo@redhat.com> - 0.16.0-5
+- Handle vendor packages in Centos-Stream
+
 * Mon Aug 25 2025 Sayan Paul <saypaul@redhat.com> - 0.16.0-4
 - Adhering to rust packaging best practices
 

tests/greenboot-bootc-anaconda-iso.sh

@@ -38,7 +38,6 @@ case "${ID}-${VERSION_ID}" in
         BIB_URL="quay.io/centos-bootc/bootc-image-builder:latest"
         BOOT_ARGS="uefi"
         sudo dnf install -y rpmbuild rust-packaging
-        sudo dnf install -y rust-anyhow+default-devel rust-clap+derive-devel rust-clap+default-devel rust-clap_derive-devel rust-config+default-devel rust-config-devel rust-env_logger+default-devel rust-env_logger-devel rust-glob+default-devel rust-glob-devel rust-log+default-devel rust-log-devel rust-nix+default-devel rust-nix-devel rust-once_cell+default-devel rust-once_cell-devel rust-pretty_env_logger+default-devel rust-pretty_env_logger-devel rust-serde+default-devel rust-serde-devel rust-serde_json+default-devel rust-serde_json-devel rust-tempfile+default-devel rust-tempfile-devel rust-thiserror+default-devel rust-thiserror-devel
         ;;
     "centos-10")
         OS_VARIANT="centos-stream9"

tests/greenboot-bootc-qcow2.sh

@@ -38,7 +38,6 @@ case "${ID}-${VERSION_ID}" in
         BIB_URL="quay.io/centos-bootc/bootc-image-builder:latest"
         BOOT_ARGS="uefi"
         sudo dnf install -y rpmbuild rust-packaging
-        sudo dnf install -y rust-anyhow+default-devel rust-clap+derive-devel rust-clap+default-devel rust-clap_derive-devel rust-config+default-devel rust-config-devel rust-env_logger+default-devel rust-env_logger-devel rust-glob+default-devel rust-glob-devel rust-log+default-devel rust-log-devel rust-nix+default-devel rust-nix-devel rust-once_cell+default-devel rust-once_cell-devel rust-pretty_env_logger+default-devel rust-pretty_env_logger-devel rust-serde+default-devel rust-serde-devel rust-serde_json+default-devel rust-serde_json-devel rust-tempfile+default-devel rust-tempfile-devel rust-thiserror+default-devel rust-thiserror-devel
         ;;
     "centos-10")
         OS_VARIANT="centos-stream9"