Skip to contentSkip to conversation

freerdp: fold .inc into .bb

PATCH In review Martin Jansa 2 participants 3 messages Feb 23, 2016 – Feb 25, 2016

lore
Share & tools
lore

Martin Jansa

author
#0 lore raw

PATCH 1/1 freerdp: fold .inc into .bb

* currently it's broken again
ERROR: freerdp-1.2.5+gitrAUTOINC+62da9d28c6-r0 do_package: QA Issue: freerdp: Files/directories were installed but not shipped in any package:
/usr/bin
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
freerdp: 1 installed and not shipped files. [installed-vs-shipped]

Signed-off-by Martin Jansa <[email protected]>
---
 meta-oe/recipes-support/freerdp/freerdp.inc    | 74 -----------------------
 meta-oe/recipes-support/freerdp/freerdp_git.bb | 83 +++++++++++++++++++++++---
 2 files changed, 75 insertions(+), 82 deletions(-)
 delete mode 100644 meta-oe/recipes-support/freerdp/freerdp.inc
meta-oe/recipes-support/freerdp/freerdp.inc deleted +0 -74
deleted file mode 100644
index 2937bc5..0000000
@@ -1,74 +0,0 @@
-# Copyright (C) 2010-2012 O.S. Systems Software Ltda. All Rights Reserved
-# Released under the MIT license
-
-DESCRIPTION = "FreeRDP RDP client & server library"
-HOMEPAGE = "http://www.freerdp.com"
-DEPENDS = "openssl alsa-lib pcsc-lite"
-SECTION = "net"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-inherit pkgconfig cmake
-
-EXTRA_OECMAKE += "-DWITH_ALSA=ON \
-                  -DWITH_PCSC=ON \
-                  -DWITH_FFMPEG=OFF \
-                  -DWITH_CUNIT=OFF \
-                  -DWITH_NEON=OFF \
-                 "
-
-PACKAGECONFIG ??= "  \
-                ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\
-                ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\
-                ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}\
-                ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}\
-                ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}\
-                gstreamer cups \
-                "
-
-X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi libxrender libxfixes libxdamage libxrandr libxkbfile"
-PACKAGECONFIG[x11] = "-DWITH_X11=ON -DWITH_XINERAMA=ON -DWITH_XEXT=ON -DWITH_XCURSOR=ON -DWITH_XV=ON -DWITH_XI=ON -DWITH_XRENDER=ON -DWITH_XFIXES=ON -DWITH_XDAMAGE=ON -DWITH_XRANDR=ON -DWITH_XKBFILE=ON,-DWITH_X11=OFF,${X11_DEPS}"
-PACKAGECONFIG[wayland] = "-DWITH_WAYLAND=ON,-DWITH_WAYLAND=OFF,wayland"
-PACKAGECONFIG[directfb] = "-DWITH_DIRECTFB=ON,-DWITH_DIRECTFB=OFF,directfb"
-PACKAGECONFIG[pam] = "-DWITH_PAM=ON,-DWITH_PAM=OFF,libpam"
-PACKAGECONFIG[pulseaudio] = "-DWITH_PULSEAUDIO=ON,-DWITH_PULSEAUDIO=OFF,pulseaudio"
-PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER_1_0=ON,-DWITH_GSTREAMER_1_0=OFF,gstreamer1.0 gstreamer1.0-plugins-base"
-PACKAGECONFIG[cups] = "-DWITH_CUPS=ON,-DWITH_CUPS=OFF,cups"
-
-PACKAGES =+ "libfreerdp"
-
-LEAD_SONAME = "libfreerdp.so"
-FILES_libfreerdp = "${libdir}/lib*${SOLIBS}"
-
-PACKAGES_DYNAMIC += "^libfreerdp-plugin-.*"
-
-# we will need winpr-makecert to generate TLS certificates
-do_install_append () {
-    install -m755 winpr/tools/makecert/cli/winpr-makecert ${D}${bindir}
-    rm -rf ${D}/${libdir}/cmake
-    rm -rf ${D}/${libdir}/freerdp
-}
-
-python populate_packages_prepend () {
-    freerdp_root = d.expand('${libdir}/freerdp')
-
-    do_split_packages(d, freerdp_root, '^(audin_.*)\.so$',
-        output_pattern='libfreerdp-plugin-%s',
-        description='FreeRDP plugin %s',
-        prepend=True, extra_depends='libfreerdp-plugin-audin')
-
-    do_split_packages(d, freerdp_root, '^(rdpsnd_.*)\.so$',
-        output_pattern='libfreerdp-plugin-%s',
-        description='FreeRDP plugin %s',
-        prepend=True, extra_depends='libfreerdp-plugin-rdpsnd')
-
-    do_split_packages(d, freerdp_root, '^(tsmf_.*)\.so$',
-        output_pattern='libfreerdp-plugin-%s',
-        description='FreeRDP plugin %s',
-        prepend=True, extra_depends='libfreerdp-plugin-tsmf')
-
-    do_split_packages(d, freerdp_root, '^([^-]*)\.so$',
-        output_pattern='libfreerdp-plugin-%s',
-        description='FreeRDP plugin %s',
-        prepend=True, extra_depends='')
-}
meta-oe/recipes-support/freerdp/freerdp_git.bb +75 -8

