Skip to content
Snippets Groups Projects

motorola-cedric: Add framebuffer patch.

Merged Imported Administrator requested to merge device/motorola-cedric into master

This patch fixes Xorg. Adapted from the Xiaomi A1.

Merge request reports

Approved by

Merged by AdministratorAdministrator 6 years ago (Feb 3, 2019 1:24am UTC)

Merge details

  • Changes merged into master with 43464026.
  • Deleted the source branch.

Pipeline #195751 skipped

Pipeline skipped for 43464026 on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Author Owner

    Two issues:

    • Please fix the git history, so it is based on current master. Do not "git merge master", but instead create a new branch that is based on the official master branch, e.g. with git checkout -b my-new-branch; git reset --hard origin/master, assuming that origin is the official origin. Then make your change on top of that. If you get stuck with that, please ask in the chat.
    • The pkgrel of your linux package needs to be increased.

    Thanks for the MR @Hacker1245!

    By Oliver Smith on 2019-01-31T07:47:05

  • Author Owner

    @ollieparanoid So do I need to make a new MR?

    By Hacker1245 on 2019-01-31T13:33:36

  • Author Owner

    @Hacker1245 you can also force-push to the branch on this MR.

    By Oliver Smith on 2019-02-01T06:51:21

  • Author Owner

    Step by step it would be something like this (untested, please try it and ask the nice folks in IRC/matrix for help if needed, so we don't get stuck here and can merge your nice patch):

    1. Run git remote -v and note which remote name the official repository has, and which remote name your fork has (one of them is probably called "origin", just look at the listing it gives you). I'll call them "upstream" and "fork" in this post, please replace these two words with the appropriate names.
    • a) If you do not have the "upstream" remote added yet, add it now: git remote add -f upstream https://gitlab.postmarketos.org/postmarketos/pmaports.git
    • b) If you already have the "upstream" remote, fetch it from the server to get the latest commits: git fetch upstream
    1. Make sure you have checked out your device/motorola-cedric branch: git checkout device/motorola-cedric
    2. Let's make a backup: git checkout -b backup (this branch is now exactly the same as your other branch)
    3. Let's go back to the branch of this merge request: git checkout device/motorola-cedric
    4. Put this branch at the same position as upstream/master (be careful, only do this if you have made a backup like in step 4.): git reset --hard upstream/master
    5. Make your changes again just like in this diff (and increase the pkgrel of your linux package)
    6. Commit your changes: git commit
    7. Force-push this branch: git push --force

    By Oliver Smith on 2019-02-01T07:02:32

  • Administrator mentioned in issue wiki#26 (closed) · Imported

    mentioned in issue wiki#26 (closed)

    By Oliver Smith on 2019-02-01T07:04:11

  • Administrator added 15 commits · Imported

    added 15 commits

    Compare with previous version

    By Hacker1245 on 2019-02-01T17:45:42

  • Administrator added 1 commit · Imported

    added 1 commit

    Compare with previous version

    By Hacker1245 on 2019-02-01T17:47:08

  • Author Owner

    @ollieparanoid Everything is done

    By Hacker1245 on 2019-02-01T20:31:53

  • Administrator added 1 commit · Imported

    added 1 commit

    Compare with previous version

    By Oliver Smith on 2019-02-03T01:23:34

  • Administrator approved this merge request · Imported

    approved this merge request

    By Oliver Smith on 2019-02-03T01:24:09

  • Author Owner

    Thank you very much @Hacker1245!

    By Oliver Smith on 2019-02-03T01:24:18

  • Administrator merged · Imported

    merged

    By Oliver Smith on 2019-02-03T01:24:27

  • Administrator mentioned in commit 862a02bd · Imported

    mentioned in commit 862a02bd

    By Hacker1245 on 2019-02-14T19:42:53

  • Administrator mentioned in commit 43464026 · Imported

    mentioned in commit 43464026

    By Hacker1245 on 2019-02-19T17:40:20

Please register or sign in to reply
Loading