Ubuntu
haproxy package

Merge ~mirespace/ubuntu/+source/haproxy:backport-haproxy-focal-mirespace into ~canonical-server/ubuntu/+source/haproxy:backport-haproxy-focal

  1. Git
  2. lp:~mirespace/ubuntu/+source/haproxy
  3. backport-haproxy-focal-mirespace
  4. Merge into backport-haproxy-focal
Proposed by Miriam España Acebal
Status: Merged
Merged at revision: e70d3adaa5323dc06f745462dbb6064365808ac4
Proposed branch: ~mirespace/ubuntu/+source/haproxy:backport-haproxy-focal-mirespace
Merge into: ~canonical-server/ubuntu/+source/haproxy:backport-haproxy-focal
Diff against target: 24 lines (+2/-2)
1 file modified
debian/rules (+2/-2)
Reviewer Review Type Date Requested Status
Christian Ehrhardt  Approve
Canonical Server Pending
Review via email: mp+413341@code.launchpad.net

Description of the change

Hi,

building haproxy with a recipe has the following issue:
It applies all the patches to build the new source folder before
build the deb package, so in that new folder the debian/patches
folder is gone. In the auto install overriding, a patch that was
there is needed and breaksthe build (FTBFS).

I've been able to build the arm64 version for focal in this PPA:
ppa:mirespace/haproxy-build-recipe-arm64-focal

Please, take a look because maybe a proper place for store the
patch outside the d/p folder can be considered... thanks!

To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Generally LGTM as being the right approach for this problem.
But a few questions inline ...

review: Needs Information
Revision history for this message
Miriam España Acebal (mirespace) wrote :

I forgot to mention that I moved the patch that is applied during building outside the
debian/patches folder, because it is not used within the d/p/series file.

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

whitespace damage is gone, approving
+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/patches/debianize-dconv.patch b/debian/debianize-dconv.patch
2similarity index 100%
3rename from debian/patches/debianize-dconv.patch
4rename to debian/debianize-dconv.patch
5diff --git a/debian/rules b/debian/rules
6index 0aec5c9..39618bf 100755
7--- a/debian/rules
8+++ b/debian/rules
9@@ -66,13 +66,13 @@ override_dh_auto_build-arch:
10
11 override_dh_auto_build-indep:
12 # Build the HTML documentation, after patching dconv
13- patch -p1 < $(CURDIR)/debian/patches/debianize-dconv.patch
14+ patch -p1 < $(CURDIR)/debian/debianize-dconv.patch
15 for doc in intro configuration management; do \
16 python3 -B $(CURDIR)/debian/dconv/haproxy-dconv.py \
17 -i $(CURDIR)/doc/$${doc}.txt \
18 -o $(CURDIR)/doc/$${doc}.html ;\
19 done
20- patch -p1 -R < $(CURDIR)/debian/patches/debianize-dconv.patch
21+ patch -p1 -R < $(CURDIR)/debian/debianize-dconv.patch
22 $(MAKE) -C doc/lua-api html
23
24 override_dh_auto_clean:

Subscribers

People subscribed via source and target branches