Skip to content
Snippets Groups Projects

Merge 4.19.67-2

Merged Andrew Lee requested to merge merge-4.19.67-2 into apertis/v2020dev0
1 unresolved thread

linux (4.19.67-2co1) apertis; urgency=medium

  • Merge from Debian buster. Remaining apertis changes:
    • Add default apertis gbp.conf
    • Widen the binnmu match for Apertis builds
    • Disable rt flavours
    • Disable build of udeb packages
    • Disable signed templates
    • Disable cloud images
    • Install dtbs in /boot
    • d/p/apparmor: Add latest upstream apparmor patches
      • Including fix to enforce denied dbus transations
    • arm64: Add configuration for the 64 bit Renesas platforms
    • armhf: Add configuration for the i.MX6 platform
      • Enable CONFIG_CRYPTO_DEV_FSL_CAAM
      • Disable XEN
      • Add configuration options needed for Audio and USB on Sabre AI boards
    • armhf: d/p/apertis/sabreai-audio: Add fixes for loading and using the audio on i.MX6 Sabre AI boards
    • Bump abiname as we don't match the Debian kernel ABI
  • Dropped downstream changes:
    • Support for Raspbery Pi CM3 (APERTIS-6053): shipped upstream
    • Module ABI tweaks: build was still broken on armhf and arm64, replaced by abiname bump
Edited by Emanuele Aina

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • You can drop the changes related to the two items below, now that we effectively don't run the ABI checks anymore, as those produce a downstream delta we no longer need:

    • Preserve ABI whether the module signing support is enabled or not (df5b9376)
    • Drop the check for the fips_enabled symbol (6d946370)
  • Commit f257a9fd should also be unneeded. By changing the ABI version, the ABI check script will simply look in a different folder and will ignore those files.

  • For 50169b90 I'd include a longer explanation in the commit message:

    Bump abiname as we don't match the Debian kernel ABI
    
    The ABI of the Apertis kernel packages does not match the one of the Debian ones due to different configuration options.
    
    In particular, disabling module signing changes the ABI signature of all the symbols accepting a `struct module` parameter, for which we had a workaround in https://gitlab.apertis.org/pkg/target/linux/commit/df5b937662ec9fb0b6d87794227000a3e7522172
    
    However on `armhf` we also disable Xen support (thus dropping all the Xen-related exported symbols) and we enable modules that export symbols which are not tracked by the Debian ABI reference, causing build failures.
    
    We now simply recognize that the two Apertis and Debian ABI do not really match (binary kernel module compatibility is not a goal at the moment) and thus we bump the ABI name in `debian/config/defines`.
    
    After that, generated files are updated with:
    
        $ fakeroot debian/rules debian/control-real
  • Emanuele Aina added 3 commits

    added 3 commits

    • 02479e78 - Merge branch 'debian/buster' into apertis/v2020dev0
    • 184c1dc0 - Bump abiname as we don't match the Debian kernel ABI
    • ec325c93 - Releasing apertis version 4.19.67-2co1.

    Compare with previous version

  • Emanuele Aina changed title from Merge 4.19.67 2 to Merge 4.19.67-2

    changed title from Merge 4.19.67 2 to Merge 4.19.67-2

  • Emanuele Aina changed the description

    changed the description

  • Emanuele Aina added 3 commits

    added 3 commits

    • a3594b8d - Refreshed debian/patches/apparmor/0002-UBUNTU-SAUCE-apparmor-userspace-queries.patch.
    • 627f089b - Bump abiname as we don't match the Debian kernel ABI
    • 8e227c6b - Releasing apertis version 4.19.67-2co1.

    Compare with previous version

  • Emanuele Aina added 4 commits

    added 4 commits

    • fc1e8e55 - Merge branch 'debian/buster' into apertis/v2020dev0
    • 4f3bfb6d - Refreshed debian/patches/apparmor/0002-UBUNTU-SAUCE-apparmor-userspace-queries.patch.
    • 8e1482b4 - Bump abiname as we don't match the Debian kernel ABI
    • 0187d613 - Releasing apertis version 4.19.67-2co1.

    Compare with previous version

  • merged

Please register or sign in to reply
Loading