This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
osmith gerrit-no-reply at lists.osmocom.orgosmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/22217 ) Change subject: OBS: conflict: generate conflicting rpm too ...................................................................... OBS: conflict: generate conflicting rpm too Related: OS#4733 Change-Id: Ifac815574758668172b0a7bb089585ce5a17b9e3 --- M scripts/common-obs-conflict.sh 1 file changed, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/17/22217/1 diff --git a/scripts/common-obs-conflict.sh b/scripts/common-obs-conflict.sh index ecd21c7..a4fc98d 100644 --- a/scripts/common-obs-conflict.sh +++ b/scripts/common-obs-conflict.sh @@ -79,6 +79,40 @@ cd "$oldpwd" } +# Create the conflicting package for rpm (e.g. contrib/osmocom-nightly.spec.in). The remaining +# placeholders are replaced in osmo_obs_add_rpm_spec(). +# +# $1: name of dummy package (e.g. "osmocom-nightly") +# $2-*: name of conflicting packages (e.g. "osmocom-latest") +osmo_obs_prepare_conflict_rpm() { + local pkgname="$1" + shift + local spec_in="contrib/$pkgname.spec.in" + + mkdir -p contrib + + cat << EOF > "$spec_in" +Name: $pkgname +Version: @VERSION@ +Release: 0 +Summary: Dummy package, which conflicts with: $@ +License: AGPL-3.0-or-later +Group: Hardware/Mobile +Source: @SOURCE@ +EOF + + for i in "$@"; do + echo "Conflicts: $i" >> "$spec_in" + done + + cat << EOF >> "$spec_in" +%description +Dummy package, which conflicts with: $@ +%files +EOF + +} + # Create conflicting packages # $1: name of dummy package (e.g. "osmocom-nightly") # $2-*: name of conflicting packages (e.g. "osmocom-latest") @@ -90,6 +124,7 @@ cd "$pkgname" osmo_obs_prepare_conflict_deb "$@" + osmo_obs_prepare_conflict_rpm "$@" # Put in git repository git init . -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ifac815574758668172b0a7bb089585ce5a17b9e3 Gerrit-Change-Number: 22217 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith at sysmocom.de> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210115/957a6b30/attachment.htm>