gstreamer-plugins: Change anonymous python structure
PATCH 1/3 gstreamer-plugins: Change anonymous python structure
This change ensures that the SRC_URI is set before base.bbclass code is called. This will also ensure that the xz-native depends is set correct.
[YOCTO #5127]
Signed-off-by Saul Wold <[email protected]>
--- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc +6 -4
@@ -30,7 +30,9 @@ oe_runconf_prepend() { fi } -python __anonymous () { +SRC_URI = "${@get_gst_srcuri(d)}" + +def get_gst_srcuri(d): # check if expected prefix is present prefix = "gstreamer1.0-" bpn = d.getVar("BPN", True)
@@ -43,10 +45,10 @@ python __anonymous () { branch = d.getVar("GSTREAMER_1_0_GIT_BRANCH", True) if pv == "git": - d.setVar("SRC_URI", "git://anongit.freedesktop.org/gstreamer/%s;branch=%s" % (gstpkg_basename, branch)) + s = "git://anongit.freedesktop.org/gstreamer/%s;branch=%s" % (gstpkg_basename, branch) else: - d.setVar("SRC_URI", "http://gstreamer.freedesktop.org/src/%s/%s-%s.tar.xz" % (gstpkg_basename, gstpkg_basename, pv)) -} + s = "http://gstreamer.freedesktop.org/src/%s/%s-%s.tar.xz" % (gstpkg_basename, gstpkg_basename, pv) + return s delete_liblink_m4_file() { # This m4 file contains nastiness which conflicts with libtool 2.2.2
Signature · 1 line
1.8.3.1
PATCH 2/3 systemd.bbclass: get the correct /lib directory
By using os.path.dirname(systemd_unitdir) we get the correct /lib directory instead of dealing with possibly multilib directories. This address a QA Error for shipped/not installed /lib with multilib and x32.
Signed-off-by Saul Wold <[email protected]>
--- meta/classes/systemd.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta/classes/systemd.bbclass +3 -3
@@ -168,9 +168,9 @@ python rm_systemd_unitdir (){ systemd_unitdir = oe.path.join(d.getVar("D", True), d.getVar('systemd_unitdir', True)) if os.path.exists(systemd_unitdir): shutil.rmtree(systemd_unitdir) - base_libdir = oe.path.join(d.getVar("D", True), d.getVar('base_libdir', True)) - if (os.path.exists(base_libdir) and not os.listdir(base_libdir)): - os.rmdir(base_libdir) + systemd_libdir = os.path.dirname(systemd_unitdir) + if (os.path.exists(systemd_libdir) and not os.listdir(systemd_libdir)): + os.rmdir(systemd_libdir) } do_install[postfuncs] += "rm_systemd_unitdir "
Signature · 1 line
1.8.3.1
PATCH 3/3 cmake.bbclass: ensure CMAKE_SYSTEM_NAME is correct
In reply to Saul WoldUsing TARGET_OS can add the ABIEXTENSION so ensure that is is removed for the Linux TARGET_OS, we might have other TARGET_OSes so don't hard code CMAKE_SYSTEM_NAME
[YOCTO #5145]
Signed-off-by Saul Wold <[email protected]>
--- meta/classes/cmake.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/cmake.bbclass +1 -1
@@ -35,7 +35,7 @@ cmake_do_generate_toolchain_file() { cat > ${WORKDIR}/toolchain.cmake <<EOF # CMake system name must be something like "Linux". # This is important for cross-compiling. -set( CMAKE_SYSTEM_NAME `echo ${TARGET_OS} | sed 's/^./\u&/'` ) +set( CMAKE_SYSTEM_NAME `echo ${TARGET_OS} | sed -e 's/^./\u&/' -e 's/^\(Linux\).*/\1/'` ) set( CMAKE_SYSTEM_PROCESSOR ${TARGET_ARCH} ) set( CMAKE_C_COMPILER ${OECMAKE_C_COMPILER} ) set( CMAKE_CXX_COMPILER ${OECMAKE_CXX_COMPILER} )
Signature · 1 line
1.8.3.1