96 lines not on this page · raw message

Signature · 1 line
2.7.1
#1 lore raw

Oops. I'll take a look at this.

Regards,

*Manuel Bachmann, Graphics & Multimedia Engineer www.iot.bzh
<http://iot.bzh> *

2016-02-23 17:28 GMT+01:00 Martin Jansa <[email protected]>:

Quoted 236 lines

* currently it's broken again
ERROR: freerdp-1.2.5+gitrAUTOINC+62da9d28c6-r0 do_package: QA Issue:
freerdp: Files/directories were installed but not shipped in any package:
/usr/bin
Please set FILES such that these items are packaged. Alternatively if
they are unneeded, avoid installing them or delete them within do_install.
freerdp: 1 installed and not shipped files. [installed-vs-shipped]

Signed-off-by Martin Jansa <[email protected]>
---
 meta-oe/recipes-support/freerdp/freerdp.inc    | 74
-----------------------
 meta-oe/recipes-support/freerdp/freerdp_git.bb | 83
+++++++++++++++++++++++---
 2 files changed, 75 insertions(+), 82 deletions(-)
 delete mode 100644 meta-oe/recipes-support/freerdp/freerdp.inc
meta-oe/recipes-support/freerdp/freerdp.inc deleted +0 -21
deleted file mode 100644
index 2937bc5..0000000
@@ -1,74 +0,0 @@
-# Copyright (C) 2010-2012 O.S. Systems Software Ltda. All Rights Reserved
-# Released under the MIT license
-
-DESCRIPTION = "FreeRDP RDP client & server library"
-HOMEPAGE = "http://www.freerdp.com"
-DEPENDS = "openssl alsa-lib pcsc-lite"
-SECTION = "net"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-inherit pkgconfig cmake
-
-EXTRA_OECMAKE += "-DWITH_ALSA=ON \
-                  -DWITH_PCSC=ON \
-                  -DWITH_FFMPEG=OFF \
-                  -DWITH_CUNIT=OFF \
-                  -DWITH_NEON=OFF \
-                 "
-
-PACKAGECONFIG ??= "  \
-                ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '',

d)}\
- ${@bb.utils.contains('DISTRO_FEATURES', 'wayland',
'wayland', '', d)}\
- ${@bb.utils.contains('DISTRO_FEATURES', 'directfb',
'directfb', '', d)}\
- ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '',
d)}\
- ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio',
'pulseaudio', '', d)}\

meta-oe/recipes-support/freerdp/freerdp.inc deleted +0 -4
-                gstreamer cups \
-                "
-
-X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi

libxrender libxfixes libxdamage libxrandr libxkbfile"

meta-oe/recipes-support/freerdp/freerdp.inc deleted +0 -6
-PACKAGECONFIG[x11] = "-DWITH_X11=ON -DWITH_XINERAMA=ON -DWITH_XEXT=ON
-DWITH_XCURSOR=ON -DWITH_XV=ON -DWITH_XI=ON -DWITH_XRENDER=ON
-DWITH_XFIXES=ON -DWITH_XDAMAGE=ON -DWITH_XRANDR=ON
-DWITH_XKBFILE=ON,-DWITH_X11=OFF,${X11_DEPS}"
-PACKAGECONFIG[wayland] = "-DWITH_WAYLAND=ON,-DWITH_WAYLAND=OFF,wayland"
-PACKAGECONFIG[directfb] =

"-DWITH_DIRECTFB=ON,-DWITH_DIRECTFB=OFF,directfb"

meta-oe/recipes-support/freerdp/freerdp.inc deleted +0 -2
-PACKAGECONFIG[pam] = "-DWITH_PAM=ON,-DWITH_PAM=OFF,libpam"
-PACKAGECONFIG[pulseaudio] =

"-DWITH_PULSEAUDIO=ON,-DWITH_PULSEAUDIO=OFF,pulseaudio" -PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER_1_0=ON,-DWITH_GSTREAMER_1_0=OFF,gstreamer1.0 gstreamer1.0-plugins-base"

