Skip to content

[Backport staging-23.11] alsa-ucm-conf: drop conflicting upstream patch#290702

Merged
vcunat merged 1 commit intostaging-23.11from
backport-289388-to-staging-23.11
Feb 22, 2024
Merged

[Backport staging-23.11] alsa-ucm-conf: drop conflicting upstream patch#290702
vcunat merged 1 commit intostaging-23.11from
backport-289388-to-staging-23.11

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Feb 22, 2024 •
edited by vcunat
Loading

Bot-based backport to staging-23.11, triggered by a label in #289388.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-commiter, if you find that it is not acceptable, leave a comment.

@trofi @github-actions
alsa-ucm-conf: drop conflicting upstream patch
4697565 
Without the change the build fails on `staging` as:

    alsa-ucm-conf> Running phase: patchPhase
    alsa-ucm-conf> applying patch /nix/store/m1yxcbpkxrqjp7kml9ij2x4i1y5zc0m2-alsa-ucm-conf-splitpcm-device-argument-fix.patch
    alsa-ucm-conf> patching file ucm2/common/pcm/split.conf
    alsa-ucm-conf> Reversed (or previously applied) patch detected!  Assume -R? [n]
    alsa-ucm-conf> Apply anyway? [n]
    alsa-ucm-conf> Skipping patch.
    alsa-ucm-conf> 1 out of 1 hunk ignored -- saving rejects to file ucm2/common/pcm/split.conf.rej

(cherry picked from commit 0e64c89)
@github-actions github-actions bot mentioned this pull request Feb 22, 2024
Merged
13 tasks
@vcunat vcunat merged commit e32e704 into staging-23.11 Feb 22, 2024
@vcunat vcunat deleted the backport-289388-to-staging-23.11 branch February 22, 2024 20:36
@ofborg ofborg bot requested a review from roastiek February 22, 2024 22:32
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Feb 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@roastiek roastiek Awaiting requested review from roastiek

Assignees

No one assigned

Labels

10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@vcunat @trofi