zbar: fix random do_prepare_recipe_sysroot_gettext failures
PATCH 1/2 zbar: fix random do_prepare_recipe_sysroot_gettext failures
* do_prepare_recipe_sysroot task is added as:
addtask do_prepare_recipe_sysroot before do_configure after do_fetch
which doesn't ensure that directory is created
* we can run this task as "after do_unpack", but it's just easier to run
it in do_configure_prepend without the need for extra task
* fixes:
zbar/0.23.1+gitAUTOINC+89e7900d85-r0/temp/run.do_prepare_recipe_sysroot_gettext.30306' failed with exit code 1:
install: target 'zbar/0.23.1+gitAUTOINC+89e7900d85-r0/git/' is not a directory: No such file or directory
WARNING: exit code 1 from a shell command.
Signed-off-by Martin Jansa <[email protected]>
--- meta-oe/recipes-support/zbar/zbar_git.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
meta-oe/recipes-support/zbar/zbar_git.bb +2 -3
@@ -53,7 +53,6 @@ CPPFLAGS_append = "\ TARGET_CXXFLAGS_append = " -fPIC" -do_prepare_recipe_sysroot_gettext() { - install -m 755 ${STAGING_DATADIR_NATIVE}/gettext/ABOUT-NLS ${S}/ +do_configure_prepend() { + install -m 755 ${STAGING_DATADIR_NATIVE}/gettext/ABOUT-NLS ${S}/ } -addtask do_prepare_recipe_sysroot_gettext after do_prepare_recipe_sysroot before do_configure
Signature · 1 line
2.27.0
PATCH 2/2 zbar: use 4 spaces for indentation
Signed-off-by Martin Jansa <[email protected]>
--- meta-oe/recipes-support/zbar/zbar_git.bb | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
meta-oe/recipes-support/zbar/zbar_git.bb +12 -12
@@ -10,8 +10,8 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5e9ee833a2118adc7d8b5ea38e5b1cef" SRC_URI = "git://github.com/mchehab/zbar.git;branch=master \ - file://0001-qt-Create-subdir-in-Makefile.patch \ - file://0002-zbarcam-Create-subdir-in-Makefile.patch \ + file://0001-qt-Create-subdir-in-Makefile.patch \ + file://0002-zbarcam-Create-subdir-in-Makefile.patch \ " SRCREV = "89e7900d85dd54ef351a7ed582aec6a5a5d7fa37"
@@ -21,15 +21,15 @@ PV = "0.23.1+git${SRCPV}" DEPENDS += "xmlto-native" PACKAGECONFIG ??= "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ " PACKAGECONFIG ??= "video python3" inherit autotools pkgconfig gettext \ - ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'gtk3', 'gobject-introspection', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)} + ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'gtk3', 'gobject-introspection', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)} PACKAGECONFIG[x11] = "--with-x, --without-x, libxv" PACKAGECONFIG[video] = "--enable-video, --disable-video, v4l-utils libv4l"
@@ -40,15 +40,15 @@ PACKAGECONFIG[qt5] = "--with-qt5, --without-qt5, qtbase qtbase-native qtx11extra PACKAGECONFIG[imagemagick] = "--with-imagemagick, --without-imagemagick, imagemagick" FILES_${PN} += "${bindir} \ - ${@bb.utils.contains('DEPENDS', 'python3-native', '${libdir}', '', d)} \ + ${@bb.utils.contains('DEPENDS', 'python3-native', '${libdir}', '', d)} \ " CPPFLAGS_append = "\ - ${@bb.utils.contains('PACKAGECONFIG', 'qt5', '\ - -I${STAGING_INCDIR}/QtX11Extras \ - -I${STAGING_INCDIR}/dbus-1.0 \ - -I${STAGING_LIBDIR}/dbus-1.0/include \ - ', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'qt5', '\ + -I${STAGING_INCDIR}/QtX11Extras \ + -I${STAGING_INCDIR}/dbus-1.0 \ + -I${STAGING_LIBDIR}/dbus-1.0/include \ + ', '', d)} \ " TARGET_CXXFLAGS_append = " -fPIC"
Signature · 1 line
2.27.0