diff mbox

[ovs-dev] openvswitch: FTBFS with dpkg-buildpackage.

Message ID 1482153374-10228-1-git-send-email-nic@opencloud.tech
State Accepted
Headers show

Commit Message

nickcooper-zhangtonghao Dec. 19, 2016, 1:16 p.m. UTC
The debian packages are ready. This patch fixes the
bug #831924 reported at debian bug tracking system.
With this patch, openvswitch-2.6.1 will be upload to
the Debian archive.  If we build the packages with
"dpkg-buildpackage --target binary-indep", an error
state arises. debian/rules should be modified so that
the build-indep and binary-indep target generates
the architecture independent packages. If there are
things not be handled properly,let me know.

Reported-at: https://people.debian.org/~lucas/logs/2016/07/20/openvswitch_2.5.1~pre+git20160626-2_unstable_archallonly.log
Signed-off-by: nickcooper-zhangtonghao <nic@opencloud.tech>
---
 debian/rules | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Ben Pfaff Dec. 23, 2016, 5:35 p.m. UTC | #1
On Mon, Dec 19, 2016 at 05:16:14AM -0800, nickcooper-zhangtonghao wrote:
> The debian packages are ready. This patch fixes the
> bug #831924 reported at debian bug tracking system.
> With this patch, openvswitch-2.6.1 will be upload to
> the Debian archive.  If we build the packages with
> "dpkg-buildpackage --target binary-indep", an error
> state arises. debian/rules should be modified so that
> the build-indep and binary-indep target generates
> the architecture independent packages. If there are
> things not be handled properly,let me know.
> 
> Reported-at: https://people.debian.org/~lucas/logs/2016/07/20/openvswitch_2.5.1~pre+git20160626-2_unstable_archallonly.log
> Signed-off-by: nickcooper-zhangtonghao <nic@opencloud.tech>

Thanks, applied to master and branch-2.6.
diff mbox

Patch

diff --git a/debian/rules b/debian/rules
index 4c34b07..12fb94a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,7 @@  override_dh_auto_clean:
 	rm -f python/ovs/*.pyc python/ovs/db/*.pyc
 	dh_auto_clean
 
-override_dh_install:
+override_dh_install-arch:
 	dh_install
 	# openvswitch-switch
 	cp debian/openvswitch-switch.template debian/openvswitch-switch/usr/share/openvswitch/switch/default.template
@@ -59,6 +59,9 @@  override_dh_install:
 	# ovn-central
 	cp debian/ovn-central.template debian/ovn-central/usr/share/ovn/central/default.template
 
+override_dh_install-indep:
+	dh_install
+
 	# openvswitch-datapath-source
 	cp debian/rules.modules debian/openvswitch-datapath-source/usr/src/modules/openvswitch-datapath/debian/rules
 	chmod 755 debian/openvswitch-datapath-source/usr/src/modules/openvswitch-datapath/debian/rules