Tags: help
----- Original Message -----
> Greetings.
>
> I have the ok from the Release Managers to consider this issue as RC
> for stretch. I'm going to wait at least one week before raising
> this to "serious".
>
> If you need help to fix this bug, please tag it as "help".
Actually some advice would be great, having had an initial look into
this one now. Patch below shows the basic split we'll need to make
the architecture independent packages generated separately, but I'm
not sure how to fit that split into the rest of the rules file (I get
the same sort of errors with a change like this in place no matter
what I try - maybe its obvious to someone more deb knowledgeable?).
Thanks!
--
Nathan
diff --git a/debian/rules b/debian/rules
index dccf619..44774a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -163,7 +163,20 @@ clean:
dh_autotools-dev_restoreconfig
dh_clean
-binary-indep:
+binary-indep: checkroot build-stamp
+ @echo "== dpkg-buildpackage: binary-indep" 1>&2
+ $(checkdir)
+ $(pkgpcp_import_sar) $(MAKE) -C src/sar2pcp install
+ $(pkgpcp_import_ganglia) $(MAKE) -C src/ganglia2pcp install
+ $(pkgpcp_import_mrtg) $(MAKE) -C src/mrtg2pcp install
+ $(pkgpcp_import_sheet) $(MAKE) -C src/sheet2pcp install
+ $(pkgpcp_import_iostat) $(MAKE) -C src/iostat2pcp install
+ dh_perl -p $(pcp_import_sar)
+ dh_perl -p $(pcp_import_ganglia)
+ dh_perl -p $(pcp_import_mrtg)
+ dh_perl -p $(pcp_import_sheet)
+ dh_perl -p $(pcp_import_iostat)
+ dh_installdeb
binary-arch: checkroot build-stamp
@echo "== dpkg-buildpackage: binary-arch" 1>&2
@@ -177,11 +190,6 @@ binary-arch: checkroot build-stamp
$(pkglibpcp_pmda_perl) $(MAKE) -C src/perl/PMDA install_perl
$(pkglibpcp_import_perl) $(MAKE) -C src/perl/LogImport install_perl
$(pkgpcp_logsummary_perl) $(MAKE) -C src/perl/LogSummary install_perl
- $(pkgpcp_import_sar) $(MAKE) -C src/sar2pcp install
- $(pkgpcp_import_ganglia) $(MAKE) -C src/ganglia2pcp install
- $(pkgpcp_import_mrtg) $(MAKE) -C src/mrtg2pcp install
- $(pkgpcp_import_sheet) $(MAKE) -C src/sheet2pcp install
- $(pkgpcp_import_iostat) $(MAKE) -C src/iostat2pcp install
$(pkgpcp_import_collectl) $(MAKE) -C src/collectl2pcp install
$(pkgpcp_export_graphite) $(MAKE) -C src/pcp2graphite install
$(pkgpcp_export_zabbix) $(MAKE) -C src/zabbix-agent install
@@ -237,11 +245,6 @@ binary-arch: checkroot build-stamp
dh_perl -p $(libpcp_pmda_perl)
dh_perl -p $(libpcp_import_perl)
dh_perl -p $(pcp_logsummary_perl)
- dh_perl -p $(pcp_import_sar)
- dh_perl -p $(pcp_import_ganglia)
- dh_perl -p $(pcp_import_mrtg)
- dh_perl -p $(pcp_import_sheet)
- dh_perl -p $(pcp_import_iostat)
dh_installdeb
dh_shlibdeps 2>/dev/null # qmake doesn't allow a library list
dh_gencontrol $(SUBSTVARS) 2>/dev/null # squash the python:Versions
warning
