Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "[Core] Re-order user space rules inclusion (#17459)" #18032

Merged
merged 1 commit into from
Aug 13, 2022

Conversation

spidey3
Copy link
Contributor

@spidey3 spidey3 commented Aug 13, 2022

This reverts commit 69fa2d8.

Description

PR #17459 has broken some community layouts that depend on userspace code, because it loads userspace rules.mk before community layout rules.mk, thereby removing the ability to turn settings on/off in the community layout, and then react to those settings in the build of the userspace code. For example, see layouts/community/75_ansi/spidey3.

This PR rolls back #17459 for now.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

[see above]

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@spidey3 spidey3 requested a review from a team August 13, 2022 21:08
@tzarc tzarc merged commit 2f87abd into qmk:develop Aug 13, 2022
nolanseaton pushed a commit to nolanseaton/qmk_firmware that referenced this pull request Jan 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants