crda: enable staging install
PATCH 1/1 crda: enable staging install
It's needed to make mklibs work otherwise it can't find the missing library for the crda binary.
Signed-off-by Maxime Hadjinlian <[email protected]>
--- package/crda/crda.mk | 5 +++++ 1 file changed, 5 insertions(+)
package/crda/crda.mk +5 -0
@@ -10,12 +10,17 @@ CRDA_SITE = $(BR2_KERNEL_MIRROR)/software/network/crda CRDA_DEPENDENCIES = host-pkgconf host-python-pycrypto libnl libgcrypt CRDA_LICENSE = ISC CRDA_LICENSE_FILES = LICENSE +CRDA_INSTALL_STAGING = YES define CRDA_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) \ $(MAKE) all_noverify -C $(@D) endef +define CRDA_INSTALL_STAGING_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) install -C $(@D) DESTDIR=$(STAGING_DIR) +endef + define CRDA_INSTALL_TARGET_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) install -C $(@D) DESTDIR=$(TARGET_DIR) endef
--
2.13.2
PATCH 1/1 qt5base: disable libraries not built
From: Maxime Hadjinlian <[email protected]>
We don't build theses libraries by default (we deactivate them at configure time).
Theses are at the moment enabled by default in BR, a better patch will be made at a later time.
--- package/qt5/qt5base/qt5base.mk | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
package/qt5/qt5base/qt5base.mk +16 -16
@@ -186,22 +186,22 @@ QT5BASE_INSTALL_LIBS_y += Qt5Core QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XCB) += Qt5XcbQpa QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK) += Qt5Network QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_CONCURRENT) += Qt5Concurrent -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST) += Qt5Test -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFSDeviceIntegration -ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFsKmsSupport -endif -else -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglDeviceIntegration -endif - -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport +#QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql +#QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST) += Qt5Test +#QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml +#QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL +#ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +#QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFSDeviceIntegration +#ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) +#QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFsKmsSupport +#endif +#else +#QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglDeviceIntegration +#endif +# +#QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui +#QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets +#QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus
Signature · 1 line
2.13.2
PATCH 1/1 crda: enable staging install
In reply to Maxime HadjinlianHello,
Quoted 2 lines · Maxime Hadjinlian
It's needed to make mklibs work otherwise it can't find the missing library for the crda binary.
What is this mklibs thing? Why does it matter? We need a better justification for this change :)
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com