meta-oe/recipes-support/freerdp/freerdp.inc deleted +0 -39
-PACKAGECONFIG[cups] = "-DWITH_CUPS=ON,-DWITH_CUPS=OFF,cups"
-
-PACKAGES =+ "libfreerdp"
-
-LEAD_SONAME = "libfreerdp.so"
-FILES_libfreerdp = "${libdir}/lib*${SOLIBS}"
-
-PACKAGES_DYNAMIC += "^libfreerdp-plugin-.*"
-
-# we will need winpr-makecert to generate TLS certificates
-do_install_append () {
-    install -m755 winpr/tools/makecert/cli/winpr-makecert ${D}${bindir}
-    rm -rf ${D}/${libdir}/cmake
-    rm -rf ${D}/${libdir}/freerdp
-}
-
-python populate_packages_prepend () {
-    freerdp_root = d.expand('${libdir}/freerdp')
-
-    do_split_packages(d, freerdp_root, '^(audin_.*)\.so$',
-        output_pattern='libfreerdp-plugin-%s',
-        description='FreeRDP plugin %s',
-        prepend=True, extra_depends='libfreerdp-plugin-audin')
-
-    do_split_packages(d, freerdp_root, '^(rdpsnd_.*)\.so$',
-        output_pattern='libfreerdp-plugin-%s',
-        description='FreeRDP plugin %s',
-        prepend=True, extra_depends='libfreerdp-plugin-rdpsnd')
-
-    do_split_packages(d, freerdp_root, '^(tsmf_.*)\.so$',
-        output_pattern='libfreerdp-plugin-%s',
-        description='FreeRDP plugin %s',
-        prepend=True, extra_depends='libfreerdp-plugin-tsmf')
-
-    do_split_packages(d, freerdp_root, '^([^-]*)\.so$',
-        output_pattern='libfreerdp-plugin-%s',
-        description='FreeRDP plugin %s',
-        prepend=True, extra_depends='')
-}
meta-oe/recipes-support/freerdp/freerdp_git.bb +22 -8
index 13dff6e..c749b0c 100644
@@ -1,18 +1,18 @@
-# Copyright (C) 2010-2012, O.S. Systems Software Ltda.
+# Copyright (C) 2010-2012 O.S. Systems Software Ltda. All Rights Reserved
 # Released under the MIT license
 
-include freerdp.inc
+DESCRIPTION = "FreeRDP RDP client & server library"
+HOMEPAGE = "http://www.freerdp.com"
+DEPENDS = "openssl alsa-lib pcsc-lite"
+SECTION = "net"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-inherit gitpkgv
+inherit pkgconfig cmake gitpkgv
 
 PV = "1.2.5+gitr${SRCPV}"
 PKGV = "${GITPKGVTAG}"
 
-EXTRA_OECMAKE += "-DBUILD_STATIC_LIBS=OFF \
-                  -DCMAKE_POSITION_INDEPENDANT_CODE=ON \
-                  -DWITH_MANPAGES=OFF \
-                 "
-
 SRCREV = "62da9d28c674814c81c245c1c7882eb0da7be76b"
 SRC_URI = "git://github.com/FreeRDP/FreeRDP.git \
     file://winpr-makecert-Build-with-install-RPATH.patch \

@@ -20,3 +20,70 @@ SRC_URI = "git://github.com/FreeRDP/FreeRDP.git \
 "
 
 S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE += " \
+    -DWITH_ALSA=ON \
+    -DWITH_PCSC=ON \
+    -DWITH_FFMPEG=OFF \
+    -DWITH_CUNIT=OFF \
+    -DWITH_NEON=OFF \
+    -DBUILD_STATIC_LIBS=OFF \
+    -DCMAKE_POSITION_INDEPENDANT_CODE=ON \
+    -DWITH_MANPAGES=OFF \
+"
+
+PACKAGECONFIG ??= "  \
+                ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '',

d)}\
+ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland',
'wayland', '', d)}\
+ ${@bb.utils.contains('DISTRO_FEATURES', 'directfb',
'directfb', '', d)}\
+ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '',
d)}\
+ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio',
'pulseaudio', '', d)}\

meta-oe/recipes-support/freerdp/freerdp_git.bb +4 -0
+                gstreamer cups \
+                "
+
+X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi

libxrender libxfixes libxdamage libxrandr libxkbfile"

