| Message ID | 1444149818-2589-1-git-send-email-tim.gardner@canonical.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Oct 06, 2015 at 10:43:38AM -0600, tim.gardner@canonical.com wrote: > From: Tim Gardner <tim.gardner@canonical.com> > > Annotations are unique to the derivative. Therefore, use annotations > found in the derivative config directory. > > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > --- > > Instead of changing the value of sharedconfdir, just use an already defined > variable, e.g., commonconfdir. > > debian/rules.d/4-checks.mk | 2 +- > debian/scripts/misc/kernelconfig | 3 +-- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk > index a3c8ed9..a431d0b 100644 > --- 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 ba8f317..a5321d7 100755 > --- 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 > @@ -157,7 +156,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 Originally we intended annotations to be consume directly by branches to ensure that critical security enforcements are the same in each branch. We really don't use annotations that way due to the huge drift from series to series. For the LTS backports I can see you might need to modify these also. So overall this change makes sense as long as the annotations are synced in the backport (and we discussed this elsewhere and they are). Acked-by: Andy Whitcroft <apw@canonical.com> -apw
diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk index a3c8ed9..a431d0b 100644 --- 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 ba8f317..a5321d7 100755 --- 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 @@ -157,7 +156,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