| Message ID | 20200217113113.27900-1-stefan.bader@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [F/Unstable] UBUNTU: [Packaging] final-checks: Depend on makefile flavours | expand |
On Mon, Feb 17, 2020 at 12:31:13PM +0100, Stefan Bader wrote: > The available ABI files do not depend on the config flavours but > those actually built. So instead of looking at the config files, > parse the flavours variable of the <arch>.mk files. > > This handles the case where we would like to drop certain flavours > or even whole architectures in backport kernels. Removing the > configuration file is bad because that would cause a huge delta > everytime we rebase (a local mangle would to remove the config > file each time and then the next updateconfigs would re-arrange > things based on that). > > Instead we can rely on the information in the architecture > specific rules. > > Ignore: yes > Signed-off-by: Stefan Bader <stefan.bader@canonical.com> > --- > > We have this in some hwe branches but it would be good to queue > it up for devel, so we do not have to constantly put it back when > we run into that case of dropping stuff. > > -Stefan Acked and applied to Focal/linux.
diff --git a/debian/scripts/misc/final-checks b/debian/scripts/misc/final-checks index 4b1afa76b821..df3cd308c36f 100755 --- a/debian/scripts/misc/final-checks +++ b/debian/scripts/misc/final-checks @@ -51,8 +51,15 @@ do if [ "$image_pkg" = "false" ]; then continue fi - - for flavour in $(ls -1 "$debian/config/$arch/config.flavour."*) + if [ ! -f "$debian/rules.d/$arch.mk" ]; then + continue + fi + flavours=$( + awk '/^\s*flavours\s*=/{ + sub(/^\s*flavours\s*=\s*/, ""); + print + }' "$debian/rules.d/$arch.mk") + for flavour in $flavours do flavour=$(echo "$flavour" | sed -e 's@.*/config.flavour.@@') abi_check "$debian/abi/$abi" "$arch" "$flavour"
The available ABI files do not depend on the config flavours but those actually built. So instead of looking at the config files, parse the flavours variable of the <arch>.mk files. This handles the case where we would like to drop certain flavours or even whole architectures in backport kernels. Removing the configuration file is bad because that would cause a huge delta everytime we rebase (a local mangle would to remove the config file each time and then the next updateconfigs would re-arrange things based on that). Instead we can rely on the information in the architecture specific rules. Ignore: yes Signed-off-by: Stefan Bader <stefan.bader@canonical.com> --- We have this in some hwe branches but it would be good to queue it up for devel, so we do not have to constantly put it back when we run into that case of dropping stuff. -Stefan debian/scripts/misc/final-checks | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)