rpms/osbuild-composer
8
0
Fork 2
Code Issues Pull Requests Releases Activity

Add AlmaLinux support patch

Browse Source 
Add AlmaLinux-Kitten support patch
This commit is contained in:
Eduard Abdullin 2025-04-09 02:44:30 +00:00 committed by root
commit 195229c76b
4 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -110,3 +110,4 @@
/osbuild-composer-134.tar.gz /osbuild-composer-134.tar.gz
/osbuild-composer-135.tar.gz /osbuild-composer-135.tar.gz
/osbuild-composer-136.tar.gz /osbuild-composer-136.tar.gz
/osbuild-composer-137.tar.gz

24
osbuild-composer.spec
View File

@ -8,11 +8,11 @@
%bcond_with relax_requires %bcond_with relax_requires
# The minimum required osbuild version # The minimum required osbuild version
%global min_osbuild_version 139 %global min_osbuild_version 142
%global goipath github.com/osbuild/osbuild-composer %global goipath github.com/osbuild/osbuild-composer
Version: 136 Version: 137
%gometa %gometa
@ -121,13 +121,6 @@ make man
# Build test binaries with `go test -c`, so that they can take advantage of # Build test binaries with `go test -c`, so that they can take advantage of
# golang's testing package. The golang rpm macros don't support building them # golang's testing package. The golang rpm macros don't support building them
# directly. Thus, do it manually, taking care to also include a build id. # directly. Thus, do it manually, taking care to also include a build id.
#
# On Fedora, also turn off go modules and set the path to the one into which
# the golang-* packages install source code.
%if 0%{?fedora}
export GO111MODULE=off
export GOPATH=%{gobuilddir}:%{gopath}
%endif
TEST_LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')" TEST_LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')"
@ -315,14 +308,12 @@ install -m 0644 -vp test/data/rhel-upgrade/* %{buildroot}%
%check %check
export GOFLAGS="-buildmode=pie" export GOFLAGS="-buildmode=pie"
%if 0%{?rhel} %if 0%{?rhel}
export GOFLAGS+=" -mod=vendor -tags=exclude_graphdriver_btrfs" export GOFLAGS+=" -tags=exclude_graphdriver_btrfs"
%endif
export GOPATH=$PWD/_build:%{gopath} export GOPATH=$PWD/_build:%{gopath}
# cd inside GOPATH, otherwise go with GO111MODULE=off ignores vendor directory # cd inside GOPATH, otherwise go with GO111MODULE=off ignores vendor directory
cd $PWD/_build/src/%{goipath} cd $PWD/_build/src/%{goipath}
%gotest ./...
%else
%gocheck
%endif
%post %post
%systemd_post osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket %systemd_post osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket
@ -477,10 +468,13 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif %endif
%changelog %changelog
* Fri Apr 04 2025 Eduard Abdullin <eabdullin@almalinux.org> - 136-1.alma.1 * Wed Apr 09 2025 Eduard Abdullin <eabdullin@almalinux.org> - 137-1.alma.1
- Add AlmaLinux support patch - Add AlmaLinux support patch
- Add AlmaLinux-Kitten support patch - Add AlmaLinux-Kitten support patch
* Thu Apr 03 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 137-1
- New upstream release
* Mon Mar 31 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 136-1 * Mon Mar 31 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 136-1
- New upstream release - New upstream release

2
sources
View File

@ -1 +1 @@
SHA512 (osbuild-composer-136.tar.gz) = 100f36779fbb02f2b00b5c78e89a8a2307957be5f5d04da721168b8e51a96408034564f1f4239449ef23d7df8d710e55bbada998c5bfe15d1cbd14dd23a515a2 SHA512 (osbuild-composer-137.tar.gz) = e26cf40aed1ffd67741fc13585973bd70cd987bc1243ce7c6e77214b3dd187e50f9b4e1bb28673eed59f46a5c27098787ea73e4fe06a5c53dd475bc2c28165f1

2
tests/unit-tests/run-unit-tests.sh
View File

@ -16,7 +16,7 @@ sudo dnf builddep -y osbuild-composer.spec
cd "${TMT_SOURCE_DIR}" cd "${TMT_SOURCE_DIR}"
# Extract the Source0 basename without extension # Extract the Source0 basename without extension
SRC_DIR=$(spectool --source 0 osbuild-composer.spec | sed 's/.\+\(osbuild-composer-[0-9]\+\)\.tar\.gz/\1/') SRC_DIR=$(spectool --source 0 osbuild-composer.spec | sed -E 's|.*/([^/]*)\.tar\.gz$|\1|')
# Move to the extracted sources directory (patches are applied by default) # Move to the extracted sources directory (patches are applied by default)
cd "${SRC_DIR}" cd "${SRC_DIR}"