core/pkg-generic: check proper package installation
PATCH v3 1/1 core/pkg-generic: check proper package installation
Some packages misbehave, and install files in either of;
- $(STAGING_DIR)/$(O) or $(TARGET_DIR)/$(O),
- $(STAGING_DIR)/$(HOST_DIR) or $(TARGET_DIR)/$(HOST_DIR).
One common reason for that is that pkgconf now prepends the sysroot path to all the paths it returns. Other reasons vary, but are mostly due to poorly writen generic-packages.
And a new step hooks to check that no file gets installed in either locations, called after the install-target and install-staging steps.
---
Changes v2 -> v3;
- also check for $(HOST_DIR) in case the user specified an out-of-build-dir locatiopn (Arnout)
---
Note that, in the current state of Buildroot, this *will* cause a lot of build failures until all those packages are fixed. Among the known to break are quite a few Xorg packages, plus many packages that need to call moc (from Qt4 for sure, possibly from Qt5 too).
--- package/pkg-generic.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
package/pkg-generic.mk +19 -0
@@ -87,6 +87,25 @@ define step_pkg_size endef GLOBAL_INSTRUMENTATION_HOOKS += step_pkg_size +define step_check_build_dir_one + if [ -d $(2) ]; then \ + printf "ERROR: package %s installs files in %s\n" $(1) $(2) >&2; \ + exit 1; \ + fi +endef + +define step_check_build_dir + $(if $(filter install-staging,$(2)),\ + $(if $(filter end,$(1)),\ + $(call step_check_build_dir_one,$(3),$(STAGING_DIR)/$(HOST_DIR)); \ + $(call step_check_build_dir_one,$(3),$(STAGING_DIR)/$(O)))) + $(if $(filter install-target,$(2)),\ + $(if $(filter end,$(1)),\ + $(call step_check_build_dir_one,$(3),$(TARGET_DIR)/$(HOST_DIR)); \ + $(call step_check_build_dir_one,$(3),$(TARGET_DIR)/$(O)))) +endef +GLOBAL_INSTRUMENTATION_HOOKS += step_check_build_dir + # User-supplied script ifneq ($(BR2_INSTRUMENTATION_SCRIPTS),) define step_user
Signature · 1 line
1.9.1
PATCH v3 1/1 core/pkg-generic: check proper package installation
Hi Yann,
Sorry to be annoying, but...
Quoted 23 lines · Yann E. MORIN
Some packages misbehave, and install files in either of;
- $(STAGING_DIR)/$(O) or $(TARGET_DIR)/$(O),
- $(STAGING_DIR)/$(HOST_DIR) or $(TARGET_DIR)/$(HOST_DIR).One common reason for that is that pkgconf now prepends the sysroot path to all the paths it returns. Other reasons vary, but are mostly due to poorly writen generic-packages.
And a new step hooks to check that no file gets installed in either locations, called after the install-target and install-staging steps.
Signed-off-by "Yann E. MORIN" <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Gustavo Zacarias <[email protected]>Cc Arnout Vandecappelle <[email protected]>Cc Peter Seiderer <[email protected]>Cc Romain Naour <[email protected]>---
Changes v2 -> v3;
- also check for $(HOST_DIR) in case the user specified an out-of-build-dir locatiopn (Arnout)
Quoted 5 lines
---
Note that, in the current state of Buildroot, this *will* cause a lot of build failures until all those packages are fixed. Among the known to break are quite a few Xorg packages, plus many packages that need to call moc (from Qt4 for sure, possibly from Qt5 too).
Still not true for moc :-)
Quoted 9 lines
--- package/pkg-generic.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)package/pkg-generic.mk +0
-0
package/pkg-generic.mk define step_pkg_size · line 91
Quoted 5 lines
package/pkg-generic.mk +2
-0@@ -87,6 +87,25 @@ define step_pkg_size endef GLOBAL_INSTRUMENTATION_HOOKS += step_pkg_size +define step_check_build_dir_one + if [ -d $(2) ]; then \
Perhaps it would be better to handle the $(HOST_DIR) / $(O) combination here, so:
if [ -d $(2)/$(HOST_DIR) -o -d $(2)/$(O) ]; then \
Quoted 6 lines
package/pkg-generic.mk +6
-0+ printf "ERROR: package %s installs files in %s\n" $(1) $(2) >&2; \ + exit 1; \ + fi +endef + +define step_check_build_dir
package/pkg-generic.mk define step_pkg_size · line 107
Quoted 10 lines
package/pkg-generic.mk +10
-0+ $(if $(filter install-staging,$(2)),\ + $(if $(filter end,$(1)),\ + $(call step_check_build_dir_one,$(3),$(STAGING_DIR)/$(HOST_DIR)); \ + $(call step_check_build_dir_one,$(3),$(STAGING_DIR)/$(O)))) + $(if $(filter install-target,$(2)),\ + $(if $(filter end,$(1)),\ + $(call step_check_build_dir_one,$(3),$(TARGET_DIR)/$(HOST_DIR)); \ + $(call step_check_build_dir_one,$(3),$(TARGET_DIR)/$(O)))) +endef +GLOBAL_INSTRUMENTATION_HOOKS += step_check_build_dir
You never replied to my comment that I think this would fit better directly in
the .stamp_install_* rules rather than as hooks. My reasoning is that it is much more difficult to find out why some commands are being called when they're hidden in hooks. That's not too bad for things like gathering statistics since they're supposedly inobtrusive, but here you're throwing an error so it is really useful to be able to find easily in the source where this error comes from.
Regards,
Arnout
Quoted 5 lines
package/pkg-generic.mk +1
-0+ # User-supplied script ifneq ($(BR2_INSTRUMENTATION_SCRIPTS),) define step_user
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
PATCH v3 1/1 core/pkg-generic: check proper package installation
Gustavo, All,
On 2015-11-06 10:06 +0100, Arnout Vandecappelle spake thusly:
Quoted 24 lines · Yann E. MORIN
Quoted 23 lines
Some packages misbehave, and install files in either of;
- $(STAGING_DIR)/$(O) or $(TARGET_DIR)/$(O),
- $(STAGING_DIR)/$(HOST_DIR) or $(TARGET_DIR)/$(HOST_DIR).One common reason for that is that pkgconf now prepends the sysroot path to all the paths it returns. Other reasons vary, but are mostly due to poorly writen generic-packages.
And a new step hooks to check that no file gets installed in either locations, called after the install-target and install-staging steps.
Signed-off-by "Yann E. MORIN" <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Gustavo Zacarias <[email protected]>Cc Arnout Vandecappelle <[email protected]>Cc Peter Seiderer <[email protected]>Cc Romain Naour <[email protected]>---
Changes v2 -> v3;
- also check for $(HOST_DIR) in case the user specified an out-of-build-dir locatiopn (Arnout)
Quoted 7 lines
Quoted 5 lines
---
Note that, in the current state of Buildroot, this *will* cause a lot of build failures until all those packages are fixed. Among the known to break are quite a few Xorg packages, plus many packages that need to call moc (from Qt4 for sure, possibly from Qt5 too).Still not true for moc :-)
Yeah. I was really off-tracks yesterday (hard day at $work, followed by yet another hard day)... Sorry...
Quoted 12 lines
Quoted 12 lines
--- package/pkg-generic.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)package/pkg-generic.mk +0
-0@@ -87,6 +87,25 @@ define step_pkg_size endef GLOBAL_INSTRUMENTATION_HOOKS += step_pkg_size
Quoted 8 lines
package/pkg-generic.mk define step_pkg_size · line 91
Quoted 2 lines
package/pkg-generic.mk +2
-0+define step_check_build_dir_one + if [ -d $(2) ]; then \Perhaps it would be better to handle the $(HOST_DIR) / $(O) combination here, so:
if [ -d $(2)/$(HOST_DIR) -o -d $(2)/$(O) ]; then \package/pkg-generic.mk define step_pkg_size · line 92
Quoted 1 line
package/pkg-generic.mk +1
-0+ printf "ERROR: package %s installs files in %s\n" $(1) $(2) >&2; \
And then how do you differentiate the error message?
But granted, we should probably do both checks here, like so:
if [ -d $(2)/$(HOST_DIR) ]; then \
printf "error... HOSTD_IR...n" >&2; exit 1; \
fi
if [ -d $(2)/$(O) ]; then \
printf "error... O...\n" >&2; exit 1; \
fiQuoted 10 lines
Quoted 10 lines
package/pkg-generic.mk +10
-0+ exit 1; \ + fi +endef + +define step_check_build_dir + $(if $(filter install-staging,$(2)),\ + $(if $(filter end,$(1)),\ + $(call step_check_build_dir_one,$(3),$(STAGING_DIR)/$(HOST_DIR)); \ + $(call step_check_build_dir_one,$(3),$(STAGING_DIR)/$(O)))) + $(if $(filter install-target,$(2)),\
Quoted 8 lines
package/pkg-generic.mk define step_pkg_size · line 107
Quoted 5 lines
package/pkg-generic.mk +5
-0+ $(if $(filter end,$(1)),\ + $(call step_check_build_dir_one,$(3),$(TARGET_DIR)/$(HOST_DIR)); \ + $(call step_check_build_dir_one,$(3),$(TARGET_DIR)/$(O)))) +endef +GLOBAL_INSTRUMENTATION_HOOKS += step_check_build_dirYou never replied to my comment that I think this would fit better directly in
the .stamp_install_* rules rather than as hooks.
Yeah, sorry, see above... :-(
Quoted 5 lines
My reasoning is that it is much
more difficult to find out why some commands are being called when they're hidden in hooks. That's not too bad for things like gathering statistics since they're supposedly inobtrusive, but here you're throwing an error so it is really useful to be able to find easily in the source where this error comes from.
My reasoning is that I like hooks. ;-) After all, IIRC, I was the one to add them in the first place; I have to use them! ;-)
But OK, that potentially makes sense, like we do for the .la fixups.
I like the way you categorize hooks: they are for instrumentation (hence their names!). EVerything else you should go into the relevant command block.
I'll fix up and respin.
Thanks! :-)
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'