meta-oe/recipes-support/freerdp/freerdp_git.bb +3 -3
+PACKAGECONFIG[x11] = "-DWITH_X11=ON -DWITH_XINERAMA=ON -DWITH_XEXT=ON
-DWITH_XCURSOR=ON -DWITH_XV=ON -DWITH_XI=ON -DWITH_XRENDER=ON
-DWITH_XFIXES=ON -DWITH_XDAMAGE=ON -DWITH_XRANDR=ON
-DWITH_XKBFILE=ON,-DWITH_X11=OFF,${X11_DEPS}"
+PACKAGECONFIG[wayland] = "-DWITH_WAYLAND=ON,-DWITH_WAYLAND=OFF,wayland"
+PACKAGECONFIG[directfb] =

"-DWITH_DIRECTFB=ON,-DWITH_DIRECTFB=OFF,directfb"

meta-oe/recipes-support/freerdp/freerdp_git.bb +2 -0
+PACKAGECONFIG[pam] = "-DWITH_PAM=ON,-DWITH_PAM=OFF,libpam"
+PACKAGECONFIG[pulseaudio] =

"-DWITH_PULSEAUDIO=ON,-DWITH_PULSEAUDIO=OFF,pulseaudio" +PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER_1_0=ON,-DWITH_GSTREAMER_1_0=OFF,gstreamer1.0 gstreamer1.0-plugins-base"

meta-oe/recipes-support/freerdp/freerdp_git.bb +39 -1
+PACKAGECONFIG[cups] = "-DWITH_CUPS=ON,-DWITH_CUPS=OFF,cups"
+
+PACKAGES =+ "libfreerdp"
+
+LEAD_SONAME = "libfreerdp.so"
+FILES_libfreerdp = "${libdir}/lib*${SOLIBS}"
+
+PACKAGES_DYNAMIC += "^libfreerdp-plugin-.*"
+
+# we will need winpr-makecert to generate TLS certificates
+do_install_append () {
+    install -m755 winpr/tools/makecert/cli/winpr-makecert ${D}${bindir}
+    rm -rf ${D}/${libdir}/cmake
+    rm -rf ${D}/${libdir}/freerdp
+}
+
+python populate_packages_prepend () {
+    freerdp_root = d.expand('${libdir}/freerdp')
+
+    do_split_packages(d, freerdp_root, '^(audin_.*)\.so$',
+        output_pattern='libfreerdp-plugin-%s',
+        description='FreeRDP plugin %s',
+        prepend=True, extra_depends='libfreerdp-plugin-audin')
+
+    do_split_packages(d, freerdp_root, '^(rdpsnd_.*)\.so$',
+        output_pattern='libfreerdp-plugin-%s',
+        description='FreeRDP plugin %s',
+        prepend=True, extra_depends='libfreerdp-plugin-rdpsnd')
+
+    do_split_packages(d, freerdp_root, '^(tsmf_.*)\.so$',
+        output_pattern='libfreerdp-plugin-%s',
+        description='FreeRDP plugin %s',
+        prepend=True, extra_depends='libfreerdp-plugin-tsmf')
+
+    do_split_packages(d, freerdp_root, '^([^-]*)\.so$',
+        output_pattern='libfreerdp-plugin-%s',
+        description='FreeRDP plugin %s',
+        prepend=True, extra_depends='')
+}
--

2.7.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

author
#2 lore raw

PATCH 1/1 freerdp: Fix QA warning when no binaries are built

* without x11 or wayland enabled from DISTRO_FEATURES there is nothing in /usr/bin and this empty directory causes QA error

Signed-off-by Martin Jansa <[email protected]>
---
 meta-oe/recipes-support/freerdp/freerdp_git.bb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
meta-oe/recipes-support/freerdp/freerdp_git.bb +6 -2
index c749b0c..4c81b57 100644
@@ -60,8 +60,12 @@ PACKAGES_DYNAMIC += "^libfreerdp-plugin-.*"
 # we will need winpr-makecert to generate TLS certificates
 do_install_append () {
     install -m755 winpr/tools/makecert/cli/winpr-makecert ${D}${bindir}
-    rm -rf ${D}/${libdir}/cmake
-    rm -rf ${D}/${libdir}/freerdp
+    rm -rf ${D}${libdir}/cmake
+    rm -rf ${D}${libdir}/freerdp
+    # without x11, wayland, directfb enabled this directory will be empty
+    # causing QA error: ERROR: freerdp-1.2.5+gitrAUTOINC+62da9d28c6-r0 do_package: QA Issue: freerdp: Files/directories were installed but not shipped in any package:
+    #   /usr/bin
+    rmdir ${D}${bindir} --ignore-fail-on-non-empty
 }
 
 python populate_packages_prepend () {
Signature · 1 line
2.7.1