* [Buildroot] [PATCH 01/29] package/pkg-generic: add check for deprecated _INSTALL_HOST_OPTS
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-08-10 22:09 ` Thomas Petazzoni via buildroot
2023-01-01 23:36 ` [Buildroot] [PATCH 02/29] package/libmng: fix optional dependency to lcms2 Ricardo Martincoski
` (27 subsequent siblings)
28 siblings, 1 reply; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni, Ricardo Martincoski
Commit "f6fe8932df pkg-generic: add checks on deprecated variables
FOO_BAR_OPT" introduced checks for deprecated variables, and warns the
user to use _INSTALL_HOST_OPTS instead of _INSTALL_HOST_OPT.
Commit "6a25cec33d package/pkg-cmake.mk: rename _INSTALL_HOST_OPTS ->
_INSTALL_OPTS" removed the usage of _INSTALL_HOST_OPTS but didn't add a
check for the deprecated variable.
Add a warning to change _INSTALL_HOST_OPTS to _INSTALL_OPTS.
And change the warning for _INSTALL_HOST_OPT to also suggest
_INSTALL_OPTS.
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
package/pkg-generic.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index f24e03a325..9db86eccea 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -1200,7 +1200,8 @@ $(eval $(call check-deprecated-variable,$(2)_MAKE_OPT,$(2)_MAKE_OPTS))
$(eval $(call check-deprecated-variable,$(2)_INSTALL_OPT,$(2)_INSTALL_OPTS))
$(eval $(call check-deprecated-variable,$(2)_INSTALL_TARGET_OPT,$(2)_INSTALL_TARGET_OPTS))
$(eval $(call check-deprecated-variable,$(2)_INSTALL_STAGING_OPT,$(2)_INSTALL_STAGING_OPTS))
-$(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_OPTS))
+$(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_OPTS))
+$(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPTS,$(2)_INSTALL_OPTS))
$(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS))
$(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS))
$(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS))
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* Re: [Buildroot] [PATCH 01/29] package/pkg-generic: add check for deprecated _INSTALL_HOST_OPTS
2023-01-01 23:36 ` [Buildroot] [PATCH 01/29] package/pkg-generic: add check for deprecated _INSTALL_HOST_OPTS Ricardo Martincoski
@ 2023-08-10 22:09 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 77+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-08-10 22:09 UTC (permalink / raw)
To: Ricardo Martincoski; +Cc: buildroot
On Sun, 1 Jan 2023 20:36:25 -0300
Ricardo Martincoski <ricardo.martincoski@gmail.com> wrote:
> Commit "f6fe8932df pkg-generic: add checks on deprecated variables
> FOO_BAR_OPT" introduced checks for deprecated variables, and warns the
> user to use _INSTALL_HOST_OPTS instead of _INSTALL_HOST_OPT.
>
> Commit "6a25cec33d package/pkg-cmake.mk: rename _INSTALL_HOST_OPTS ->
> _INSTALL_OPTS" removed the usage of _INSTALL_HOST_OPTS but didn't add a
> check for the deprecated variable.
>
> Add a warning to change _INSTALL_HOST_OPTS to _INSTALL_OPTS.
> And change the warning for _INSTALL_HOST_OPT to also suggest
> _INSTALL_OPTS.
>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> package/pkg-generic.mk | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
Not sure why we didn't apply this earlier: applied to next. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 77+ messages in thread
* [Buildroot] [PATCH 02/29] package/libmng: fix optional dependency to lcms2
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
2023-01-01 23:36 ` [Buildroot] [PATCH 01/29] package/pkg-generic: add check for deprecated _INSTALL_HOST_OPTS Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-04 16:45 ` Peter Korsgaard
2023-01-11 9:06 ` Peter Korsgaard
2023-01-01 23:36 ` [Buildroot] [PATCH 03/29] package/qcom-db410c-firmware: fix typo for <pkg>_LICENSE Ricardo Martincoski
` (26 subsequent siblings)
28 siblings, 2 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Ricardo Martincoski
"0ce9b533e3 libmng: new package" introduced a typo that makes the
optional dependency to lcms2 ineffective.
Fix the typo LIBMNG_DEPDENDENCIES -> LIBMNG_DEPENDENCIES.
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Tested using this minimal config:
BR2_x86_i686=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_LCMS2=y
BR2_PACKAGE_LIBMNG=y
before this patch:
$ make libmng-show-depends
host-skeleton jpeg skeleton toolchain zlib
after this patch:
$ make libmng-show-depends
host-skeleton jpeg lcms2 skeleton toolchain zlib
build test:
44 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed
https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/731769914
test-pkg config:
BR2_PACKAGE_LCMS2=y
BR2_PACKAGE_LIBMNG=y
---
package/libmng/libmng.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/libmng/libmng.mk b/package/libmng/libmng.mk
index 090fe18380..8ffd74c05b 100644
--- a/package/libmng/libmng.mk
+++ b/package/libmng/libmng.mk
@@ -14,7 +14,7 @@ LIBMNG_LICENSE = libmng license
LIBMNG_LICENSE_FILES = LICENSE
ifeq ($(BR2_PACKAGE_LCMS2),y)
-LIBMNG_DEPDENDENCIES += lcms2
+LIBMNG_DEPENDENCIES += lcms2
else
LIBMNG_CONF_OPTS += --without-lcms2
endif
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* [Buildroot] [PATCH 03/29] package/qcom-db410c-firmware: fix typo for <pkg>_LICENSE
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
2023-01-01 23:36 ` [Buildroot] [PATCH 01/29] package/pkg-generic: add check for deprecated _INSTALL_HOST_OPTS Ricardo Martincoski
2023-01-01 23:36 ` [Buildroot] [PATCH 02/29] package/libmng: fix optional dependency to lcms2 Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-04 16:44 ` Peter Korsgaard
2023-01-11 9:06 ` Peter Korsgaard
2023-01-01 23:36 ` [Buildroot] [PATCH 04/29] package/tinyxml: fix typo for TINYXML_CPE_ID_VENDOR Ricardo Martincoski
` (25 subsequent siblings)
28 siblings, 2 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Mike Frampton, Ricardo Martincoski
Cc: Mike Frampton <mikeframpo@gmail.com>
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
$ make defconfig
$ make qcom-db410c-firmware-legal-info
$ cat output/legal-info/manifest.csv
before this patch:
"qcom-db410c-firmware","1034.2.1","unknown","LICENSE",
"linux-board-support-package-r1034.2.1.zip",
"https://releases.linaro.org/96boards/dragonboard410c/qualcomm/firmware","glibc
[GPL-2.0+ (programs), LGPL-2.1+, BSD-3-Clause, MIT (library)]
linux-headers [GPL-2.0] skeleton-init-common [unknown]
skeleton-init-sysv [unknown]"
after this patch:
"qcom-db410c-firmware","1034.2.1","Qualcomm firmware license","LICENSE",
"linux-board-support-package-r1034.2.1.zip",
"https://releases.linaro.org/96boards/dragonboard410c/qualcomm/firmware","glibc
[GPL-2.0+ (programs), LGPL-2.1+, BSD-3-Clause, MIT (library)]
linux-headers [GPL-2.0] skeleton-init-common [unknown]
skeleton-init-sysv [unknown]"
---
package/qcom-db410c-firmware/qcom-db410c-firmware.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/qcom-db410c-firmware/qcom-db410c-firmware.mk b/package/qcom-db410c-firmware/qcom-db410c-firmware.mk
index 9ef32cc9d4..cf4b59b72e 100644
--- a/package/qcom-db410c-firmware/qcom-db410c-firmware.mk
+++ b/package/qcom-db410c-firmware/qcom-db410c-firmware.mk
@@ -8,7 +8,7 @@ QCOM_DB410C_FIRMWARE_VERSION = 1034.2.1
QCOM_DB410C_FIRMWARE_BASE = linux-board-support-package-r$(QCOM_DB410C_FIRMWARE_VERSION)
QCOM_DB410C_FIRMWARE_SOURCE = $(QCOM_DB410C_FIRMWARE_BASE).zip
QCOM_DB410C_FIRMWARE_SITE = https://releases.linaro.org/96boards/dragonboard410c/qualcomm/firmware
-QCOM_DB410C_FIRMWARE_LICENCE = Qualcomm firmware license
+QCOM_DB410C_FIRMWARE_LICENSE = Qualcomm firmware license
QCOM_DB410C_FIRMWARE_LICENSE_FILES = LICENSE
QCOM_DB410C_FIRMWARE_DEPENDENCIES = host-mtools
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* [Buildroot] [PATCH 04/29] package/tinyxml: fix typo for TINYXML_CPE_ID_VENDOR
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (2 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 03/29] package/qcom-db410c-firmware: fix typo for <pkg>_LICENSE Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-04 16:44 ` Peter Korsgaard
2023-01-11 9:06 ` Peter Korsgaard
2023-01-01 23:36 ` [Buildroot] [PATCH 05/29] package/gobject-introspection: really use host python for host variant Ricardo Martincoski
` (24 subsequent siblings)
28 siblings, 2 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Ricardo Martincoski
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Tested using this minimal config:
BR2_x86_i686=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_TINYXML=y
and these commands:
$ make pkg-stats
$ grep -A73 '"tinyxml":' output/pkg-stats.json > after
|--- before
|+++ after
|@@ -17 +17 @@
|- "warnings": 1,
|+ "warnings": 0,
|@@ -20 +20 @@
|- "cpeid": null,
|+ "cpeid": "cpe:2.3:a:tinyxml_project:tinyxml:2.6.2_2:*:*:*:*:*:*:*",
|@@ -49,2 +49,2 @@
|- "error",
|- "1 warnings"
|+ "ok",
|+ "no warnings"
|@@ -54 +54 @@
|- "no verified CPE identifier"
|+ "CPE version unknown in CPE database"
---
package/tinyxml/tinyxml.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk
index d173254e31..8e706f1a1e 100644
--- a/package/tinyxml/tinyxml.mk
+++ b/package/tinyxml/tinyxml.mk
@@ -12,7 +12,7 @@ TINYXML_AUTORECONF = YES
TINYXML_INSTALL_STAGING = YES
TINYXML_LICENSE = Zlib
TINYXML_LICENSE_FILES = README
-TINYXML_CPE_ID_VENDOT = tinyxml_project
+TINYXML_CPE_ID_VENDOR = tinyxml_project
# 0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch
TINYXML_IGNORE_CVES += CVE-2021-42260
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* [Buildroot] [PATCH 05/29] package/gobject-introspection: really use host python for host variant
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (3 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 04/29] package/tinyxml: fix typo for TINYXML_CPE_ID_VENDOR Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-05 22:28 ` Peter Korsgaard
2023-01-11 9:51 ` Peter Korsgaard
2023-01-01 23:36 ` [Buildroot] [PATCH 06/29] package/i2pd: really install configuration files Ricardo Martincoski
` (23 subsequent siblings)
28 siblings, 2 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Ricardo Martincoski
Commit "abc110e362 package/gobject-introspection: bump to version
1.68.0" renamed the define that makes sure g-ir-tool-template uses the
host python, but forgot to update its call on pre-configure hooks.
Update it now.
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Tested using this minimal config:
BR2_x86_i686=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_PYTHON3=y
BR2_PACKAGE_GOBJECT_INTROSPECTION=y
and these commands:
$ make host-gobject-introspection-configure
$ head -n 1 output/build/host-gobject-introspection-*/tools/g-ir-tool-template.in
Before this patch:
#!@PYTHON_CMD@
After this patch:
(the shebang points to the correct absolute path to output/host/bin/python3)
---
package/gobject-introspection/gobject-introspection.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk
index c8ad9b3c72..70f4addeab 100644
--- a/package/gobject-introspection/gobject-introspection.mk
+++ b/package/gobject-introspection/gobject-introspection.mk
@@ -67,7 +67,7 @@ HOST_GOBJECT_INTROSPECTION_CONF_ENV = \
define GOBJECT_INTROSPECTION_FIX_TOOLS_PYTHON_PATH
$(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python3%' $(@D)/tools/g-ir-tool-template.in
endef
-HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
+HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLS_PYTHON_PATH
# Perform the following:
# - Just as above, Ensure that g-ir-tool-template.in uses the host python.
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* [Buildroot] [PATCH 06/29] package/i2pd: really install configuration files
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (4 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 05/29] package/gobject-introspection: really use host python for host variant Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-04 16:46 ` Peter Korsgaard
2023-01-11 9:14 ` Peter Korsgaard
2023-01-01 23:36 ` [Buildroot] [PATCH 07/29] package/ima-evm-utils: really install to staging Ricardo Martincoski
` (22 subsequent siblings)
28 siblings, 2 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine, Ricardo Martincoski
While applying [1] the commit "fffbd2c9f7 i2pd: new package"
unintentionally removed completely the post-install hooks, so
I2PD_INSTALL_CONFIGURATION_FILES is declared but never called.
Fix the install of configuration files by adding the defined symbol to
the post-install hooks.
[1] http://patchwork.ozlabs.org/project/buildroot/patch/20180327212401.5173-1-fontaine.fabrice@gmail.com/
Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Tested using this minimal config:
BR2_x86_i686=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_I2PD=y
|--- output.before/build/packages-file-list.txt.sorted
|+++ output.after/build/packages-file-list.txt.sorted
|@@ -15486,0 +15487,2 @@
|+i2pd,./etc/i2pd/i2pd.conf
|+i2pd,./etc/i2pd/tunnels.conf
|@@ -15491,0 +15494,19 @@
|+i2pd,./var/lib/i2pd/certificates/family/gostcoin.crt
|+i2pd,./var/lib/i2pd/certificates/family/i2pd-dev.crt
|+i2pd,./var/lib/i2pd/certificates/family/i2p-dev.crt
|+i2pd,./var/lib/i2pd/certificates/family/mca2-i2p.crt
|+i2pd,./var/lib/i2pd/certificates/family/stormycloud.crt
|+i2pd,./var/lib/i2pd/certificates/family/volatile.crt
|+i2pd,./var/lib/i2pd/certificates/reseed/acetone_at_mail.i2p.crt
|+i2pd,./var/lib/i2pd/certificates/reseed/creativecowpat_at_mail.i2p.crt
|+i2pd,./var/lib/i2pd/certificates/reseed/echelon3_at_mail.i2p.crt
|+i2pd,./var/lib/i2pd/certificates/reseed/hankhill19580_at_gmail.com.crt
|+i2pd,./var/lib/i2pd/certificates/reseed/hiduser0_at_mail.i2p.crt
|+i2pd,./var/lib/i2pd/certificates/reseed/hottuna_at_mail.i2p.crt
|+i2pd,./var/lib/i2pd/certificates/reseed/i2p-reseed_at_mk16.de.crt
|+i2pd,./var/lib/i2pd/certificates/reseed/igor_at_novg.net.crt
|+i2pd,./var/lib/i2pd/certificates/reseed/lazygravy_at_mail.i2p.crt
|+i2pd,./var/lib/i2pd/certificates/reseed/orignal_at_mail.i2p.crt
|+i2pd,./var/lib/i2pd/certificates/reseed/r4sas-reseed_at_mail.i2p.crt
|+i2pd,./var/lib/i2pd/certificates/reseed/rambler_at_mail.i2p.crt
|+i2pd,./var/lib/i2pd/certificates/reseed/reseed_at_diva.exchange.crt
---
package/i2pd/i2pd.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/i2pd/i2pd.mk b/package/i2pd/i2pd.mk
index b99212be47..ad268a235c 100644
--- a/package/i2pd/i2pd.mk
+++ b/package/i2pd/i2pd.mk
@@ -44,6 +44,7 @@ define I2PD_INSTALL_CONFIGURATION_FILES
mkdir -p $(TARGET_DIR)/var/lib/i2pd
cp -a $(@D)/contrib/certificates $(TARGET_DIR)/var/lib/i2pd
endef
+I2PD_POST_INSTALL_TARGET_HOOKS += I2PD_INSTALL_CONFIGURATION_FILES
define I2PD_USERS
i2pd -1 i2pd -1 * /var/lib/i2pd - - I2P Daemon
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* Re: [Buildroot] [PATCH 06/29] package/i2pd: really install configuration files
2023-01-01 23:36 ` [Buildroot] [PATCH 06/29] package/i2pd: really install configuration files Ricardo Martincoski
@ 2023-01-04 16:46 ` Peter Korsgaard
2023-01-11 9:14 ` Peter Korsgaard
1 sibling, 0 replies; 77+ messages in thread
From: Peter Korsgaard @ 2023-01-04 16:46 UTC (permalink / raw)
To: Ricardo Martincoski; +Cc: Fabrice Fontaine, buildroot
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes:
> While applying [1] the commit "fffbd2c9f7 i2pd: new package"
> unintentionally removed completely the post-install hooks, so
> I2PD_INSTALL_CONFIGURATION_FILES is declared but never called.
> Fix the install of configuration files by adding the defined symbol to
> the post-install hooks.
> [1] http://patchwork.ozlabs.org/project/buildroot/patch/20180327212401.5173-1-fontaine.fabrice@gmail.com/
> Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 77+ messages in thread
* Re: [Buildroot] [PATCH 06/29] package/i2pd: really install configuration files
2023-01-01 23:36 ` [Buildroot] [PATCH 06/29] package/i2pd: really install configuration files Ricardo Martincoski
2023-01-04 16:46 ` Peter Korsgaard
@ 2023-01-11 9:14 ` Peter Korsgaard
1 sibling, 0 replies; 77+ messages in thread
From: Peter Korsgaard @ 2023-01-11 9:14 UTC (permalink / raw)
To: Ricardo Martincoski; +Cc: Fabrice Fontaine, buildroot
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes:
> While applying [1] the commit "fffbd2c9f7 i2pd: new package"
> unintentionally removed completely the post-install hooks, so
> I2PD_INSTALL_CONFIGURATION_FILES is declared but never called.
> Fix the install of configuration files by adding the defined symbol to
> the post-install hooks.
> [1] http://patchwork.ozlabs.org/project/buildroot/patch/20180327212401.5173-1-fontaine.fabrice@gmail.com/
> Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Committed to 2022.11.x and 2022.02.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 77+ messages in thread
* [Buildroot] [PATCH 07/29] package/ima-evm-utils: really install to staging
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (5 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 06/29] package/i2pd: really install configuration files Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-02 18:40 ` Petr Vorel
` (2 more replies)
2023-01-01 23:36 ` [Buildroot] [PATCH 08/29] package/qt5/qt5virtualkeyboard: really configure language layouts Ricardo Martincoski
` (21 subsequent siblings)
28 siblings, 3 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Ricardo Martincoski
Commit "8229196d41 package/ima-evm-utils: new package" added
IMA_EVM_UTILS_INSTALL_STAGING_CMDS without enabling
IMA_EVM_UTILS_INSTALL_STAGING, so currently the package is not installed
to staging.
Enable installing to staging.
Cc: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Tested using this minimal config:
BR2_x86_i686=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_IMA_EVM_UTILS=y
|--- output.before/build/packages-file-list-staging.txt.sorted
|+++ output.after/build/packages-file-list-staging.txt.sorted
|@@ -0,0 +1,6 @@
|+ima-evm-utils,./usr/bin/evmctl
|+ima-evm-utils,./usr/include/imaevm.h
|+ima-evm-utils,./usr/lib/libimaevm.la
|+ima-evm-utils,./usr/lib/libimaevm.so
|+ima-evm-utils,./usr/lib/libimaevm.so.3
|+ima-evm-utils,./usr/lib/libimaevm.so.3.0.0
---
package/ima-evm-utils/ima-evm-utils.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/ima-evm-utils/ima-evm-utils.mk b/package/ima-evm-utils/ima-evm-utils.mk
index 7ee34d5e1a..01984402ce 100644
--- a/package/ima-evm-utils/ima-evm-utils.mk
+++ b/package/ima-evm-utils/ima-evm-utils.mk
@@ -8,6 +8,7 @@ IMA_EVM_UTILS_VERSION = 1.4
IMA_EVM_UTILS_SITE = http://downloads.sourceforge.net/project/linux-ima/ima-evm-utils
IMA_EVM_UTILS_LICENSE = GPL-2.0
IMA_EVM_UTILS_LICENSE_FILES = COPYING
+IMA_EVM_UTILS_INSTALL_STAGING = YES
IMA_EVM_UTILS_DEPENDENCIES = host-pkgconf keyutils openssl tpm2-tss
# Tarball doesn't contain configure
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* Re: [Buildroot] [PATCH 07/29] package/ima-evm-utils: really install to staging
2023-01-01 23:36 ` [Buildroot] [PATCH 07/29] package/ima-evm-utils: really install to staging Ricardo Martincoski
@ 2023-01-02 18:40 ` Petr Vorel
2023-01-04 16:46 ` Peter Korsgaard
2023-01-11 9:14 ` Peter Korsgaard
2 siblings, 0 replies; 77+ messages in thread
From: Petr Vorel @ 2023-01-02 18:40 UTC (permalink / raw)
To: Ricardo Martincoski; +Cc: buildroot
Hi Ricardo,
Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
Fixes: 8229196d41 ("package/ima-evm-utils: new package")
Thanks for correcting my work!
Kind regards,
Petr
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 77+ messages in thread* Re: [Buildroot] [PATCH 07/29] package/ima-evm-utils: really install to staging
2023-01-01 23:36 ` [Buildroot] [PATCH 07/29] package/ima-evm-utils: really install to staging Ricardo Martincoski
2023-01-02 18:40 ` Petr Vorel
@ 2023-01-04 16:46 ` Peter Korsgaard
2023-01-11 9:14 ` Peter Korsgaard
2 siblings, 0 replies; 77+ messages in thread
From: Peter Korsgaard @ 2023-01-04 16:46 UTC (permalink / raw)
To: Ricardo Martincoski; +Cc: buildroot
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes:
> Commit "8229196d41 package/ima-evm-utils: new package" added
> IMA_EVM_UTILS_INSTALL_STAGING_CMDS without enabling
> IMA_EVM_UTILS_INSTALL_STAGING, so currently the package is not installed
> to staging.
> Enable installing to staging.
> Cc: Petr Vorel <petr.vorel@gmail.com>
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 77+ messages in thread
* Re: [Buildroot] [PATCH 07/29] package/ima-evm-utils: really install to staging
2023-01-01 23:36 ` [Buildroot] [PATCH 07/29] package/ima-evm-utils: really install to staging Ricardo Martincoski
2023-01-02 18:40 ` Petr Vorel
2023-01-04 16:46 ` Peter Korsgaard
@ 2023-01-11 9:14 ` Peter Korsgaard
2 siblings, 0 replies; 77+ messages in thread
From: Peter Korsgaard @ 2023-01-11 9:14 UTC (permalink / raw)
To: Ricardo Martincoski; +Cc: buildroot
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes:
> Commit "8229196d41 package/ima-evm-utils: new package" added
> IMA_EVM_UTILS_INSTALL_STAGING_CMDS without enabling
> IMA_EVM_UTILS_INSTALL_STAGING, so currently the package is not installed
> to staging.
> Enable installing to staging.
> Cc: Petr Vorel <petr.vorel@gmail.com>
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Committed to 2022.11.x and 2022.02.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 77+ messages in thread
* [Buildroot] [PATCH 08/29] package/qt5/qt5virtualkeyboard: really configure language layouts
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (6 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 07/29] package/ima-evm-utils: really install to staging Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-04 16:48 ` Peter Korsgaard
2023-01-11 9:14 ` Peter Korsgaard
2023-01-01 23:36 ` [Buildroot] [PATCH 09/29] package/tekui: really disable parallel build Ricardo Martincoski
` (20 subsequent siblings)
28 siblings, 2 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Giulio Benetti, Julien Corjon, Ricardo Martincoski
Commit "170777f342 package/qt5/qt5virtualkeyboard: convert to qmake
infrastructure" changed most but not all <pkg>_QMAKEFLAGS to
<pkg>_CONF_OPTS.
As a consequence, BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS is
ignored and all layouts are compiled in.
Some layouts have different licenses (e.g. pinying), so the license
information for a build that is configured to not include such layouts
is wrong.
Change the remaining _QMAKEFLAGS entry, fixing the config for which
language layouts are compiled and installed.
Cc: Giulio Benetti <giulio.benetti@benettiengineering.com>
Cc: Julien Corjon <corjon.j@ecagroup.com>
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Tested using this minimal config:
BR2_x86_i686=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_QT5=y
BR2_PACKAGE_QT5VIRTUALKEYBOARD=y
that is expected to compile/install only en_GB layout.
|--- output.before/build/packages-file-list.txt.sorted
|+++ output.after/build/packages-file-list.txt.sorted
|@@ -3647,5 +3646,0 @@
|-qt5virtualkeyboard,./usr/lib/cmake/Qt5VirtualKeyboard/Qt5VirtualKeyboard_QtVirtualKeyboardHangulPlugin.cmake
|-qt5virtualkeyboard,./usr/lib/cmake/Qt5VirtualKeyboard/Qt5VirtualKeyboard_QtVirtualKeyboardOpenWnnPlugin.cmake
|-qt5virtualkeyboard,./usr/lib/cmake/Qt5VirtualKeyboard/Qt5VirtualKeyboard_QtVirtualKeyboardPinyinPlugin.cmake
|-qt5virtualkeyboard,./usr/lib/cmake/Qt5VirtualKeyboard/Qt5VirtualKeyboard_QtVirtualKeyboardTCImePlugin.cmake
|-qt5virtualkeyboard,./usr/lib/cmake/Qt5VirtualKeyboard/Qt5VirtualKeyboard_QtVirtualKeyboardThaiPlugin.cmake
|@@ -3660,5 +3654,0 @@
|-qt5virtualkeyboard,./usr/lib/qt/plugins/virtualkeyboard/libqtvirtualkeyboard_hangul.so
|-qt5virtualkeyboard,./usr/lib/qt/plugins/virtualkeyboard/libqtvirtualkeyboard_openwnn.so
|-qt5virtualkeyboard,./usr/lib/qt/plugins/virtualkeyboard/libqtvirtualkeyboard_pinyin.so
|-qt5virtualkeyboard,./usr/lib/qt/plugins/virtualkeyboard/libqtvirtualkeyboard_tcime.so
|-qt5virtualkeyboard,./usr/lib/qt/plugins/virtualkeyboard/libqtvirtualkeyboard_thai.so
build test:
44 builds, 29 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed
https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/731801232
test-pkg config:
BR2_PACKAGE_QT5=y
BR2_PACKAGE_QT5VIRTUALKEYBOARD=y
---
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
index c31d455c4e..3fefdc874d 100644
--- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
+++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
@@ -16,7 +16,7 @@ QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3
QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS = $(call qstrip,$(BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS))
ifneq ($(strip $(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),)
-QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+="$(foreach lang,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS),lang-$(lang))"
+QT5VIRTUALKEYBOARD_CONF_OPTS += CONFIG+="$(foreach lang,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS),lang-$(lang))"
ifneq ($(filter ja_JP all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),)
QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (openwnn)
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* Re: [Buildroot] [PATCH 08/29] package/qt5/qt5virtualkeyboard: really configure language layouts
2023-01-01 23:36 ` [Buildroot] [PATCH 08/29] package/qt5/qt5virtualkeyboard: really configure language layouts Ricardo Martincoski
@ 2023-01-04 16:48 ` Peter Korsgaard
2023-01-11 9:14 ` Peter Korsgaard
1 sibling, 0 replies; 77+ messages in thread
From: Peter Korsgaard @ 2023-01-04 16:48 UTC (permalink / raw)
To: Ricardo Martincoski; +Cc: Giulio Benetti, Julien Corjon, buildroot
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes:
> Commit "170777f342 package/qt5/qt5virtualkeyboard: convert to qmake
> infrastructure" changed most but not all <pkg>_QMAKEFLAGS to
> <pkg>_CONF_OPTS.
> As a consequence, BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS is
> ignored and all layouts are compiled in.
> Some layouts have different licenses (e.g. pinying), so the license
> information for a build that is configured to not include such layouts
> is wrong.
> Change the remaining _QMAKEFLAGS entry, fixing the config for which
> language layouts are compiled and installed.
> Cc: Giulio Benetti <giulio.benetti@benettiengineering.com>
> Cc: Julien Corjon <corjon.j@ecagroup.com>
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 77+ messages in thread
* Re: [Buildroot] [PATCH 08/29] package/qt5/qt5virtualkeyboard: really configure language layouts
2023-01-01 23:36 ` [Buildroot] [PATCH 08/29] package/qt5/qt5virtualkeyboard: really configure language layouts Ricardo Martincoski
2023-01-04 16:48 ` Peter Korsgaard
@ 2023-01-11 9:14 ` Peter Korsgaard
1 sibling, 0 replies; 77+ messages in thread
From: Peter Korsgaard @ 2023-01-11 9:14 UTC (permalink / raw)
To: Ricardo Martincoski; +Cc: Giulio Benetti, Julien Corjon, buildroot
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes:
> Commit "170777f342 package/qt5/qt5virtualkeyboard: convert to qmake
> infrastructure" changed most but not all <pkg>_QMAKEFLAGS to
> <pkg>_CONF_OPTS.
> As a consequence, BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS is
> ignored and all layouts are compiled in.
> Some layouts have different licenses (e.g. pinying), so the license
> information for a build that is configured to not include such layouts
> is wrong.
> Change the remaining _QMAKEFLAGS entry, fixing the config for which
> language layouts are compiled and installed.
> Cc: Giulio Benetti <giulio.benetti@benettiengineering.com>
> Cc: Julien Corjon <corjon.j@ecagroup.com>
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Committed to 2022.11.x and 2022.02.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 77+ messages in thread
* [Buildroot] [PATCH 09/29] package/tekui: really disable parallel build
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (7 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 08/29] package/qt5/qt5virtualkeyboard: really configure language layouts Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-04 16:51 ` Peter Korsgaard
2023-01-11 9:14 ` Peter Korsgaard
2023-01-01 23:36 ` [Buildroot] [PATCH 10/29] Revert "pptp-linux: fix build with high BR2_JLEVEL settings" Ricardo Martincoski
` (19 subsequent siblings)
28 siblings, 2 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Ricardo Martincoski
Commit "c80789c917 tekui: disable parallel build" added TEKUI_MAKE but
that is not a symbol used by the generic package infra.
Ensure -j1 is passed to the build and install commands by using
TEKUI_MAKE explicitly.
Fixes:
http://autobuild.buildroot.net/results/c6cd0d488581013a8b215b0ee2fd8f549a868d4b
Cc: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
NOTE: I was unable to reproduce the build issue locally, in current
master, using a few times:
$ make BR2_JLEVEL=99 tekui-dirclean tekui
either at the output of:
$ br-reproduce-build c6cd0d488581013a8b215b0ee2fd8f549a868d4b
or with this minimal defconfig:
BR2_x86_i686=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_JLEVEL=99
BR2_PACKAGE_TEKUI=y
BR2_PACKAGE_LUA=y
Testing using this defconfig:
BR2_x86_i686=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_JLEVEL=3
BR2_PACKAGE_TEKUI=y
BR2_PACKAGE_LUA=y
and the command:
$ make V=1 tekui-build
Before this patch:
... /usr/bin/make -j3 ...
After this patch:
... /usr/bin/make -j1 ...
---
package/tekui/tekui.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/tekui/tekui.mk b/package/tekui/tekui.mk
index 13000edd3e..3cb7ff51e5 100644
--- a/package/tekui/tekui.mk
+++ b/package/tekui/tekui.mk
@@ -59,11 +59,11 @@ endif
endif
define TEKUI_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) $(TEKUI_MAKE_OPTS) PREFIX="/usr" -C $(@D) all
+ $(TARGET_MAKE_ENV) $(TEKUI_MAKE) $(TEKUI_MAKE_OPTS) PREFIX="/usr" -C $(@D) all
endef
define TEKUI_INSTALL_TARGET_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) $(TEKUI_MAKE_OPTS) PREFIX="$(TARGET_DIR)/usr" -C $(@D) install
+ $(TARGET_MAKE_ENV) $(TEKUI_MAKE) $(TEKUI_MAKE_OPTS) PREFIX="$(TARGET_DIR)/usr" -C $(@D) install
endef
$(eval $(generic-package))
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* [Buildroot] [PATCH 10/29] Revert "pptp-linux: fix build with high BR2_JLEVEL settings"
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (8 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 09/29] package/tekui: really disable parallel build Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-04 16:52 ` Peter Korsgaard
2023-01-11 9:14 ` Peter Korsgaard
2023-01-01 23:36 ` [Buildroot] [PATCH 11/29] Revert "package/zip: install to staging" Ricardo Martincoski
` (18 subsequent siblings)
28 siblings, 2 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Ricardo Martincoski
This reverts commit ffc4afe084a76e7246bd373c73b706f512a86c2b.
Commit from 2012 "ffc4afe084 pptp-linux: fix build with high BR2_JLEVEL
settings" added <pkg>_MAKE to a generic package, but the generic infra
does not take this symbol into account.
The build issue was fixed in 2013 with commit "a5b8081b89 pptp-linux:
fix parallel build" by adding a patch file.
So drop the bogus PPTP_LINUX_MAKE.
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Using this defconfig:
BR2_x86_i686=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_JLEVEL=3
BR2_PACKAGE_PPTP_LINUX=y
one can see at the output of:
$ make V=1 pptp-linux
Before this patch:
... /usr/bin/make -j3 ...
After this patch:
... /usr/bin/make -j3 ...
---
package/pptp-linux/pptp-linux.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk
index 7fd0733977..b6c740e710 100644
--- a/package/pptp-linux/pptp-linux.mk
+++ b/package/pptp-linux/pptp-linux.mk
@@ -7,7 +7,6 @@
PPTP_LINUX_VERSION = 1.10.0
PPTP_LINUX_SITE = http://downloads.sourceforge.net/project/pptpclient/pptp/pptp-$(PPTP_LINUX_VERSION)
PPTP_LINUX_SOURCE = pptp-$(PPTP_LINUX_VERSION).tar.gz
-PPTP_LINUX_MAKE = $(MAKE1)
PPTP_LINUX_LICENSE = GPL-2.0+
PPTP_LINUX_LICENSE_FILES = COPYING
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* [Buildroot] [PATCH 11/29] Revert "package/zip: install to staging"
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (9 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 10/29] Revert "pptp-linux: fix build with high BR2_JLEVEL settings" Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-04 16:53 ` Peter Korsgaard
2023-01-11 9:14 ` Peter Korsgaard
2023-01-01 23:36 ` [Buildroot] [PATCH 12/29] boot/ti-k3-r5-loader: drop bogus TI_K3_R5_LOADER_BOARD Ricardo Martincoski
` (17 subsequent siblings)
28 siblings, 2 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Jan Pedersen, Ricardo Martincoski
This reverts commit c5b5b5ccabe35e11f0ca8db4361bb3f335fc59fb.
Commit "c5b5b5ccab package/zip: install to staging" contains a typo that
prevents installing to staging.
ZIP_INSTALLING_STAGING_CMDS -> ZIP_INSTALL_STAGING_CMDS
But the package does not install headers or libraries, only ELF and
manual files.
So instead of fixing the install to staging, revert the bogus commit.
Cc: Jan Pedersen <jp@jp-embedded.com>
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Even in the case we fix the typo:
-define ZIP_INSTALLING_STAGING_CMDS
+define ZIP_INSTALL_STAGING_CMDS
using this defconfig:
BR2_x86_i686=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_ZIP=y
one can confirm the package does not install libraries or headers:
|--- output.before/build/packages-file-list-staging.txt.sorted
|+++ output.after/build/packages-file-list-staging.txt.sorted
|@@ -2346,0 +2347,8 @@
|+zip,./usr/bin/zip
|+zip,./usr/bin/zipcloak
|+zip,./usr/bin/zipnote
|+zip,./usr/bin/zipsplit
|+zip,./usr/man/man1/zip.1
|+zip,./usr/man/man1/zipcloak.1
|+zip,./usr/man/man1/zipnote.1
|+zip,./usr/man/man1/zipsplit.1
---
package/zip/zip.mk | 6 ------
1 file changed, 6 deletions(-)
diff --git a/package/zip/zip.mk b/package/zip/zip.mk
index 2d11e1c763..67958a4a66 100644
--- a/package/zip/zip.mk
+++ b/package/zip/zip.mk
@@ -11,7 +11,6 @@ ZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src
ZIP_LICENSE = Info-ZIP
ZIP_LICENSE_FILES = LICENSE
ZIP_CPE_ID_VENDOR = info-zip_project
-ZIP_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_BZIP2),y)
ZIP_DEPENDENCIES += bzip2
@@ -41,11 +40,6 @@ define ZIP_INSTALL_TARGET_CMDS
prefix=$(TARGET_DIR)/usr
endef
-define ZIP_INSTALLING_STAGING_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \
- prefix=$(STAGING_DIR)/usr
-endef
-
define HOST_ZIP_BUILD_CMDS
$(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \
CFLAGS="$(HOST_CFLAGS) $(ZIP_CFLAGS)" \
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* Re: [Buildroot] [PATCH 11/29] Revert "package/zip: install to staging"
2023-01-01 23:36 ` [Buildroot] [PATCH 11/29] Revert "package/zip: install to staging" Ricardo Martincoski
@ 2023-01-04 16:53 ` Peter Korsgaard
2023-01-11 9:14 ` Peter Korsgaard
1 sibling, 0 replies; 77+ messages in thread
From: Peter Korsgaard @ 2023-01-04 16:53 UTC (permalink / raw)
To: Ricardo Martincoski; +Cc: Jan Pedersen, buildroot
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes:
> This reverts commit c5b5b5ccabe35e11f0ca8db4361bb3f335fc59fb.
> Commit "c5b5b5ccab package/zip: install to staging" contains a typo that
> prevents installing to staging.
> ZIP_INSTALLING_STAGING_CMDS -> ZIP_INSTALL_STAGING_CMDS
> But the package does not install headers or libraries, only ELF and
> manual files.
> So instead of fixing the install to staging, revert the bogus commit.
> Cc: Jan Pedersen <jp@jp-embedded.com>
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 77+ messages in thread
* Re: [Buildroot] [PATCH 11/29] Revert "package/zip: install to staging"
2023-01-01 23:36 ` [Buildroot] [PATCH 11/29] Revert "package/zip: install to staging" Ricardo Martincoski
2023-01-04 16:53 ` Peter Korsgaard
@ 2023-01-11 9:14 ` Peter Korsgaard
1 sibling, 0 replies; 77+ messages in thread
From: Peter Korsgaard @ 2023-01-11 9:14 UTC (permalink / raw)
To: Ricardo Martincoski; +Cc: Jan Pedersen, buildroot
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes:
> This reverts commit c5b5b5ccabe35e11f0ca8db4361bb3f335fc59fb.
> Commit "c5b5b5ccab package/zip: install to staging" contains a typo that
> prevents installing to staging.
> ZIP_INSTALLING_STAGING_CMDS -> ZIP_INSTALL_STAGING_CMDS
> But the package does not install headers or libraries, only ELF and
> manual files.
> So instead of fixing the install to staging, revert the bogus commit.
> Cc: Jan Pedersen <jp@jp-embedded.com>
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Committed to 2022.11.x and 2022.02.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 77+ messages in thread
* [Buildroot] [PATCH 12/29] boot/ti-k3-r5-loader: drop bogus TI_K3_R5_LOADER_BOARD
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (10 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 11/29] Revert "package/zip: install to staging" Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-04 16:53 ` Peter Korsgaard
2023-01-01 23:36 ` [Buildroot] [PATCH 13/29] package/checkpolicy: drop bogus CHECKPOLICY_STAGING_CMDS Ricardo Martincoski
` (16 subsequent siblings)
28 siblings, 1 reply; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Xuanhao Shi, Ricardo Martincoski, Anand Gadiyar
Commit "0189bcb47c boot/ti-k3-r5-loader: new package" added an unused
define.
The define value is calculated from an inexistent option
BR2_TARGET_TI_K3_R5_LOADER_BOARD, so drop the line.
Cc: Anand Gadiyar <gadiyar@ti.com>
Cc: Xuanhao Shi <X15000177@gmail.com>
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
index 422ab20d71..afa309aa98 100644
--- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
+++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
@@ -26,7 +26,6 @@ TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \
$(BR2_BISON_HOST_DEPENDENCY) \
$(BR2_FLEX_HOST_DEPENDENCY)
-TI_K3_R5_LOADER_BOARD = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD))
ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y)
TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig
else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y)
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* [Buildroot] [PATCH 13/29] package/checkpolicy: drop bogus CHECKPOLICY_STAGING_CMDS
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (11 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 12/29] boot/ti-k3-r5-loader: drop bogus TI_K3_R5_LOADER_BOARD Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-05 8:31 ` Peter Korsgaard
2023-01-11 9:31 ` Peter Korsgaard
2023-01-01 23:36 ` [Buildroot] [PATCH 14/29] package/exfat: drop dangling EXFAT_CFLAGS Ricardo Martincoski
` (15 subsequent siblings)
28 siblings, 2 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Matt Weber, Ricardo Martincoski
Commit "b06110621d checkpolicy: allow compiling for target" contains a
typo that prevents installing to staging. It also forgot to enable
CHECKPOLICY_INSTALL_STAGING.
But the package does not install headers or libraries, only ELF and
manual files.
So instead of fixing the install to staging, drop the bogus
CHECKPOLICY_STAGING_CMDS.
Cc: Clayton Shotwell <clayton.shotwell@collins.com>
Cc: Matt Weber <matthew.weber@collins.com>
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
My first try was to fix the install do staging:
+CHECKPOLICY_INSTALL_STAGING = YES
-define CHECKPOLICY_STAGING_CMDS
+define CHECKPOLICY_INSTALL_STAGING_CMDS
But then I notice that the package does not install headers or
libraries, looking at output/build/packages-file-list-staging:
+checkpolicy,./usr/bin/checkmodule
+checkpolicy,./usr/bin/checkpolicy
+checkpolicy,./usr/share/man/man8/checkmodule.8
+checkpolicy,./usr/share/man/man8/checkpolicy.8
+checkpolicy,./usr/share/man/ru/man8/checkmodule.8
+checkpolicy,./usr/share/man/ru/man8/checkpolicy.8
---
package/checkpolicy/checkpolicy.mk | 5 -----
1 file changed, 5 deletions(-)
diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk
index af9a58cee8..baf16fb802 100644
--- a/package/checkpolicy/checkpolicy.mk
+++ b/package/checkpolicy/checkpolicy.mk
@@ -20,11 +20,6 @@ define CHECKPOLICY_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CHECKPOLICY_MAKE_OPTS) DESTDIR=$(STAGING_DIR)
endef
-define CHECKPOLICY_STAGING_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CHECKPOLICY_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
-
-endef
-
define CHECKPOLICY_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CHECKPOLICY_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install
endef
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* Re: [Buildroot] [PATCH 13/29] package/checkpolicy: drop bogus CHECKPOLICY_STAGING_CMDS
2023-01-01 23:36 ` [Buildroot] [PATCH 13/29] package/checkpolicy: drop bogus CHECKPOLICY_STAGING_CMDS Ricardo Martincoski
@ 2023-01-05 8:31 ` Peter Korsgaard
2023-01-11 9:31 ` Peter Korsgaard
1 sibling, 0 replies; 77+ messages in thread
From: Peter Korsgaard @ 2023-01-05 8:31 UTC (permalink / raw)
To: Ricardo Martincoski; +Cc: Matt Weber, buildroot
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes:
> Commit "b06110621d checkpolicy: allow compiling for target" contains a
> typo that prevents installing to staging. It also forgot to enable
> CHECKPOLICY_INSTALL_STAGING.
> But the package does not install headers or libraries, only ELF and
> manual files.
> So instead of fixing the install to staging, drop the bogus
> CHECKPOLICY_STAGING_CMDS.
> Cc: Clayton Shotwell <clayton.shotwell@collins.com>
> Cc: Matt Weber <matthew.weber@collins.com>
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 77+ messages in thread
* Re: [Buildroot] [PATCH 13/29] package/checkpolicy: drop bogus CHECKPOLICY_STAGING_CMDS
2023-01-01 23:36 ` [Buildroot] [PATCH 13/29] package/checkpolicy: drop bogus CHECKPOLICY_STAGING_CMDS Ricardo Martincoski
2023-01-05 8:31 ` Peter Korsgaard
@ 2023-01-11 9:31 ` Peter Korsgaard
1 sibling, 0 replies; 77+ messages in thread
From: Peter Korsgaard @ 2023-01-11 9:31 UTC (permalink / raw)
To: Ricardo Martincoski; +Cc: Matt Weber, buildroot
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes:
> Commit "b06110621d checkpolicy: allow compiling for target" contains a
> typo that prevents installing to staging. It also forgot to enable
> CHECKPOLICY_INSTALL_STAGING.
> But the package does not install headers or libraries, only ELF and
> manual files.
> So instead of fixing the install to staging, drop the bogus
> CHECKPOLICY_STAGING_CMDS.
> Cc: Clayton Shotwell <clayton.shotwell@collins.com>
> Cc: Matt Weber <matthew.weber@collins.com>
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Committed to 2022.11.x and 2022.02.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 77+ messages in thread
* [Buildroot] [PATCH 14/29] package/exfat: drop dangling EXFAT_CFLAGS
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (12 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 13/29] package/checkpolicy: drop bogus CHECKPOLICY_STAGING_CMDS Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-04 21:53 ` Peter Korsgaard
2023-01-11 9:17 ` Peter Korsgaard
2023-01-01 23:36 ` [Buildroot] [PATCH 15/29] package/falcosecurity-libs: drop bogus FALCOSECURITY_LIBS_SUPPORTS_IN_SOURCE_BUILD Ricardo Martincoski
` (14 subsequent siblings)
28 siblings, 2 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Ricardo Martincoski
Commit "98538bb0a2 exfat: bump to version 1.2.1" changed the package
infra from generic to autotools, but dropped all usages of EXFAT_CFLAGS.
This config is ignored by autotools package infra.
So drop the dangling symbol.
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Before this patch, 'std=c99' cannot be seen in the output of:
make V=1 exfat
---
package/exfat/exfat.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/package/exfat/exfat.mk b/package/exfat/exfat.mk
index 282a30aa5e..c0ef77a113 100644
--- a/package/exfat/exfat.mk
+++ b/package/exfat/exfat.mk
@@ -11,7 +11,6 @@ EXFAT_DEPENDENCIES = libfuse host-pkgconf
EXFAT_LICENSE = GPL-2.0+
EXFAT_LICENSE_FILES = COPYING
EXFAT_CPE_ID_VENDOR = exfat_project
-EXFAT_CFLAGS = $(TARGET_CFLAGS) -std=c99
EXFAT_CONF_OPTS += --exec-prefix=/
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* [Buildroot] [PATCH 15/29] package/falcosecurity-libs: drop bogus FALCOSECURITY_LIBS_SUPPORTS_IN_SOURCE_BUILD
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (13 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 14/29] package/exfat: drop dangling EXFAT_CFLAGS Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-04 21:55 ` Peter Korsgaard
2023-01-11 9:17 ` Peter Korsgaard
2023-01-01 23:36 ` [Buildroot] [PATCH 16/29] package/glib-networking: drop dangling GLIB_NETWORKING_INSTALL_TARGET_OPTS Ricardo Martincoski
` (13 subsequent siblings)
28 siblings, 2 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Francis Laniel, Ricardo Martincoski
Commit "a15e35c4eb falcosecurity-libs: add new package" uses the infras
kernel-module and generic-package. Neither of them support
<pkg>_SUPPORTS_IN_SOURCE_BUILD, only the CMake infra does.
So drop the bogus symbol.
Cc: Francis Laniel <flaniel@linux.microsoft.com>
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
package/falcosecurity-libs/falcosecurity-libs.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/package/falcosecurity-libs/falcosecurity-libs.mk b/package/falcosecurity-libs/falcosecurity-libs.mk
index f2c389948f..92d5c61832 100644
--- a/package/falcosecurity-libs/falcosecurity-libs.mk
+++ b/package/falcosecurity-libs/falcosecurity-libs.mk
@@ -9,7 +9,6 @@ FALCOSECURITY_LIBS_SITE = $(call github,falcosecurity,libs,$(FALCOSECURITY_LIBS_
FALCOSECURITY_LIBS_LICENSE = Apache-2.0 (userspace), MIT or GPL-2.0 (driver)
FALCOSECURITY_LIBS_LICENSE_FILES = COPYING driver/MIT.txt driver/GPL2.txt
FALCOSECURITY_LIBS_CPE_ID_VENDOR = falco
-FALCOSECURITY_LIBS_SUPPORTS_IN_SOURCE_BUILD = NO
FALCOSECURITY_LIBS_DEPENDENCIES = \
c-ares \
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* Re: [Buildroot] [PATCH 15/29] package/falcosecurity-libs: drop bogus FALCOSECURITY_LIBS_SUPPORTS_IN_SOURCE_BUILD
2023-01-01 23:36 ` [Buildroot] [PATCH 15/29] package/falcosecurity-libs: drop bogus FALCOSECURITY_LIBS_SUPPORTS_IN_SOURCE_BUILD Ricardo Martincoski
@ 2023-01-04 21:55 ` Peter Korsgaard
2023-01-11 9:17 ` Peter Korsgaard
1 sibling, 0 replies; 77+ messages in thread
From: Peter Korsgaard @ 2023-01-04 21:55 UTC (permalink / raw)
To: Ricardo Martincoski; +Cc: Francis Laniel, buildroot
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes:
> Commit "a15e35c4eb falcosecurity-libs: add new package" uses the infras
> kernel-module and generic-package. Neither of them support
> <pkg>_SUPPORTS_IN_SOURCE_BUILD, only the CMake infra does.
> So drop the bogus symbol.
> Cc: Francis Laniel <flaniel@linux.microsoft.com>
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 77+ messages in thread
* Re: [Buildroot] [PATCH 15/29] package/falcosecurity-libs: drop bogus FALCOSECURITY_LIBS_SUPPORTS_IN_SOURCE_BUILD
2023-01-01 23:36 ` [Buildroot] [PATCH 15/29] package/falcosecurity-libs: drop bogus FALCOSECURITY_LIBS_SUPPORTS_IN_SOURCE_BUILD Ricardo Martincoski
2023-01-04 21:55 ` Peter Korsgaard
@ 2023-01-11 9:17 ` Peter Korsgaard
1 sibling, 0 replies; 77+ messages in thread
From: Peter Korsgaard @ 2023-01-11 9:17 UTC (permalink / raw)
To: Ricardo Martincoski; +Cc: Francis Laniel, buildroot
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes:
> Commit "a15e35c4eb falcosecurity-libs: add new package" uses the infras
> kernel-module and generic-package. Neither of them support
> <pkg>_SUPPORTS_IN_SOURCE_BUILD, only the CMake infra does.
> So drop the bogus symbol.
> Cc: Francis Laniel <flaniel@linux.microsoft.com>
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Committed to 2022.11.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 77+ messages in thread
* [Buildroot] [PATCH 16/29] package/glib-networking: drop dangling GLIB_NETWORKING_INSTALL_TARGET_OPTS
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (14 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 15/29] package/falcosecurity-libs: drop bogus FALCOSECURITY_LIBS_SUPPORTS_IN_SOURCE_BUILD Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-04 21:55 ` Peter Korsgaard
2023-01-11 9:18 ` Peter Korsgaard
2023-01-01 23:36 ` [Buildroot] [PATCH 17/29] package/gobject-introspection: drop bugus GOBJECT_INTROSPECTION_AUTORECONF Ricardo Martincoski
` (12 subsequent siblings)
28 siblings, 2 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Ricardo Martincoski
In 2015, commit "3fe434bf35 glib-networking: specify GIO_MODULE_DIR for
target" correctly used <pkg>_INSTALL_TARGET_OPTS with an autotools
package.
But later on, in 2018, commit "928a72c49f package/glib-networking: bump
version to 2.56.1" changed the package to use the meson infra, that does
not support <pkg>_INSTALL_TARGET_OPTS.
So this symbol is bogus since 2018. Drop it now.
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Before this patch, 'GIO_MODULE_DIR' cannot be seen in the output of:
make V=1 glib-networking-install-target
---
package/glib-networking/glib-networking.mk | 2 --
1 file changed, 2 deletions(-)
diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk
index e8905dfff4..4adc13d39f 100644
--- a/package/glib-networking/glib-networking.mk
+++ b/package/glib-networking/glib-networking.mk
@@ -21,8 +21,6 @@ GLIB_NETWORKING_CONF_OPTS = \
GLIB_NETWORKING_LICENSE = LGPL-2.0+
GLIB_NETWORKING_LICENSE_FILES = COPYING
GLIB_NETWORKING_CPE_ID_VENDOR = gnome
-GLIB_NETWORKING_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) \
- GIO_MODULE_DIR=/usr/lib/gio/modules install
ifeq ($(BR2_PACKAGE_GNUTLS),y)
GLIB_NETWORKING_DEPENDENCIES += gnutls
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* Re: [Buildroot] [PATCH 16/29] package/glib-networking: drop dangling GLIB_NETWORKING_INSTALL_TARGET_OPTS
2023-01-01 23:36 ` [Buildroot] [PATCH 16/29] package/glib-networking: drop dangling GLIB_NETWORKING_INSTALL_TARGET_OPTS Ricardo Martincoski
@ 2023-01-04 21:55 ` Peter Korsgaard
2023-01-11 9:18 ` Peter Korsgaard
1 sibling, 0 replies; 77+ messages in thread
From: Peter Korsgaard @ 2023-01-04 21:55 UTC (permalink / raw)
To: Ricardo Martincoski; +Cc: buildroot
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes:
> In 2015, commit "3fe434bf35 glib-networking: specify GIO_MODULE_DIR for
> target" correctly used <pkg>_INSTALL_TARGET_OPTS with an autotools
> package.
> But later on, in 2018, commit "928a72c49f package/glib-networking: bump
> version to 2.56.1" changed the package to use the meson infra, that does
> not support <pkg>_INSTALL_TARGET_OPTS.
> So this symbol is bogus since 2018. Drop it now.
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> Before this patch, 'GIO_MODULE_DIR' cannot be seen in the output of:
> make V=1 glib-networking-install-target
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 77+ messages in thread
* Re: [Buildroot] [PATCH 16/29] package/glib-networking: drop dangling GLIB_NETWORKING_INSTALL_TARGET_OPTS
2023-01-01 23:36 ` [Buildroot] [PATCH 16/29] package/glib-networking: drop dangling GLIB_NETWORKING_INSTALL_TARGET_OPTS Ricardo Martincoski
2023-01-04 21:55 ` Peter Korsgaard
@ 2023-01-11 9:18 ` Peter Korsgaard
1 sibling, 0 replies; 77+ messages in thread
From: Peter Korsgaard @ 2023-01-11 9:18 UTC (permalink / raw)
To: Ricardo Martincoski; +Cc: buildroot
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes:
> In 2015, commit "3fe434bf35 glib-networking: specify GIO_MODULE_DIR for
> target" correctly used <pkg>_INSTALL_TARGET_OPTS with an autotools
> package.
> But later on, in 2018, commit "928a72c49f package/glib-networking: bump
> version to 2.56.1" changed the package to use the meson infra, that does
> not support <pkg>_INSTALL_TARGET_OPTS.
> So this symbol is bogus since 2018. Drop it now.
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Committed to 2022.11.x and 2022.02.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 77+ messages in thread
* [Buildroot] [PATCH 17/29] package/gobject-introspection: drop bugus GOBJECT_INTROSPECTION_AUTORECONF
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (15 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 16/29] package/glib-networking: drop dangling GLIB_NETWORKING_INSTALL_TARGET_OPTS Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-04 21:56 ` Peter Korsgaard
2023-01-11 9:18 ` Peter Korsgaard
2023-01-01 23:36 ` [Buildroot] [PATCH 18/29] package/libtalloc: drop bogus LIBTALLOC_{C, LD}FLAGS Ricardo Martincoski
` (11 subsequent siblings)
28 siblings, 2 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Ricardo Martincoski
Commit "7687a396e8 package/gobject-introspection: new package" added the
package using the meson infra for both target and host variants.
Meson infra does not support <pkg>_AUTORECONF.
So drop the bogus symbol.
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
package/gobject-introspection/gobject-introspection.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk
index 70f4addeab..12e5b81b1b 100644
--- a/package/gobject-introspection/gobject-introspection.mk
+++ b/package/gobject-introspection/gobject-introspection.mk
@@ -9,7 +9,6 @@ GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0
GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR)
GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz
GOBJECT_INTROSPECTION_INSTALL_STAGING = YES
-GOBJECT_INTROSPECTION_AUTORECONF = YES
GOBJECT_INTROSPECTION_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-2-Clause
GOBJECT_INTROSPECTION_LICENSE_FILES = COPYING.LGPL COPYING.GPL giscanner/scannerlexer.l
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* [Buildroot] [PATCH 18/29] package/libtalloc: drop bogus LIBTALLOC_{C, LD}FLAGS
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (16 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 17/29] package/gobject-introspection: drop bugus GOBJECT_INTROSPECTION_AUTORECONF Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-04 22:04 ` Peter Korsgaard
2023-01-11 9:19 ` Peter Korsgaard
2023-01-01 23:36 ` [Buildroot] [PATCH 19/29] package/lrzsz: drop bogus LRZSZ_BUILD_HOOKS Ricardo Martincoski
` (10 subsequent siblings)
28 siblings, 2 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: David GOUARIN, Matt Weber, Ricardo Martincoski
Commit "f0d37e275a package/libtalloc: new package" added these symbols
but they are not used in the package and also not recognized by the waf
package infra.
So drop the ignored symbols.
Cc: David GOUARIN <dgouarin@gmail.com>
Cc: Matt Weber <matthew.weber@collins.com>
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
build test:
44 builds, 4 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed
https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/731863771
test-pkg config:
BR2_PACKAGE_LIBTIRPC=y
BR2_PACKAGE_LIBTALLOC=y
---
package/libtalloc/libtalloc.mk | 2 --
1 file changed, 2 deletions(-)
diff --git a/package/libtalloc/libtalloc.mk b/package/libtalloc/libtalloc.mk
index 75d3da263b..ca15180d22 100644
--- a/package/libtalloc/libtalloc.mk
+++ b/package/libtalloc/libtalloc.mk
@@ -31,8 +31,6 @@ LIBTALLOC_CONF_OPTS += --cross-compile \
--with-libiconv=$(STAGING_DIR)/usr
ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
-LIBTALLOC_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`
-LIBTALLOC_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs libtirpc`
LIBTALLOC_DEPENDENCIES += libtirpc host-pkgconf
endif
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* Re: [Buildroot] [PATCH 18/29] package/libtalloc: drop bogus LIBTALLOC_{C, LD}FLAGS
2023-01-01 23:36 ` [Buildroot] [PATCH 18/29] package/libtalloc: drop bogus LIBTALLOC_{C, LD}FLAGS Ricardo Martincoski
@ 2023-01-04 22:04 ` Peter Korsgaard
2023-01-11 9:19 ` Peter Korsgaard
1 sibling, 0 replies; 77+ messages in thread
From: Peter Korsgaard @ 2023-01-04 22:04 UTC (permalink / raw)
To: Ricardo Martincoski; +Cc: David GOUARIN, Matt Weber, buildroot
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes:
> Commit "f0d37e275a package/libtalloc: new package" added these symbols
> but they are not used in the package and also not recognized by the waf
> package infra.
> So drop the ignored symbols.
> Cc: David GOUARIN <dgouarin@gmail.com>
> Cc: Matt Weber <matthew.weber@collins.com>
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> build test:
> 44 builds, 4 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed
> https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/731863771
> test-pkg config:
> BR2_PACKAGE_LIBTIRPC=y
> BR2_PACKAGE_LIBTALLOC=y
> ---
> package/libtalloc/libtalloc.mk | 2 --
> 1 file changed, 2 deletions(-)
> diff --git a/package/libtalloc/libtalloc.mk b/package/libtalloc/libtalloc.mk
> index 75d3da263b..ca15180d22 100644
> --- a/package/libtalloc/libtalloc.mk
> +++ b/package/libtalloc/libtalloc.mk
> @@ -31,8 +31,6 @@ LIBTALLOC_CONF_OPTS += --cross-compile \
> --with-libiconv=$(STAGING_DIR)/usr
> ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
> -LIBTALLOC_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`
> -LIBTALLOC_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs libtirpc`
> LIBTALLOC_DEPENDENCIES += libtirpc host-pkgconf
I wonder if host-pkgconf is then needed?
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 77+ messages in thread* Re: [Buildroot] [PATCH 18/29] package/libtalloc: drop bogus LIBTALLOC_{C, LD}FLAGS
2023-01-01 23:36 ` [Buildroot] [PATCH 18/29] package/libtalloc: drop bogus LIBTALLOC_{C, LD}FLAGS Ricardo Martincoski
2023-01-04 22:04 ` Peter Korsgaard
@ 2023-01-11 9:19 ` Peter Korsgaard
1 sibling, 0 replies; 77+ messages in thread
From: Peter Korsgaard @ 2023-01-11 9:19 UTC (permalink / raw)
To: Ricardo Martincoski; +Cc: David GOUARIN, Matt Weber, buildroot
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes:
> Commit "f0d37e275a package/libtalloc: new package" added these symbols
> but they are not used in the package and also not recognized by the waf
> package infra.
> So drop the ignored symbols.
> Cc: David GOUARIN <dgouarin@gmail.com>
> Cc: Matt Weber <matthew.weber@collins.com>
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Committed to 2022.11.x and 2022.02.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 77+ messages in thread
* [Buildroot] [PATCH 19/29] package/lrzsz: drop bogus LRZSZ_BUILD_HOOKS
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (17 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 18/29] package/libtalloc: drop bogus LIBTALLOC_{C, LD}FLAGS Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-04 22:06 ` Peter Korsgaard
2023-01-11 9:22 ` Peter Korsgaard
2023-01-01 23:36 ` [Buildroot] [PATCH 20/29] package/policycoreutils: drop bogus INSTALL_TARGET_LINUX_PAM_CONFS Ricardo Martincoski
` (9 subsequent siblings)
28 siblings, 2 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Ricardo Martincoski
Commit "4f3f291a3b lrzsz: convert to autotools infrastructure" converted
the package to use autotools infra but added a define that is never
called.
Drop the bogus define.
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
package/lrzsz/lrzsz.mk | 4 ----
1 file changed, 4 deletions(-)
diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk
index 45c88619e0..3897975d73 100644
--- a/package/lrzsz/lrzsz.mk
+++ b/package/lrzsz/lrzsz.mk
@@ -18,10 +18,6 @@ define LRZSZ_POST_CONFIGURE_HOOKS
$(SED) "s~\(#define ENABLE_SYSLOG.*\)~/* \1 */~;" $(@D)/config.h
endef
-define LRZSZ_BUILD_HOOKS
- $(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" prefix="$(TARGET_DIR)" -C $(@D)
-endef
-
define LRZSZ_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 -D $(@D)/src/lrz $(TARGET_DIR)/usr/bin/rz
$(INSTALL) -m 0755 -D $(@D)/src/lsz $(TARGET_DIR)/usr/bin/sz
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* [Buildroot] [PATCH 20/29] package/policycoreutils: drop bogus INSTALL_TARGET_LINUX_PAM_CONFS
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (18 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 19/29] package/lrzsz: drop bogus LRZSZ_BUILD_HOOKS Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-04 22:07 ` Peter Korsgaard
2023-01-11 9:22 ` Peter Korsgaard
2023-01-01 23:36 ` [Buildroot] [PATCH 21/29] package/qoriq-rcw: drop bogus QORIQ_RCW_FILE_BIN Ricardo Martincoski
` (8 subsequent siblings)
28 siblings, 2 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Matt Weber, Ricardo Martincoski
Commit "cb328f77f8 policycoreutils: new package" added a define that is
never called: POLICYCOREUTILS_INSTALL_TARGET_LINUX_PAM_CONFS.
The build system from the package already install these files to target.
So just drop the bogus define.
Cc: Clayton Shotwell <clayton.shotwell@collins.com>
Cc: Matt Weber <matthew.weber@collins.com>
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Using this defconfig:
BR2_x86_i686=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_LINUX_PAM=y
BR2_PACKAGE_POLICYCOREUTILS=y
and performing a build before and after this patch, the content in
target/etc/pam.d/ is exactly the same.
$ md5sum output.*/target/etc/pam.d/* |sort
8448253cd52778260856591208cbf09a output.after/target/etc/pam.d/run_init
8448253cd52778260856591208cbf09a output.before/target/etc/pam.d/run_init
912cb497b06401def2991346787cfff3 output.after/target/etc/pam.d/other
912cb497b06401def2991346787cfff3 output.before/target/etc/pam.d/other
eac337ec241afe0ef2f4e5039be26cea output.after/target/etc/pam.d/login
eac337ec241afe0ef2f4e5039be26cea output.before/target/etc/pam.d/login
f4a2547443ac34fb30b7d06719328570 output.after/target/etc/pam.d/newrole
f4a2547443ac34fb30b7d06719328570 output.before/target/etc/pam.d/newrole
---
package/policycoreutils/policycoreutils.mk | 4 ----
1 file changed, 4 deletions(-)
diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk
index 60575ac644..8505dbca3f 100644
--- a/package/policycoreutils/policycoreutils.mk
+++ b/package/policycoreutils/policycoreutils.mk
@@ -16,10 +16,6 @@ POLICYCOREUTILS_MAKE_OPTS = LDLIBS=$(TARGET_NLS_LIBS)
ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
POLICYCOREUTILS_DEPENDENCIES += linux-pam
POLICYCOREUTILS_MAKE_OPTS += NAMESPACE_PRIV=y
-define POLICYCOREUTILS_INSTALL_TARGET_LINUX_PAM_CONFS
- $(INSTALL) -D -m 0644 $(@D)/newrole/newrole-lspp.pamd $(TARGET_DIR)/etc/pam.d/newrole
- $(INSTALL) -D -m 0644 $(@D)/run_init/run_init.pamd $(TARGET_DIR)/etc/pam.d/run_init
-endef
endif
ifeq ($(BR2_PACKAGE_AUDIT),y)
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* [Buildroot] [PATCH 21/29] package/qoriq-rcw: drop bogus QORIQ_RCW_FILE_BIN
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (19 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 20/29] package/policycoreutils: drop bogus INSTALL_TARGET_LINUX_PAM_CONFS Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-04 22:08 ` Peter Korsgaard
2023-01-11 9:23 ` Peter Korsgaard
2023-01-01 23:36 ` [Buildroot] [PATCH 22/29] package/rhash: drop dangling RHASH_ADDLDFLAGS Ricardo Martincoski
` (7 subsequent siblings)
28 siblings, 2 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Matt Weber, Ricardo Martincoski
While applying [1] and cleaning up, the commit "d167f7006e
package/qoriq-rcw: add in-tree rcw source support" ended up keeping an
unused define.
Drop it now.
[1] http://patchwork.ozlabs.org/project/buildroot/patch/20200207083857.28058-4-jerry.huang@nxp.com/
Cc: Matt Weber <matthew.weber@collins.com>
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
package/qoriq-rcw/qoriq-rcw.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/package/qoriq-rcw/qoriq-rcw.mk b/package/qoriq-rcw/qoriq-rcw.mk
index 8b1ceacfce..b9c9e99222 100644
--- a/package/qoriq-rcw/qoriq-rcw.mk
+++ b/package/qoriq-rcw/qoriq-rcw.mk
@@ -59,7 +59,6 @@ endef
else ifneq ($(QORIQ_RCW_INTREE),)
QORIQ_RCW_PLATFORM = $(firstword $(subst /, ,$(QORIQ_RCW_INTREE)))
-QORIQ_RCW_FILE_BIN = $(lastword $(subst /, ,$(QORIQ_RCW_INTREE)))
define HOST_QORIQ_RCW_BUILD_CMDS
$(MAKE) -C $(@D)/$(QORIQ_RCW_PLATFORM)
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* Re: [Buildroot] [PATCH 21/29] package/qoriq-rcw: drop bogus QORIQ_RCW_FILE_BIN
2023-01-01 23:36 ` [Buildroot] [PATCH 21/29] package/qoriq-rcw: drop bogus QORIQ_RCW_FILE_BIN Ricardo Martincoski
@ 2023-01-04 22:08 ` Peter Korsgaard
2023-01-11 9:23 ` Peter Korsgaard
1 sibling, 0 replies; 77+ messages in thread
From: Peter Korsgaard @ 2023-01-04 22:08 UTC (permalink / raw)
To: Ricardo Martincoski; +Cc: Matt Weber, buildroot
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes:
> While applying [1] and cleaning up, the commit "d167f7006e
> package/qoriq-rcw: add in-tree rcw source support" ended up keeping an
> unused define.
> Drop it now.
> [1] http://patchwork.ozlabs.org/project/buildroot/patch/20200207083857.28058-4-jerry.huang@nxp.com/
> Cc: Matt Weber <matthew.weber@collins.com>
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 77+ messages in thread
* Re: [Buildroot] [PATCH 21/29] package/qoriq-rcw: drop bogus QORIQ_RCW_FILE_BIN
2023-01-01 23:36 ` [Buildroot] [PATCH 21/29] package/qoriq-rcw: drop bogus QORIQ_RCW_FILE_BIN Ricardo Martincoski
2023-01-04 22:08 ` Peter Korsgaard
@ 2023-01-11 9:23 ` Peter Korsgaard
1 sibling, 0 replies; 77+ messages in thread
From: Peter Korsgaard @ 2023-01-11 9:23 UTC (permalink / raw)
To: Ricardo Martincoski; +Cc: Matt Weber, buildroot
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes:
> While applying [1] and cleaning up, the commit "d167f7006e
> package/qoriq-rcw: add in-tree rcw source support" ended up keeping an
> unused define.
> Drop it now.
> [1] http://patchwork.ozlabs.org/project/buildroot/patch/20200207083857.28058-4-jerry.huang@nxp.com/
> Cc: Matt Weber <matthew.weber@collins.com>
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Committed to 2022.11.x and 2022.02.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 77+ messages in thread
* [Buildroot] [PATCH 22/29] package/rhash: drop dangling RHASH_ADDLDFLAGS
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (20 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 21/29] package/qoriq-rcw: drop bogus QORIQ_RCW_FILE_BIN Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-04 22:09 ` Peter Korsgaard
2023-01-11 9:24 ` Peter Korsgaard
2023-01-01 23:36 ` [Buildroot] [PATCH 23/29] package/swupdate: drop dangling SWUPDATE_BUILD_CONFIG Ricardo Martincoski
` (6 subsequent siblings)
28 siblings, 2 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Ricardo Martincoski
Commit "ead2afda13 package/rhash: bump version to 1.4.0" dropped the
only usage of this define but the define itself was left dangling.
Drop it now.
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
package/rhash/rhash.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/package/rhash/rhash.mk b/package/rhash/rhash.mk
index 8c33de1862..1f7456e4e7 100644
--- a/package/rhash/rhash.mk
+++ b/package/rhash/rhash.mk
@@ -12,7 +12,6 @@ RHASH_LICENSE_FILES = COPYING
RHASH_CPE_ID_VENDOR = rhash_project
RHASH_INSTALL_STAGING = YES
RHASH_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
-RHASH_ADDLDFLAGS = $(TARGET_NLS_LIBS)
ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
RHASH_CONF_OPTS += --enable-gettext
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* [Buildroot] [PATCH 23/29] package/swupdate: drop dangling SWUPDATE_BUILD_CONFIG
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (21 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 22/29] package/rhash: drop dangling RHASH_ADDLDFLAGS Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-04 22:09 ` Peter Korsgaard
2023-01-11 9:24 ` Peter Korsgaard
2023-01-01 23:36 ` [Buildroot] [PATCH 24/29] package/wpa_supplicant: drop dangling WPA_SUPPLICANT_{LDFLAGS, MAKE_ENV} Ricardo Martincoski
` (5 subsequent siblings)
28 siblings, 2 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Ricardo Martincoski
"6c63e4de4a boot/swupdate: don't specify .config to munge" dropped all
usages of this define but the define itself was left dangling.
Drop it now.
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
package/swupdate/swupdate.mk | 2 --
1 file changed, 2 deletions(-)
diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk
index 8f05b83922..11a3946753 100644
--- a/package/swupdate/swupdate.mk
+++ b/package/swupdate/swupdate.mk
@@ -208,8 +208,6 @@ define SWUPDATE_SET_WEBSERVER
endef
endif
-SWUPDATE_BUILD_CONFIG = $(@D)/.config
-
SWUPDATE_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_SWUPDATE_CONFIG))
SWUPDATE_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* [Buildroot] [PATCH 24/29] package/wpa_supplicant: drop dangling WPA_SUPPLICANT_{LDFLAGS, MAKE_ENV}
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (22 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 23/29] package/swupdate: drop dangling SWUPDATE_BUILD_CONFIG Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-04 22:10 ` Peter Korsgaard
2023-01-11 9:25 ` Peter Korsgaard
2023-01-01 23:36 ` [Buildroot] [PATCH 25/29] utils/check-package: fix check for <pkg>_REDISTRIBUTE Ricardo Martincoski
` (4 subsequent siblings)
28 siblings, 2 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Sergey Matyukevich, Matt Weber, Ricardo Martincoski
Commit "0340b45da0 wpa_supplicant: bump to version 1.0" from 2012
converted the package to use the generic infra, but added a bogus
WPA_SUPPLICANT_LDFLAGS end left a dangling WPA_SUPPLICANT_MAKE_ENV.
Drop the symbols that are not used since 2012.
Cc: Matt Weber <matthew.weber@collins.com>
Cc: Sergey Matyukevich <geomatsi@gmail.com>
Cc: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
package/wpa_supplicant/wpa_supplicant.mk | 4 ----
1 file changed, 4 deletions(-)
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index e5e3938be1..42c6f772ac 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -13,7 +13,6 @@ WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config
WPA_SUPPLICANT_SUBDIR = wpa_supplicant
WPA_SUPPLICANT_DBUS_SERVICE = fi.w1.wpa_supplicant1
WPA_SUPPLICANT_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/
-WPA_SUPPLICANT_LDFLAGS = $(TARGET_LDFLAGS)
WPA_SUPPLICANT_SELINUX_MODULES = networkmanager
# install the wpa_client library
@@ -157,9 +156,6 @@ endif
ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS),y)
WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf dbus
-WPA_SUPPLICANT_MAKE_ENV = \
- PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
- PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_CTRL_IFACE_DBUS_NEW
define WPA_SUPPLICANT_INSTALL_DBUS_NEW
$(INSTALL) -m 0644 -D \
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* Re: [Buildroot] [PATCH 24/29] package/wpa_supplicant: drop dangling WPA_SUPPLICANT_{LDFLAGS, MAKE_ENV}
2023-01-01 23:36 ` [Buildroot] [PATCH 24/29] package/wpa_supplicant: drop dangling WPA_SUPPLICANT_{LDFLAGS, MAKE_ENV} Ricardo Martincoski
@ 2023-01-04 22:10 ` Peter Korsgaard
2023-01-11 9:25 ` Peter Korsgaard
1 sibling, 0 replies; 77+ messages in thread
From: Peter Korsgaard @ 2023-01-04 22:10 UTC (permalink / raw)
To: Ricardo Martincoski; +Cc: Matt Weber, Sergey Matyukevich, buildroot
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes:
> Commit "0340b45da0 wpa_supplicant: bump to version 1.0" from 2012
> converted the package to use the generic infra, but added a bogus
> WPA_SUPPLICANT_LDFLAGS end left a dangling WPA_SUPPLICANT_MAKE_ENV.
> Drop the symbols that are not used since 2012.
> Cc: Matt Weber <matthew.weber@collins.com>
> Cc: Sergey Matyukevich <geomatsi@gmail.com>
> Cc: Yegor Yefremov <yegorslists@googlemail.com>
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 77+ messages in thread* Re: [Buildroot] [PATCH 24/29] package/wpa_supplicant: drop dangling WPA_SUPPLICANT_{LDFLAGS, MAKE_ENV}
2023-01-01 23:36 ` [Buildroot] [PATCH 24/29] package/wpa_supplicant: drop dangling WPA_SUPPLICANT_{LDFLAGS, MAKE_ENV} Ricardo Martincoski
2023-01-04 22:10 ` Peter Korsgaard
@ 2023-01-11 9:25 ` Peter Korsgaard
1 sibling, 0 replies; 77+ messages in thread
From: Peter Korsgaard @ 2023-01-11 9:25 UTC (permalink / raw)
To: Ricardo Martincoski; +Cc: Matt Weber, Sergey Matyukevich, buildroot
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes:
> Commit "0340b45da0 wpa_supplicant: bump to version 1.0" from 2012
> converted the package to use the generic infra, but added a bogus
> WPA_SUPPLICANT_LDFLAGS end left a dangling WPA_SUPPLICANT_MAKE_ENV.
> Drop the symbols that are not used since 2012.
> Cc: Matt Weber <matthew.weber@collins.com>
> Cc: Sergey Matyukevich <geomatsi@gmail.com>
> Cc: Yegor Yefremov <yegorslists@googlemail.com>
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Committed to 2022.11.x and 2022.02.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 77+ messages in thread
* [Buildroot] [PATCH 25/29] utils/check-package: fix check for <pkg>_REDISTRIBUTE
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (23 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 24/29] package/wpa_supplicant: drop dangling WPA_SUPPLICANT_{LDFLAGS, MAKE_ENV} Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-01 23:36 ` [Buildroot] [PATCH 26/29] utils/check-package: check linux-tools Ricardo Martincoski
` (3 subsequent siblings)
28 siblings, 0 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Ricardo Martincoski
Commit "8e87d76c12 check-package: check *.mk files" added a typo that
prevents check-package from checking <PKG>_REDISTRIBUTE default value.
Fix the typo: _INSTALL_REDISTRIBUTE -> _REDISTRIBUTE
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Running on current master generates no warnings.
---
utils/checkpackagelib/lib_mk.py | 2 +-
utils/checkpackagelib/test_lib_mk.py | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py
index b50a19ac62..b0bd52bdf6 100644
--- a/utils/checkpackagelib/lib_mk.py
+++ b/utils/checkpackagelib/lib_mk.py
@@ -296,7 +296,7 @@ class UselessFlag(_CheckFunction):
r"_LIBTOOL_PATCH\s*=\s*YES"])))
DEFAULT_GENERIC_FLAG = re.compile(r"^.*{}".format("|".join([
r"_INSTALL_IMAGES\s*=\s*NO",
- r"_INSTALL_REDISTRIBUTE\s*=\s*YES",
+ r"_REDISTRIBUTE\s*=\s*YES",
r"_INSTALL_STAGING\s*=\s*NO",
r"_INSTALL_TARGET\s*=\s*YES"])))
END_CONDITIONAL = re.compile(r"^\s*({})".format("|".join(end_conditional)))
diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py
index 49fa216fcd..5f5663377b 100644
--- a/utils/checkpackagelib/test_lib_mk.py
+++ b/utils/checkpackagelib/test_lib_mk.py
@@ -531,13 +531,13 @@ UselessFlag = [
('generic',
'any.mk',
'ANY_INSTALL_IMAGES = NO\n'
- 'ANY_INSTALL_REDISTRIBUTE = YES\n'
+ 'ANY_REDISTRIBUTE = YES\n'
'ANY_INSTALL_STAGING = NO\n'
'ANY_INSTALL_TARGET = YES\n',
[['any.mk:1: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)',
'ANY_INSTALL_IMAGES = NO\n'],
['any.mk:2: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)',
- 'ANY_INSTALL_REDISTRIBUTE = YES\n'],
+ 'ANY_REDISTRIBUTE = YES\n'],
['any.mk:3: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)',
'ANY_INSTALL_STAGING = NO\n'],
['any.mk:4: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)',
@@ -547,9 +547,9 @@ UselessFlag = [
'ifneq (condition)\n'
'ANY_INSTALL_IMAGES = NO\n'
'endif\n'
- 'ANY_INSTALL_REDISTRIBUTE = YES\n',
+ 'ANY_REDISTRIBUTE = YES\n',
[['any.mk:4: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)',
- 'ANY_INSTALL_REDISTRIBUTE = YES\n']]),
+ 'ANY_REDISTRIBUTE = YES\n']]),
]
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* [Buildroot] [PATCH 26/29] utils/check-package: check linux-tools
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (24 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 25/29] utils/check-package: fix check for <pkg>_REDISTRIBUTE Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-01 23:36 ` [Buildroot] [PATCH 27/29] utils/check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (2 subsequent siblings)
28 siblings, 0 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Ricardo Martincoski
Each linux tool uses a fragment of a .mk file, named, for instance:
package/linux-tools/linux-tool-cpupower.mk.in
So currently check-package does not check these files.
Add the support in check-package script.
At the same time, factor out a function to derive package prefix from
the filename being checked, so the fix (calling os.path.splitext twice)
can be applied in a single place.
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Running on current master generates no warnings.
---
utils/check-package | 3 ++-
utils/checkpackagelib/lib_mk.py | 28 ++++++++++---------
utils/checkpackagelib/test_lib_mk.py | 40 ++++++++++++++++++++++++++++
3 files changed, 57 insertions(+), 14 deletions(-)
diff --git a/utils/check-package b/utils/check-package
index f64daed84c..6bd0c0b31f 100755
--- a/utils/check-package
+++ b/utils/check-package
@@ -61,6 +61,7 @@ DO_CHECK_INTREE = re.compile(r"|".join([
DO_NOT_CHECK_INTREE = re.compile(r"|".join([
r"boot/barebox/barebox\.mk$",
r"fs/common\.mk$",
+ r"package/alchemy/atom.mk.in$",
r"package/doc-asciidoc\.mk$",
r"package/pkg-\S*\.mk$",
r"toolchain/helpers\.mk$",
@@ -84,7 +85,7 @@ def get_lib_from_filename(fname):
return checkpackagelib.lib_config
if fname.endswith(".hash"):
return checkpackagelib.lib_hash
- if fname.endswith(".mk"):
+ if fname.endswith(".mk") or fname.endswith(".mk.in"):
return checkpackagelib.lib_mk
if fname.endswith(".patch"):
return checkpackagelib.lib_patch
diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py
index b0bd52bdf6..931fa39dda 100644
--- a/utils/checkpackagelib/lib_mk.py
+++ b/utils/checkpackagelib/lib_mk.py
@@ -21,6 +21,16 @@ continue_conditional = ["elif", "else"]
end_conditional = ["endif"]
+def get_package_prefix_from_filename(filename):
+ package = os.path.splitext(os.path.splitext(os.path.basename(filename))[0])[0]
+ # linux tools do not use LINUX_TOOL_ prefix for variables
+ package = package.replace("linux-tool-", "")
+ # linux extensions do not use LINUX_EXT_ prefix for variables
+ package = package.replace("linux-ext-", "")
+ package_upper = package.replace("-", "_").upper()
+ return package, package_upper
+
+
class Indent(_CheckFunction):
COMMENT = re.compile(r"^\s*#")
CONDITIONAL = re.compile(r"^\s*({})\s".format("|".join(start_conditional + end_conditional + continue_conditional)))
@@ -179,12 +189,10 @@ class RemoveDefaultPackageSourceVariable(_CheckFunction):
packages_that_may_contain_default_source = ["binutils", "gcc", "gdb"]
def before(self):
- package, _ = os.path.splitext(os.path.basename(self.filename))
- package_upper = package.replace("-", "_").upper()
- self.package = package
+ self.package, package_upper = get_package_prefix_from_filename(self.filename)
self.FIND_SOURCE = re.compile(
r"^{}_SOURCE\s*=\s*{}-\$\({}_VERSION\)\.tar\.gz"
- .format(package_upper, package, package_upper))
+ .format(package_upper, self.package, package_upper))
def check_line(self, lineno, text):
if self.FIND_SOURCE.search(text):
@@ -254,16 +262,10 @@ class TypoInPackageVariable(_CheckFunction):
VARIABLE = re.compile(r"^(define\s+)?([A-Z0-9_]+_[A-Z0-9_]+)")
def before(self):
- package, _ = os.path.splitext(os.path.basename(self.filename))
- package = package.replace("-", "_").upper()
- # linux tools do not use LINUX_TOOL_ prefix for variables
- package = package.replace("LINUX_TOOL_", "")
- # linux extensions do not use LINUX_EXT_ prefix for variables
- package = package.replace("LINUX_EXT_", "")
- self.package = package
- self.REGEX = re.compile(r"(HOST_|ROOTFS_)?({}_[A-Z0-9_]+)".format(package))
+ _, self.package = get_package_prefix_from_filename(self.filename)
+ self.REGEX = re.compile(r"(HOST_|ROOTFS_)?({}_[A-Z0-9_]+)".format(self.package))
self.FIND_VIRTUAL = re.compile(
- r"^{}_PROVIDES\s*(\+|)=\s*(.*)".format(package))
+ r"^{}_PROVIDES\s*(\+|)=\s*(.*)".format(self.package))
self.virtual = []
def check_line(self, lineno, text):
diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py
index 5f5663377b..d817cdece0 100644
--- a/utils/checkpackagelib/test_lib_mk.py
+++ b/utils/checkpackagelib/test_lib_mk.py
@@ -3,6 +3,40 @@ import checkpackagelib.test_util as util
import checkpackagelib.lib_mk as m
+get_package_prefix_from_filename = [
+ ('linux extension',
+ 'linux/linux-ext-aufs.mk',
+ ['aufs', 'AUFS']),
+ ('linux tool',
+ 'package/linux-tools/linux-tool-gpio.mk.in',
+ ['gpio', 'GPIO']),
+ ('boot',
+ 'boot/binaries-marvell/binaries-marvell.mk',
+ ['binaries-marvell', 'BINARIES_MARVELL']),
+ ('toolchain',
+ 'toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk',
+ ['toolchain-external-bootlin', 'TOOLCHAIN_EXTERNAL_BOOTLIN']),
+ ('package, underscore, subfolder',
+ 'package/x11r7/xapp_bitmap/xapp_bitmap.mk',
+ ['xapp_bitmap', 'XAPP_BITMAP']),
+ ('package, starting with number',
+ 'package/4th/4th.mk',
+ ['4th', '4TH']),
+ ('package, long name',
+ 'package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.mk',
+ ['perl-mojolicious-plugin-authentication', 'PERL_MOJOLICIOUS_PLUGIN_AUTHENTICATION']),
+ ('package, case sensitive',
+ 'package/libeXosip2/libeXosip2.mk',
+ ['libeXosip2', 'LIBEXOSIP2']),
+ ]
+
+
+@pytest.mark.parametrize('testname,filename,expected', get_package_prefix_from_filename)
+def test_get_package_prefix_from_filename(testname, filename, expected):
+ prefix_lower, prefix_upper = m.get_package_prefix_from_filename(filename)
+ assert [prefix_lower, prefix_upper] == expected
+
+
Indent = [
('ignore comment at beginning of line',
'any',
@@ -496,6 +530,12 @@ TypoInPackageVariable = [
'OTHERS_VAR = \n',
[['any.mk:2: possible typo: OTHERS_VAR -> *ANY*',
'OTHERS_VAR = \n']]),
+ ('linux tool',
+ 'package/linux-tools/linux-tool-cpupower.mk.in',
+ 'CPUPOWER_DEPENDENCIES =\n'
+ 'POWER_DEPENDENCIES +=\n',
+ [['package/linux-tools/linux-tool-cpupower.mk.in:2: possible typo: POWER_DEPENDENCIES -> *CPUPOWER*',
+ 'POWER_DEPENDENCIES +=\n']]),
]
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* [Buildroot] [PATCH 27/29] utils/check-package: warn about symbols not recognized by a package infra
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (25 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 26/29] utils/check-package: check linux-tools Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-01 23:36 ` [Buildroot] [PATCH 28/29] utils/check-package: warn about disabled install Ricardo Martincoski
2023-01-01 23:36 ` [Buildroot] [PATCH 29/29] docs/manual: standardize references to the generic infra Ricardo Martincoski
28 siblings, 0 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot
Cc: Ricardo Martincoski, Thomas Petazzoni, Giulio Benetti,
Romain Naour, Thomas De Schampheleire
For each .mk file, create a list of all symbols defined and compare to
the list of symbols supported by the package infra(s) used in the file.
Also keep track of usage for internal variables, since any variable
suffix can be used as long the variable is use in the file.
Ignore some variables that are defined in one file and used in others,
for instance the variable that holds the path to host tools to be used
in the build of other packages.
Use a small list for the exceptions that don't use a package/rootfs
infra: linux extensions and initramfs.
Also support the special case of _SUBDIR, see below.
In the main script, add support for a check function to return more than
one warning at once.
Create a simple model for the package infras, listing the supported
suffixes for variables for each package infra type.
This file may need updates when new package infras are added or existent
ones are changed.
Add an exception to initramfs, because it changes TARGETS_ROOTFS.
Add an exception to xenomai because it changes LINUX_EXTRA_DOWNLOADS.
Add an exception to luarocks because it changes TARGET_FINALIZE_HOOKS.
Add an exception to toolchain/toolchain.mk because it does not call any
package infra.
The _SUBDIR variable is a tricky one. It *is* declared for the generic
infra package (and all package infras that inherit from the generic
one), but it is really used in certain conditions.
package/pkg-generic.mk uses <pkg>_SUBDIR only to define:
(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
and it also uses <pkg>_SRCDIR only to define:
$(2)_BUILDDIR ?= $$($(2)_SRCDIR)
so the generic package infra does not really uses _SUBDIR by itself in
the common scenario.
So The manual entry for the generic infra seems correct in not
mentioning _SUBDIR.
Also any package infra that inherits from the generic one (by calling
inner-generic-package) needs to use one of the three variables in order
to support _SUBDIR: _BUILDDIR, _SRCDIR or _SUBDIR.
That is the case for: autotools (_SRCDIR), cargo (_SRCDIR, _SUBDIR),
cmake (_BUILDDIR, _SRCDIR), luarocks (_SRCDIR, _SUBDIR),
meson (_SRCDIR), perl (_SRCDIR), python (_BUILDDIR), qmake (_BUILDDIR)
and waf (_SRCDIR).
Of course the .mk file for a package using the generic infra can define
this symbol and use it, directly or indirectly, for example, in its
_INSTALL_TARGET_CMDS.
Also any package infra, even the ones that do not use directly any of
the three variables above, can use _SUBDIR when the package uses the
macros KCONFIG_ENABLE_OPT, KCONFIG_SET_OPT or KCONFIG_DISABLE_OPT
declared in package/pkg-utils.mk.
Cc: Francois Perrad <francois.perrad@gadz.org>
Cc: Giulio Benetti <giulio.benetti@benettiengineering.com>
Cc: Romain Naour <romain.naour@gmail.com>
Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Running on current master:
boot/ti-k3-r5-loader/ti-k3-r5-loader.mk:29: possible typo on suffix: TI_K3_R5_LOADER_BOARD
package/falcosecurity-libs/falcosecurity-libs.mk:12: possible typo on suffix: FALCOSECURITY_LIBS_SUPPORTS_IN_SOURCE_BUILD
package/i2pd/i2pd.mk:39: possible typo on suffix: I2PD_INSTALL_CONFIGURATION_FILES
package/policycoreutils/policycoreutils.mk:19: possible typo on suffix: POLICYCOREUTILS_INSTALL_TARGET_LINUX_PAM_CONFS
package/checkpolicy/checkpolicy.mk:23: possible typo on suffix: CHECKPOLICY_STAGING_CMDS
package/qcom-db410c-firmware/qcom-db410c-firmware.mk:11: possible typo on suffix: QCOM_DB410C_FIRMWARE_LICENCE
package/lrzsz/lrzsz.mk:21: possible typo on suffix: LRZSZ_BUILD_HOOKS
package/gobject-introspection/gobject-introspection.mk:12: possible typo on suffix: GOBJECT_INTROSPECTION_AUTORECONF
package/gobject-introspection/gobject-introspection.mk:67: possible typo on suffix: GOBJECT_INTROSPECTION_FIX_TOOLS_PYTHON_PATH
package/pptp-linux/pptp-linux.mk:10: possible typo on suffix: PPTP_LINUX_MAKE
package/exfat/exfat.mk:14: possible typo on suffix: EXFAT_CFLAGS
package/rhash/rhash.mk:15: possible typo on suffix: RHASH_ADDLDFLAGS
package/wpa_supplicant/wpa_supplicant.mk:16: possible typo on suffix: WPA_SUPPLICANT_LDFLAGS
package/wpa_supplicant/wpa_supplicant.mk:160: possible typo on suffix: WPA_SUPPLICANT_MAKE_ENV
package/libtalloc/libtalloc.mk:34: possible typo on suffix: LIBTALLOC_CFLAGS
package/libtalloc/libtalloc.mk:35: possible typo on suffix: LIBTALLOC_LDFLAGS
package/tinyxml/tinyxml.mk:15: possible typo on suffix: TINYXML_CPE_ID_VENDOT
package/zip/zip.mk:44: possible typo on suffix: ZIP_INSTALLING_STAGING_CMDS
package/libmng/libmng.mk:17: possible typo on suffix: LIBMNG_DEPDENDENCIES
package/swupdate/swupdate.mk:211: possible typo on suffix: SWUPDATE_BUILD_CONFIG
package/glib-networking/glib-networking.mk:24: possible typo on suffix: GLIB_NETWORKING_INSTALL_TARGET_OPTS
package/tekui/tekui.mk:15: possible typo on suffix: TEKUI_MAKE
package/qoriq-rcw/qoriq-rcw.mk:63: possible typo on suffix: QORIQ_RCW_FILE_BIN
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk:19: possible typo on suffix: QT5VIRTUALKEYBOARD_QMAKEFLAGS
---
fs/initramfs/initramfs.mk | 1 +
linux/linux-ext-xenomai.mk | 2 +-
package/luarocks/luarocks.mk | 2 +
toolchain/toolchain.mk | 2 +
utils/check-package | 17 +-
utils/checkpackagelib/lib_mk.py | 109 +++++++
utils/checkpackagelib/pkg_infra.py | 309 +++++++++++++++++++
utils/checkpackagelib/test_lib_mk.py | 426 +++++++++++++++++++++++++++
8 files changed, 863 insertions(+), 5 deletions(-)
create mode 100644 utils/checkpackagelib/pkg_infra.py
diff --git a/fs/initramfs/initramfs.mk b/fs/initramfs/initramfs.mk
index 3b3d4ed8b9..69f0910368 100644
--- a/fs/initramfs/initramfs.mk
+++ b/fs/initramfs/initramfs.mk
@@ -27,6 +27,7 @@ rootfs-initramfs-show-depends:
.PHONY: rootfs-initramfs rootfs-initramfs-show-depends
ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
+# check-package TypoInVariableSuffix
TARGETS_ROOTFS += rootfs-initramfs
endif
diff --git a/linux/linux-ext-xenomai.mk b/linux/linux-ext-xenomai.mk
index 5ec6891bbf..247ff087cb 100644
--- a/linux/linux-ext-xenomai.mk
+++ b/linux/linux-ext-xenomai.mk
@@ -12,7 +12,7 @@ XENOMAI_ADEOS_PATCH = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH))
ifneq ($(filter ftp://% http://% https://%,$(XENOMAI_ADEOS_PATCH)),)
XENOMAI_ADEOS_PATCH_NAME = $(notdir $(XENOMAI_ADEOS_PATCH))
XENOMAI_ADEOS_PATCH_PATH = $(LINUX_DL_DIR)/$(XENOMAI_ADEOS_PATCH_NAME)
-# check-package TypoInPackageVariable
+# check-package TypoInPackageVariable, TypoInVariableSuffix
LINUX_EXTRA_DOWNLOADS += $(XENOMAI_ADEOS_PATCH)
BR_NO_CHECK_HASH_FOR += $(XENOMAI_ADEOS_PATCH_NAME)
else
diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk
index 2bec2fca25..58295f7478 100644
--- a/package/luarocks/luarocks.mk
+++ b/package/luarocks/luarocks.mk
@@ -43,11 +43,13 @@ endef
$(eval $(host-generic-package))
+# check-package TypoInVariableSuffix
define LUAROCKS_FINALIZE_TARGET
rm -rf $(TARGET_DIR)/usr/lib/luarocks
endef
# Apply to global variable directly, as pkg-generic does not
ifneq ($(BR2_PACKAGE_LUAJIT)$(BR2_PACKAGE_LUA),)
+# check-package TypoInVariableSuffix
TARGET_FINALIZE_HOOKS += LUAROCKS_FINALIZE_TARGET
endif
diff --git a/toolchain/toolchain.mk b/toolchain/toolchain.mk
index fe87a72ed4..36344c1b20 100644
--- a/toolchain/toolchain.mk
+++ b/toolchain/toolchain.mk
@@ -10,6 +10,7 @@
# Install the gconv modules
ifeq ($(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY),y)
TOOLCHAIN_GLIBC_GCONV_LIBS = $(call qstrip,$(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_LIST))
+# check-package TypoInVariableSuffix
define TOOLCHAIN_GLIBC_COPY_GCONV_LIBS
$(Q)found_gconv=no; \
for d in $(TOOLCHAIN_EXTERNAL_PREFIX) ''; do \
@@ -51,5 +52,6 @@ define TOOLCHAIN_GLIBC_COPY_GCONV_LIBS
>$(TARGET_DIR)/usr/lib/gconv/gconv-modules; \
fi
endef
+# check-package TypoInVariableSuffix
TOOLCHAIN_TARGET_FINALIZE_HOOKS += TOOLCHAIN_GLIBC_COPY_GCONV_LIBS
endif
diff --git a/utils/check-package b/utils/check-package
index 6bd0c0b31f..0d9c4c1994 100755
--- a/utils/check-package
+++ b/utils/check-package
@@ -126,10 +126,19 @@ def print_warnings(warnings):
if warnings is None:
return 0 # No warning generated.
- for level, message in enumerate(warnings):
- if flags.verbose >= level:
- print(message.replace("\t", "< tab >").rstrip())
- return 1 # One more warning to count.
+ # Allow each check function to return either one warning or a list of warnings
+ if len(warnings) == 0:
+ return 0 # No warning generated.
+ if type(warnings[0]) is list:
+ all_warnings = warnings
+ else:
+ all_warnings = [warnings]
+
+ for each_warning in all_warnings:
+ for level, message in enumerate(each_warning):
+ if flags.verbose >= level:
+ print(message.replace("\t", "< tab >").rstrip())
+ return len(all_warnings) # One or more warnings to count.
def check_file_using_lib(fname):
diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py
index 931fa39dda..d9f254ca32 100644
--- a/utils/checkpackagelib/lib_mk.py
+++ b/utils/checkpackagelib/lib_mk.py
@@ -13,6 +13,7 @@ from checkpackagelib.lib import EmptyLastLine # noqa: F401
from checkpackagelib.lib import NewlineAtEof # noqa: F401
from checkpackagelib.lib import TrailingSpace # noqa: F401
from checkpackagelib.lib import Utf8Characters # noqa: F401
+from checkpackagelib.pkg_infra import get_valid_suffixes
from checkpackagelib.tool import NotExecutable # noqa: F401
# used in more than one check
@@ -292,6 +293,114 @@ class TypoInPackageVariable(_CheckFunction):
text]
+class TypoInVariableSuffix(_CheckFunction):
+ USED_OUTSIDE_THE_PACKAGE = [
+ "ALCHEMY_INSTALL_LIB_SDK_FILE",
+ "ALCHEMY_MAKE",
+ "ALCHEMY_TARGET_ENV",
+ "ARCH_TOOLCHAIN_WRAPPER_OPTS",
+ "BR_LIBC",
+ "BR_NO_CHECK_HASH_FOR",
+ "DIRECTFB_HOST_BINARY",
+ "ERLANG_EI_VSN",
+ "GCC_TARGET_ABI",
+ "GCC_TARGET_ARCH",
+ "GCC_TARGET_CPU",
+ "GCC_TARGET_FLOAT_ABI",
+ "GCC_TARGET_FP32_MODE",
+ "GCC_TARGET_FPU",
+ "GCC_TARGET_MODE",
+ "GCC_TARGET_NAN",
+ "GOB2_HOST_BINARY",
+ "HOST_GCC_APPLY_PATCHES",
+ "HOST_GCC_CONFIGURE_SYMLINK",
+ "HOST_GCC_INSTALL_WRAPPER_AND_SIMPLE_SYMLINKS",
+ "HOST_GCC_XTENSA_OVERLAY_EXTRACT",
+ "HOST_GO_HOST_ENV",
+ "HOST_GO_TARGET_ENV",
+ "LIBGLIB2_HOST_BINARY",
+ "LIBXML2_HOST_BINARY",
+ "LUA_RUN",
+ "MKFS_JFFS2",
+ "PKG_CONFIG_HOST_BINARY",
+ "QEMU_USER",
+ "QT5_QMAKE",
+ "QT5_QT_CONF_FIXUP",
+ "QT6_SOURCE_TARBALL_PREFIX",
+ "TOOLCHAIN_WRAPPER_BUILD",
+ "TOOLCHAIN_WRAPPER_INSTALL",
+ ]
+ DEFINITION = re.compile(r"^(define\s+)?([A-Z0-9_]+_[A-Z0-9_]+)")
+ USAGE = re.compile(r"([A-Z0-9_]+_[A-Z0-9_]+)")
+ INDIRECTLY_USING_SUBDIR = re.compile(r"\$\(call\s+" + r",|\$\(call\s+".join([
+ "KCONFIG_DISABLE_OPT",
+ "KCONFIG_ENABLE_OPT",
+ "KCONFIG_SET_OPT",
+ ]) + r",|[A-Z0-9_]+" + r"\b|[A-Z0-9_]+".join([
+ "_BUILDDIR",
+ "_SRCDIR",
+ "_SUBDIR",
+ ]) + r"\b")
+
+ def before(self):
+ self.usage = []
+ self.definitions = {}
+ if self.filename.startswith("linux/linux-ext-"):
+ self.valid_suffixes = ["LINUX_EXTENSIONS", "_PREPARE_KERNEL"]
+ elif self.filename.startswith("package/linux-tools/linux-tool-"):
+ self.valid_suffixes = ["LINUX_TOOLS", "LINUX_TOOLS_POST_PATCH_HOOKS", "_DEPENDENCIES",
+ "_BUILD_CMDS", "_INSTALL_STAGING_CMDS", "_INSTALL_TARGET_CMDS",
+ "_LINUX_CONFIG_FIXUPS", "_INSTALL_INIT_SYSTEMD",
+ "_INSTALL_INIT_SYSV", "_INSTALL_INIT_OPENRC"]
+ elif self.filename.startswith("fs/initramfs/"):
+ self.valid_suffixes = ["_DEPENDENCIES", "_NAME", "_TYPE"]
+ else:
+ self.valid_suffixes = []
+ self.using_subdir = False
+
+ def check_line(self, lineno, text):
+ self.valid_suffixes += get_valid_suffixes(text)
+
+ m = self.DEFINITION.search(text)
+ if m:
+ variable = m.group(2)
+ if variable not in self.USED_OUTSIDE_THE_PACKAGE:
+ self.definitions[variable] = [lineno, text]
+
+ rest_of_line = self.DEFINITION.sub('', text)
+ variables = self.USAGE.findall(rest_of_line)
+ for variable in variables:
+ self.usage.append(variable)
+
+ if self.INDIRECTLY_USING_SUBDIR.search(rest_of_line):
+ self.using_subdir = True
+
+ def after(self):
+ if self.using_subdir:
+ _, package = get_package_prefix_from_filename(self.filename)
+ self.usage.append(package + "_SUBDIR")
+ self.usage.append("HOST_" + package + "_SUBDIR")
+
+ possible_typo = {}
+ for variable, where in self.definitions.items():
+ valid_suffix = False
+ for suffix in self.valid_suffixes:
+ if variable.endswith(suffix):
+ valid_suffix = True
+ break
+ if not valid_suffix:
+ possible_typo[variable] = where
+
+ warnings = []
+ for variable, where in possible_typo.items():
+ if variable not in self.usage:
+ lineno, text = where
+ warnings.append(["{}:{}: possible typo on suffix: {}"
+ .format(self.filename, lineno, variable),
+ text])
+ return warnings
+
+
class UselessFlag(_CheckFunction):
DEFAULT_AUTOTOOLS_FLAG = re.compile(r"^.*{}".format("|".join([
r"_AUTORECONF\s*=\s*NO",
diff --git a/utils/checkpackagelib/pkg_infra.py b/utils/checkpackagelib/pkg_infra.py
new file mode 100644
index 0000000000..8e93670548
--- /dev/null
+++ b/utils/checkpackagelib/pkg_infra.py
@@ -0,0 +1,309 @@
+AUTOTOOLS_VALID_SUFFIXES = [
+ "_AUTORECONF",
+ "_AUTORECONF_OPTS",
+ "_CONF_ENV",
+ "_CONF_OPTS",
+ "_GETTEXTIZE",
+ "_GETTEXTIZE_OPTS",
+ "_INSTALL_OPTS",
+ "_INSTALL_STAGING_OPTS",
+ "_INSTALL_TARGET_OPTS",
+ "_LIBTOOL_PATCH",
+ "_MAKE",
+ "_MAKE_ENV",
+ "_MAKE_OPTS",
+ "_SUBDIR",
+ ]
+BAREBOX_VALID_SUFFIXES = [
+ ]
+CARGO_VALID_SUFFIXES = [
+ "_CARGO_BUILD_OPTS",
+ "_CARGO_ENV",
+ "_CARGO_INSTALL_OPTS",
+ "_SUBDIR",
+ ]
+CMAKE_VALID_SUFFIXES = [
+ "_CONF_ENV",
+ "_CONF_OPTS",
+ "_INSTALL_OPTS",
+ "_INSTALL_STAGING_OPTS",
+ "_INSTALL_TARGET_OPTS",
+ "_MAKE",
+ "_MAKE_ENV",
+ "_MAKE_OPTS",
+ "_SUBDIR",
+ "_SUPPORTS_IN_SOURCE_BUILD",
+ ]
+GENERIC_VALID_SUFFIXES = [
+ "_ACTUAL_SOURCE_SITE",
+ "_ACTUAL_SOURCE_TARBALL",
+ "_ADDITIONAL_DOWNLOADS",
+ "_ADD_SKELETON_DEPENDENCY",
+ "_ADD_TOOLCHAIN_DEPENDENCY",
+ "_BIN_ARCH_EXCLUDE",
+ "_BUILD_CMDS",
+ "_CONFIGURE_CMDS",
+ "_CONFIG_SCRIPTS",
+ "_CPE_ID",
+ "_CPE_ID_PREFIX",
+ "_CPE_ID_PRODUCT",
+ "_CPE_ID_UPDATE",
+ "_CPE_ID_VENDOR",
+ "_CPE_ID_VERSION",
+ "_DEPENDENCIES",
+ "_DEVICES",
+ "_DL_DIR",
+ "_DL_ENV",
+ "_DL_OPTS",
+ "_DL_SUBDIR",
+ "_DL_VERSION",
+ "_DOWNLOAD_DEPENDENCIES",
+ "_DOWNLOAD_POST_PROCESS",
+ "_DROP_FILES_OR_DIRS",
+ "_EXCLUDES",
+ "_EXTRACT_CMDS",
+ "_EXTRACT_DEPENDENCIES",
+ "_EXTRA_DOWNLOADS",
+ "_FLAT_STACKSIZE",
+ "_GIT_LFS",
+ "_GIT_SUBMODULES",
+ "_HELP_CMDS",
+ "_IGNORE_CVES",
+ "_INSTALL_CMDS",
+ "_INSTALL_IMAGES",
+ "_INSTALL_IMAGES_CMDS",
+ "_INSTALL_INIT_OPENRC",
+ "_INSTALL_INIT_SYSTEMD",
+ "_INSTALL_INIT_SYSV",
+ "_INSTALL_STAGING",
+ "_INSTALL_STAGING_CMDS",
+ "_INSTALL_TARGET",
+ "_INSTALL_TARGET_CMDS",
+ "_KEEP_PY_FILES",
+ "_LICENSE",
+ "_LICENSE_FILES",
+ "_LINUX_CONFIG_FIXUPS",
+ "_NAME",
+ "_OVERRIDE_SRCDIR",
+ "_OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS",
+ "_PATCH",
+ "_PATCH_DEPENDENCIES",
+ "_PERMISSIONS",
+ "_POST_BUILD_HOOKS",
+ "_POST_CONFIGURE_HOOKS",
+ "_POST_DOWNLOAD_HOOKS",
+ "_POST_EXTRACT_HOOKS",
+ "_POST_INSTALL_HOOKS",
+ "_POST_INSTALL_IMAGES_HOOKS",
+ "_POST_INSTALL_STAGING_HOOKS",
+ "_POST_INSTALL_TARGET_HOOKS",
+ "_POST_LEGAL_INFO_HOOKS",
+ "_POST_PATCH_HOOKS",
+ "_POST_PREPARE_HOOKS",
+ "_POST_RSYNC_HOOKS",
+ "_PRE_BUILD_HOOKS",
+ "_PRE_CONFIGURE_HOOKS",
+ "_PRE_DOWNLOAD_HOOKS",
+ "_PRE_EXTRACT_HOOKS",
+ "_PRE_INSTALL_HOOKS",
+ "_PRE_INSTALL_IMAGES_HOOKS",
+ "_PRE_INSTALL_STAGING_HOOKS",
+ "_PRE_INSTALL_TARGET_HOOKS",
+ "_PRE_LEGAL_INFO_HOOKS",
+ "_PRE_PATCH_HOOKS",
+ "_PRE_RSYNC_HOOKS",
+ "_PROVIDES",
+ "_REDISTRIBUTE",
+ "_ROOTFS_PRE_CMD_HOOKS",
+ "_SELINUX_MODULES",
+ "_SITE",
+ "_SITE_METHOD",
+ "_SOURCE",
+ "_STRIP_COMPONENTS",
+ "_TARGET_FINALIZE_HOOKS",
+ "_TOOLCHAIN_WRAPPER_ARGS",
+ "_USERS",
+ "_VERSION",
+ ]
+GOLANG_VALID_SUFFIXES = [
+ "_BIN_NAME",
+ "_BUILD_OPTS",
+ "_BUILD_TARGETS",
+ "_GOMOD",
+ "_GO_ENV",
+ "_INSTALL_BINS",
+ "_LDFLAGS",
+ "_SRC_DOMAIN",
+ "_SRC_SOFTWARE",
+ "_SRC_VENDOR",
+ "_TAGS",
+ ]
+KCONFIG_VALID_SUFFIXES = [
+ "_KCONFIG_DEFCONFIG",
+ "_KCONFIG_DEPENDENCIES",
+ "_KCONFIG_DOTCONFIG",
+ "_KCONFIG_EDITORS",
+ "_KCONFIG_FILE",
+ "_KCONFIG_FIXUP_CMDS",
+ "_KCONFIG_FRAGMENT_FILES",
+ "_KCONFIG_MAKE",
+ "_KCONFIG_OPTS",
+ "_KCONFIG_RULES",
+ "_KCONFIG_SUPPORTS_DEFCONFIG",
+ "_MAKE",
+ "_MAKE_ENV",
+ ]
+KERNEL_MODULE_VALID_SUFFIXES = [
+ "_DEPENDENCIES",
+ "_MAKE",
+ "_MODULE_MAKE_OPTS",
+ "_MODULE_SUBDIRS",
+ ]
+LUAROCKS_VALID_SUFFIXES = [
+ "_BUILD_OPTS",
+ "_NAME_UPSTREAM",
+ "_ROCKSPEC",
+ "_SUBDIR",
+ ]
+MESON_VALID_SUFFIXES = [
+ "_CFLAGS",
+ "_CONF_ENV",
+ "_CONF_OPTS",
+ "_CXXFLAGS",
+ "_FCFLAGS",
+ "_LDFLAGS",
+ "_MESON_EXTRA_BINARIES",
+ "_MESON_EXTRA_PROPERTIES",
+ "_NINJA_ENV",
+ "_NINJA_OPTS",
+ "_SUBDIR",
+ ]
+PERL_VALID_SUFFIXES = [
+ "_BUILD_OPTS",
+ "_CONF_ENV",
+ "_CONF_OPTS",
+ "_DISTNAME",
+ "_INSTALL_TARGET_OPTS",
+ "_PREFER_INSTALLER",
+ "_SUBDIR",
+ ]
+PYTHON_VALID_SUFFIXES = [
+ "_BASE_INSTALL_CMD",
+ "_BUILD_OPTS",
+ "_ENV",
+ "_INSTALL_OPTS",
+ "_INSTALL_STAGING_OPTS",
+ "_INSTALL_TARGET_OPTS",
+ "_SETUP_TYPE",
+ "_SUBDIR",
+ ]
+QMAKE_VALID_SUFFIXES = [
+ "_CONF_ENV",
+ "_CONF_OPTS",
+ "_INSTALL_STAGING_OPTS",
+ "_INSTALL_TARGET_OPTS",
+ "_MAKE_ENV",
+ "_MAKE_OPTS",
+ "_SUBDIR",
+ "_SYNC_QT_HEADERS",
+ ]
+REBAR_VALID_SUFFIXES = [
+ "_CONF_ENV",
+ "_KEEP_DEPENDENCIES",
+ "_REBAR_ENV",
+ "_USE_AUTOCONF",
+ "_USE_BUNDLED_REBAR",
+ ]
+ROOTFS_VALID_SUFFIXES = [
+ "_CMD",
+ "_DEPENDENCIES",
+ "_IMAGE_NAME",
+ "_POST_GEN_HOOKS",
+ "_PRE_GEN_HOOKS",
+ ]
+TOOLCHAIN_EXTERNAL_VALID_SUFFIXES = [
+ ]
+VIRTUAL_VALID_SUFFIXES = [
+ "_IS_VIRTUAL",
+ ]
+WAF_VALID_SUFFIXES = [
+ "_BUILD_OPTS",
+ "_CONF_ENV",
+ "_CONF_OPTS",
+ "_INSTALL_STAGING_OPTS",
+ "_INSTALL_TARGET_OPTS",
+ "_MAKE_ENV",
+ "_NEEDS_EXTERNAL_WAF",
+ "_SUBDIR",
+ "_WAF",
+ "_WAF_OPTS",
+ ]
+
+
+ALL_VALID_SUFFIXES = \
+ AUTOTOOLS_VALID_SUFFIXES + \
+ BAREBOX_VALID_SUFFIXES + \
+ CARGO_VALID_SUFFIXES + \
+ CMAKE_VALID_SUFFIXES + \
+ GENERIC_VALID_SUFFIXES + \
+ GOLANG_VALID_SUFFIXES + \
+ KCONFIG_VALID_SUFFIXES + \
+ KERNEL_MODULE_VALID_SUFFIXES + \
+ LUAROCKS_VALID_SUFFIXES + \
+ MESON_VALID_SUFFIXES + \
+ PERL_VALID_SUFFIXES + \
+ PYTHON_VALID_SUFFIXES + \
+ QMAKE_VALID_SUFFIXES + \
+ REBAR_VALID_SUFFIXES + \
+ ROOTFS_VALID_SUFFIXES + \
+ TOOLCHAIN_EXTERNAL_VALID_SUFFIXES + \
+ VIRTUAL_VALID_SUFFIXES + \
+ WAF_VALID_SUFFIXES
+
+
+def get_valid_suffixes(text):
+ if text.startswith("include"):
+ # we cannot guess the package infra used looking only at this file, so
+ # default to a superset of all known package infra types
+ return ALL_VALID_SUFFIXES
+ if text.startswith("$(eval"):
+ if "autotools-package)" in text:
+ return GENERIC_VALID_SUFFIXES + AUTOTOOLS_VALID_SUFFIXES
+ if "barebox-package)" in text:
+ return GENERIC_VALID_SUFFIXES + KCONFIG_VALID_SUFFIXES + BAREBOX_VALID_SUFFIXES
+ if "cargo-package)" in text:
+ return GENERIC_VALID_SUFFIXES + CARGO_VALID_SUFFIXES
+ if "cmake-package)" in text:
+ return GENERIC_VALID_SUFFIXES + CMAKE_VALID_SUFFIXES
+ if "generic-package)" in text:
+ return GENERIC_VALID_SUFFIXES
+ if "golang-package)" in text:
+ return GENERIC_VALID_SUFFIXES + GOLANG_VALID_SUFFIXES
+ if "kconfig-package)" in text:
+ return GENERIC_VALID_SUFFIXES + KCONFIG_VALID_SUFFIXES
+ if "kernel-module)" in text:
+ return KERNEL_MODULE_VALID_SUFFIXES
+ if "luarocks-package)" in text:
+ return GENERIC_VALID_SUFFIXES + LUAROCKS_VALID_SUFFIXES
+ if "meson-package)" in text:
+ return GENERIC_VALID_SUFFIXES + MESON_VALID_SUFFIXES
+ if "perl-package)" in text:
+ return GENERIC_VALID_SUFFIXES + PERL_VALID_SUFFIXES
+ if "python-package)" in text:
+ return GENERIC_VALID_SUFFIXES + PYTHON_VALID_SUFFIXES
+ if "qmake-package)" in text:
+ return GENERIC_VALID_SUFFIXES + QMAKE_VALID_SUFFIXES
+ if "rebar-package)" in text:
+ return GENERIC_VALID_SUFFIXES + AUTOTOOLS_VALID_SUFFIXES + REBAR_VALID_SUFFIXES
+ if "(rootfs)" in text:
+ return ROOTFS_VALID_SUFFIXES
+ if "toolchain-external-package)" in text:
+ return GENERIC_VALID_SUFFIXES + TOOLCHAIN_EXTERNAL_VALID_SUFFIXES
+ if "virtual-package)" in text:
+ return GENERIC_VALID_SUFFIXES + VIRTUAL_VALID_SUFFIXES
+ if "waf-package)" in text:
+ return GENERIC_VALID_SUFFIXES + WAF_VALID_SUFFIXES
+ # any new package infra will need support here, otherwise default to a
+ # superset of all known package infra types
+ return ALL_VALID_SUFFIXES
+ return []
diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py
index d817cdece0..56cd8bc391 100644
--- a/utils/checkpackagelib/test_lib_mk.py
+++ b/utils/checkpackagelib/test_lib_mk.py
@@ -545,6 +545,432 @@ def test_TypoInPackageVariable(testname, filename, string, expected):
assert warnings == expected
+TypoInVariableSuffix = [
+ ('good',
+ 'any.mk',
+ 'ANY_CONF_OPTS = \n'
+ '$(eval $(foo-package))\n',
+ [[]]),
+ ('bad',
+ 'any.mk',
+ 'ANY_VAR = \n'
+ '$(eval $(foo-package))\n',
+ [[['any.mk:1: possible typo on suffix: ANY_VAR', 'ANY_VAR = \n']]]),
+ ('internal variable',
+ 'any.mk',
+ 'ANY_VAR = \n'
+ 'ANY_CONF_OPTS = ANY_VAR OTHER_VAR\n'
+ '$(eval $(foo-package))\n',
+ [[]]),
+ ('ignore missing space',
+ 'any.mk',
+ 'OTHER_VAR= \n',
+ [[['any.mk:1: possible typo on suffix: OTHER_VAR', 'OTHER_VAR= \n']]]),
+ ('libc exception',
+ './any.mk',
+ 'BR_LIBC = \n',
+ [[]]),
+ ('arch/gcc/toolchain exception',
+ 'any.mk',
+ 'GCC_TARGET_FPU += \n',
+ [[]]),
+ ('host (bad)',
+ 'any.mk',
+ 'HOST_OTHER_VAR = \n',
+ [[['any.mk:1: possible typo on suffix: HOST_OTHER_VAR', 'HOST_OTHER_VAR = \n']]]),
+ ('provides',
+ 'any.mk',
+ 'ANY_PROVIDES = other thing\n'
+ 'OTHER_VAR = \n'
+ '$(eval $(foo-package))\n',
+ [[['any.mk:2: possible typo on suffix: OTHER_VAR', 'OTHER_VAR = \n']]]),
+ ('ignore space',
+ 'any.mk',
+ 'ANY_PROVIDES = thing other \n'
+ 'OTHER_VAR = \n'
+ '$(eval $(foo-package))\n',
+ [[['any.mk:2: possible typo on suffix: OTHER_VAR', 'OTHER_VAR = \n']]]),
+ ('multiple warnings',
+ 'file.mk',
+ 'LUA_RUN = FILE_INTERNAL_VAR\n'
+ 'FILE_DEPENDENCY = wrong\n'
+ 'FILE_LICENCE = wrong\n'
+ 'FILE_CONF_OPTS = ok\n'
+ 'FILE_INTERNAL_VAR = used above\n'
+ 'FILE_WRONG = # commment\n'
+ '$(eval $(foo-package))\n',
+ [[['file.mk:2: possible typo on suffix: FILE_DEPENDENCY', 'FILE_DEPENDENCY = wrong\n'],
+ ['file.mk:3: possible typo on suffix: FILE_LICENCE', 'FILE_LICENCE = wrong\n'],
+ ['file.mk:6: possible typo on suffix: FILE_WRONG', 'FILE_WRONG = # commment\n']]]),
+ ('linux extensions',
+ 'linux/linux-ext-any.mk',
+ 'ANY_CPE_ID = \n'
+ 'define ANY_BUILD_CMDS\n'
+ 'endef\n'
+ 'ANY_PREPARE_KERNEL = \n',
+ [[['linux/linux-ext-any.mk:1: possible typo on suffix: ANY_CPE_ID', 'ANY_CPE_ID = \n'],
+ ['linux/linux-ext-any.mk:2: possible typo on suffix: ANY_BUILD_CMDS', 'define ANY_BUILD_CMDS\n']]]),
+ ('linux tools',
+ 'package/linux-tools/linux-tool-any.mk',
+ 'ANY_CPE_ID = \n'
+ 'define ANY_BUILD_CMDS\n'
+ 'endef\n'
+ 'ANY_PREPARE_KERNEL = \n',
+ [[['package/linux-tools/linux-tool-any.mk:1: possible typo on suffix: ANY_CPE_ID', 'ANY_CPE_ID = \n'],
+ ['package/linux-tools/linux-tool-any.mk:4: possible typo on suffix: ANY_PREPARE_KERNEL', 'ANY_PREPARE_KERNEL = \n']]]),
+ ('initramfs do not use fs infra',
+ 'fs/initramfs/any.mk',
+ 'ANY_CPE_ID = \n'
+ 'ANY_NAME = \n',
+ [[['fs/initramfs/any.mk:1: possible typo on suffix: ANY_CPE_ID', 'ANY_CPE_ID = \n']]]),
+ ('autotools',
+ 'any.mk',
+ 'ANY_CONF_OPTS = \n'
+ 'ANY_CPE_ID = \n'
+ 'ANY_GETTEXTIZE = \n'
+ 'ANY_SUPPORTS_IN_SOURCE_BUILD = \n'
+ '$(eval $(autotools-package))\n',
+ [[['any.mk:4: possible typo on suffix: ANY_SUPPORTS_IN_SOURCE_BUILD', 'ANY_SUPPORTS_IN_SOURCE_BUILD = \n']]]),
+ ('barebox',
+ 'any.mk',
+ 'ANY_CONF_OPTS = \n'
+ 'ANY_CPE_ID = \n'
+ '$(eval $(barebox-package))\n',
+ [[['any.mk:1: possible typo on suffix: ANY_CONF_OPTS', 'ANY_CONF_OPTS = \n']]]),
+ ('cmake',
+ 'any.mk',
+ 'ANY_CONF_OPTS = \n'
+ 'ANY_CPE_ID = \n'
+ 'ANY_GETTEXTIZE = \n'
+ 'ANY_SUPPORTS_IN_SOURCE_BUILD = \n'
+ '$(eval $(cmake-package))\n',
+ [[['any.mk:3: possible typo on suffix: ANY_GETTEXTIZE', 'ANY_GETTEXTIZE = \n']]]),
+ ('cargo',
+ 'any.mk',
+ 'ANY_CONF_OPTS = \n'
+ 'ANY_CPE_ID = \n'
+ 'ANY_CARGO_INSTALL_OPTS = \n'
+ '$(eval $(cargo-package))\n',
+ [[['any.mk:1: possible typo on suffix: ANY_CONF_OPTS', 'ANY_CONF_OPTS = \n']]]),
+ ('generic',
+ 'any.mk',
+ 'ANY_CONF_OPTS = \n'
+ 'ANY_CPE_ID = \n'
+ '$(eval $(generic-package))\n',
+ [[['any.mk:1: possible typo on suffix: ANY_CONF_OPTS', 'ANY_CONF_OPTS = \n']]]),
+ ('golang',
+ 'any.mk',
+ 'ANY_GO_ENV = \n'
+ 'ANY_CONF_OPTS = \n'
+ '$(eval $(golang-package))\n',
+ [[['any.mk:2: possible typo on suffix: ANY_CONF_OPTS', 'ANY_CONF_OPTS = \n']]]),
+ ('kconfig',
+ 'any.mk',
+ 'ANY_GO_ENV = \n'
+ 'ANY_KCONFIG_FIXUP_CMDS = \n'
+ 'ANY_PRE_PATCH_HOOKS = \n'
+ 'ANY_SUBDIR = \n'
+ '$(eval $(kconfig-package))\n',
+ [[['any.mk:1: possible typo on suffix: ANY_GO_ENV', 'ANY_GO_ENV = \n'],
+ # https://bugs.buildroot.org/show_bug.cgi?id=15161 kernel can't support SUBDIR
+ ['any.mk:4: possible typo on suffix: ANY_SUBDIR', 'ANY_SUBDIR = \n']]]),
+ ('kernel module + autotools',
+ 'any.mk',
+ 'ANY_CPE_ID = \n'
+ 'ANY_GETTEXTIZE = \n'
+ 'ANY_GO_ENV = \n'
+ 'ANY_KCONFIG_FIXUP_CMDS = \n'
+ 'ANY_MODULE_SUBDIRS = \n'
+ 'ANY_PRE_PATCH_HOOKS = \n'
+ 'ANY_SUBDIR = \n'
+ 'ANY_SUPPORTS_IN_SOURCE_BUILD = \n'
+ '$(eval $(kernel-module))\n'
+ '$(eval $(autotools-package))\n',
+ [[['any.mk:3: possible typo on suffix: ANY_GO_ENV', 'ANY_GO_ENV = \n'],
+ ['any.mk:4: possible typo on suffix: ANY_KCONFIG_FIXUP_CMDS', 'ANY_KCONFIG_FIXUP_CMDS = \n'],
+ ['any.mk:8: possible typo on suffix: ANY_SUPPORTS_IN_SOURCE_BUILD', 'ANY_SUPPORTS_IN_SOURCE_BUILD = \n']]]),
+ ('kernel module + generic',
+ 'any.mk',
+ 'ANY_CPE_ID = \n'
+ 'ANY_GETTEXTIZE = \n'
+ 'ANY_GO_ENV = \n'
+ 'ANY_KCONFIG_FIXUP_CMDS = \n'
+ 'ANY_MODULE_SUBDIRS = \n'
+ 'ANY_PRE_PATCH_HOOKS = \n'
+ 'ANY_SUBDIR = \n'
+ 'ANY_SUPPORTS_IN_SOURCE_BUILD = \n'
+ '$(eval $(kernel-module))\n'
+ '$(eval $(generic-package))\n',
+ [[['any.mk:2: possible typo on suffix: ANY_GETTEXTIZE', 'ANY_GETTEXTIZE = \n'],
+ ['any.mk:3: possible typo on suffix: ANY_GO_ENV', 'ANY_GO_ENV = \n'],
+ ['any.mk:4: possible typo on suffix: ANY_KCONFIG_FIXUP_CMDS', 'ANY_KCONFIG_FIXUP_CMDS = \n'],
+ ['any.mk:7: possible typo on suffix: ANY_SUBDIR', 'ANY_SUBDIR = \n'],
+ ['any.mk:8: possible typo on suffix: ANY_SUPPORTS_IN_SOURCE_BUILD', 'ANY_SUPPORTS_IN_SOURCE_BUILD = \n']]]),
+ ('kernel module + cmake',
+ 'any.mk',
+ 'ANY_CPE_ID = \n'
+ 'ANY_GETTEXTIZE = \n'
+ 'ANY_GO_ENV = \n'
+ 'ANY_KCONFIG_FIXUP_CMDS = \n'
+ 'ANY_MODULE_SUBDIRS = \n'
+ 'ANY_PRE_PATCH_HOOKS = \n'
+ 'ANY_SUBDIR = \n'
+ 'ANY_SUPPORTS_IN_SOURCE_BUILD = \n'
+ '$(eval $(kernel-module))\n'
+ '$(eval $(cmake-package))\n',
+ [[['any.mk:2: possible typo on suffix: ANY_GETTEXTIZE', 'ANY_GETTEXTIZE = \n'],
+ ['any.mk:3: possible typo on suffix: ANY_GO_ENV', 'ANY_GO_ENV = \n'],
+ ['any.mk:4: possible typo on suffix: ANY_KCONFIG_FIXUP_CMDS', 'ANY_KCONFIG_FIXUP_CMDS = \n']]]),
+ ('luarocks',
+ 'any.mk',
+ 'ANY_BUILD_OPTS = \n'
+ 'ANY_CFLAGS = \n'
+ 'ANY_ROCKSPEC = \n'
+ 'ANY_DISTNAME = \n'
+ 'ANY_SETUP_TYPE = \n'
+ 'ANY_CONF_OPTS = \n'
+ 'ANY_INSTALL_STAGING_OPTS = \n'
+ 'ANY_USE_AUTOCONF = \n'
+ 'ANY_PRE_PATCH_HOOKS = \n'
+ 'ANY_SUBDIR = \n'
+ '$(eval $(luarocks-package))\n',
+ [[['any.mk:2: possible typo on suffix: ANY_CFLAGS', 'ANY_CFLAGS = \n'],
+ ['any.mk:4: possible typo on suffix: ANY_DISTNAME', 'ANY_DISTNAME = \n'],
+ ['any.mk:5: possible typo on suffix: ANY_SETUP_TYPE', 'ANY_SETUP_TYPE = \n'],
+ ['any.mk:6: possible typo on suffix: ANY_CONF_OPTS', 'ANY_CONF_OPTS = \n'],
+ ['any.mk:7: possible typo on suffix: ANY_INSTALL_STAGING_OPTS', 'ANY_INSTALL_STAGING_OPTS = \n'],
+ ['any.mk:8: possible typo on suffix: ANY_USE_AUTOCONF', 'ANY_USE_AUTOCONF = \n']]]),
+ ('meson',
+ 'any.mk',
+ 'ANY_BUILD_OPTS = \n'
+ 'ANY_CFLAGS = \n'
+ 'ANY_ROCKSPEC = \n'
+ 'ANY_DISTNAME = \n'
+ 'ANY_SETUP_TYPE = \n'
+ 'ANY_CONF_OPTS = \n'
+ 'HOST_ANY_INSTALL_STAGING_OPTS = \n'
+ 'ANY_USE_AUTOCONF = \n'
+ 'ANY_PRE_PATCH_HOOKS = \n'
+ 'ANY_SUBDIR = \n'
+ '$(eval $(host-meson-package))\n',
+ [[['any.mk:1: possible typo on suffix: ANY_BUILD_OPTS', 'ANY_BUILD_OPTS = \n'],
+ ['any.mk:3: possible typo on suffix: ANY_ROCKSPEC', 'ANY_ROCKSPEC = \n'],
+ ['any.mk:4: possible typo on suffix: ANY_DISTNAME', 'ANY_DISTNAME = \n'],
+ ['any.mk:5: possible typo on suffix: ANY_SETUP_TYPE', 'ANY_SETUP_TYPE = \n'],
+ ['any.mk:7: possible typo on suffix: HOST_ANY_INSTALL_STAGING_OPTS', 'HOST_ANY_INSTALL_STAGING_OPTS = \n'],
+ ['any.mk:8: possible typo on suffix: ANY_USE_AUTOCONF', 'ANY_USE_AUTOCONF = \n']]]),
+ ('perl',
+ 'any.mk',
+ 'ANY_BUILD_OPTS = \n'
+ 'ANY_CFLAGS = \n'
+ 'ANY_ROCKSPEC = \n'
+ 'ANY_DISTNAME = \n'
+ 'ANY_SETUP_TYPE = \n'
+ 'ANY_CONF_OPTS = \n'
+ 'ANY_INSTALL_STAGING_OPTS = \n'
+ 'ANY_USE_AUTOCONF = \n'
+ 'ANY_PRE_PATCH_HOOKS = \n'
+ 'ANY_SUBDIR = \n'
+ '$(eval $(perl-package))\n',
+ [[['any.mk:2: possible typo on suffix: ANY_CFLAGS', 'ANY_CFLAGS = \n'],
+ ['any.mk:3: possible typo on suffix: ANY_ROCKSPEC', 'ANY_ROCKSPEC = \n'],
+ ['any.mk:5: possible typo on suffix: ANY_SETUP_TYPE', 'ANY_SETUP_TYPE = \n'],
+ ['any.mk:7: possible typo on suffix: ANY_INSTALL_STAGING_OPTS', 'ANY_INSTALL_STAGING_OPTS = \n'],
+ ['any.mk:8: possible typo on suffix: ANY_USE_AUTOCONF', 'ANY_USE_AUTOCONF = \n']]]),
+ ('python',
+ 'any.mk',
+ 'ANY_BUILD_OPTS = \n'
+ 'ANY_CFLAGS = \n'
+ 'ANY_ROCKSPEC = \n'
+ 'ANY_DISTNAME = \n'
+ 'ANY_SETUP_TYPE = \n'
+ 'ANY_CONF_OPTS = \n'
+ 'ANY_INSTALL_STAGING_OPTS = \n'
+ 'ANY_USE_AUTOCONF = \n'
+ 'ANY_PRE_PATCH_HOOKS = \n'
+ 'ANY_SUBDIR = \n'
+ 'ANY_SYNC_QT_HEADERS = \n'
+ '$(eval $(host-python-package))\n',
+ [[['any.mk:2: possible typo on suffix: ANY_CFLAGS', 'ANY_CFLAGS = \n'],
+ ['any.mk:3: possible typo on suffix: ANY_ROCKSPEC', 'ANY_ROCKSPEC = \n'],
+ ['any.mk:4: possible typo on suffix: ANY_DISTNAME', 'ANY_DISTNAME = \n'],
+ ['any.mk:6: possible typo on suffix: ANY_CONF_OPTS', 'ANY_CONF_OPTS = \n'],
+ ['any.mk:8: possible typo on suffix: ANY_USE_AUTOCONF', 'ANY_USE_AUTOCONF = \n'],
+ ['any.mk:11: possible typo on suffix: ANY_SYNC_QT_HEADERS', 'ANY_SYNC_QT_HEADERS = \n']]]),
+ ('qmake + host generic',
+ 'any.mk',
+ 'ANY_BUILD_OPTS = \n'
+ 'ANY_CFLAGS = \n'
+ 'ANY_ROCKSPEC = \n'
+ 'ANY_DISTNAME = \n'
+ 'ANY_SETUP_TYPE = \n'
+ 'ANY_CONF_OPTS = \n'
+ 'ANY_INSTALL_TARGET_OPTS = \n'
+ 'ANY_USE_AUTOCONF = \n'
+ 'ANY_PRE_PATCH_HOOKS = \n'
+ 'ANY_SUBDIR = \n'
+ 'ANY_SYNC_QT_HEADERS = \n'
+ '$(eval $(qmake-package))\n'
+ '$(eval $(host-generic-package))\n',
+ [[['any.mk:1: possible typo on suffix: ANY_BUILD_OPTS', 'ANY_BUILD_OPTS = \n'],
+ ['any.mk:2: possible typo on suffix: ANY_CFLAGS', 'ANY_CFLAGS = \n'],
+ ['any.mk:3: possible typo on suffix: ANY_ROCKSPEC', 'ANY_ROCKSPEC = \n'],
+ ['any.mk:4: possible typo on suffix: ANY_DISTNAME', 'ANY_DISTNAME = \n'],
+ ['any.mk:5: possible typo on suffix: ANY_SETUP_TYPE', 'ANY_SETUP_TYPE = \n'],
+ ['any.mk:8: possible typo on suffix: ANY_USE_AUTOCONF', 'ANY_USE_AUTOCONF = \n']]]),
+ ('rebar',
+ 'any.mk',
+ 'ANY_BUILD_OPTS = \n'
+ 'ANY_CFLAGS = \n'
+ 'ANY_ROCKSPEC = \n'
+ 'ANY_DISTNAME = \n'
+ 'ANY_SETUP_TYPE = \n'
+ 'ANY_CONF_OPTS = \n'
+ 'ANY_INSTALL_STAGING_OPTS = \n'
+ 'ANY_USE_AUTOCONF = \n'
+ 'ANY_PRE_PATCH_HOOKS = \n'
+ 'ANY_SUBDIR = \n'
+ 'ANY_SYNC_QT_HEADERS = \n'
+ '$(eval $(rebar-package))\n',
+ [[['any.mk:1: possible typo on suffix: ANY_BUILD_OPTS', 'ANY_BUILD_OPTS = \n'],
+ ['any.mk:2: possible typo on suffix: ANY_CFLAGS', 'ANY_CFLAGS = \n'],
+ ['any.mk:3: possible typo on suffix: ANY_ROCKSPEC', 'ANY_ROCKSPEC = \n'],
+ ['any.mk:4: possible typo on suffix: ANY_DISTNAME', 'ANY_DISTNAME = \n'],
+ ['any.mk:5: possible typo on suffix: ANY_SETUP_TYPE', 'ANY_SETUP_TYPE = \n'],
+ ['any.mk:11: possible typo on suffix: ANY_SYNC_QT_HEADERS', 'ANY_SYNC_QT_HEADERS = \n']]]),
+ ('toolchain-external',
+ 'any.mk',
+ 'ANY_BUILD_OPTS = \n'
+ 'ANY_CFLAGS = \n'
+ 'ANY_CONF_OPTS = \n'
+ 'ANY_INSTALL_STAGING_OPTS = \n'
+ 'ANY_INSTALL_STAGING = \n'
+ 'ANY_INSTALL_STAGING_CMDS = \n'
+ 'ANY_IS_VIRTUAL= \n'
+ 'ANY_PRE_PATCH_HOOKS = \n'
+ 'ANY_SETUP_TYPE = \n'
+ 'ANY_SUBDIR = \n'
+ 'ANY_SYNC_QT_HEADERS = \n'
+ 'ANY_USE_AUTOCONF = \n'
+ 'ANY_WAF = \n'
+ '$(eval $(toolchain-external-package))\n',
+ [[['any.mk:1: possible typo on suffix: ANY_BUILD_OPTS', 'ANY_BUILD_OPTS = \n'],
+ ['any.mk:2: possible typo on suffix: ANY_CFLAGS', 'ANY_CFLAGS = \n'],
+ ['any.mk:3: possible typo on suffix: ANY_CONF_OPTS', 'ANY_CONF_OPTS = \n'],
+ ['any.mk:4: possible typo on suffix: ANY_INSTALL_STAGING_OPTS', 'ANY_INSTALL_STAGING_OPTS = \n'],
+ ['any.mk:7: possible typo on suffix: ANY_IS_VIRTUAL', 'ANY_IS_VIRTUAL= \n'],
+ ['any.mk:9: possible typo on suffix: ANY_SETUP_TYPE', 'ANY_SETUP_TYPE = \n'],
+ ['any.mk:10: possible typo on suffix: ANY_SUBDIR', 'ANY_SUBDIR = \n'],
+ ['any.mk:11: possible typo on suffix: ANY_SYNC_QT_HEADERS', 'ANY_SYNC_QT_HEADERS = \n'],
+ ['any.mk:12: possible typo on suffix: ANY_USE_AUTOCONF', 'ANY_USE_AUTOCONF = \n'],
+ ['any.mk:13: possible typo on suffix: ANY_WAF', 'ANY_WAF = \n']]]),
+ ('virtual',
+ 'any.mk',
+ 'ANY_BUILD_OPTS ?= \n'
+ 'ANY_CFLAGS := \n'
+ 'ANY_CONF_OPTS = \n'
+ 'ANY_INSTALL_STAGING_OPTS = \n'
+ 'ANY_IS_VIRTUAL= \n'
+ 'ANY_PRE_PATCH_HOOKS += \n'
+ 'ANY_SETUP_TYPE = \n'
+ 'ANY_SUBDIR = \n'
+ 'ANY_SYNC_QT_HEADERS = \n'
+ 'ANY_USE_AUTOCONF = \n'
+ 'ANY_WAF = \n'
+ '$(eval $(virtual-package))\n',
+ [[['any.mk:1: possible typo on suffix: ANY_BUILD_OPTS', 'ANY_BUILD_OPTS ?= \n'],
+ ['any.mk:2: possible typo on suffix: ANY_CFLAGS', 'ANY_CFLAGS := \n'],
+ ['any.mk:3: possible typo on suffix: ANY_CONF_OPTS', 'ANY_CONF_OPTS = \n'],
+ ['any.mk:4: possible typo on suffix: ANY_INSTALL_STAGING_OPTS', 'ANY_INSTALL_STAGING_OPTS = \n'],
+ ['any.mk:7: possible typo on suffix: ANY_SETUP_TYPE', 'ANY_SETUP_TYPE = \n'],
+ ['any.mk:8: possible typo on suffix: ANY_SUBDIR', 'ANY_SUBDIR = \n'],
+ ['any.mk:9: possible typo on suffix: ANY_SYNC_QT_HEADERS', 'ANY_SYNC_QT_HEADERS = \n'],
+ ['any.mk:10: possible typo on suffix: ANY_USE_AUTOCONF', 'ANY_USE_AUTOCONF = \n'],
+ ['any.mk:11: possible typo on suffix: ANY_WAF', 'ANY_WAF = \n']]]),
+ ('waf',
+ 'any.mk',
+ 'ANY_BUILD_OPTS = \n'
+ 'ANY_CFLAGS = \n'
+ 'ANY_CONF_OPTS = \n'
+ 'ANY_INSTALL_STAGING_OPTS = \n'
+ 'ANY_IS_VIRTUAL= \n'
+ 'ANY_PRE_PATCH_HOOKS = \n'
+ 'ANY_SETUP_TYPE = \n'
+ 'ANY_SUBDIR = \n'
+ 'ANY_SYNC_QT_HEADERS = \n'
+ 'ANY_USE_AUTOCONF = \n'
+ 'ANY_WAF = \n'
+ '$(eval $(waf-package))\n',
+ [[['any.mk:2: possible typo on suffix: ANY_CFLAGS', 'ANY_CFLAGS = \n'],
+ ['any.mk:5: possible typo on suffix: ANY_IS_VIRTUAL', 'ANY_IS_VIRTUAL= \n'],
+ ['any.mk:7: possible typo on suffix: ANY_SETUP_TYPE', 'ANY_SETUP_TYPE = \n'],
+ ['any.mk:9: possible typo on suffix: ANY_SYNC_QT_HEADERS', 'ANY_SYNC_QT_HEADERS = \n'],
+ ['any.mk:10: possible typo on suffix: ANY_USE_AUTOCONF', 'ANY_USE_AUTOCONF = \n']]]),
+ ('SUBDIR no use',
+ 'any.mk',
+ 'ANY_SUBDIR = \n'
+ 'define ANY_INSTALL_TARGET_CMDS\n'
+ '\tmake\n'
+ 'endef\n'
+ '$(eval $(generic-package))\n',
+ [[['any.mk:1: possible typo on suffix: ANY_SUBDIR', 'ANY_SUBDIR = \n']]]),
+ ('SUBDIR explicit use',
+ 'any.mk',
+ 'ANY_SUBDIR = \n'
+ 'define ANY_INSTALL_TARGET_CMDS\n'
+ '\tmake $(ANY_SUBDIR)\n'
+ 'endef\n'
+ '$(eval $(generic-package))\n',
+ [[]]),
+ ('SUBDIR indirect use 1',
+ 'any.mk',
+ 'ANY_SUBDIR = \n'
+ 'define ANY_INSTALL_TARGET_CMDS\n'
+ '\tmake $(ANY_SRCDIR)\n'
+ 'endef\n'
+ '$(eval $(generic-package))\n',
+ [[]]),
+ ('SUBDIR indirect use 2',
+ 'any.mk',
+ 'ANY_SUBDIR = \n'
+ 'define ANY_INSTALL_TARGET_CMDS\n'
+ '\tmake $(ANY_BUILDDIR)\n'
+ 'endef\n'
+ '$(eval $(generic-package))\n',
+ [[]]),
+ ('SUBDIR indirect use 3',
+ 'any.mk',
+ 'ANY_SUBDIR = \n'
+ 'define ANY_LINUX_CONFIG_FIXUPS\n'
+ '\t$(call KCONFIG_ENABLE_OPT,CONFIG_BPF_SYSCALL)\n'
+ 'endef\n'
+ '$(eval $(generic-package))\n',
+ [[]]),
+ ('SUBDIR indirect use 4',
+ 'any.mk',
+ 'ANY_SUBDIR = \n'
+ 'define ANY_LINUX_CONFIG_FIXUPS\n'
+ '\t$(call KCONFIG_SET_OPT,CONFIG_BPF_SYSCALL)\n'
+ 'endef\n'
+ '$(eval $(generic-package))\n',
+ [[]]),
+ ('SUBDIR indirect use 5',
+ 'any.mk',
+ 'ANY_SUBDIR = \n'
+ 'define ANY_LINUX_CONFIG_FIXUPS\n'
+ '\t$(call KCONFIG_DISABLE_OPT,CONFIG_BPF_SYSCALL)\n'
+ 'endef\n'
+ '$(eval $(kconfig-package))\n',
+ [[]]),
+ ]
+
+
+@pytest.mark.parametrize('testname,filename,string,expected', TypoInVariableSuffix)
+def test_TypoInVariableSuffix(testname, filename, string, expected):
+ warnings = util.check_file(m.TypoInVariableSuffix, filename, string)
+ assert warnings == expected
+
+
UselessFlag = [
('autoreconf no',
'any.mk',
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* [Buildroot] [PATCH 28/29] utils/check-package: warn about disabled install
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (26 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 27/29] utils/check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
2023-01-01 23:36 ` [Buildroot] [PATCH 29/29] docs/manual: standardize references to the generic infra Ricardo Martincoski
28 siblings, 0 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Ricardo Martincoski
When a package defines one of these variables:
<pkg>_INSTALL_IMAGES_CMDS
<pkg>_PRE_INSTALL_IMAGES_HOOKS
<pkg>_POST_INSTALL_IMAGES_HOOKS
it also needs to enable <pkg>_INSTALL_IMAGES.
The same also occurs for <pkg>_INSTALL_STAGING.
And yet <pkg>_INSTALL_TARGET is a similar case, except that it defaults
to YES, while the other two default to NO.
So warn when a package defines a install command or hook that will never
be called because the equivalent flag is not set.
Take into account that some special cases have <pkg>_INSTALL_STAGING
defaulting to YES.
Also only warn when the script can determine for sure the flag to
install is disabled. So if a flag that defaults to YES is overridden to
NO inside a conditional, consider it may be enabled.
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Running on current master:
package/ima-evm-utils/ima-evm-utils.mk:24: never called because IMA_EVM_UTILS_INSTALL_STAGING is disabled
---
utils/checkpackagelib/lib_mk.py | 89 ++++++++++++++++++
utils/checkpackagelib/test_lib_mk.py | 129 +++++++++++++++++++++++++++
2 files changed, 218 insertions(+)
diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py
index d9f254ca32..2bb56a5084 100644
--- a/utils/checkpackagelib/lib_mk.py
+++ b/utils/checkpackagelib/lib_mk.py
@@ -32,6 +32,95 @@ def get_package_prefix_from_filename(filename):
return package, package_upper
+class DisabledInstall(_CheckFunction):
+ END_CONDITIONAL = re.compile(r"^\s*({})".format("|".join(end_conditional)))
+ START_CONDITIONAL = re.compile(r"^\s*({})".format("|".join(start_conditional)))
+ PATHS_WITH_INSTALL_STAGING_YES = [
+ "package/linux-tools/",
+ "toolchain/",
+ ]
+
+ def before(self):
+ _, self.package = get_package_prefix_from_filename(self.filename)
+
+ self.install_images = False
+ self.all_images_cmds = []
+ self.IMAGES_CMDS = re.compile(r"^\s*(define\s+)?{}({})".format(self.package, "|".join([
+ r"_PRE_INSTALL_IMAGES_HOOKS",
+ r"_INSTALL_IMAGES_CMDS",
+ r"_POST_INSTALL_IMAGES_HOOKS"])))
+ self.INSTALL_IMAGES = re.compile(r"\s*{}_INSTALL_IMAGES\s*=\s*YES".format(self.package))
+
+ self.install_staging = False
+ for path in self.PATHS_WITH_INSTALL_STAGING_YES:
+ if self.filename.startswith(path):
+ self.install_staging = True
+ break
+ self.all_staging_cmds = []
+ self.STAGING_CMDS = re.compile(r"^\s*(define\s+)?{}({})".format(self.package, "|".join([
+ r"_PRE_INSTALL_STAGING_HOOKS",
+ r"_INSTALL_STAGING_CMDS",
+ r"_POST_INSTALL_STAGING_HOOKS"])))
+ self.INSTALL_STAGING = re.compile(r"\s*{}_INSTALL_STAGING\s*=\s*YES".format(self.package))
+
+ self.conditional = 0
+ self.install_target = True
+ self.all_target_cmds = []
+ self.TARGET_CMDS = re.compile(r"^\s*(define\s+)?{}({})".format(self.package, "|".join([
+ r"_PRE_INSTALL_TARGET_HOOKS",
+ r"_INSTALL_TARGET_CMDS",
+ r"_POST_INSTALL_TARGET_HOOKS"])))
+ self.INSTALL_TARGET = re.compile(r"\s*{}_INSTALL_TARGET\s*=\s*NO".format(self.package))
+
+ def check_line(self, lineno, text):
+ if self.START_CONDITIONAL.search(text):
+ self.conditional += 1
+ return
+ if self.END_CONDITIONAL.search(text):
+ self.conditional -= 1
+ return
+
+ if self.INSTALL_IMAGES.search(text):
+ self.install_images = True
+ return
+ if self.INSTALL_STAGING.search(text):
+ self.install_staging = True
+ return
+ if self.INSTALL_TARGET.search(text):
+ if self.conditional == 0:
+ self.install_target = False
+ return
+
+ if self.IMAGES_CMDS.search(text):
+ self.all_images_cmds.append([lineno, text])
+ return
+ if self.STAGING_CMDS.search(text):
+ self.all_staging_cmds.append([lineno, text])
+ return
+ if self.TARGET_CMDS.search(text):
+ self.all_target_cmds.append([lineno, text])
+ return
+
+ def after(self):
+ warnings = []
+ if not self.install_images:
+ for lineno, text in self.all_images_cmds:
+ warnings.append(["{}:{}: never called because {}_INSTALL_IMAGES is disabled"
+ .format(self.filename, lineno, self.package),
+ text])
+ if not self.install_staging:
+ for lineno, text in self.all_staging_cmds:
+ warnings.append(["{}:{}: never called because {}_INSTALL_STAGING is disabled"
+ .format(self.filename, lineno, self.package),
+ text])
+ if not self.install_target:
+ for lineno, text in self.all_target_cmds:
+ warnings.append(["{}:{}: never called because {}_INSTALL_TARGET is disabled"
+ .format(self.filename, lineno, self.package),
+ text])
+ return warnings
+
+
class Indent(_CheckFunction):
COMMENT = re.compile(r"^\s*#")
CONDITIONAL = re.compile(r"^\s*({})\s".format("|".join(start_conditional + end_conditional + continue_conditional)))
diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py
index 56cd8bc391..d59bfe917e 100644
--- a/utils/checkpackagelib/test_lib_mk.py
+++ b/utils/checkpackagelib/test_lib_mk.py
@@ -37,6 +37,135 @@ def test_get_package_prefix_from_filename(testname, filename, expected):
assert [prefix_lower, prefix_upper] == expected
+DisabledInstall = [
+ ('ignore comment at beginning of line',
+ 'any.mk',
+ '# very useful comment\n',
+ [[]]),
+ ('install images disabled (default)',
+ 'any.mk',
+ 'define ANY_INSTALL_IMAGES_CMDS\n'
+ 'endef\n'
+ 'ANY_PRE_INSTALL_IMAGES_HOOKS += MY_HOOK \n'
+ 'ANY_POST_INSTALL_IMAGES_HOOKS += MY_HOOK\t\n',
+ [[['any.mk:1: never called because ANY_INSTALL_IMAGES is disabled',
+ 'define ANY_INSTALL_IMAGES_CMDS\n'],
+ ['any.mk:3: never called because ANY_INSTALL_IMAGES is disabled',
+ 'ANY_PRE_INSTALL_IMAGES_HOOKS += MY_HOOK \n'],
+ ['any.mk:4: never called because ANY_INSTALL_IMAGES is disabled',
+ 'ANY_POST_INSTALL_IMAGES_HOOKS += MY_HOOK\t\n']]]),
+ ('install images disabled (explicit)',
+ 'any.mk',
+ 'ANY_INSTALL_IMAGES = NO\n'
+ 'define ANY_INSTALL_IMAGES_CMDS\n'
+ 'endef\n'
+ ' ANY_PRE_INSTALL_IMAGES_HOOKS += MY_HOOK\n'
+ '\tANY_POST_INSTALL_IMAGES_HOOKS += MY_HOOK\n',
+ [[['any.mk:2: never called because ANY_INSTALL_IMAGES is disabled',
+ 'define ANY_INSTALL_IMAGES_CMDS\n'],
+ ['any.mk:4: never called because ANY_INSTALL_IMAGES is disabled',
+ ' ANY_PRE_INSTALL_IMAGES_HOOKS += MY_HOOK\n'],
+ ['any.mk:5: never called because ANY_INSTALL_IMAGES is disabled',
+ '\tANY_POST_INSTALL_IMAGES_HOOKS += MY_HOOK\n']]]),
+ ('install images enabled',
+ 'any.mk',
+ ' ANY_INSTALL_IMAGES = YES \n'
+ 'define ANY_INSTALL_IMAGES_CMDS\n'
+ 'endef\n'
+ 'ANY_PRE_INSTALL_IMAGES_HOOKS += MY_HOOK\n'
+ 'ANY_POST_INSTALL_IMAGES_HOOKS += MY_HOOK\n',
+ [[]]),
+ ('install staging enabled (default for toolchain)',
+ 'toolchain/toolchain-any.mk',
+ 'define ANY_INSTALL_STAGING_CMDS\n'
+ 'endef\n'
+ 'ANY_POST_INSTALL_STAGING_HOOKS += MY_HOOK\t\n',
+ [[]]),
+ ('install staging enabled (default for linux tools)',
+ 'package/linux-tools/linux-tool-foo.mk.in',
+ 'define FOO_INSTALL_STAGING_CMDS\n'
+ 'endef\n',
+ [[]]),
+ ('install staging disabled (default)',
+ 'any.mk',
+ 'define ANY_INSTALL_STAGING_CMDS\n'
+ 'endef\n'
+ 'ANY_PRE_INSTALL_STAGING_HOOKS += MY_HOOK \n'
+ 'ANY_POST_INSTALL_STAGING_HOOKS += MY_HOOK\t\n',
+ [[['any.mk:1: never called because ANY_INSTALL_STAGING is disabled',
+ 'define ANY_INSTALL_STAGING_CMDS\n'],
+ ['any.mk:3: never called because ANY_INSTALL_STAGING is disabled',
+ 'ANY_PRE_INSTALL_STAGING_HOOKS += MY_HOOK \n'],
+ ['any.mk:4: never called because ANY_INSTALL_STAGING is disabled',
+ 'ANY_POST_INSTALL_STAGING_HOOKS += MY_HOOK\t\n']]]),
+ ('install staging disabled (explicit)',
+ 'any.mk',
+ 'ANY_INSTALL_STAGING = NO\n'
+ 'define ANY_INSTALL_STAGING_CMDS\n'
+ 'endef\n'
+ ' ANY_PRE_INSTALL_STAGING_HOOKS += MY_HOOK\n'
+ '\tANY_POST_INSTALL_STAGING_HOOKS += MY_HOOK\n',
+ [[['any.mk:2: never called because ANY_INSTALL_STAGING is disabled',
+ 'define ANY_INSTALL_STAGING_CMDS\n'],
+ ['any.mk:4: never called because ANY_INSTALL_STAGING is disabled',
+ ' ANY_PRE_INSTALL_STAGING_HOOKS += MY_HOOK\n'],
+ ['any.mk:5: never called because ANY_INSTALL_STAGING is disabled',
+ '\tANY_POST_INSTALL_STAGING_HOOKS += MY_HOOK\n']]]),
+ ('install staging enabled',
+ 'any.mk',
+ ' ANY_INSTALL_STAGING = YES \n'
+ 'define ANY_INSTALL_STAGING_CMDS\n'
+ 'endef\n'
+ 'ANY_PRE_INSTALL_STAGING_HOOKS += MY_HOOK\n'
+ 'ANY_POST_INSTALL_STAGING_HOOKS += MY_HOOK\n',
+ [[]]),
+ ('install target disabled (explicit)',
+ 'any.mk',
+ 'ANY_INSTALL_TARGET = NO\n'
+ 'define ANY_INSTALL_TARGET_CMDS\n'
+ 'endef\n'
+ ' ANY_PRE_INSTALL_TARGET_HOOKS += MY_HOOK\n'
+ '\tANY_POST_INSTALL_TARGET_HOOKS += MY_HOOK\n',
+ [[['any.mk:2: never called because ANY_INSTALL_TARGET is disabled',
+ 'define ANY_INSTALL_TARGET_CMDS\n'],
+ ['any.mk:4: never called because ANY_INSTALL_TARGET is disabled',
+ ' ANY_PRE_INSTALL_TARGET_HOOKS += MY_HOOK\n'],
+ ['any.mk:5: never called because ANY_INSTALL_TARGET is disabled',
+ '\tANY_POST_INSTALL_TARGET_HOOKS += MY_HOOK\n']]]),
+ ('install target enabled (explict)',
+ 'any.mk',
+ 'ANY_INSTALL_TARGET = YES\n'
+ 'define ANY_INSTALL_TARGET_CMDS\n'
+ 'endef\n'
+ 'ANY_PRE_INSTALL_TARGET_HOOKS += MY_HOOK\n'
+ 'ANY_POST_INSTALL_TARGET_HOOKS += MY_HOOK\n',
+ [[]]),
+ ('install target enabled (default)',
+ 'any.mk',
+ 'define ANY_INSTALL_TARGET_CMDS\n'
+ 'endef\n'
+ 'ANY_PRE_INSTALL_TARGET_HOOKS += MY_HOOK\n'
+ 'ANY_POST_INSTALL_TARGET_HOOKS += MY_HOOK\n',
+ [[]]),
+ ('install target possibly enabled (conditional)',
+ 'any.mk',
+ 'ifeq ($(condition))\n'
+ 'ANY_INSTALL_TARGET = NO\n'
+ 'endif\n'
+ 'define ANY_INSTALL_TARGET_CMDS\n'
+ 'endef\n'
+ 'ANY_PRE_INSTALL_TARGET_HOOKS += MY_HOOK\n'
+ 'ANY_POST_INSTALL_TARGET_HOOKS += MY_HOOK\n',
+ [[]]),
+ ]
+
+
+@pytest.mark.parametrize('testname,filename,string,expected', DisabledInstall)
+def test_DisabledInstall(testname, filename, string, expected):
+ warnings = util.check_file(m.DisabledInstall, filename, string)
+ assert warnings == expected
+
+
Indent = [
('ignore comment at beginning of line',
'any',
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread* [Buildroot] [PATCH 29/29] docs/manual: standardize references to the generic infra
2023-01-01 23:36 [Buildroot] [PATCH 00/29] check-package: warn about symbols not recognized by a package infra Ricardo Martincoski
` (27 preceding siblings ...)
2023-01-01 23:36 ` [Buildroot] [PATCH 28/29] utils/check-package: warn about disabled install Ricardo Martincoski
@ 2023-01-01 23:36 ` Ricardo Martincoski
28 siblings, 0 replies; 77+ messages in thread
From: Ricardo Martincoski @ 2023-01-01 23:36 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan, Thomas De Schampheleire, Ricardo Martincoski
Currently the text for each package infra that mentions the usage of
variables already provided by the generic infra diverge from each other:
- some (golang, kconfig, python) add a cross-referece to the generic
infra chapter;
- kconfig does not list any example;
- some mention _LICENSE as an example, others don't;
- some (cargo, golang, python) add an 'etc.' at the end of the examples,
giving the idea that can be more symbols provided by the generic
infra than the ones listed;
- most have the text 'works by defining a number of variables before
calling the +<macro-name>+ macro', except golang and kconfig;
- some actually list 'A few additional variables' but keep using some
old reference as 'An additional variable';
- some say 'First, all the package metadata' and other only 'All the
package metadata';
- most mention _SUBDIR as an example of variable supported by the
generic infra, even the generic infra manual not mentioning it.
The _SUBDIR variable is a tricky one. It *is* declared for the generic
infra package (and all package infras that inherit from the generic
one), but it is really used in certain conditions.
package/pkg-generic.mk uses <pkg>_SUBDIR only to define:
(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
and it also uses <pkg>_SRCDIR only to define:
$(2)_BUILDDIR ?= $$($(2)_SRCDIR)
so the generic package infra does not really uses _SUBDIR by itself in
the common scenario.
So the manual entry for the generic infra seems correct in not
mentioning _SUBDIR.
Also any package infra that inherits from the generic one (by calling
inner-generic-package) needs to use one of the three variables in order
to support _SUBDIR: _BUILDDIR, _SRCDIR or _SUBDIR.
That is the case for: autotools (_SRCDIR), cargo (_SRCDIR, _SUBDIR),
cmake (_BUILDDIR, _SRCDIR), luarocks (_SRCDIR, _SUBDIR),
meson (_SRCDIR), perl (_SRCDIR), python (_BUILDDIR), qmake (_BUILDDIR)
and waf (_SRCDIR).
Of course the .mk file for a package using the generic infra can define
this symbol and use it, directly or indirectly, for example, in its
_INSTALL_TARGET_CMDS.
Also any package infra, even the ones that do not use directly any of
the three variables above, can use _SUBDIR when the package uses the
macros KCONFIG_ENABLE_OPT, KCONFIG_SET_OPT or KCONFIG_DISABLE_OPT
declared in package/pkg-utils.mk.
Improve the correctness for the manual by standardizing the text among
the package infras:
- use the same text "All the package metadata information variables that
exist in the generic package infrastructure also exist in the
<name> infrastructure:" for all of them;
- add the cross-reference for all of them;
- do not mention _SUBDIR as a variable that exist on generic infra;
- use the same set of examples for all infras: "_VERSION, _SOURCE,
_PATCH, _SITE, _DEPENDENCIES, _LICENSE, _LICENSE_FILES, etc.";
- wrap the modified text at 72 columns;
- add "macro" to golang and luarocks infra;
- use "A few additional variables" for qmake and waf.
At same time, add a missing format on golang manual for
BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS.
Cc: Eric Le Bihan <eric.le.bihan.dev@free.fr>
Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
docs/manual/adding-packages-autotools.txt | 11 +++++------
docs/manual/adding-packages-cargo.txt | 9 +++++----
docs/manual/adding-packages-cmake.txt | 10 +++++-----
docs/manual/adding-packages-golang.txt | 9 +++++----
docs/manual/adding-packages-kconfig.txt | 18 ++++++++++++++----
docs/manual/adding-packages-luarocks.txt | 12 +++++++-----
docs/manual/adding-packages-meson.txt | 9 +++++----
docs/manual/adding-packages-perl.txt | 12 ++++++------
docs/manual/adding-packages-python.txt | 4 ++--
docs/manual/adding-packages-qmake.txt | 12 ++++++------
docs/manual/adding-packages-rebar.txt | 13 ++++++-------
docs/manual/adding-packages-waf.txt | 12 ++++++------
12 files changed, 72 insertions(+), 59 deletions(-)
diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
index a041d91eb6..0cec82d95f 100644
--- a/docs/manual/adding-packages-autotools.txt
+++ b/docs/manual/adding-packages-autotools.txt
@@ -76,12 +76,11 @@ Just like the generic infrastructure, the autotools infrastructure
works by defining a number of variables before calling the
+autotools-package+ macro.
-First, all the package metadata information variables that exist in the
-generic infrastructure also exist in the autotools infrastructure:
-+LIBFOO_VERSION+, +LIBFOO_SOURCE+,
-+LIBFOO_PATCH+, +LIBFOO_SITE+,
-+LIBFOO_SUBDIR+, +LIBFOO_DEPENDENCIES+,
-+LIBFOO_INSTALL_STAGING+, +LIBFOO_INSTALL_TARGET+.
+All the package metadata information variables that exist in the
+xref:generic-package-reference[generic package infrastructure] also
+exist in the autotools infrastructure: +LIBFOO_VERSION+,
++LIBFOO_SOURCE+, +LIBFOO_PATCH+, +LIBFOO_SITE+, +LIBFOO_DEPENDENCIES+,
++LIBFOO_LICENSE+, +LIBFOO_LICENSE_FILES+, etc.
A few additional variables, specific to the autotools infrastructure,
can also be defined. Many of them are only useful in very specific
diff --git a/docs/manual/adding-packages-cargo.txt b/docs/manual/adding-packages-cargo.txt
index e18fd9ce23..4eedda8dc6 100644
--- a/docs/manual/adding-packages-cargo.txt
+++ b/docs/manual/adding-packages-cargo.txt
@@ -64,10 +64,11 @@ Just like the generic infrastructure, the Cargo infrastructure works
by defining a number of variables before calling the +cargo-package+
or +host-cargo-package+ macros.
-First, all the package metadata information variables that exist in
-the generic infrastructure also exist in the Cargo infrastructure:
-+FOO_VERSION+, +FOO_SOURCE+, +FOO_PATCH+, +FOO_SITE+,
-+FOO_DEPENDENCIES+, +FOO_LICENSE+, +FOO_LICENSE_FILES+, etc.
+All the package metadata information variables that exist in the
+xref:generic-package-reference[generic package infrastructure] also
+exist in the Cargo infrastructure: +FOO_VERSION+, +FOO_SOURCE+,
++FOO_PATCH+, +FOO_SITE+, +FOO_DEPENDENCIES+, +FOO_LICENSE+,
++FOO_LICENSE_FILES+, etc.
A few additional variables, specific to the Cargo infrastructure, can
also be defined. Many of them are only useful in very specific cases,
diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt
index 541d7422cf..e69f072bb5 100644
--- a/docs/manual/adding-packages-cmake.txt
+++ b/docs/manual/adding-packages-cmake.txt
@@ -75,11 +75,11 @@ Just like the generic infrastructure, the CMake infrastructure works
by defining a number of variables before calling the +cmake-package+
macro.
-First, all the package metadata information variables that exist in
-the generic infrastructure also exist in the CMake infrastructure:
-+LIBFOO_VERSION+, +LIBFOO_SOURCE+, +LIBFOO_PATCH+, +LIBFOO_SITE+,
-+LIBFOO_SUBDIR+, +LIBFOO_DEPENDENCIES+, +LIBFOO_INSTALL_STAGING+,
-+LIBFOO_INSTALL_TARGET+.
+All the package metadata information variables that exist in the
+xref:generic-package-reference[generic package infrastructure] also
+exist in the Cmake infrastructure: +LIBFOO_VERSION+, +LIBFOO_SOURCE+,
++LIBFOO_PATCH+, +LIBFOO_SITE+, +LIBFOO_DEPENDENCIES+, +LIBFOO_LICENSE+,
++LIBFOO_LICENSE_FILES+, etc.
A few additional variables, specific to the CMake infrastructure, can
also be defined. Many of them are only useful in very specific cases,
diff --git a/docs/manual/adding-packages-golang.txt b/docs/manual/adding-packages-golang.txt
index c952cde577..95fa083f69 100644
--- a/docs/manual/adding-packages-golang.txt
+++ b/docs/manual/adding-packages-golang.txt
@@ -56,16 +56,17 @@ The main macro of the Go package infrastructure is
ability to build host packages is also available, with the
+host-golang-package+ macro.
Host packages built by +host-golang-package+ macro should depend on
-BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS.
++BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS+.
Just like the generic infrastructure, the Go infrastructure works
-by defining a number of variables before calling the +golang-package+.
+by defining a number of variables before calling the +golang-package+
+macro.
All the package metadata information variables that exist in the
xref:generic-package-reference[generic package infrastructure] also
exist in the Go infrastructure: +FOO_VERSION+, +FOO_SOURCE+,
-+FOO_PATCH+, +FOO_SITE+, +FOO_SUBDIR+, +FOO_DEPENDENCIES+,
-+FOO_LICENSE+, +FOO_LICENSE_FILES+, +FOO_INSTALL_STAGING+, etc.
++FOO_PATCH+, +FOO_SITE+, +FOO_DEPENDENCIES+, +FOO_LICENSE+,
++FOO_LICENSE_FILES+, etc.
Note that it is not necessary to add +host-go+ in the
+FOO_DEPENDENCIES+ variable of a package, since this basic dependency
diff --git a/docs/manual/adding-packages-kconfig.txt b/docs/manual/adding-packages-kconfig.txt
index a35681775f..10901cf339 100644
--- a/docs/manual/adding-packages-kconfig.txt
+++ b/docs/manual/adding-packages-kconfig.txt
@@ -15,10 +15,20 @@ expose the package's +menuconfig+ target as +foo-menuconfig+ in
Buildroot, and to handle the copying back and forth of the configuration
file in a correct way.
-The +kconfig-package+ infrastructure is based on the +generic-package+
-infrastructure. All variables supported by +generic-package+ are
-available in +kconfig-package+ as well. See
-xref:generic-package-reference[] for more details.
+The main macro of the kconfig package infrastructure is
++kconfig-package+: like +generic-package+ it works by defining a number
+of variables providing metadata information about the package, and then
+calling +kconfig-package+ macro.
+
+Just like the generic infrastructure, the kconfig infrastructure works
+by defining a number of variables before calling the +kconfig-package+
+macro.
+
+All the package metadata information variables that exist in the
+xref:generic-package-reference[generic package infrastructure] also
+exist in the kconfig infrastructure: +FOO_VERSION+, +FOO_SOURCE+,
++FOO_PATCH+, +FOO_SITE+, +FOO_DEPENDENCIES+, +FOO_LICENSE+,
++FOO_LICENSE_FILES+, etc.
In order to use the +kconfig-package+ infrastructure for a Buildroot
package, the minimally required lines in the +.mk+ file, in addition to
diff --git a/docs/manual/adding-packages-luarocks.txt b/docs/manual/adding-packages-luarocks.txt
index 70f48fc02c..f76dcb33ad 100644
--- a/docs/manual/adding-packages-luarocks.txt
+++ b/docs/manual/adding-packages-luarocks.txt
@@ -73,16 +73,18 @@ infrastructures in Buildroot, respectively.
The main macro of the LuaRocks package infrastructure is +luarocks-package+:
like +generic-package+ it works by defining a number of variables providing
-metadata information about the package, and then calling +luarocks-package+.
+metadata information about the package, and then calling +luarocks-package+
+macro.
Just like the generic infrastructure, the LuaRocks infrastructure works
by defining a number of variables before calling the +luarocks-package+
macro.
-First, all the package metadata information variables that exist in
-the generic infrastructure also exist in the LuaRocks infrastructure:
-+LUA_FOO_VERSION+, +LUA_FOO_SOURCE+, +LUA_FOO_SITE+,
-+LUA_FOO_DEPENDENCIES+, +LUA_FOO_LICENSE+, +LUA_FOO_LICENSE_FILES+.
+All the package metadata information variables that exist in the
+xref:generic-package-reference[generic package infrastructure] also
+exist in the LuaRocks infrastructure: +LUA_FOO_VERSION+,
++LUA_FOO_SOURCE+, +LUA_FOO_PATCH+, +LUA_FOO_SITE+,
++LUA_FOO_DEPENDENCIES+, +LUA_FOO_LICENSE+, +LUA_FOO_LICENSE_FILES+, etc.
Two of them are populated by the LuaRocks infrastructure (for the
+download+ step). If your package is not hosted on the LuaRocks mirror
diff --git a/docs/manual/adding-packages-meson.txt b/docs/manual/adding-packages-meson.txt
index 029c8c2488..13407d814d 100644
--- a/docs/manual/adding-packages-meson.txt
+++ b/docs/manual/adding-packages-meson.txt
@@ -76,10 +76,11 @@ packages is also available, with the +host-meson-package+ macro.
Just like the generic infrastructure, the Meson infrastructure works by defining
a number of variables before calling the +meson-package+ macro.
-First, all the package metadata information variables that exist in the generic
-infrastructure also exist in the Meson infrastructure: +FOO_VERSION+,
-+FOO_SOURCE+, +FOO_PATCH+, +FOO_SITE+, +FOO_SUBDIR+, +FOO_DEPENDENCIES+,
-+FOO_INSTALL_STAGING+, +FOO_INSTALL_TARGET+.
+All the package metadata information variables that exist in the
+xref:generic-package-reference[generic package infrastructure] also
+exist in the Meson infrastructure: +FOO_VERSION+, +FOO_SOURCE+,
++FOO_PATCH+, +FOO_SITE+, +FOO_DEPENDENCIES+, +FOO_LICENSE+,
++FOO_LICENSE_FILES+, etc.
A few additional variables, specific to the Meson infrastructure, can also be
defined. Many of them are only useful in very specific cases, typical packages
diff --git a/docs/manual/adding-packages-perl.txt b/docs/manual/adding-packages-perl.txt
index 6ce693fd6e..73cfd50d09 100644
--- a/docs/manual/adding-packages-perl.txt
+++ b/docs/manual/adding-packages-perl.txt
@@ -85,12 +85,12 @@ Just like the generic infrastructure, the Perl/CPAN infrastructure
works by defining a number of variables before calling the
+perl-package+ macro.
-First, all the package metadata information variables that exist in the
-generic infrastructure also exist in the Perl/CPAN infrastructure:
-+PERL_FOO_VERSION+, +PERL_FOO_SOURCE+,
-+PERL_FOO_PATCH+, +PERL_FOO_SITE+,
-+PERL_FOO_SUBDIR+, +PERL_FOO_DEPENDENCIES+,
-+PERL_FOO_INSTALL_TARGET+.
+All the package metadata information variables that exist in the
+xref:generic-package-reference[generic package infrastructure] also
+exist in the Perl/CPAN infrastructure: +PERL_FOO_VERSION+,
++PERL_FOO_SOURCE+, +PERL_FOO_PATCH+, +PERL_FOO_SITE+,
++PERL_FOO_DEPENDENCIES+, +PERL_FOO_LICENSE+, +PERL_FOO_LICENSE_FILES+,
+etc.
Note that setting +PERL_FOO_INSTALL_STAGING+ to +YES+ has no effect
unless a +PERL_FOO_INSTALL_STAGING_CMDS+ variable is defined. The perl
diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt
index 500967f235..0b0f644a79 100644
--- a/docs/manual/adding-packages-python.txt
+++ b/docs/manual/adding-packages-python.txt
@@ -81,8 +81,8 @@ All the package metadata information variables that exist in the
xref:generic-package-reference[generic package infrastructure] also
exist in the Python infrastructure: +PYTHON_FOO_VERSION+,
+PYTHON_FOO_SOURCE+, +PYTHON_FOO_PATCH+, +PYTHON_FOO_SITE+,
-+PYTHON_FOO_SUBDIR+, +PYTHON_FOO_DEPENDENCIES+, +PYTHON_FOO_LICENSE+,
-+PYTHON_FOO_LICENSE_FILES+, +PYTHON_FOO_INSTALL_STAGING+, etc.
++PYTHON_FOO_DEPENDENCIES+, +PYTHON_FOO_LICENSE+,
++PYTHON_FOO_LICENSE_FILES+, etc.
Note that:
diff --git a/docs/manual/adding-packages-qmake.txt b/docs/manual/adding-packages-qmake.txt
index 699d082aa1..ac34b37264 100644
--- a/docs/manual/adding-packages-qmake.txt
+++ b/docs/manual/adding-packages-qmake.txt
@@ -51,13 +51,13 @@ Just like the generic infrastructure, the QMake infrastructure works
by defining a number of variables before calling the +qmake-package+
macro.
-First, all the package metadata information variables that exist in
-the generic infrastructure also exist in the QMake infrastructure:
-+LIBFOO_VERSION+, +LIBFOO_SOURCE+, +LIBFOO_PATCH+, +LIBFOO_SITE+,
-+LIBFOO_SUBDIR+, +LIBFOO_DEPENDENCIES+, +LIBFOO_INSTALL_STAGING+,
-+LIBFOO_INSTALL_TARGET+.
+All the package metadata information variables that exist in the
+xref:generic-package-reference[generic package infrastructure] also
+exist in the QMake infrastructure: +LIBFOO_VERSION+, +LIBFOO_SOURCE+,
++LIBFOO_PATCH+, +LIBFOO_SITE+, +LIBFOO_DEPENDENCIES+, +LIBFOO_LICENSE+,
++LIBFOO_LICENSE_FILES+, etc.
-An additional variable, specific to the QMake infrastructure, can
+A few additional variables, specific to the QMake infrastructure, can
also be defined.
* +LIBFOO_CONF_ENV+, to specify additional environment variables to
diff --git a/docs/manual/adding-packages-rebar.txt b/docs/manual/adding-packages-rebar.txt
index d78b3171d8..bc3d890707 100644
--- a/docs/manual/adding-packages-rebar.txt
+++ b/docs/manual/adding-packages-rebar.txt
@@ -51,13 +51,12 @@ Just like the generic infrastructure, the +rebar+ infrastructure works
by defining a number of variables before calling the +rebar-package+
macro.
-First, all the package metadata information variables that exist in
-the generic infrastructure also exist in the +rebar+ infrastructure:
-+ERLANG_FOOBAR_VERSION+, +ERLANG_FOOBAR_SOURCE+,
-+ERLANG_FOOBAR_PATCH+, +ERLANG_FOOBAR_SITE+,
-+ERLANG_FOOBAR_SUBDIR+, +ERLANG_FOOBAR_DEPENDENCIES+,
-+ERLANG_FOOBAR_INSTALL_STAGING+, +ERLANG_FOOBAR_INSTALL_TARGET+,
-+ERLANG_FOOBAR_LICENSE+ and +ERLANG_FOOBAR_LICENSE_FILES+.
+All the package metadata information variables that exist in the
+xref:generic-package-reference[generic package infrastructure] also
+exist in the +rebar+ infrastructure: +ERLANG_FOOBAR_VERSION+,
++ERLANG_FOOBAR_SOURCE+, +ERLANG_FOOBAR_PATCH+, +ERLANG_FOOBAR_SITE+,
++ERLANG_FOOBAR_DEPENDENCIES+, +ERLANG_FOOBAR_LICENSE+,
++ERLANG_FOOBAR_LICENSE_FILES+, etc.
A few additional variables, specific to the +rebar+ infrastructure,
can also be defined. Many of them are only useful in very specific
diff --git a/docs/manual/adding-packages-waf.txt b/docs/manual/adding-packages-waf.txt
index 101cddf1f1..6f08053237 100644
--- a/docs/manual/adding-packages-waf.txt
+++ b/docs/manual/adding-packages-waf.txt
@@ -51,13 +51,13 @@ Just like the generic infrastructure, the Waf infrastructure works
by defining a number of variables before calling the +waf-package+
macro.
-First, all the package metadata information variables that exist in
-the generic infrastructure also exist in the Waf infrastructure:
-+LIBFOO_VERSION+, +LIBFOO_SOURCE+, +LIBFOO_PATCH+, +LIBFOO_SITE+,
-+LIBFOO_SUBDIR+, +LIBFOO_DEPENDENCIES+, +LIBFOO_INSTALL_STAGING+,
-+LIBFOO_INSTALL_TARGET+.
+All the package metadata information variables that exist in the
+xref:generic-package-reference[generic package infrastructure] also
+exist in the Waf infrastructure: +LIBFOO_VERSION+, +LIBFOO_SOURCE+,
++LIBFOO_PATCH+, +LIBFOO_SITE+, +LIBFOO_DEPENDENCIES+, +LIBFOO_LICENSE+,
++LIBFOO_LICENSE_FILES+, etc.
-An additional variable, specific to the Waf infrastructure, can
+A few additional variables, specific to the Waf infrastructure, can
also be defined.
* +LIBFOO_SUBDIR+ may contain the name of a subdirectory inside the
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 77+ messages in thread