heartbeat

Author SHA1 Message Date

Author	SHA1	Message	Date
Michael Prokop	404c886721	MT#9617 Apply debian-changes patch as sipwise-debian-changes.patch As identified via the according binary build of https://jenkins.mgm.sipwise.com/job/heartbeat-sources/ build number 206 all the Makefiles get rebuilt if we don't apply the debian-changes that has been used so far (see e.g. working builds like #208 and #211). Without this patch we get: \| [...] \| missing --run aclocal-1.7 \| [....] \| missing --run automake-1.7 \| [...] \| missing --run autoconf \| [...] \| /bin/bash ./config.status --recheck \| [...] \| configure: creating ./config.status \| [...] \| /bin/bash ./config.status Makefile \| config.status: creating Makefile during the build process (tools like aclocal-1.7 and automake-1.7 aren't even available at all). The resulting heartbeat binary doesn't use /usr/lib64 in its library path then, therefore failing with: \| /usr/lib64/heartbeat/heartbeat: error while loading shared libraries: libstonith.so.1: cannot open shared object file: No such file or directory One possible workaround for this would be to run: \| echo /usr/lib64 > /etc/ld.so.conf.d/heartbeat.conf; ldconfig but to avoid possible further hidden problems with this let's apply sipwise-debian-changes.patch. This patch is the result of actually using the source from \| dget -u http://archive.debian.org/debian/pool/main/h/heartbeat/heartbeat_2.1.3-6lenny4.dsc as its base since the very beginning of this repository. dpkg-source automatically recorded those changes for us as debian-changes file (see commit id `f94588851c`). We want to be able to have a clean repository state for a decent workflow with git and quilt. Therefore instead of using this patch implicitly, make this patch an explicit one.	12 years ago
Alexander Lutay	f15f7fe24e	MT#7505 Add .gitreview file for heartbeat	12 years ago
Michael Prokop	f94588851c	add single-debian-patch to debian/source/options Debian/squeeze's dpkg-source automatically commits changes: \| dpkg-source: info: local changes stored in source/debian/patches/debian-changes-2.1.3-7~sipwise3+0~20130624111524.76+wheezy~1.gbp21dd0b, the modified files are: whereas that's no longer true for Debian/wheezy: \| dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/heartbeat-2_2.1.3-7~sipwise3+0~20130708093100.78+wheezy~1.gbp21dd0b.diff.n4aEQk \| dpkg-source: info: you can integrate the local changes with dpkg-source --commit In heartbeat_2.1.3.orig.tar.gz (md5: bca53530a3802f7677772323047405cd) the debian/ directory was present already and some changes to it as well as changes to upstream code (sic!) have been part of heartbeat_2.1.3-8.diff.gz then. Let's automatically commit those changes through dpkg-source instead of manually adding them to a debian/patches/ patch, at least until it can be easily resolved through a new upstream version instead of rewriting upstream branch/tag history. Addressing build error https://jenkins.mgm.sipwise.com/job/heartbeat-source/78/console	13 years ago

Michael Prokop

MT#9617 Apply debian-changes patch as sipwise-debian-changes.patch

As identified via the according binary build of
https://jenkins.mgm.sipwise.com/job/heartbeat-sources/ build
number 206 all the Makefiles get rebuilt if we don't apply the
debian-changes that has been used so far (see e.g. working builds
like #208 and #211).

Without this patch we get:

| [...]
| missing --run aclocal-1.7
| [....]
| missing --run automake-1.7
| [...]
| missing --run autoconf
| [...]
| /bin/bash ./config.status --recheck
| [...]
| configure: creating ./config.status
| [...]
| /bin/bash ./config.status Makefile
| config.status: creating Makefile

during the build process (tools like aclocal-1.7 and automake-1.7
aren't even available at all). The resulting heartbeat binary
doesn't use /usr/lib64 in its library path then, therefore
failing with:

| /usr/lib64/heartbeat/heartbeat: error while loading shared libraries: libstonith.so.1: cannot open shared object file: No such file or directory

One possible workaround for this would be to run:

| echo /usr/lib64 > /etc/ld.so.conf.d/heartbeat.conf; ldconfig

but to avoid possible further hidden problems with this let's
apply sipwise-debian-changes.patch. This patch is the
result of actually using the source from

| dget -u http://archive.debian.org/debian/pool/main/h/heartbeat/heartbeat_2.1.3-6lenny4.dsc

as its base since the very beginning of this repository.
dpkg-source automatically recorded those changes for us as
debian-changes file (see commit id f94588851c). We
want to be able to have a clean repository state for a decent
workflow with git and quilt.  Therefore instead of using this
patch implicitly, make this patch an explicit one.

Alexander Lutay

f15f7fe24e

MT#7505 Add .gitreview file for heartbeat

Michael Prokop

f94588851c

add single-debian-patch to debian/source/options

Debian/squeeze's dpkg-source automatically commits changes:

| dpkg-source: info: local changes stored in source/debian/patches/debian-changes-2.1.3-7~sipwise3+0~20130624111524.76+wheezy~1.gbp21dd0b, the modified files are:

whereas that's no longer true for Debian/wheezy:

| dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/heartbeat-2_2.1.3-7~sipwise3+0~20130708093100.78+wheezy~1.gbp21dd0b.diff.n4aEQk
| dpkg-source: info: you can integrate the local changes with dpkg-source --commit

In heartbeat_2.1.3.orig.tar.gz (md5: bca53530a3802f7677772323047405cd)
the debian/ directory was present already and some *changes* to
it as well as changes to upstream code (sic!) have been part of
heartbeat_2.1.3-8.diff.gz then.

Let's automatically commit those changes through dpkg-source instead
of manually adding them to a debian/patches/ patch, at least
until it can be easily resolved through a new upstream version
instead of rewriting upstream branch/tag history.

Addressing build error https://jenkins.mgm.sipwise.com/job/heartbeat-source/78/console

3 Commits (mr7.3.1)