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

flake: bump to 2024 #274

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

flake: bump to 2024 #274

wants to merge 4 commits into from

Conversation

Atemu
Copy link
Contributor

@Atemu Atemu commented Jan 18, 2025

It built fine but I'll have to test on a real device.

@Atemu
Copy link
Contributor Author

Atemu commented Jan 18, 2025

Oh and the update scripts will need to be tested too.

@Atemu
Copy link
Contributor Author

Atemu commented Jan 18, 2025

Our gitRepo hack fell apart:

Fetching information for https://github.com/LineageOS/android lineage-22.1
repo: error: "git" failed with exit status 128
  cwd: /var/tmp/tmp8i24wdg7/.repo/repo.tmp
  cmd: ['git', 'fetch', '--quiet', 'origin', '+refs/heads/*:refs/remotes/origin/*', '+refs/tags/*:refs/tags/*']
  stderr:
  >> fatal: detected dubious ownership in repository at '/nix/store/cmiydy9870gcxqp6qkkxjz8axcqjym06-git-repo-2.45/var/repo/.git'
  >> To add an exception for this directory, call:
  >> 
  >>    git config --global --add safe.directory /nix/store/cmiydy9870gcxqp6qkkxjz8axcqjym06-git-repo-2.45/var/repo/.git
  >> fatal: Could not read from remote repository.
  >> 
  >> Please make sure you have the correct access rights
  >> and the repository exists.
fatal: double check your --repo-rev setting.
fatal: repo init failed; run without --quiet to see why
fatal: cloning the git-repo repository failed, will remove '.repo/repo' 
Traceback (most recent call last):
  File "/Volumes/Data/AOSP/robotnix/flavors/lineageos/../../scripts/mk_repo_file.py", line 295, in <module>
    main()
  File "/Volumes/Data/AOSP/robotnix/flavors/lineageos/../../scripts/mk_repo_file.py", line 281, in main
    make_repo_file(args.url, args.ref, ref_type, prev_data,
  File "/Volumes/Data/AOSP/robotnix/flavors/lineageos/../../scripts/mk_repo_file.py", line 105, in make_repo_file
    subprocess.check_call([
  File "/nix/store/kjgslpdqchx1sm7a5h9xibi5rrqcqfnl-python3-3.12.8/lib/python3.12/subprocess.py", line 413, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['repo', 'init', '--manifest-url=https://github.com/LineageOS/android', '--manifest-branch=refs/heads/lineage-22.1', '--quiet', '--no-repo-verify', '--depth=1']' returned non-zero exit status 1.

@Atemu Atemu force-pushed the 2024 branch 3 times, most recently from 6797eeb to ad4d64c Compare January 18, 2025 23:32
@Atemu
Copy link
Contributor Author

Atemu commented Jan 18, 2025

Okay, took a few attempts but I fixed that. Currently running an update for 22.1.

@Atemu Atemu force-pushed the 2024 branch 2 times, most recently from 0229f6c to 923ce52 Compare January 26, 2025 18:51
Atemu added 4 commits January 26, 2025 19:51
Our hack for gitRepo relied on fetching from the Nix store but git 2.35 doesn't
allow accessing git repos with "dubious" ownership.

This little patch just short-circuits the check.
@Atemu
Copy link
Contributor Author

Atemu commented Jan 26, 2025

I successfully ran the LOS update script and reproduced the same state as before (against my local mirror).

The build also worked fine in a previous iteration but I'll build once again to confirm.

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

Successfully merging this pull request may close these issues.

1 participant