Mercurial > code > home > repos > infra

changeset 309:f17d9925a2aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ubuntu update changed sources a bit
author drewp@bigasterisk.com
date Mon, 16 Sep 2024 20:10:00 -0700
parents 5449b2aea2df
children be6b2695542c
files apt.py package_lists.py templates/sources.list.j2
diffstat 3 files changed, 4 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/apt.py	Sat Aug 24 15:07:34 2024 -0700
+++ b/apt.py	Mon Sep 16 20:10:00 2024 -0700
@@ -60,7 +60,7 @@
     dir / 'raspi.list',
 ]):
     found = map(Path, cast(str, host.get_fact(FindFiles, dir, quote_path=True)))
-    if set(found) - set(known):
+    if set(found) - set(known) - {dir / 'ubuntu.sources'}:
         raise SystemExit(f"new files in {host.name} /etc/apt/sources.list.d/ - please remove")
     for f in known:
         files.file(path=f, present=False)
@@ -72,6 +72,9 @@
 
     files.template(src='templates/sources.list.j2', dest='/etc/apt/sources.list')
 
+    if 'big' in host.groups or 'laptop' in host.groups or 'hosted' in host.groups:
+        files.template(src='templates/ubuntu.sources.j2', dest='/etc/apt/sources.list.d/ubuntu.sources')
+
     clear_known_sources_files()
     apt.packages(update=True,
                  cache_time=86400,
--- a/package_lists.py	Sat Aug 24 15:07:34 2024 -0700
+++ b/package_lists.py	Mon Sep 16 20:10:00 2024 -0700
@@ -161,7 +161,6 @@
     'cmake',
     'code',
     'cups',
-    'darcs',
     'dclock',
     'dolphin',
     'eog',
--- a/templates/sources.list.j2	Sat Aug 24 15:07:34 2024 -0700
+++ b/templates/sources.list.j2	Mon Sep 16 20:10:00 2024 -0700
@@ -16,19 +16,6 @@
 deb [signed-by=/etc/apt/keyrings/coral.gpg] https://packages.cloud.google.com/apt coral-edgetpu-stable main
 {% endif %}
 
-{% if 'big' in host.groups or 'laptop' in host.groups or 'hosted' in host.groups %}
-deb http://us.archive.ubuntu.com/ubuntu mantic main restricted
-deb http://us.archive.ubuntu.com/ubuntu mantic multiverse
-deb http://us.archive.ubuntu.com/ubuntu mantic universe
-deb http://us.archive.ubuntu.com/ubuntu mantic-backports main restricted universe multiverse
-deb http://us.archive.ubuntu.com/ubuntu mantic-security main restricted
-deb http://us.archive.ubuntu.com/ubuntu mantic-security multiverse
-deb http://us.archive.ubuntu.com/ubuntu mantic-security universe
-deb http://us.archive.ubuntu.com/ubuntu mantic-updates main restricted
-deb http://us.archive.ubuntu.com/ubuntu mantic-updates multiverse
-deb http://us.archive.ubuntu.com/ubuntu mantic-updates universe
-{% endif %}
-
 {% if host.name == 'pipe' %}
 # seems stuck on jammy since http://deb.odroid.in/n2/ and https://wiki.odroid.com/odroid-n2/os_images/ubuntu don't have anything newer (2023-12-28)
 deb [signed-by=/etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg] http://archive.canonical.com/ubuntu jammy partner