allow modules to be turned off

Signed-off-by: John Rigby <john.rigby@linaro.org>

5 files changed, 11 insertions, 29 deletions

diff --git a/debian.linaro/rules.d/arm64.mk b/debian.linaro/rules.d/arm64.mk
index 3aec006bfee..59d3873c12a 100644
--- a/debian.linaro/rules.d/arm64.mk
+++ b/debian.linaro/rules.d/arm64.mk
@@ -18,3 +18,5 @@ disable_d_i	= true
 do_complete_flavour_headers	= true
 do_timestamp_version	= true
 skipconfig	= true
+modules_target =
+modules_install_target =
diff --git a/debian.linaro/rules.d/armel.mk b/debian.linaro/rules.d/armel.mk
index e658587ad6a..bbb8b243827 100644
--- a/debian.linaro/rules.d/armel.mk
+++ b/debian.linaro/rules.d/armel.mk
@@ -15,3 +15,5 @@ disable_d_i	= true
 do_complete_flavour_headers	= true
 do_timestamp_version	= true
 skipconfig	= true
+modules_target = modules
+modules_install_target = modules_install
diff --git a/debian.linaro/rules.d/armhf.mk b/debian.linaro/rules.d/armhf.mk
index 49c9572a55e..8c778c19515 100644
--- a/debian.linaro/rules.d/armhf.mk
+++ b/debian.linaro/rules.d/armhf.mk
@@ -18,3 +18,5 @@ disable_d_i	= true
 do_complete_flavour_headers	= true
 do_timestamp_version	= true
 skipconfig	= true
+modules_target = modules
+modules_install_target = modules_install
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 1dfe74248e7..f306ecea106 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -39,7 +39,7 @@ build-%: $(stampdir)/stamp-build-%
 $(stampdir)/stamp-build-%: target_flavour = $*
 $(stampdir)/stamp-build-%: $(stampdir)/stamp-prepare-%
 	@echo Debug: $@
-	$(build_cd) $(kmake) $(build_O) $(conc_level) $(build_image) modules dtbs
+	$(build_cd) $(kmake) $(build_O) $(conc_level) $(build_image) $(modules_target) dtbs
 	@touch $@
 
 # Install the finished build
@@ -89,7 +89,7 @@ ifeq ($(no_dumpfile),)
 	chmod 0600 $(pkgdir)/boot/vmcoreinfo-$(abi_release)-$*
 endif
 
-	$(build_cd) $(kmake) $(build_O) $(conc_level) modules_install \
+	$(build_cd) $(kmake) $(build_O) $(conc_level) $(modules_install_target) \
 		INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=$(pkgdir)/ \
 		INSTALL_FW_PATH=$(pkgdir)/lib/firmware/$(abi_release)-$*
 
@@ -175,7 +175,7 @@ ifneq ($(skipdbg),true)
 	# Debug image is simple
 	install -m644 -D $(builddir)/build-$*/vmlinux \
 		$(dbgpkgdir)/usr/lib/debug/boot/vmlinux-$(abi_release)-$*
-	$(build_cd) $(kmake) $(build_O) modules_install \
+	$(build_cd) $(kmake) $(build_O) $(modules_install_target) \
 		INSTALL_MOD_PATH=$(dbgpkgdir)/usr/lib/debug
 	# Add .gnu_debuglink sections to each stripped .ko
 	# pointing to unstripped verson
@@ -268,14 +268,14 @@ endif
 	#
 	mkdir $(pkgdir)/lib/modules/$(abi_release)-$*/_
 	mv $(pkgdir)/lib/modules/$(abi_release)-$*/modules.order \
-		$(pkgdir)/lib/modules/$(abi_release)-$*/_
+		$(pkgdir)/lib/modules/$(abi_release)-$*/_ || :
 	if [ -f $(pkgdir)/lib/modules/$(abi_release)-$*/modules.builtin ] ; then \
 	    mv $(pkgdir)/lib/modules/$(abi_release)-$*/modules.builtin \
 		$(pkgdir)/lib/modules/$(abi_release)-$*/_; \
 	fi
 	rm -f $(pkgdir)/lib/modules/$(abi_release)-$*/modules.*
 	mv $(pkgdir)/lib/modules/$(abi_release)-$*/_/* \
-		$(pkgdir)/lib/modules/$(abi_release)-$*
+		$(pkgdir)/lib/modules/$(abi_release)-$* || :
 	rmdir $(pkgdir)/lib/modules/$(abi_release)-$*/_
 
 headers_tmp := $(CURDIR)/debian/tmp-headers
diff --git a/debian/tests/check-aliases b/debian/tests/check-aliases
deleted file mode 100755
index b85118ff12c..00000000000
--- a/debian/tests/check-aliases
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/perl -w
-
-my %map;
-
-print "Checking for dupe aliases in $ENV{'FLAVOUR'}...\n";
-
-$aliases =
-  "$ENV{'INSTALL_DIR'}/lib/modules/$ENV{'VERSION'}-$ENV{'FLAVOUR'}/modules.alias";
-
-open(ALIASES, "< $aliases") or die "Could not open $aliases";
-
-while (<ALIASES>) {
-	chomp;
-	my ($junk, $alias, $module) = split;
-
-	if (defined($map{$alias})) {
-		printf("%s %20s / %-20s : %s \n", ("$map{$alias}" eq "$module")
-			? "INT" : "   ", $map{$alias}, $module, $alias);
-	} else {
-		$map{$alias} = $module;
-	}
-}
-
-exit(0);