0a2590256e
- Kernel snapshot, patch and guard now match the running 7.2.10-fiw-nyx-v1.2. - Overlay install replaces the tree instead of merging, so removed ebuilds cannot linger next to a newer Manifest; the old tree is restored on failure. - Limine refresh removes ESP kernel folders the managed menu no longer lists. - ESP discovery checks fstab FAT mounts, triggers x-systemd.automount and ignores the autofs placeholder.
796 lines
43 KiB
Python
796 lines
43 KiB
Python
#!/usr/bin/env python3
|
|
"""Selection, preview, config restoration and Portage installation backend."""
|
|
import argparse
|
|
import hashlib
|
|
import json
|
|
import os
|
|
import re
|
|
import shutil
|
|
import subprocess
|
|
import sys
|
|
import tempfile
|
|
from datetime import datetime, timezone
|
|
from pathlib import Path
|
|
|
|
REPO = Path(__file__).resolve().parents[1]
|
|
sys.path.insert(0, str(REPO / 'tools'))
|
|
sys.path.insert(0, str(REPO / 'lib'))
|
|
from capture import sections, read_jsonc
|
|
import backups
|
|
import reporting
|
|
import proposals
|
|
import device_presets
|
|
from setup import (FLATPAKS, SERVICES, required_repositories,
|
|
existing_repository, repository_config, stage_repositories,
|
|
publish_repositories, install_flatpaks, enable_services)
|
|
|
|
GROUPS = ['system', 'kde', 'fiw-apps', 'cli', 'dev', 'gaming', 'fiw-tools', 'tidewm']
|
|
EXTRAS = {'filelight': 'Filelight', 'btrfs': 'Btrfs tools', 'nvidia': 'NVIDIA drivers'}
|
|
CATALOG = json.loads((REPO / 'configs/catalog.json').read_text())
|
|
OWNERS = {'fish': 'fish', 'kitty': 'kitty', 'neovim': 'nvim', 'fastfetch': 'fastfetch',
|
|
'vesktop': 'vesktop-bin', 'vscode': 'code', 'dolphin': 'dolphin', 'spectacle': 'spectacle'}
|
|
AUTOSTART_GROUPS = {'steam': 'gaming', 'spotify': 'fiw-apps', 'vesktop': 'fiw-apps',
|
|
'opendeck': 'fiw-tools', 'musicpresence': 'fiw-tools'}
|
|
|
|
|
|
def load_selection(path=None, profile='stock'):
|
|
selection = json.loads((Path(path) if path else REPO / 'presets' / (profile + '.json')).read_text())
|
|
if not isinstance(selection, dict):
|
|
raise ValueError('Selection must be a JSON object.')
|
|
if not isinstance(selection.get('name'), str) or not selection['name'].strip():
|
|
raise ValueError('Selection needs a name.')
|
|
if selection.get('profile') not in ('stock', 'fiw-ryzen'):
|
|
raise ValueError('Unknown preset')
|
|
for field in ('flatpaks', 'services'):
|
|
if selection.get(field) is None:
|
|
selection[field] = []
|
|
for field, allowed in [('groups', GROUPS), ('configs', CATALOG), ('extras', EXTRAS),
|
|
('flatpaks', FLATPAKS), ('services', SERVICES)]:
|
|
if not isinstance(selection.get(field), list):
|
|
raise ValueError('Selection must be a list: ' + field)
|
|
if any(not isinstance(x, str) or x not in allowed for x in selection.get(field, [])):
|
|
raise ValueError('Unknown selection in ' + field)
|
|
if selection.get('kernel') not in ('binary', 'custom'):
|
|
raise ValueError('Unknown kernel choice')
|
|
if selection.get('bootloader') not in ('keep', 'limine', 'grub'):
|
|
raise ValueError('Unknown bootloader choice')
|
|
return selection
|
|
|
|
|
|
def atoms(path):
|
|
return [l.strip() for l in path.read_text().splitlines() if l.strip() and not l.lstrip().startswith('#')]
|
|
|
|
|
|
def package_map(selection):
|
|
result = {group: atoms(REPO / 'packages' / (group + '.list')) for group in selection['groups']}
|
|
if 'system' in result:
|
|
result['system'] += ['sys-kernel/gentoo-kernel-bin']
|
|
if selection['kernel'] == 'custom':
|
|
snapshot = json.loads((REPO / 'optional/kernel/snapshot.json').read_text())
|
|
result['system'] += [snapshot['atom']]
|
|
for extra in selection.get('extras', []):
|
|
result[extra] = atoms(REPO / 'packages/optional' / (extra + '.list'))
|
|
if selection['bootloader'] != 'keep':
|
|
result['boot-' + selection['bootloader']] = atoms(REPO / 'packages/optional' / (selection['bootloader'] + '.list'))
|
|
support = []
|
|
if selection.get('flatpaks'):
|
|
support.append('sys-apps/flatpak')
|
|
for key in selection.get('services', []):
|
|
support += SERVICES[key]['packages']
|
|
if selection['bootloader'] != 'keep':
|
|
support += ['sys-kernel/installkernel', 'sys-kernel/dracut', 'sys-boot/efibootmgr']
|
|
selected = {atom.split('::')[0] for packages in result.values() for atom in packages}
|
|
support = [atom for atom in dict.fromkeys(support) if atom not in selected]
|
|
if support:
|
|
result['setup'] = support
|
|
return result
|
|
|
|
|
|
def source_policy(selection):
|
|
result = atoms(REPO / 'packages/source.list')
|
|
if selection['kernel'] == 'custom' and 'system' in selection['groups']:
|
|
result += ['sys-kernel/gentoo-kernel']
|
|
if 'nvidia' in selection.get('extras', []):
|
|
result += ['x11-drivers/nvidia-drivers']
|
|
return result
|
|
|
|
|
|
def config_requirements(selection, planned=True):
|
|
selected = {cp_from_cpv(atom.split('::')[0].split(':')[0].lstrip('<>=~'))
|
|
for values in package_map(selection).values() for atom in values}
|
|
packages = {atom for name in selection['configs'] for atom in CATALOG[name].get('packages', [])}
|
|
installed = {}
|
|
query = shutil.which('portageq')
|
|
for atom in sorted(packages):
|
|
installed[atom] = subprocess.run([query, 'has_version', '/', atom], stdout=subprocess.DEVNULL,
|
|
stderr=subprocess.DEVNULL).returncode == 0 if query else None
|
|
return {name: [{'package': atom,
|
|
'status': 'installed' if installed[atom] else 'selected' if planned and atom in selected else 'unverified' if installed[atom] is None else 'missing'}
|
|
for atom in CATALOG[name].get('packages', [])] for name in selection['configs']}
|
|
|
|
|
|
def backup_paths():
|
|
selection = {'configs': list(CATALOG), 'groups': GROUPS}
|
|
return {str(relative): {'name': name, 'kde': CATALOG[name].get('kde', False)}
|
|
for name, _, _, relative in config_entries(selection)}
|
|
|
|
|
|
def manual_steps(selection):
|
|
steps = []
|
|
if selection.get('firefox_privacy'):
|
|
steps.append('Apply Firefox-Privacy after reviewing docs/firefox.md.')
|
|
if selection.get('spotify_custom'):
|
|
steps.append('Optional Spotify customization requires the manual setup in docs/spotify.md.')
|
|
if 'fiw-tools' in selection['groups']:
|
|
steps.append('Add Apdatifier through Plasma Add Widgets; FiwNode uses its default config.')
|
|
if 'gaming' in selection['groups']:
|
|
steps.append('Choose r2modman appearance in its settings and import any wanted profiles through the app (docs/app-configs.md).')
|
|
if 'prism' in selection['configs']:
|
|
steps.append('Set up Prism accounts, Java and Minecraft instances on this device; see docs/app-configs.md.')
|
|
if 'tidewm' in selection['groups']:
|
|
steps.append('Choose TideWM at login after installation; it creates its own default config (docs/tidewm.md).')
|
|
return steps
|
|
|
|
|
|
def merge_kconfig(old, patch):
|
|
"""Edit selected keys while retaining comments and unrelated groups/keys."""
|
|
desired = sections(patch)
|
|
old_groups = sections(old)
|
|
if '[General]' in desired and 'rules' in desired['[General]']:
|
|
rules = [r for r in old_groups.get('[General]', {}).get('rules', '').split(',') if r]
|
|
rules += [r for r in desired['[General]']['rules'].split(',') if r]
|
|
rules = list(dict.fromkeys(rules))
|
|
desired['[General]']['rules'] = ','.join(rules)
|
|
desired['[General]']['count'] = str(len(rules))
|
|
lines, group, written, seen = [], None, set(), set()
|
|
def missing():
|
|
if group in desired:
|
|
for key, value in desired[group].items():
|
|
if (group, key) not in written:
|
|
lines.append(key + '=' + value)
|
|
written.add((group, key))
|
|
for line in old.splitlines():
|
|
if line.startswith('[') and line.endswith(']'):
|
|
missing()
|
|
group = line
|
|
seen.add(group)
|
|
elif group in desired and '=' in line and not line.startswith(('#', ';')):
|
|
key = line.split('=', 1)[0]
|
|
if key in desired[group]:
|
|
if (group, key) in written:
|
|
continue
|
|
line = key + '=' + desired[group][key]
|
|
written.add((group, key))
|
|
lines.append(line)
|
|
missing()
|
|
for group, values in desired.items():
|
|
if group not in seen:
|
|
lines += ['', group] + [k + '=' + v for k, v in values.items()]
|
|
return '\n'.join(lines).strip('\n') + '\n'
|
|
|
|
|
|
def merge_json(old, patch):
|
|
existing = read_jsonc(old) if old.strip() else {}
|
|
def merge(a, b):
|
|
for key, value in b.items():
|
|
if isinstance(value, dict) and isinstance(a.get(key), dict):
|
|
merge(a[key], value)
|
|
else:
|
|
a[key] = value
|
|
merge(existing, json.loads(patch))
|
|
return json.dumps(existing, indent=2) + '\n'
|
|
|
|
|
|
def config_entries(selection):
|
|
for name in selection['configs']:
|
|
for kind in ('files', 'kconfig', 'json'):
|
|
root = REPO / 'configs' / name / kind
|
|
if not root.is_dir():
|
|
continue
|
|
for src in sorted(root.rglob('*')):
|
|
if not src.is_file() and not src.is_symlink():
|
|
continue
|
|
relative = src.relative_to(root)
|
|
if name == 'autostart' and relative.suffix == '.desktop':
|
|
if AUTOSTART_GROUPS.get(relative.stem) not in selection['groups']:
|
|
continue
|
|
yield name, kind, src, relative
|
|
|
|
|
|
def digest(path):
|
|
if path.is_symlink():
|
|
return 'link:' + os.readlink(path)
|
|
return hashlib.sha256(path.read_bytes()).hexdigest() if path.is_file() else None
|
|
|
|
|
|
def ask(prompt, choices, default):
|
|
if not sys.stdin.isatty():
|
|
raise RuntimeError('Interactive confirmation required: ' + prompt)
|
|
while True:
|
|
reply = input(prompt + ' [' + '/'.join(choices) + '] (default ' + default + '): ').strip().lower() or default
|
|
if reply in choices:
|
|
return reply
|
|
|
|
|
|
def active_plasma(home):
|
|
if home.resolve() != Path.home().resolve():
|
|
return False
|
|
result = subprocess.run(['pgrep', '-u', str(os.getuid()), '-x', 'plasmashell'], stdout=subprocess.DEVNULL)
|
|
return result.returncode == 0
|
|
|
|
|
|
def check_configs(selection, home):
|
|
entries = list(config_entries(selection))
|
|
if any(CATALOG[name].get('kde') for name, _, _, _ in entries) and active_plasma(home.resolve()):
|
|
raise RuntimeError('Log out of Plasma and apply from a TTY to prevent KDE overwriting restored settings. Portable app configs can be applied separately.')
|
|
|
|
|
|
def apply_configs(selection, home, update=False, conflict='ask'):
|
|
home = home.resolve()
|
|
entries = list(config_entries(selection))
|
|
check_configs(selection, home)
|
|
state_dir = backups.user_state(home)
|
|
index_path = state_dir / 'managed.json'
|
|
index = json.loads(index_path.read_text()) if index_path.is_file() else {}
|
|
stamp = datetime.now(timezone.utc).strftime('%Y%m%dT%H%M%S.%fZ')
|
|
report = {'applied': [], 'unchanged': [], 'kept': [], 'review': [], 'missing': []}
|
|
jobs = {}
|
|
for entry in entries:
|
|
name, kind, src, relative = entry
|
|
if relative in jobs and (kind not in ('kconfig', 'json') or jobs[relative][0][1] != kind):
|
|
raise RuntimeError('Conflicting config sources for ' + str(relative))
|
|
jobs.setdefault(relative, []).append(entry)
|
|
for relative, parts in jobs.items():
|
|
name, kind, src, _ = parts[-1]
|
|
dest = home / relative
|
|
# Keep writes inside the requested home, including through parent symlinks.
|
|
if not dest.parent.resolve().is_relative_to(home):
|
|
raise RuntimeError('Config parent points outside the target home: ' + str(relative))
|
|
if name == 'autostart' and relative.suffix == '.desktop':
|
|
command = src.read_text().split('Exec=', 1)[1].splitlines()[0].split()[0]
|
|
if not shutil.which(command) and home == Path.home().resolve():
|
|
report['missing'].append('Autostart skipped; missing command: ' + command)
|
|
continue
|
|
old_hash = digest(dest)
|
|
if src.is_symlink():
|
|
content = None
|
|
new_hash = 'link:' + os.readlink(src)
|
|
else:
|
|
content = src.read_bytes()
|
|
if '{{HOME}}' in content.decode(errors='ignore'):
|
|
content = content.decode().replace('{{HOME}}', str(home)).encode()
|
|
if kind in ('kconfig', 'json'):
|
|
old_text = dest.read_text() if dest.is_file() else ''
|
|
merge = merge_kconfig if kind == 'kconfig' else merge_json
|
|
for _, _, patch, _ in parts:
|
|
old_text = merge(old_text, patch.read_text().replace('{{HOME}}', str(home)))
|
|
content = old_text.encode()
|
|
new_hash = hashlib.sha256(content).hexdigest()
|
|
key = str(relative)
|
|
if old_hash == new_hash:
|
|
report['unchanged'].append(key)
|
|
continue
|
|
target = dest
|
|
if old_hash is not None:
|
|
edited = update and old_hash != index.get(key)
|
|
if edited:
|
|
target = Path(str(dest) + '.new')
|
|
report['review'].append(str(target.relative_to(home)))
|
|
# Never replace a previously edited .new file.
|
|
if target.exists() or target.is_symlink():
|
|
target = Path(str(target) + '.' + stamp)
|
|
report['review'][-1] = str(target.relative_to(home))
|
|
elif conflict == 'keep' or (conflict == 'ask' and ask('Replace ' + key + ' after backing it up?', ['apply', 'keep'], 'keep') == 'keep'):
|
|
report['kept'].append(key)
|
|
continue
|
|
else:
|
|
backup = state_dir / 'backups' / stamp / relative
|
|
backup.parent.mkdir(parents=True, exist_ok=True)
|
|
# Several selected presets may patch the same KConfig file.
|
|
# Keep its original version from before this entire operation.
|
|
if not backup.exists() and not backup.is_symlink():
|
|
shutil.copy2(dest, backup, follow_symlinks=False)
|
|
target.parent.mkdir(parents=True, exist_ok=True)
|
|
tmp = target.parent / ('.' + target.name + '.fiw-dots-' + stamp)
|
|
if src.is_symlink():
|
|
os.symlink(os.readlink(src), tmp)
|
|
else:
|
|
tmp.write_bytes(content)
|
|
tmp.chmod(src.stat().st_mode & 0o777)
|
|
os.replace(tmp, target)
|
|
if target == dest:
|
|
index[key] = new_hash
|
|
report['applied'].append(key)
|
|
else:
|
|
proposals.record(home, target.relative_to(home), relative, old_hash, [part[0] for part in parts])
|
|
state_dir.mkdir(parents=True, exist_ok=True)
|
|
temporary = index_path.with_name('.managed-' + stamp)
|
|
temporary.write_text(json.dumps(index, indent=2) + '\n')
|
|
temporary.replace(index_path)
|
|
(state_dir / 'selection.json').write_text(json.dumps(selection, indent=2) + '\n')
|
|
(state_dir / ('report-' + stamp + '.json')).write_text(json.dumps(report, indent=2) + '\n')
|
|
if 'fonts' in selection['configs'] and home == Path.home().resolve() and shutil.which('fc-cache'):
|
|
subprocess.run(['fc-cache', str(home / '.local/share/fonts/Fiw-Gentoo-Dots')], check=True)
|
|
print(json.dumps({k: len(v) for k, v in report.items()}, indent=2))
|
|
for key in ('review', 'missing'):
|
|
for value in report[key]:
|
|
print(key + ': ' + value)
|
|
return report
|
|
|
|
|
|
def root_files(selection, repo_location=None):
|
|
"""Return the proposed root files without modifying the host."""
|
|
result = {}
|
|
layers = ['common'] + selection['groups'] + selection.get('extras', []) + [selection['profile']]
|
|
for layer in layers:
|
|
source = REPO / 'portage' / layer
|
|
if not source.is_dir():
|
|
continue
|
|
for src in source.rglob('*'):
|
|
if not src.is_file():
|
|
continue
|
|
relative = src.relative_to(source)
|
|
if len(relative.parts) == 1:
|
|
dest = Path('etc/portage') / relative
|
|
elif relative.parts[0] == 'env':
|
|
dest = Path('etc/portage') / relative
|
|
else:
|
|
dest = Path('etc/portage') / relative.parent / ('fiw-dots-' + layer + '-' + relative.name)
|
|
result[str(dest)] = src.read_text()
|
|
for group, packages in package_map(selection).items():
|
|
result['etc/portage/sets/fiw-dots-' + group] = '\n'.join(packages) + '\n'
|
|
result['etc/portage/sets/fiw-dots'] = '\n'.join('@fiw-dots-' + g for g in package_map(selection)) + '\n'
|
|
result['etc/portage/fiw-dots.conf'] += '\n# Persist the selected binary/source policy for later emerge operations.\n'
|
|
result['etc/portage/fiw-dots.conf'] += 'EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --getbinpkg --usepkg --binpkg-respect-use=n --with-bdeps=n ' + ' '.join('--usepkg-exclude=' + atom for atom in source_policy(selection)) + '"\n'
|
|
result['etc/portage/repos.conf/fiw-dots.conf'] = '[fiw-dots]\nlocation = ' + str(repo_location or REPO / 'overlay') + '\npriority = 40\nauto-sync = no\n'
|
|
for name in required_repositories(selection):
|
|
if not existing_repository(name):
|
|
result['etc/portage/repos.conf/fiw-dots-' + name + '.conf'] = repository_config(name, '/var/db/repos/' + name)
|
|
arch = 'x86-64-v3' if selection['profile'] == 'fiw-ryzen' else 'x86-64'
|
|
result['etc/portage/binrepos.conf/fiw-dots.conf'] = '[gentoo]\npriority = 1\nsync-uri = https://distfiles.gentoo.org/releases/amd64/binpackages/23.0/' + arch + '/\nlocation = /var/cache/binhost/gentoo\nverify-signature = true\n'
|
|
if selection['kernel'] == 'custom' and 'system' in selection['groups']:
|
|
for src in (REPO / 'optional/kernel/config.d').glob('*.config'):
|
|
result['etc/kernel/config.d/' + src.name] = src.read_text()
|
|
result['etc/portage/package.accept_keywords/fiw-dots-kernel'] = 'sys-kernel/gentoo-kernel ~amd64\nsys-kernel/gentoo-kernel-bin ~amd64\nvirtual/dist-kernel ~amd64\n'
|
|
result['etc/portage/env/sys-kernel/gentoo-kernel'] = (REPO / 'optional/kernel/guard').read_text()
|
|
# Point releases of the tested series reuse the patch (see guard); a new series needs a new snapshot.
|
|
major, minor = json.loads((REPO / 'optional/kernel/snapshot.json').read_text())['patch_kernel'].split('.')[:2]
|
|
result['etc/portage/package.mask/fiw-dots-custom-kernel'] = '# Tested custom-kernel series; update snapshot and patch for the next one.\n>=sys-kernel/gentoo-kernel-' + major + '.' + str(int(minor) + 1) + '\n'
|
|
if selection['profile'] == 'fiw-ryzen':
|
|
result['etc/sysctl.d/70-fiw-dots-performance.conf'] = (REPO / 'optional/tuning/70-fiw-performance.conf').read_text()
|
|
result['etc/modules-load.d/fiw-dots-bbr.conf'] = (REPO / 'optional/tuning/bbr.conf').read_text()
|
|
if selection['bootloader'] != 'keep':
|
|
result['etc/portage/package.use/fiw-dots-boot'] = ('sys-kernel/installkernel systemd dracut -grub -uki -ukify -ugrd -efistub -refind -systemd-boot\n')
|
|
if selection['bootloader'] == 'grub':
|
|
result['etc/portage/env/fiw-dots-grub.conf'] = 'GRUB_PLATFORMS="efi-64"\n'
|
|
result['etc/portage/package.env/fiw-dots-grub'] = 'sys-boot/grub fiw-dots-grub.conf\n'
|
|
else:
|
|
result['etc/portage/package.accept_keywords/fiw-dots-limine'] = 'sys-boot/limine ~amd64\n'
|
|
result['etc/portage/package.use/fiw-dots-limine'] = 'sys-boot/limine uefi-x86-64 -bios -bios-cd -bios-pxe -uefi-cd -uefi-ia32 -uefi-aarch64 -uefi-riscv64 -uefi-loongarch64\n'
|
|
if 'tidewm' in selection['groups']:
|
|
result['etc/portage/package.accept_keywords/fiw-dots-tidewm'] = 'gui-wm/tidewm::fiw-dots **\n'
|
|
return result
|
|
|
|
|
|
def preview(selection):
|
|
packages = package_map(selection)
|
|
lines = ["Fiw-Gentoo-Dots — " + selection['name'], '']
|
|
for group, values in packages.items():
|
|
lines += [group + ' (' + str(len(values)) + ')', ' ' + ', '.join(values)]
|
|
lines += ['', 'Repositories: ' + (', '.join(required_repositories(selection)) or 'Gentoo + fiw-dots only'),
|
|
'Missing selected overlays are staged before resolution and adopted after confirmation.',
|
|
'Flatpaks (user): ' + (', '.join(selection.get('flatpaks', [])) or 'none'),
|
|
'Optional services: ' + (', '.join(selection.get('services', [])) or 'none'),
|
|
'Compile deliberately: ' + ', '.join(source_policy(selection)),
|
|
'Other packages: prefer binaries; ask compile/skip for additional source builds.',
|
|
'Kernel: ' + selection['kernel'] + (' + binary fallback' if selection['kernel'] == 'custom' else ''),
|
|
'Bootloader: ' + selection['bootloader'], '', 'Selected configs:']
|
|
requirements = config_requirements(selection)
|
|
for name in selection['configs']:
|
|
lines.append(' ' + name + ': ' + CATALOG[name]['label'])
|
|
if requirements[name]:
|
|
lines.append(' Needs: ' + ', '.join(entry['package'] + ' [' + entry['status'] + ']' for entry in requirements[name]))
|
|
if CATALOG[name].get('note'):
|
|
lines.append(' ' + CATALOG[name]['note'])
|
|
lines += ['', 'Config files: ' + str(len(list(config_entries(selection)))),
|
|
'Root configuration files: ' + str(len(root_files(selection))),
|
|
'Existing config conflicts: ask; updates preserve edits as .new.']
|
|
lines.append('Config requirements are informational; config choices do not automatically select package groups.')
|
|
|
|
if selection['bootloader'] != 'keep':
|
|
lines.append('Boot deployment: target ESP and boot files are previewed before applying; firmware changes are separately selectable (docs/boot.md).')
|
|
if selection.get('firefox_privacy'):
|
|
lines.append('Optional manual setup: Firefox-Privacy (docs/firefox.md).')
|
|
if selection.get('spotify_custom'):
|
|
lines.append('Optional manual setup: Spotify customization (docs/spotify.md). Stock Spotify is installed first.')
|
|
return '\n'.join(lines)
|
|
|
|
|
|
def export(selection, dest):
|
|
dest.mkdir(parents=True, exist_ok=True)
|
|
for relative, content in root_files(selection).items():
|
|
target = dest / relative
|
|
target.parent.mkdir(parents=True, exist_ok=True)
|
|
target.write_text(content)
|
|
if selection['kernel'] == 'custom' and 'system' in selection['groups']:
|
|
patches = dest / 'etc/portage/patches/sys-kernel/gentoo-kernel'
|
|
patches.mkdir(parents=True, exist_ok=True)
|
|
for src in (REPO / 'optional/kernel/patches').glob('*.patch'):
|
|
shutil.copy2(src, patches / src.name)
|
|
(dest / 'selection.json').write_text(json.dumps(selection, indent=2) + '\n')
|
|
(dest / 'PLAN.txt').write_text(preview(selection) + '\n')
|
|
print('Exported root configuration and plan to ' + str(dest))
|
|
|
|
|
|
def cp_from_cpv(cpv):
|
|
return re.sub(r'-\d.*$', '', cpv)
|
|
|
|
|
|
def source_builds(output):
|
|
values = set(re.findall(r'^\[ebuild[^\]]*\]\s+(?:\([^)]*\)\s+)?([^\s:]+)', output, re.M))
|
|
# Dedicated -bin ebuilds install upstream binaries; these do not require
|
|
# compiling the application just because Portage labels them "ebuild".
|
|
# These install upstream binaries or QML rather than compile applications.
|
|
no_compile = {'app-editors/vscode', 'media-sound/spotify',
|
|
'games-util/steam-launcher', 'kde-misc/apdatifier-gentoo'}
|
|
return {value for value in values if not cp_from_cpv(value).endswith('-bin')
|
|
and not value.startswith(('acct-user/', 'acct-group/', 'virtual/'))
|
|
and cp_from_cpv(value) not in no_compile}
|
|
|
|
|
|
def resolve(stage, selection, packages, execute=False):
|
|
exclusions = ' '.join(source_policy(selection))
|
|
command = ['emerge', '--config-root=' + str(stage), '--color=n', '--getbinpkg', '--usepkg',
|
|
'--binpkg-respect-use=n', '--with-bdeps=n',
|
|
'--usepkg-exclude=' + exclusions, '--autounmask=n',
|
|
'--update', '--deep', '--newuse', '--backtrack=100']
|
|
if not execute:
|
|
command += ['--pretend']
|
|
env = dict(os.environ, EMERGE_DEFAULT_OPTS='')
|
|
return subprocess.run(command + packages, env=env, text=True,
|
|
stdout=None if execute else subprocess.PIPE,
|
|
stderr=None if execute else subprocess.STDOUT)
|
|
|
|
|
|
def nvidia_modules():
|
|
"""Check both selected distribution kernels, not just /usr/src/linux."""
|
|
snapshot = json.loads((REPO / 'optional/kernel/snapshot.json').read_text())
|
|
driver = subprocess.check_output(['portageq', 'best_version', '/', 'x11-drivers/nvidia-drivers'], text=True).strip()
|
|
expected = re.sub(r'-r\d+$', '', driver.split('nvidia-drivers-', 1)[1])
|
|
result = {'checked': [], 'rebuilt': [], 'missing': []}
|
|
for atom in [snapshot['atom'], 'sys-kernel/gentoo-kernel-bin']:
|
|
cpv = subprocess.check_output(['portageq', 'best_version', '/', atom], text=True).strip()
|
|
contents = (Path('/var/db/pkg') / cpv / 'CONTENTS').read_text() if cpv else ''
|
|
versions = sorted(set(re.findall(r'/(?:usr/)?lib/modules/([^/ ]+)/', contents)))
|
|
if not versions:
|
|
result['missing'].append('NVIDIA kernel target: ' + atom)
|
|
for version in versions:
|
|
result['checked'].append(version)
|
|
def ready():
|
|
return all(subprocess.run(['modinfo', '-k', version, '-F', 'version', module],
|
|
text=True, capture_output=True).stdout.strip() == expected
|
|
for module in ['nvidia', 'nvidia_drm', 'nvidia_modeset', 'nvidia_uvm'])
|
|
if ready():
|
|
continue
|
|
build = Path('/lib/modules') / version / 'build'
|
|
print('Building NVIDIA modules for ' + version, flush=True)
|
|
command = ['emerge', '--oneshot', '--nodeps', '--usepkg=n', '--getbinpkg=n',
|
|
'--autounmask=n', '=' + driver]
|
|
if build.is_dir() and subprocess.run(command, env=dict(os.environ, KERNEL_DIR=str(build))).returncode == 0 and ready():
|
|
result['rebuilt'].append(version)
|
|
else:
|
|
result['missing'].append('NVIDIA modules for ' + version)
|
|
return result
|
|
|
|
|
|
def replace_tree(source, target):
|
|
"""Replace target with a copy of source; merging would keep removed ebuilds
|
|
next to a Manifest that no longer lists their distfiles."""
|
|
target.parent.mkdir(parents=True, exist_ok=True)
|
|
scratch = target.with_name('.' + target.name + '-new-' + str(os.getpid()))
|
|
retired = target.with_name('.' + target.name + '-old-' + str(os.getpid()))
|
|
try:
|
|
shutil.copytree(source, scratch, symlinks=True)
|
|
if target.exists() or target.is_symlink():
|
|
target.rename(retired)
|
|
try:
|
|
scratch.rename(target)
|
|
except OSError:
|
|
if retired.exists() and not target.exists():
|
|
retired.rename(target)
|
|
raise
|
|
finally:
|
|
for leftover in (scratch, retired):
|
|
if leftover.is_symlink():
|
|
leftover.unlink()
|
|
elif leftover.exists():
|
|
shutil.rmtree(leftover)
|
|
|
|
|
|
def install_packages(selection):
|
|
if os.geteuid() != 0:
|
|
raise RuntimeError('Package installation requires root. Run sudo ./install --install-packages --selection <file>.')
|
|
if selection['profile'] == 'fiw-ryzen':
|
|
cpu = Path('/proc/cpuinfo').read_text()
|
|
if 'AuthenticAMD' not in cpu or '9900X' not in cpu:
|
|
raise RuntimeError("Fiw's Ryzen targets the Ryzen 9900X/Zen 5 setup. Choose Stock on other devices.")
|
|
requested = list(dict.fromkeys(p for values in package_map(selection).values() for p in values))
|
|
if not requested:
|
|
raise RuntimeError('No packages selected')
|
|
with tempfile.TemporaryDirectory(prefix='fiw-dots-portage-') as temp:
|
|
stage = Path(temp)
|
|
# Portage evaluates ebuild metadata as its unprivileged user.
|
|
stage.chmod(0o755)
|
|
shutil.copytree('/etc/portage', stage / 'etc/portage', symlinks=True,
|
|
ignore=shutil.ignore_patterns('gnupg'))
|
|
profile = stage / 'etc/portage/make.profile'
|
|
profile.unlink()
|
|
profile.symlink_to(Path('/etc/portage/make.profile').resolve())
|
|
export(selection, stage)
|
|
fetched = stage_repositories(selection, stage)
|
|
make_conf = stage / 'etc/portage/make.conf'
|
|
make_conf.write_text(make_conf.read_text() + '\nsource "' + str(stage / 'etc/portage/fiw-dots.conf') + '"\n')
|
|
# Repository checkout is local and read-only for resolution. No live
|
|
# root files are changed before successful resolution and confirmation.
|
|
accepted, skipped = list(requested), []
|
|
approved = set(source_policy(selection))
|
|
while accepted:
|
|
plan = resolve(stage, selection, accepted)
|
|
print(plan.stdout)
|
|
if plan.returncode:
|
|
raise RuntimeError('Portage could not resolve the selection. No live configuration was applied; sync repositories or correct the reported masks first.')
|
|
unexpected = sorted({cp_from_cpv(x) for x in source_builds(plan.stdout)} - approved)
|
|
if not unexpected:
|
|
break
|
|
declined = set()
|
|
for package in unexpected:
|
|
if ask('No suitable binary for ' + package + '. Compile recommended.', ['compile', 'skip'], 'compile') == 'compile':
|
|
approved.add(package)
|
|
else:
|
|
declined.add(package)
|
|
if declined:
|
|
retained = []
|
|
for package in accepted:
|
|
single = resolve(stage, selection, [package])
|
|
needed = {cp_from_cpv(x) for x in source_builds(single.stdout)}
|
|
if single.returncode or needed & declined:
|
|
skipped.append(package)
|
|
else:
|
|
retained.append(package)
|
|
if retained == accepted:
|
|
raise RuntimeError('Cannot safely remove the skipped dependency from this selection.')
|
|
accepted = retained
|
|
print('Skipped: ' + (', '.join(skipped) or 'none'))
|
|
if not accepted:
|
|
print('All requested packages were skipped; no live configuration applied.')
|
|
return {'status': 'skipped', 'requested': requested, 'skipped': skipped, 'missing': requested}
|
|
build_modules = (selection['kernel'] == 'custom' and 'system' in selection['groups']
|
|
and 'x11-drivers/nvidia-drivers' in accepted
|
|
and any(atom.startswith('=sys-kernel/gentoo-kernel-') for atom in accepted))
|
|
if build_modules:
|
|
print('NVIDIA modules will be checked and compiled when needed for the selected custom kernel and binary fallback.')
|
|
if ask('Apply the previewed Portage files and install the accepted packages?', ['apply', 'cancel'], 'cancel') != 'apply':
|
|
return {'status': 'cancelled', 'requested': requested, 'skipped': skipped}
|
|
publish_repositories(fetched)
|
|
# Back up each existing managed destination before replacing it.
|
|
stamp = datetime.now(timezone.utc).strftime('%Y%m%dT%H%M%S.%fZ')
|
|
backup_root = Path('/var/lib/Fiw-Gentoo-Dots/backups') / stamp
|
|
for relative, content in root_files(selection, '/var/db/repos/fiw-dots').items():
|
|
dest = Path('/') / relative
|
|
if relative.startswith('etc/portage/sets/'):
|
|
continue
|
|
if dest.is_file() and dest.read_text() == content:
|
|
continue
|
|
if dest.exists() or dest.is_symlink():
|
|
if ask('Replace managed system file ' + relative + ' with a backup?', ['apply', 'keep'], 'keep') == 'keep':
|
|
continue
|
|
backup = backup_root / relative
|
|
backup.parent.mkdir(parents=True, exist_ok=True)
|
|
shutil.copy2(dest, backup, follow_symlinks=False)
|
|
dest.parent.mkdir(parents=True, exist_ok=True)
|
|
dest.write_text(content)
|
|
if selection['kernel'] == 'custom' and 'system' in selection['groups']:
|
|
patch_dir = Path('/etc/portage/patches/sys-kernel/gentoo-kernel')
|
|
patch_dir.mkdir(parents=True, exist_ok=True)
|
|
for src in (REPO / 'optional/kernel/patches').glob('*.patch'):
|
|
dest = patch_dir / src.name
|
|
if dest.exists():
|
|
backup = backup_root / dest.relative_to('/')
|
|
backup.parent.mkdir(parents=True, exist_ok=True)
|
|
shutil.copy2(dest, backup)
|
|
shutil.copy2(src, dest)
|
|
overlay = Path('/var/db/repos/fiw-dots')
|
|
if overlay.exists():
|
|
shutil.copytree(overlay, backup_root / 'overlay', symlinks=True)
|
|
replace_tree(REPO / 'overlay', overlay)
|
|
make_conf = Path('/etc/portage/make.conf')
|
|
include = 'source /etc/portage/fiw-dots.conf'
|
|
if include not in make_conf.read_text():
|
|
backup = backup_root / 'etc/portage/make.conf'
|
|
backup.parent.mkdir(parents=True, exist_ok=True)
|
|
shutil.copy2(make_conf, backup)
|
|
with make_conf.open('a') as stream:
|
|
stream.write('\n# Fiw-Gentoo-Dots selected preset\n' + include + '\n')
|
|
selected = Path('/etc/portage/sets/fiw-dots-selected')
|
|
selected.parent.mkdir(parents=True, exist_ok=True)
|
|
selected.write_text('\n'.join(accepted) + '\n')
|
|
Path('/var/tmp/notmpfs').mkdir(parents=True, exist_ok=True)
|
|
# Resolve once more against the live configuration; abort if the source
|
|
# build list changed between review and installation.
|
|
final = resolve(Path('/'), selection, ['@fiw-dots-selected'])
|
|
if final.returncode or ({cp_from_cpv(x) for x in source_builds(final.stdout)} - approved):
|
|
raise RuntimeError('The final package plan changed. Review it before retrying; backups are at ' + str(backup_root))
|
|
result = resolve(Path('/'), selection, ['@fiw-dots-selected'], execute=True)
|
|
modules = nvidia_modules() if result.returncode == 0 and build_modules else {}
|
|
missing = [atom for atom in requested if subprocess.run(
|
|
['portageq', 'has_version', '/', atom], stdout=subprocess.DEVNULL,
|
|
stderr=subprocess.DEVNULL).returncode != 0]
|
|
report = {'requested': requested, 'present': [atom for atom in accepted if atom not in missing],
|
|
'skipped': skipped, 'emerge_exit_code': result.returncode,
|
|
'missing': missing,
|
|
'modules': modules, 'failed': modules.get('missing', []),
|
|
'pending': []}
|
|
state = Path('/var/lib/Fiw-Gentoo-Dots')
|
|
state.mkdir(parents=True, exist_ok=True)
|
|
(state / ('packages-' + stamp + '.json')).write_text(json.dumps(report, indent=2) + '\n')
|
|
print('Package report: ' + str(state / ('packages-' + stamp + '.json')))
|
|
print('Missing packages: ' + (', '.join(missing) or 'none'))
|
|
if build_modules and result.returncode == 0:
|
|
print('Missing NVIDIA modules: ' + (', '.join(modules.get('missing', [])) or 'none'))
|
|
if result.returncode or modules.get('missing'):
|
|
error = RuntimeError('Some packages or kernel modules did not install; consult the package report and emerge output.')
|
|
error.report = report
|
|
raise error
|
|
if 'kde' in selection['groups'] and 'kde-plasma/plasma-login-manager' not in missing:
|
|
subprocess.run(['systemctl', 'enable', '--force', 'plasmalogin.service'], check=True)
|
|
print('Portage installation finished. Plasma Login Manager is enabled for selected KDE installs; no running greeter was restarted. Use the selected Flatpak, service and boot actions or the full restore workflow to finish setup.')
|
|
return report
|
|
|
|
|
|
def check_packages(selection):
|
|
"""Resolve against a staged copy of the current Portage configuration."""
|
|
requested = list(dict.fromkeys(p for values in package_map(selection).values() for p in values))
|
|
with tempfile.TemporaryDirectory(prefix='fiw-dots-check-') as temp:
|
|
stage = Path(temp)
|
|
stage.chmod(0o755)
|
|
shutil.copytree('/etc/portage', stage / 'etc/portage', symlinks=True,
|
|
ignore=shutil.ignore_patterns('gnupg'))
|
|
profile = stage / 'etc/portage/make.profile'
|
|
profile.unlink()
|
|
profile.symlink_to(Path('/etc/portage/make.profile').resolve())
|
|
export(selection, stage)
|
|
fetched = stage_repositories(selection, stage)
|
|
make_conf = stage / 'etc/portage/make.conf'
|
|
make_conf.write_text(make_conf.read_text() + '\nsource "' + str(stage / 'etc/portage/fiw-dots.conf') + '"\n')
|
|
result = resolve(stage, selection, requested)
|
|
print(result.stdout)
|
|
if result.returncode:
|
|
raise RuntimeError('The staged package plan could not be resolved. No live files were changed.')
|
|
extra = {cp_from_cpv(value) for value in source_builds(result.stdout)} - set(source_policy(selection))
|
|
print('Additional source-build choices required: ' + (', '.join(sorted(extra)) or 'none'))
|
|
|
|
|
|
def main():
|
|
parser = argparse.ArgumentParser(description=__doc__)
|
|
parser.add_argument('--version', action='version', version='Fiw-Gentoo-Dots ' + (REPO / 'VERSION').read_text().strip())
|
|
parser.add_argument('--selection')
|
|
parser.add_argument('--device', metavar='NAME', help='Load a named selection from ignored local/devices')
|
|
parser.add_argument('--save-device', metavar='NAME', help='Save the current selection as a named device preset')
|
|
parser.add_argument('--list-devices', action='store_true')
|
|
parser.add_argument('--profile', choices=['stock', 'fiw-ryzen'], default='stock')
|
|
parser.add_argument('--home', type=Path, default=Path.home())
|
|
parser.add_argument('--plan', action='store_true')
|
|
parser.add_argument('--catalog', action='store_true')
|
|
parser.add_argument('--export', type=Path)
|
|
parser.add_argument('--apply-configs', action='store_true')
|
|
parser.add_argument('--check-configs', action='store_true')
|
|
parser.add_argument('--install-packages', action='store_true')
|
|
parser.add_argument('--check-packages', action='store_true')
|
|
parser.add_argument('--install-flatpaks', action='store_true')
|
|
parser.add_argument('--enable-services', action='store_true')
|
|
parser.add_argument('--deploy-bootloader', action='store_true')
|
|
parser.add_argument('--boot-plan', action='store_true')
|
|
parser.add_argument('--esp', type=Path)
|
|
parser.add_argument('--list-backups', action='store_true')
|
|
parser.add_argument('--backup-plan', metavar='ID')
|
|
parser.add_argument('--restore-backup', metavar='ID')
|
|
parser.add_argument('--list-proposals', action='store_true')
|
|
parser.add_argument('--proposal-plan', metavar='ID')
|
|
parser.add_argument('--accept-proposal', metavar='ID')
|
|
parser.add_argument('--summary', action='store_true')
|
|
parser.add_argument('--run-id')
|
|
parser.add_argument('--execution-error', help=argparse.SUPPRESS)
|
|
parser.add_argument('--workflow', choices=['restore', 'configs', 'packages', 'flatpaks', 'services', 'boot', 'backup', 'proposal'], default='restore')
|
|
parser.add_argument('--update', action='store_true')
|
|
parser.add_argument('--conflict', choices=['ask', 'keep', 'apply'], default='ask')
|
|
args = parser.parse_args()
|
|
if args.catalog:
|
|
print(json.dumps({'groups': GROUPS, 'configs': CATALOG, 'extras': EXTRAS,
|
|
'flatpaks': FLATPAKS, 'services': SERVICES,
|
|
'stock': load_selection(profile='stock'), 'ryzen': load_selection(profile='fiw-ryzen'),
|
|
'devices': device_presets.list_presets(REPO, load_selection)}))
|
|
return
|
|
if args.selection is not None and args.device is not None:
|
|
raise ValueError('Choose either --selection or --device.')
|
|
selection = load_selection(device_presets.path(REPO, args.device) if args.device is not None else args.selection, args.profile)
|
|
if args.list_devices:
|
|
print(json.dumps(sorted(device_presets.list_presets(REPO, load_selection))))
|
|
return
|
|
if args.save_device is not None:
|
|
device_presets.save(REPO, args.save_device, selection, ask)
|
|
return
|
|
if args.run_id:
|
|
reporting.validate_run(args.run_id)
|
|
home = args.home.resolve()
|
|
if args.list_proposals:
|
|
print(json.dumps(proposals.list_proposals(home, backup_paths())))
|
|
return
|
|
if args.proposal_plan:
|
|
print(proposals.preview(home, args.proposal_plan, backup_paths()))
|
|
return
|
|
if args.list_backups:
|
|
print(json.dumps(backups.list_backups(home, backup_paths())))
|
|
return
|
|
if args.backup_plan:
|
|
print(json.dumps(backups.plan(home, args.backup_plan, backup_paths()), indent=2))
|
|
return
|
|
if args.summary:
|
|
if os.geteuid() == 0:
|
|
raise RuntimeError('Create the combined restoration summary as the target user.')
|
|
reporting.summarize(selection, home, config_requirements(selection, planned=False), manual_steps(selection), args.run_id, args.workflow, args.execution_error)
|
|
return
|
|
action = ('configs' if args.apply_configs else 'packages' if args.install_packages else
|
|
'flatpaks' if args.install_flatpaks else 'services-system' if args.enable_services and os.geteuid() == 0 else
|
|
'services-user' if args.enable_services else 'boot' if args.deploy_bootloader else
|
|
'backup' if args.restore_backup else 'proposal' if args.accept_proposal else 'preflight' if args.check_configs and args.run_id else None)
|
|
if action:
|
|
run_id = args.run_id or datetime.now(timezone.utc).strftime('%Y%m%dT%H%M%S.%fZ')
|
|
details = {}
|
|
try:
|
|
if action == 'configs':
|
|
if os.geteuid() == 0:
|
|
raise RuntimeError('Apply user configs as the target user, not as root.')
|
|
details = apply_configs(selection, home, args.update, args.conflict)
|
|
elif action == 'packages':
|
|
details = install_packages(selection)
|
|
elif action == 'flatpaks':
|
|
details = install_flatpaks(selection, ask)
|
|
elif action.startswith('services-'):
|
|
details = enable_services(selection, ask)
|
|
elif action == 'boot':
|
|
from boot import deploy
|
|
details = deploy(selection['bootloader'], args.esp, ask)
|
|
elif action == 'backup':
|
|
details = backups.restore(home, args.restore_backup, backup_paths(), ask, active_plasma, args.conflict)
|
|
elif action == 'proposal':
|
|
details = proposals.accept(home, args.accept_proposal, backup_paths(), ask, active_plasma)
|
|
else:
|
|
check_configs(selection, home)
|
|
print('Config restoration preflight passed.')
|
|
except (ValueError, OSError, RuntimeError, subprocess.CalledProcessError) as error:
|
|
reporting.record(selection, run_id, action, home, getattr(error, 'report', details) or {}, error)
|
|
raise
|
|
event = reporting.record(selection, run_id, action, home, details or {})
|
|
if event['status'] == 'cancelled':
|
|
raise SystemExit(130)
|
|
return
|
|
if args.export:
|
|
export(selection, args.export)
|
|
elif args.check_configs:
|
|
check_configs(selection, args.home)
|
|
print('Config restoration preflight passed.')
|
|
elif args.check_packages:
|
|
check_packages(selection)
|
|
elif args.boot_plan:
|
|
from boot import plan
|
|
print(json.dumps(plan(selection['bootloader'], args.esp), indent=2))
|
|
else:
|
|
print(preview(selection))
|
|
|
|
|
|
if __name__ == '__main__':
|
|
try:
|
|
main()
|
|
except (ValueError, OSError, RuntimeError, subprocess.CalledProcessError) as error:
|
|
print('Error: ' + str(error), file=sys.stderr)
|
|
sys.exit(1)
|