Since Agostino's tinderbox tests now report qa warning, the group v...@gentoo.org has 101 open bugs assigned, most of them caused by qa warnings from vdr-plugin-2.eclass.
Many vdr plugins need small adjustments because API or makefile changes in upstream media-video/vdr which can be easily fixed with small changes. These warnings are only useful for the vdr plugin maintainers, so I propose they should (only) be reported as QA-warnings when the global variable VDR_MAINTAINER_MODE="1" is set in make.conf This patch is also put to github in https://github.com/gentoo/gentoo/pull/36504 The PR is lacking many many "Closes: ...." tags, which I will fill in soon. Any comments? -- Martin ######################################################################## commit 00a0a3237729ec4886e07d9869fdfd6e0cd5f985 Author: Martin Dummer <martin.dum...@gmx.net> Date: Wed May 1 14:49:37 2024 +0200 vdr-plugin-2.eclass: make qa warning conditional many vdr plugins need small adjustments because API or makefile changes in upstream media-video/vdr which can be easily fixed with small changes These fixes should (only) be reported as QA-warnings when the global variable VDR_MAINTAINER_MODE="1" is set in make.conf Signed-off-by: Martin Dummer <martin.dum...@gmx.net> diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass index 8f56511032c8..bc9a88db59a5 100644 --- a/eclass/vdr-plugin-2.eclass +++ b/eclass/vdr-plugin-2.eclass @@ -160,7 +160,6 @@ vdr_create_header_checksum_file() { # Plugins failed on compile with wrong path of libsi includes, # this can be fixed by 'function + space separated list of files' fix_vdr_libsi_include() { - eqawarn "QA Notice: Fixing include of libsi-headers" local f for f; do sed -i "${f}" \ @@ -244,7 +243,7 @@ vdr_gettext_missing() { # plugins without converting to gettext local GETTEXT_MISSING=$( grep xgettext Makefile ) - if [[ -z ${GETTEXT_MISSING} ]]; then + if [[ -z ${GETTEXT_MISSING} && -n ${VDR_MAINTAINER_MODE} ]]; then eqawarn "QA Notice: Plugin isn't converted to gettext handling!" fi } @@ -306,11 +305,15 @@ vdr_i18n() { if [[ -n ${I18N_OBJECT} ]]; then if [[ "${KEEP_I18NOBJECT:-no}" = "yes" ]]; then - eqawarn "QA Notice: Forced to keep i18n.o" + if [[ -n ${VDR_MAINTAINER_MODE} ]]; then + eqawarn "QA Notice: Forced to keep i18n.o" + fi else sed -i "s:i18n.o::g" Makefile \ || die "sed failed to remove i18n from Makefile" - eqawarn "QA Notice: OBJECT i18n.o found, removed per sed" + if [[ -n ${VDR_MAINTAINER_MODE} ]]; then + eqawarn "QA Notice: OBJECT i18n.o found, removed per sed" + fi fi fi @@ -318,7 +321,9 @@ vdr_i18n() { if [[ -n ${I18N_STRING} ]]; then sed -i "s:^extern[[:space:]]*const[[:space:]]*tI18nPhrase://static const tI18nPhrase:" i18n.h \ || die "sed failed to replace tI18nPhrase" - eqawarn "QA Notice: obsolete tI18nPhrase found, disabled per sed, please recheck" + if [[ -n ${VDR_MAINTAINER_MODE} ]]; then + eqawarn "QA Notice: obsolete tI18nPhrase found, disabled per sed, please recheck" + fi fi } @@ -337,7 +342,9 @@ vdr_remove_i18n_include() { || die "sed failed to remove i18n_include" done - eqawarn "QA Notice: removed i18n.h include in ${@}" + if [[ -n ${VDR_MAINTAINER_MODE} ]]; then + eqawarn "QA Notice: removed i18n.h include in ${@}" + fi } # @FUNCTION: vdr-plugin-2_print_enable_command @@ -568,7 +575,9 @@ vdr-plugin-2_src_install() { DESTDIR="${D%/}" \ || die "emake install (makefile target) failed" else - eqawarn "QA Notice: Plugin use still the old Makefile handling" + if [[ -n ${VDR_MAINTAINER_MODE} ]]; then + eqawarn "QA Notice: Plugin use still the old Makefile handling" + fi insinto "${VDR_PLUGIN_DIR}" doins libvdr-*.so.* fi
