aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTim Gardner <tim.gardner@canonical.com>2011-08-22 09:37:57 -0600
committerJohn Rigby <john.rigby@linaro.org>2011-11-16 14:26:02 -0700
commitaf88168450a8f2e09d7f935e30a7d78f471a1b0e (patch)
tree2b911cb5c80b3803ac29e84ec492807090f1014c /debian
parent926f2464b3ec53a9a13632297edb5ed4122853ed (diff)
downloadlinux-linaro-precise-af88168450a8f2e09d7f935e30a7d78f471a1b0e.tar.gz
UBUNTU: [Config] Simplify binary-udebs dependencies
binary-udebs are always dependent on binary-debs. Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Diffstat (limited to 'debian')
-rw-r--r--debian/rules.d/2-binary-arch.mk3
-rw-r--r--debian/rules.d/5-udebs.mk4
2 files changed, 4 insertions, 3 deletions
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 466c8a4d4ee..c58a426ec3a 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -409,9 +409,10 @@ binary-debs: binary-perarch $(stampdir)/stamp-flavours $(addprefix binary-,$(fla
build-arch-deps-$(do_flavour_image_package) += $(addprefix build-,$(flavours))
build-arch: $(build-arch-deps-true)
-binary-arch-deps-$(do_flavour_image_package) = binary-debs
ifeq ($(AUTOBUILD),)
binary-arch-deps-$(do_flavour_image_package) += binary-udebs
+else
+binary-arch-deps-$(do_flavour_image_package) = binary-debs
endif
binary-arch-deps-$(do_libc_dev_package) += binary-arch-headers
ifneq ($(do_common_headers_indep),true)
diff --git a/debian/rules.d/5-udebs.mk b/debian/rules.d/5-udebs.mk
index 24fbadffc8d..63583deb5b0 100644
--- a/debian/rules.d/5-udebs.mk
+++ b/debian/rules.d/5-udebs.mk
@@ -1,11 +1,11 @@
# Do udebs if not disabled in the arch-specific makefile
-binary-udebs: binary-debs debian/control
+binary-udebs: binary-debs
ifeq ($(disable_d_i),)
@$(MAKE) --no-print-directory -f $(DROOT)/rules DEBIAN=$(DEBIAN) \
do-binary-udebs
endif
-do-binary-udebs:
+do-binary-udebs: debian/control
dh_testdir
dh_testroot