search

radxa / manifests

100 stars 40 forks source link

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

Open minamikoichi opened 3 years ago

minamikoichi commented 3 years ago

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 commented 3 years ago

This problem is affecting me as well.

Worked around it by reverting commit 8d1ba02 locally.

qsazx874 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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

mburr-precor commented 3 years ago

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

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