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

Is ”fix Bug of USB Camera commit” SHA correct? #6

Open
minamikoichi opened this issue Jan 11, 2021 · 6 comments
Open

Is ”fix Bug of USB Camera commit” SHA correct? #6

minamikoichi opened this issue Jan 11, 2021 · 6 comments

Comments

@minamikoichi
Copy link

minamikoichi commented Jan 11, 2021

Is ”fix Bug of USB Camera commit” SHA correct?

Repository's newly SHA is 8eb2c924768ae555d437219f210e35f7b28e2fb0.
https://gitlab.com/rk-vendor/rk/platform/vendor/rockchip/common/-/tree/rockchip-android-10

@Ahren-Li

@mburr-precor
Copy link

This problem is affecting me as well.

Worked around it by reverting commit 8d1ba02 locally.

@qsazx874
Copy link

This problem is affecting me as well.

Worked around it by reverting commit 8d1ba02 locally.
@michael Burr
how did you do it?
Can you tell me the details, thanks!

@mburr-precor
Copy link

I did a git revert --no-commit 8d1ba02 in the .repo/manifests directory to back out the manifest change that caused the problem.

I chose not to commit since I expected the problem to be fixed relatively quickly.

Keep in mind that as @minamikoichi pointed out, the repository in question has several new commits (bur not the one that got put into the manifest). My workaround ignores those. You might want to take a look at them to see if any will affect what you're doing:

@qsazx874
Copy link

qsazx874 commented Feb 1, 2021

I gave it a try, then did

repo init -b rockchip-android-10 -m rockchip-q-release.xml
repo sync

but it didn't fix the problem for me )-:

error.GitError: rk/platform/vendor/rockchip/common rev-list ('^28d3f9e8f0561cb1c795ad54ecc71ce04016e5ee', 'HEAD', '--'): fatal: bad object HEAD

@mburr-precor
Copy link

I believe the repo init gets the manifests again and undoes the workaround. Try this:

  • repo init ...
  • apply workaround
  • repo sync

@mburr-precor
Copy link

This problem was fixed with:

in repository: ./.repo/manifests
in branches:  default
============
commit ec11400
Merge: d9482ef 9eaf624
Author:     steph <41779051+StephenInVamrs@users.noreply.github.com>
AuthorDate: Sun Feb 7 10:08:01 2021 +0800
Commit:     GitHub <noreply@github.com>
CommitDate: Sun Feb 7 10:08:01 2021 +0800

    Merge pull request #8 from Shine-YuLL/rockchip-android-10
    
    Fix the SHA of vendor/rockchip/common repositories

============

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

No branches or pull requests

3 participants