UBUNTU: SAUCE: Switch to using debian/scripts/sign-module

Use the new script debian/scripts/sign-module to determine if a modules
needs to be signed.

Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>

diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
index 7d744d9fe8e03dbc6b4576b19e66314e0bbbbf67..8555e2219318ac76fb910bbd64beb4dff56f1d4c 100644 (file)
--- a/scripts/Makefile.modinst
+++ b/scripts/Makefile.modinst
@@ -72,11 +72,9 @@ else
 sig-key := $(CONFIG_MODULE_SIG_KEY)
 endif
 quiet_cmd_sign = SIGN    $@
-      cmd_sign = if echo "$@" | grep -qF "/drivers/staging/" && \
-                    test -f $(srctree)/debian/signature-inclusion && \
-                    ! grep -qFx "$(notdir $@)" $(srctree)/debian/signature-inclusion ; \
-                 then echo "UBUNTU: Not signing $@" ; \
-                 else scripts/sign-file $(CONFIG_MODULE_SIG_HASH) $(sig-key) certs/signing_key.x509 $@ \
+      cmd_sign = if test -e $(srctree)/debian/scripts/sign-module && \
+                    $(srctree)/debian/scripts/sign-module $@ ; \
+                 then scripts/sign-file $(CONFIG_MODULE_SIG_HASH) $(sig-key) certs/signing_key.x509 $@ \
                       $(if $(KBUILD_EXTMOD),|| true) ; \
                  fi
 else