zabbix: packaging fixes and cleanup

[danielfdickinson]

📦 Package Details

Maintainer: @danielfdickinson

Description:

This is intended to be cherry-picked to go with PR #28426, once this PR has gone through the buildbots.

• It removes the wrongly committed cspell.json.
• It fixes and erroneous use of BUILD_VARIANT where VARIANT should be used.
• In preparation for further changes, deduplicate package definitions,
  and reorganize them. At the same time make use of provides to ensure
  both existing names are preserved, and that it is possible to be
  specific about the variant of the package one wants.
• It also condenses the package conffiles, install, postinst, etc handling.
  This is more maintainable (less copy and paste and less to modify).

---

🧪 Run Testing Details

To be done

• OpenWrt Version:
• OpenWrt Target/Subtarget:
• OpenWrt Device:

---

✅ Formalities

• I have reviewed the CONTRIBUTING.md file for detailed contributing guidelines.

[mhei]

Hu, this sounds strange. Is this by design or do we consider it a bug? Then maybe raise an issue upstream?

[danielfdickinson]

@mhei I don't think is is an upstream issue as upstream doesn't generate Kconfig from other sources (in our case Makefiles are parsed by Perl scripts) but create the Kconfig directly and check that in.

The issue, as I recall from looking at this years ago, is the the Perl scripts dump all the packages into one great big list that is sorted alphabetically. This can result in some strange behaviour of an item lower in the list is preceded by a package from a different Makefile that is a child of something in that Makefile. The later package ends up (in certain situations) getting the indentation / submenu settings (I don't remember exactly) from the preceding package.

I think a resolution would require an update to the Perl scripts which probably haven't been touched for almost a decade, and would require a rewrite of the process, I think. Maybe a GSoC project, but whether it is worth it is another thing.

[danielfdickinson]

This is what it looks like if I change anossl to nossl:

[danielfdickinson]

In tmp/.config-package.in (a generated file), one sees:

        config PACKAGE_zabbix-agentd-gnutls
                tristate "zabbix-agentd-gnutls......................... Zabbix agentd (with GnuTLS)"
                default y if DEFAULT_zabbix-agentd-gnutls
                default m if ALL
                select PACKAGE_libc
                select PACKAGE_libevent2-pthreads
                select PACKAGE_libgnutls
                select PACKAGE_libiconv-full if BUILD_NLS
                select PACKAGE_libpcre2
                select PACKAGE_zlib
                help
                 Zabbix agentd (with GnuTLS)

        config PACKAGE_zabbix-agentd-nossl
                tristate "zabbix-agentd-nossl............................... Zabbix agentd (no SSL)"
                default y if DEFAULT_zabbix-agentd-nossl
                default m if ALL
                select PACKAGE_libc
                select PACKAGE_libevent2-pthreads
                select PACKAGE_libiconv-full if BUILD_NLS
                select PACKAGE_libpcre2
                select PACKAGE_zlib
                depends on m || (PACKAGE_zabbix-agentd-openssl != y)
                depends on m || (PACKAGE_zabbix-agentd-gnutls != y)
                help
                 Zabbix agentd (no SSL)

        config PACKAGE_zabbix-agentd-openssl
                tristate "zabbix-agentd-openssl....................... Zabbix agentd (with OpenSSL)"
                default y if DEFAULT_zabbix-agentd-openssl
                default m if ALL
                select PACKAGE_libc
                select PACKAGE_libevent2-pthreads
                select PACKAGE_libiconv-full if BUILD_NLS
                select PACKAGE_libopenssl
                select PACKAGE_libpcre2
                select PACKAGE_zlib
                help

[danielfdickinson]

So I didn't remember quite correctly. This is generated this way using tmp/.packageinfo and/or temp.packagedeps which are each one big sorted list.

[danielfdickinson]

IIRC the problem is in scripts/package-metadata.pl .

[danielfdickinson]

I've created openwrt/openwrt#21734 for this.