#1108 multilib improvements
Merged 2 years ago by kevin. Opened 2 years ago by kparal.
kparal/pungi-fedora multilib  into  main

file modified
+67 -18
@@ -202,31 +202,80 @@ 

      }),

  ]

  

+ # Note: If you change something here (affects Rawhide/Branched composes), also

+ # submit the same change to the Bodhi config (affects updates for stable releases),

+ # we want to keep them in sync:

+ # https://pagure.io/fedora-infra/ansible/blob/main/f/roles/bodhi2/backend/templates/pungi.rpm.conf.j2

+ #

  # format: {arch|*: [packages]}

  multilib_blacklist = {

-     '*': ['kernel', 'kernel-PAE*', 'kernel*debug*',

-         'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',

-         'php-devel', 'java-*', 'bash-devel',

-         'httpd-devel', 'tomcat-native', 'php*', 'httpd',

-         'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*',

-         'mp'

-     ],

+     '*': [

+         'bash-devel',

+         'dmraid-devel',

+         'ghc-*',

+         'httpd',

+         'httpd-devel',

+         'java-*',

+         'kdeutils-devel',

+         'kernel',

+         'kernel*debug*',

+         'kernel-PAE*',
kevin commented 2 years ago

This is gone... with the kernel no longer making i686...

+         'krb5-server',

+         'krb5-server-ldap',

+         'mkinitrd-devel',
kevin commented 2 years ago

replaced by dracut?

+         'mod_*',

+         'mp',

+         'php*',

+         'php-devel',

+         'tomcat-native',

+         ],

  }

  

- 

+ # Note: If you change something here (affects Rawhide/Branched composes), also

+ # submit the same change to the Bodhi config (affects updates for stable releases),

+ # we want to keep them in sync:

+ # https://pagure.io/fedora-infra/ansible/blob/main/f/roles/bodhi2/backend/templates/pungi.rpm.conf.j2

+ #

  # format: {arch|*: [packages]}

  multilib_whitelist = {

-     '*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',

-         'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',

-         'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',

-         'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',

-         'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc',

-         'fakechroot-libs','mesa-vdpau-drivers', 'mesa-vulkan-drivers',

-         'p11-kit-trust', 'mariadb-connector-odbc', 'compiler-rt',

+     '*': [

+         '*-static',

+         'apitrace-libs',

+         'compiler-rt',

+         'dssi-vst-wine',

+         'fakechroot-libs',

+         'fakeroot-libs',

+         'glib-networking',

+         'glx-utils',

+         'ibus-gtk2',

+         'ibus-gtk3',

+         'ibus-libs',

+         'iptables',

+         'libflashsupport',
kevin commented 2 years ago

Gone with the death of flash

+         'libgnat',

+         'lmms-vst',

+         'mangohud',

+         'mariadb-connector-odbc',

+         'mesa-vdpau-drivers',

+         'mesa-vulkan-drivers',

+         'mysql-connector-odbc',

+         'nosync',

+         'nspluginwrapper',

          'nvidia-query-resource-opengl-lib',

-         'ibus-libs', 'ibus-gtk2', 'ibus-gtk3',

-         'glib-networking', 'dssi-vst-wine', 'mangohud', 'vkBasalt', 'glx-utils'

-     ],

+         'p11-kit-trust',

+         'perl-libs',

+         'pipewire',

+         'postgresql-odbc',

+         'redhat-lsb',

+         'syslinux-extlinux-nonlinux',

+         'syslinux-nonlinux',

+         'syslinux-tftpboot',
kevin commented 2 years ago

syslinux should be no longer needed in rawhide

+         'valgrind',

+         'vkBasalt',

+         'wine',

+         'wine-*',

+         'yaboot',

+         ],

  }

  

  createiso_skip = [

Trying to sync multilib values between pungi-fedora and a bodhi infra config. For more details:
https://pagure.io/fedora-infrastructure/issue/10779
Please look at the commits individually, not the global diff.

For reference, a similar PR was accepted in fedora infra ansible:
https://pagure.io/fedora-infra/ansible/pull-request/1121

The multilib_whitelist should now be exactly the same as in fedora infra after this PR is merged.

+1, but... could you add a nice big comment here (and I can push it on the bodhi side too, or you can submit another pr there)?

something like:
if you add/remove something from here, please also add/remove it in the other location... we want to keep them in sync.
Or even explain that one affects rawhide/branched and the other all updates...

just to remind us to keep them in sync and also for future generations wondering...

1 new commit added

  • multilib: note that people should update it in two places
2 years ago

I added the comment and created the same patch here:
https://pagure.io/fedora-infra/ansible/pull-request/1131

Note that multilib_blacklist is currently not in sync, because I didn't dare to decide which side is better.

This is gone... with the kernel no longer making i686...

replaced by dracut?

Gone with the death of flash

syslinux should be no longer needed in rawhide

All that said, we could just merge this and clean up non existent packages in another PR. ;)

I guess let's merge this now and update the blacklist in a subsequent step. Perhaps by then somebody will have tried the shared config file approach mentioned in the ticket, which would save us some troubles.

Pull-Request has been merged by kevin

2 years ago
Metadata