public inbox for [email protected]  

help / color / mirror / Atom feed

From: Bradford Boyle <[email protected]>
To: Christoph Berg <[email protected]>
Cc: [email protected]
Subject: Re: vip-manager and vip-manager2 FTBFS
Date: Tue, 20 Aug 2024 23:21:21 -0700
Message-ID: <CAOMoQbQ4_6fkmfF3B=6VPerVSbGk4QCFUxgqhaF3Fhf+NPbc3A@mail.gmail.com> (raw)
In-Reply-To: <[email protected]>
References: <CAOMoQbRG3=vJNUm8W2fONx17FCiDUjQHOqOBaaOG2tic0xuk9Q@mail.gmail.com>
	<[email protected]>

Hi Christoph,

> The way to go is probably still patches for the respective etcd-client
> versions, and enabling them in debian/patches/series from
> generate-pgdg-source depending on the distribution targeted.

I've pushed my changes for vip-manager and vip-manager2 packages to
salsa and attached is patch for gnerate-pgdg-source that selectively
enable/disable the patches depending on the distributions. I have
manually tested the sed commands and that the resulting source package
builds on sid and bookworm.

As time permits, I would appreciate any reviews.

Thanks,
-- Bradford


Attachments:

  [application/octet-stream] 0001-vip-manager-Tweak-etcd-patches-for-older-dists.patch (1.1K, 2-0001-vip-manager-Tweak-etcd-patches-for-older-dists.patch)
  download | inline diff:
From ddbf345e2d9405fe6002324a82e33a9ee5c5e4c3 Mon Sep 17 00:00:00 2001
From: "Bradford D. Boyle" <[email protected]>
Date: Tue, 20 Aug 2024 23:03:47 -0700
Subject: [PATCH] vip-manager: Tweak etcd patches for older dists

---
 jenkins/generate-pgdg-source | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/jenkins/generate-pgdg-source b/jenkins/generate-pgdg-source
index 1ab5f8f..7b05f18 100755
--- a/jenkins/generate-pgdg-source
+++ b/jenkins/generate-pgdg-source
@@ -328,6 +328,19 @@ case $PACKAGE in
         TWEAK+=("Remove netip-port patch.")
         ;;
     esac
+    case ${distribution:-} in
+      bookworm|bullseye|nobel|mantic)
+        sed -i -e '/etcd-3.5-build-fixes.patch/d' debian/patches/series
+        TWEAK+=("Disable etcd-3.5-build-fixes patch.")
+    esac
+    ;;
+  vip-manager2)
+    case ${distribution:-} in
+      bookworm|bullseye|noble|mantic|jammy)
+        sed -i -e 's/etcd-3.5-build-fixes.patch/etcd-3.4-build-fixes.patch/' debian/patches/series
+        TWEAK+=("Switch etcd-3.4-build-fixes patch for etcd-3.5-build-fixes.")
+        ;;
+    esac
     ;;
 esac
 
-- 
2.46.0

view thread (4+ messages)  latest in thread

reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: [email protected]
  Cc: [email protected], [email protected]
  Subject: Re: vip-manager and vip-manager2 FTBFS
  In-Reply-To: <CAOMoQbQ4_6fkmfF3B=6VPerVSbGk4QCFUxgqhaF3Fhf+NPbc3A@mail.gmail.com>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox