|
 |
ac3a84 |
From 16f2d0c4a25a717a9a0b49903a55db1263156055 Mon Sep 17 00:00:00 2001
|
|
|
4295f9 |
From: Frantisek Sumsal <frantisek@sumsal.cz>
|
|
|
4295f9 |
Date: Wed, 9 Jun 2021 15:23:59 +0200
|
|
|
4295f9 |
Subject: [PATCH] ci: reconfigure Packit for RHEL 9
|
|
|
4295f9 |
|
|
|
ac3a84 |
Related: #2138081
|
|
|
4295f9 |
rhel-only
|
|
|
4295f9 |
---
|
|
|
ac3a84 |
.packit.yml | 12 ++++++------
|
|
|
ac3a84 |
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
4295f9 |
|
|
|
4295f9 |
diff --git a/.packit.yml b/.packit.yml
|
|
|
ac3a84 |
index a7502b25b4..d0eebab181 100644
|
|
|
4295f9 |
--- a/.packit.yml
|
|
|
4295f9 |
+++ b/.packit.yml
|
|
|
ac3a84 |
@@ -17,14 +17,12 @@ srpm_build_deps: []
|
|
|
4295f9 |
|
|
|
4295f9 |
actions:
|
|
|
4295f9 |
post-upstream-clone:
|
|
|
4295f9 |
- # Use the Fedora Rawhide specfile
|
|
|
4295f9 |
- - "git clone https://src.fedoraproject.org/rpms/systemd .packit_rpm --depth=1"
|
|
|
4295f9 |
+ # Use the CentOS Stream specfile
|
|
|
4295f9 |
+ - "git clone https://gitlab.com/redhat/centos-stream/rpms/systemd.git .packit_rpm --depth=1"
|
|
|
4295f9 |
# Drop the "sources" file so rebase-helper doesn't think we're a dist-git
|
|
|
4295f9 |
- "rm -fv .packit_rpm/sources"
|
|
|
4295f9 |
- # Drop backported patches from the specfile, but keep the downstream-only ones
|
|
|
ac3a84 |
- # - Patch(0000-0499): backported patches from upstream
|
|
|
4295f9 |
- # - Patch0500-9999: downstream-only patches
|
|
|
ac3a84 |
- - "sed -ri '/^Patch(0[0-4]?[0-9]{0,2})?\\:.+\\.patch/d' .packit_rpm/systemd.spec"
|
|
|
4295f9 |
+ # Drop all patches, since they're already included in the tarball
|
|
|
4295f9 |
+ - "sed -ri '/^Patch[0-9]+:/d' .packit_rpm/systemd.spec"
|
|
|
4295f9 |
# Build the RPM with --werror. Even though --werror doesn't work in all
|
|
|
4295f9 |
# cases (see [0]), we can't use -Dc_args=/-Dcpp_args= here because of the
|
|
|
4295f9 |
# RPM hardening macros, that use $CFLAGS/$CPPFLAGS (see [1]).
|
|
|
ac3a84 |
@@ -33,7 +31,9 @@ actions:
|
|
|
4295f9 |
# [1] https://github.com/systemd/systemd/pull/18908#issuecomment-792250110
|
|
|
4295f9 |
- 'sed -i "/^CONFIGURE_OPTS=(/a--werror" .packit_rpm/systemd.spec'
|
|
|
4295f9 |
|
|
|
4295f9 |
+# Available targets can be listed via `copr-cli list-chroots`
|
|
|
4295f9 |
jobs:
|
|
|
4295f9 |
+# Build test
|
|
|
4295f9 |
- job: copr_build
|
|
|
4295f9 |
trigger: pull_request
|
|
|
4295f9 |
metadata:
|