minor fixes

diff --git a/brc3 b/brc3
index d1386b32e3799df89d7de105bad80b104ee584c7..289ee99f633c0594dbb405cd7e7e9f9162a140af 100644 (file)
--- a/brc3
+++ b/brc3
@@ -33,14 +33,14 @@ ecne-noble-get-missing() {
   noble=$(echo ${prefix}ubuntu.com_ubuntu_dists_noble{,-security,-updates}_{main,universe}_binary-amd64_Packages)
   ecne=$(echo ${prefix}trisquel.org_trisquel_dists_ecne{,-updates,-security}_main_binary-amd64_Packages)
   test-ecne-noble-package-lists-exist
-  u24_kernel_pkgs="virtual|oem|image|generic|firmware|aws|azure|buildinfo|cloud|gcp|gke|headers|ibm|lowlatency|modules|nvidia|riscv|tools|intel|oracle|lib-rust"
+  u24_kernel_pkgs="virtual|oem|image|generic|firmware|aws|azure|buildinfo|cloud|gcp|gke|headers|hwe|ibm|lowlatency|modules|nvidia|riscv|tools|intel|oracle|lib-rust"
   for dist in ecne noble; do
     # shellcheck disable=SC2094 # false positive
     {
       # task- because trisquel doesn't have most(all?) ubuntu tasks.
       # firefox-locale because we have abrowser.
       # chromium because they are just ancillary to the snap package.
-      grep-dctrl -F package -v -e "ubuntu|zfs|thunderbird|^firefox-locale|^chromium|^task-|snapd|microcode|gnome-firmware|nonfree|fwupd|^linux-($u24_kernel_pkgs)" ${!dist} | \
+      grep-dctrl -F package -v -e "ubuntu|zfs|thunderbird|^firefox-locale|^chromium|^task-|snapd|microcode|gnome-firmware|nonfree|^oem-|fwupd|^linux-($u24_kernel_pkgs)" ${!dist} | \
         grep-dctrl -s package -n -F depends,pre-depends -v snapd -
       if [[ $dist == noble ]]; then
         echo ubuntu-keyring
@@ -64,7 +64,7 @@ EOF
 update-ecne-missing() {
   mkc /t/mmchroot
   ecne-noble-get-missing
-  cp prefs /b/fai/fai/config/files/etc/apt/preferences.d/ecne-missing/ECNE
+  cp prefs /b/fai/fai/config/files/etc/apt/preferences.d/ecne-missing/ECNE_MISSING
   s cp prefs /etc/apt/preferences.d/ecne-missing
 }
 mmdebstrap-ecne-noble() {

diff --git a/subdir_files/sieve/liststest.sieve b/subdir_files/sieve/liststest.sieve
index 62a412c7833664aa49142d90c18f33f7cf8d9227..990980a84a01956f0603f1c93adcb79a6e4f308d 100644 (file)
--- a/subdir_files/sieve/liststest.sieve
+++ b/subdir_files/sieve/liststest.sieve
@@ -96,6 +96,9 @@ if anyof (
 # may 2023 exim list ids changed
   header :contains "list-id" "<exim-dev.lists.exim.org>",
   header :contains "list-id" "<exim-users.lists.exim.org>",
+  # goes to inbox, just here so I can find the name easier
+  #header :contains "list-id" "<pkg-exim4-users.alioth-lists.debian.net>",
+
   header :contains "list-id" "<octave-maintainers.gnu.org>",
   header :contains "list-id" "<discuss-gnuradio.gnu.org>",
   header :contains "list-id" "<seabios.seabios.org>",