Groups keyboard shortcuts have been updated
Dismiss
See shortcuts

Request for Help: Encountering Jiri Issues While Trying to Run a Previous Commit

29 views
Skip to first unread message

waterlight m

unread,
Oct 26, 2023, 5:18:42 AM10/26/23
to discuss
Hello, I recently downloaded the latest version of Fuchsia and am trying to revert back to commit ed1641a804c68e01b44bd9bdf8d880f2b03e984a.
 I performed a git checkout operation followed by a build. However, I encountered an error while using fx set core.x64
ERROR at //src/connectivity/wlan/wlancfg/BUILD.gn:10:1: Can't load input file.
import("//third_party/cobalt/metrics_registry.gni")
^-------------------------------------------------
Unable to load:
 /home/mdd/project/fuchsia/third_party/cobalt/metrics_registry.gni
I also checked in the secondary tree for:
 /home/mdd/project/fuchsia/build/secondary/third_party/cobalt/metrics_registry.gni
See //products/core.gni:33:3: which caused the file to be included.
  "//src/connectivity/wlan/wlancfg:wlancfg-core-shard",
  ^---------------------------------------------------
ERROR: error running gn gen: exit status 1



I believe this may be a mismatch issue with the third_party under prebuilt managed by jiri. I also switched the commit of the fuchsia/integration repository to the corresponding commit of  ed1641a804  , with the git log information excerpted below (only relevant information included):
commit 4cf31598f6809d5eb41a94ca862bce6e6f8fdee6 (HEAD)
Original-Revision: ed1641a804c68e01b44bd9bdf8d880f2b03e984a

The output of jiri status is as follows:
mdd@vm ~/p/fuchsia ((ed1641a8…))> jiri status
.:
JIRI_HEAD: 9bec22f8c3b [netstack3] Make UDP `recvfrom` return zoned addresses where it can
Current Revision: ed1641a804c [zircon] Add zx_socket_set_disposition system call
Branch: DETACHED-HEAD(ed1641a804c [zircon] Add zx_socket_set_disposition system call)

integration:
JIRI_HEAD: 03b0645ea4 [roll] Roll fuchsia [netstack3] Make UDP `recvfrom` return zoned addresses where it can
Current Revision: 4cf31598f6 [roll] Roll fuchsia [zircon] Add zx_socket_set_disposition system call
Branch: DETACHED-HEAD(4cf31598f6 [roll] Roll fuchsia [zircon] Add zx_socket_set_disposition system call)

Attempts Made: Post-checkout, I have tried using jiri update and fx sync-from-stem commands. However, both commands result in updating to the latest version. I am unsure if there's an incorrect usage or an issue elsewhere.

I am reaching out for any guidance or assistance to resolve this. Thank you for your time and consideration.







David Turner

unread,
Oct 26, 2023, 10:41:55 AM10/26/23
to waterlight m, discuss
Hello,

First of all, it looks like ed1641a804 is a commit from the main fuchsia.git repository. As you discovered, simply doing a git checkout there to a previous commit will not update all other git repositories managed by Jiri, which is why you are seeing the original error you described (i.e. //third_party/ content not being updated properly).

The state of the whole Fuchsia checkout is controlled by the content of $FUCHSIA/integration/, which is itself checked out from https://fuchsia.googlesource.com/integration/.
By default, a regular `jiri update` will try to checkout this repository to the latest upstream revision, then read its content to update the rest of the Fuchsia sources (git repositories and CIPD packages).
But you can override this by using the `-local-manifest` flag, which will not try to update $FUCHSIA/integration/ at all. So to checkout your whole tree to a given previous integration_commit value, one would do:

cd $FUCHSIA_DIR
git -C integration checkout <integration_commit>
jiri update -local-manifest

However, it is challenging to find the value of <integration_commit> manually, however `fx sync-to-stem`  should be able to do that for you automatically by probing your $FUCHSIA/ directory.
Normally, you should do something like `cd $FUCHSIA && git checkout <fuchsia_commit> && fx sync-to-stem .` to get everything working. What kind of problem did you have with it?

(And yes, we know it is terribly slow).



--
All posts must follow the Fuchsia Code of Conduct https://fuchsia.dev/fuchsia-src/CODE_OF_CONDUCT or may be removed.
---
You received this message because you are subscribed to the Google Groups "discuss" group.
To unsubscribe from this group and stop receiving emails from it, send an email to discuss+u...@fuchsia.dev.
To view this discussion on the web visit https://groups.google.com/a/fuchsia.dev/d/msgid/discuss/960c4fd1-9b8b-4b1a-859a-2c6ffa866502n%40fuchsia.dev.
Message has been deleted
Message has been deleted

waterlight m

unread,
Oct 30, 2023, 4:52:48 AM10/30/23
to discuss, David Turner, discuss
Hello David,
Thank you for your guidance on my Fuchsia issue.I wanted to give an update on the issue I raised. Thanks to Adam's continuous guidance, I've successfully resolved the problem.I also appreciate your earlier insights.
It's great to have such a supportive community, and your expertise is truly appreciated.
Reply all
Reply to author
Forward
0 new messages