package/batctl: update to 2023.1 to match batman-adv
PATCH 1/1 package/batctl: update to 2023.1 to match batman-adv
Although the kernel interface has not changed, it is convenient to have the batctl match the batman-adv version. So, bump the package to match 01ec4a39f5ceb83c62b0040067ba53197a0a6843 batman-adv bump.
--- package/batctl/batctl.hash | 6 +++--- package/batctl/batctl.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
package/batctl/batctl.hash +3 -3
@@ -1,6 +1,6 @@ -# From https://downloads.open-mesh.org/batman/releases/batman-adv-2021.0/batctl-2021.0.tar.gz.sha1 -sha1 87d0bb34950cb70578a0ca5ce706513a8279a01c batctl-2021.0.tar.gz +# From https://downloads.open-mesh.org/batman/releases/batman-adv-2023.1/batctl-2023.1.tar.gz.sha1 +sha1 8d899c6323e228b9b370caf28e6d67621cb7d35d batctl-2023.1.tar.gz # Locally calculated -sha256 9cec8bf1952f885192749a9dc0318a54633b717aaf05c438d504efd83f5201e4 batctl-2021.0.tar.gz +sha256 e5bf47305d955abb199244bd0e5fffab96108b1affabd0d9705533f8059395f1 batctl-2023.1.tar.gz sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT
package/batctl/batctl.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -BATCTL_VERSION = 2021.0 +BATCTL_VERSION = 2023.1 BATCTL_SITE = http://downloads.open-mesh.org/batman/releases/batman-adv-$(BATCTL_VERSION) BATCTL_LICENSE = GPL-2.0, MIT (batman_adv.h, list.h) BATCTL_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT
Signature · 6 lines
2.39.3 (Apple Git-146) _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH 1/1 package/gst1-plugins-good: add qt5tools as a dependency
During a configuration with per-package, seeing the following meson build error which is resolved when the qt5tools are declared explicitly as a dependency.
build/gst1-plugins-good-1.22.9/ext/qt/meson.build:48:4: \
ERROR: Problem encountered: qt5 qmlglsink plugin is enabled, \
but qt specific tools were not found--- package/gstreamer1/gst1-plugins-good/Config.in | 1 + package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
package/gstreamer1/gst1-plugins-good/Config.in +1 -0
@@ -293,6 +293,7 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_QMLGL select BR2_PACKAGE_QT5BASE_WIDGETS select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK + select BR2_PACKAGE_QT5TOOLS select BR2_PACKAGE_QT5X11EXTRAS if BR2_PACKAGE_QT5BASE_XCB help QT5 plugin which includes elements qmlglsrc and qmlglsink
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +1 -1
@@ -357,7 +357,7 @@ endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_QMLGL),y) GST1_PLUGINS_GOOD_CONF_OPTS += -Dqt5=enabled -GST1_PLUGINS_GOOD_DEPENDENCIES += qt5declarative +GST1_PLUGINS_GOOD_DEPENDENCIES += qt5declarative qt5tools ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) GST1_PLUGINS_GOOD_DEPENDENCIES += qt5x11extras endif
Signature · 6 lines
2.39.3 (Apple Git-146) _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH 1/1] package/gst1-plugins-good: add qt5tools as a dependency
Hello Charles,
Quoted 8 lines · On Wed, 17 Apr 2024 11:13:22 -0700 Charles Hardin <[email protected]> wrote:
During a configuration with per-package, seeing the following meson build error which is resolved when the qt5tools are declared explicitly as a dependency.
build/gst1-plugins-good-1.22.9/ext/qt/meson.build:48:4: \ ERROR: Problem encountered: qt5 qmlglsink plugin is enabled, \ but qt specific tools were not found
Quoted 5 lines
Signed-off-by Charles Hardin <[email protected]>--- package/gstreamer1/gst1-plugins-good/Config.in | 1 + package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
Thanks for your patch. I am able to reproduce the issue with the following defconfig (please always include a defconfig that exhibits the bug when submitting a bug fix):
BR2_aarch64=y
BR2_cortex_a72=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
# BR2_PACKAGE_BUSYBOX is not set BR2_PACKAGE_GSTREAMER1=y BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL=y BR2_PACKAGE_GST1_PLUGINS_GOOD=y
# BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AVI is not set # BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4 is not set # BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPARSE is not set BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_QMLGL=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y
BR2_PACKAGE_QT5=y
BR2_PACKAGE_WAYLAND=y
# BR2_TARGET_ROOTFS_TAR is not set
But the thing is that even after applying your patch, the issue still occurs (I re-did a full build from scratch to be sure). I do see qt5tools being built/installed, but the build of gst1-plugins-good still fails with:
output/build/gst1-plugins-good-1.22.9/ext/qt/meson.build:48:4: ERROR: Problem encountered: qt5 qmlglsink plugin is enabled, but qt specific tools were not found
The last line of the meson logs look like this:
Got pkg-config variable host_bins : /home/thomas/buildroot/buildroot/output/host/bin
Run-time dependency qt5 (modules: Core) found: YES 5.15.11 (pkg-config)
Program /home/thomas/buildroot/buildroot/output/host/bin/moc found: YES 5.15.11 5.15.11 (/home/thomas/buildroot/buildroot/output/host/bin/moc) Program /home/thomas/buildroot/buildroot/output/host/bin/uic found: YES 5.15.11 5.15.11 (/home/thomas/buildroot/buildroot/output/host/bin/uic) Program /home/thomas/buildroot/buildroot/output/host/bin/rcc found: YES 5.15.11 5.15.11 (/home/thomas/buildroot/buildroot/output/host/bin/rcc) Program /home/thomas/buildroot/buildroot/output/host/bin/lrelease found: NO
Program lrelease5 found: NO
Program lrelease-qt5 found: NO
Program lrelease found: NO found but need: '== 5.15.11' (/usr/bin/lrelease)
Based on this and my testing, it seems like not only BR2_PACKAGE_QT5TOOLS=y is needed, but also BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS=y, so I've applied your patch with this additional fix.
Also, the issue has nothing to do with per-package builds, it can be reproduced without.
See the final commit at:
https://gitlab.com/buildroot.org/buildroot/-/commit/c107dd33e679becf8b58d78d088b5320734d3e31
Thanks again!
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Thomas Petazzoni via buildroot
AppliedQuoted 9 lines · On Wed, 17 Apr 2024 11:13:21 -0700 Charles Hardin <[email protected]> wrote:
Although the kernel interface has not changed, it is convenient to have the batctl match the batman-adv version. So, bump the package to match
01ec4a39f5ceb83c62b0040067ba53197a0a6843batman-adv bump.Signed-off-by Charles Hardin <[email protected]>--- package/batctl/batctl.hash | 6 +++--- package/batctl/batctl.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
Applied to master, thanks.
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot