UBUNTU: [Packaging] Force the target updateconfigs to consider do_enforce_all

Ignore:yes

The binary build calls the target config-prepare-check-generic to
ensure the config is valid before compiling the kernel. This target
however is using the flag do_enforce_all to control if all the
annotations should be enforced on now.

However, during development the target updateconfigs is used instead
to verify the config options are matching the annotations file, but
this target currently always assumes only annotations explicitly
marked should be enforced.

Update kernelconfig and the maintainer make file to pass the
do_enforce_all when running the target updateconfigs.

Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index decbd099b9168d14f2bf6ce34be43013fa3976d1..8bec5884e8a4a915b203be9af6078de1f9982784 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -2812,7 +2812,7 @@ CONFIG_IOMMU_IO_PGTABLE_ARMV7S                  policy<{'arm64': 'n', 'armhf': '
 
 # Menu: Device Drivers >> IOMMU Hardware Support >> Support for Intel IOMMU using DMA Remapping Devices
 CONFIG_INTEL_IOMMU                              policy<{'amd64': 'y', 'i386': 'y'}>
-CONFIG_INTEL_IOMMU_SVM                          policy<{'amd64': 'y', 'i386': 'y'}>
+CONFIG_INTEL_IOMMU_SVM                          policy<{'amd64': 'y', 'i386': '-'}>
 CONFIG_INTEL_IOMMU_DEFAULT_ON                   policy<{'amd64': 'n', 'i386': 'n'}>
 #
 CONFIG_INTEL_IOMMU_DEFAULT_ON                   note<the IOMMU can trigger boot failures> flag<REVIEW>

diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
index fabdf0888fce798820fa4afdbe21bff5b08348d7..5944ca526703ea0d45d78b356d956f8598b95dda 100644 (file)
--- a/debian/rules.d/1-maintainer.mk
+++ b/debian/rules.d/1-maintainer.mk
@@ -45,7 +45,7 @@ printdebian:
 
 updateconfigs defaultconfigs editconfigs genconfigs dumpconfigs:
        dh_testdir;
-       $(SHELL) $(DROOT)/scripts/misc/kernelconfig $@
+       $(SHELL) $(DROOT)/scripts/misc/kernelconfig $@ "$(do_enforce_all)"
        rm -rf build
 
 updateportsconfigs defaultportsconfigs editportsconfigs genportsconfigs askconfigs:

diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig
index dfb24e5be7c2920b4c56a0b944cc6a6be298b433..f95396e28f28a8a75afdae6a40b1021dc9b73b06 100755 (executable)
--- a/debian/scripts/misc/kernelconfig
+++ b/debian/scripts/misc/kernelconfig
@@ -11,7 +11,8 @@ if [ ! -f MAINTAINERS ] || [ ! -f Makefile ]; then
        exit 1
 fi
 
-mode=${1:?"Usage: $0 [oldconfig|editconfig]"}
+mode=${1:?"Usage: $0 (oldconfig|editconfig) [do_enforce_all]"}
+do_enforce_all=${2:-0}
 yes=0
 case "$mode" in
     update*configs)  mode='syncconfig' ;;
@@ -186,7 +187,7 @@ for arch in $archs; do
                if [ -f $archconfdir/$config ]; then
                        fullconf="$tmpdir/CONFIGS/$arch-$config"
                        [ ! -f "$fullconf" ] && continue
-                       "$bindir/../config-check" "$fullconf" "$arch" "$flavour" "$confdir" "0" "0" || let "fail=$fail+1"
+                       "$bindir/../config-check" "$fullconf" "$arch" "$flavour" "$confdir" "0" "$do_enforce_all" || let "fail=$fail+1"
                fi
        done
 done