UBUNTU: [Debian] config-check and prepare using ${DEBIAN}/config/annotations

Annotations are unique to the derivative. Therefore, use annotations
found in the derivative config directory.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
(cherry picked from commit 4f92f80963c358c9716e70d912449a7c2a5808aa)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk
index a3c8ed98330d1513debcc9200a99183d0fd1b689..a431d0be1e61f992bb0320d2289a6fd39be63e7f 100644 (file)
--- a/debian/rules.d/4-checks.mk
+++ b/debian/rules.d/4-checks.mk
@@ -23,5 +23,5 @@ checks-%: module-check-% abi-check-%
 config-prepare-check-%: $(stampdir)/stamp-prepare-tree-%
        @echo Debug: $@
        @perl -f $(DROOT)/scripts/config-check \
-               $(builddir)/build-$*/.config "$(arch)" "$*" "$(sharedconfdir)" "$(skipconfig)"
+               $(builddir)/build-$*/.config "$(arch)" "$*" "$(commonconfdir)" "$(skipconfig)"
 

diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig
index cfee50b3e1dc3badb70eddaca0d1c8a39c571447..ffb608222ad224b1b28b68271e3f3b0cd3bc25be 100755 (executable)
--- a/debian/scripts/misc/kernelconfig
+++ b/debian/scripts/misc/kernelconfig
@@ -24,7 +24,6 @@ case "$mode" in
 esac
 kerneldir="`pwd`"
 confdir="$kerneldir/${DEBIAN}/config"
-sharedconfdir="$kerneldir/debian.master/config"
 variant="$2"
 
 . $DEBIAN/etc/kernelconfig
@@ -158,7 +157,7 @@ for arch in $archs; do
                flavour="${config##*.}"
                if [ -f $archconfdir/$config ]; then
                        fullconf="$tmpdir/CONFIGS/$arch-$config"
-                       "$bindir/../config-check" "$fullconf" "$arch" "$flavour" "$sharedconfdir" "0" || let "fail=$fail+1"
+                       "$bindir/../config-check" "$fullconf" "$arch" "$flavour" "$confdir" "0" || let "fail=$fail+1"
                fi
        done
 done