[meta-oe][PATCH 1/3] fontforge: explicitly depend on gettext-native

[meta-oe][PATCH 1/3] fontforge: explicitly depend on gettext-native

[Martin Jansa]

* fixes:
  Making all in po
  make[2]: Entering directory
  `TOPDIR/BUILD/work/x86_64-linux/fontforge-native/20170731-r0/build/po'
  msgfmt --check --output-file=ca.mo ../../git/po/ca.po
  msgfmt --check --output-file=el.mo ../../git/po/el.po
  msgfmt --check --output-file=es.mo ../../git/po/es.po
  msgfmt --check --output-file=it.mo ../../git/po/it.po
  /bin/bash: msgfmt: command not found
  /bin/bash: msgfmt: command not found
  /bin/bash: msgfmt: command not found
  /bin/bash: msgfmt: command not found
  make[2]: *** [ca.mo] Error 127
  make[2]: *** Waiting for unfinished jobs....
  make[2]: *** [el.mo] Error 127
  make[2]: *** [es.mo] Error 127
  make[2]: *** [it.mo] Error 127
  make[2]: Leaving directory
  `TOPDIR/BUILD/work/x86_64-linux/fontforge-native/20170731-r0/build/po'

* as Ross explained:
  needs explicit dependency on gettext-native
  native disables NLS so just has gettext-minimal-native in the depends

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb b/meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb
index d9f086749f..481fedf983 100644
--- a/meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb
+++ b/meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \
     file://LICENSE;md5=3f922b42ed0033fa0fd4cd3268f6429c \
 "
 
-DEPENDS = "glib-2.0 pango giflib tiff libxml2 jpeg python libtool uthash gnulib"
+DEPENDS = "glib-2.0 pango giflib tiff libxml2 jpeg python libtool uthash gnulib gettext-native"
 DEPENDS_append_class-target = " libxi"
 
 inherit autotools pkgconfig pythonnative distro_features_check gettext
-- 
2.15.1

[meta-oe][PATCH 2/3] freediameter: add dependency on virtual/kernel and use MACHINE_ARCH

[Martin Jansa]

* TUNE_PKGARCH cannot RRECOMMEND MACHINE specific kernel-modules
* without virtual/kernel dependency (which isn't really build time
  dependency) the QA check won't traverse the dependencies correctly
  and shows following errors:
  ERROR: QA Issue: freediameter rdepends on kernel-module-ipip, but it isn't a build dependency? [build-deps]
  ERROR: QA Issue: freediameter rdepends on kernel-module-sctp, but it isn't a build dependency? [build-deps]
  ERROR: QA Issue: freediameter rdepends on kernel-module-tipc, but it isn't a build dependency? [build-deps]
  ERROR: QA Issue: freediameter rdepends on kernel-module-udp-tunnel, but it isn't a build dependency? [build-deps]
* also change kernel-module dependencies from RDEPENDS to RRECOMMENDS
  because the kernel config might include these directly and then
  freediameter shouldn't fail to install

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-protocols/freediameter/freediameter_1.2.1.bb          | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb b/meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb
index 92cd24c3ae..c556eb48e8 100644
--- a/meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb
+++ b/meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb
@@ -7,7 +7,9 @@ Accounting needs."
 
 HOMEPAGE = "http://www.freediameter.net"
 
-DEPENDS = "flex bison cmake-native libgcrypt gnutls libidn lksctp-tools"
+DEPENDS = "flex bison cmake-native libgcrypt gnutls libidn lksctp-tools virtual/kernel"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 fd_pkgname = "freeDiameter"
 
@@ -121,8 +123,8 @@ FILES_${PN} += "${libdir}/${fd_pkgname}/*"
 
 RDEPENDS_${PN}  = "glib-2.0 gnutls libidn"
 RDEPENDS_${PN} += "openssl openssl-conf openssl-engines"
-RDEPENDS_${PN} += "kernel-module-tipc kernel-module-sctp" 
-RDEPENDS_${PN} += "kernel-module-udp-tunnel kernel-module-ipip"
+RRECOMMENDS_${PN} += "kernel-module-tipc kernel-module-sctp" 
+RRECOMMENDS_${PN} += "kernel-module-udp-tunnel kernel-module-ipip"
 RDEPENDS_${PN}-ptest = "cmake"
 
 INITSCRIPT_PACKAGES = "${PN}"
-- 
2.15.1

[meta-oe][PATCH 3/3] xorgxrdp: add distro_features_check for x11

[Martin Jansa]

* fixes: following errors in every world build:
  ERROR: Nothing PROVIDES 'xrdp' (but meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb DEPENDS on or otherwise requires it)
  xrdp was skipped: missing required distro feature 'x11' (not in DISTRO_FEATURES)
  ERROR: Required build target 'meta-world-pkgdata' has no buildable providers.
  Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'xorgxrdp', 'xrdp']

  ERROR: Nothing PROVIDES 'virtual/libx11' (but meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb DEPENDS on or otherwise requires it)
  libx11-diet PROVIDES virtual/libx11 but was skipped: missing required distro feature 'x11' (not in DISTRO_FEATURES)
  libx11 PROVIDES virtual/libx11 but was skipped: missing required distro feature 'x11' (not in DISTRO_FEATURES)
  ERROR: Required build target 'meta-world-pkgdata' has no buildable providers.
  Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'xorgxrdp', 'virtual/libx11']

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb b/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb
index 20cf45f06d..6150865795 100644
--- a/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb
+++ b/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb
@@ -1,15 +1,16 @@
 SUMMARY = "Xorg drivers for xrdp."
 
 LICENSE = "X11"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a2523660329fdca3d954c0a87390e007 \
-"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a2523660329fdca3d954c0a87390e007"
 
 inherit autotools pkgconfig 
 
 DEPENDS = "virtual/libx11 xserver-xorg xrdp nasm-native"
 
-SRC_URI = "git://github.com/neutrinolabs/xorgxrdp.git \
-           "
+inherit distro_features_check
+REQUIRED_DISTRO_FEATURES = "x11"
+
+SRC_URI = "git://github.com/neutrinolabs/xorgxrdp.git"
 
 SRCREV = "c122544f184d4031bbae1ad80fbab554c34a9427"
 
-- 
2.15.1

Re: [meta-oe][PATCH 3/3] xorgxrdp: add distro_features_check for x11

[Martin Jansa]

ping

On Fri, Jan 19, 2018 at 4:19 PM, Martin Jansa <martin.jansa@gmail.com>
wrote:

> * fixes: following errors in every world build:
>   ERROR: Nothing PROVIDES 'xrdp' (but meta-oe/recipes-support/xorg-xrdp/
> xorgxrdp_0.2.5.bb DEPENDS on or otherwise requires it)
>   xrdp was skipped: missing required distro feature 'x11' (not in
> DISTRO_FEATURES)
>   ERROR: Required build target 'meta-world-pkgdata' has no buildable
> providers.
>   Missing or unbuildable dependency chain was: ['meta-world-pkgdata',
> 'xorgxrdp', 'xrdp']
>
>   ERROR: Nothing PROVIDES 'virtual/libx11' (but
> meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb DEPENDS on or
> otherwise requires it)
>   libx11-diet PROVIDES virtual/libx11 but was skipped: missing required
> distro feature 'x11' (not in DISTRO_FEATURES)
>   libx11 PROVIDES virtual/libx11 but was skipped: missing required distro
> feature 'x11' (not in DISTRO_FEATURES)
>   ERROR: Required build target 'meta-world-pkgdata' has no buildable
> providers.
>   Missing or unbuildable dependency chain was: ['meta-world-pkgdata',
> 'xorgxrdp', 'virtual/libx11']
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb
> b/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb
> index 20cf45f06d..6150865795 100644
> --- a/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb
> +++ b/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb
> @@ -1,15 +1,16 @@
>  SUMMARY = "Xorg drivers for xrdp."
>
>  LICENSE = "X11"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=a2523660329fdca3d954c0a87390e007 \
> -"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=a2523660329fdca3d954c0a87390e007"
>
>  inherit autotools pkgconfig
>
>  DEPENDS = "virtual/libx11 xserver-xorg xrdp nasm-native"
>
> -SRC_URI = "git://github.com/neutrinolabs/xorgxrdp.git \
> -           "
> +inherit distro_features_check
> +REQUIRED_DISTRO_FEATURES = "x11"
> +
> +SRC_URI = "git://github.com/neutrinolabs/xorgxrdp.git"
>
>  SRCREV = "c122544f184d4031bbae1ad80fbab554c34a9427"
>
> --
> 2.15.1
>
>

Re: [meta-oe][PATCH 2/3] freediameter: add dependency on virtual/kernel and use MACHINE_ARCH

[Martin Jansa]

ping

On Fri, Jan 19, 2018 at 4:19 PM, Martin Jansa <martin.jansa@gmail.com>
wrote:

> * TUNE_PKGARCH cannot RRECOMMEND MACHINE specific kernel-modules
> * without virtual/kernel dependency (which isn't really build time
>   dependency) the QA check won't traverse the dependencies correctly
>   and shows following errors:
>   ERROR: QA Issue: freediameter rdepends on kernel-module-ipip, but it
> isn't a build dependency? [build-deps]
>   ERROR: QA Issue: freediameter rdepends on kernel-module-sctp, but it
> isn't a build dependency? [build-deps]
>   ERROR: QA Issue: freediameter rdepends on kernel-module-tipc, but it
> isn't a build dependency? [build-deps]
>   ERROR: QA Issue: freediameter rdepends on kernel-module-udp-tunnel, but
> it isn't a build dependency? [build-deps]
> * also change kernel-module dependencies from RDEPENDS to RRECOMMENDS
>   because the kernel config might include these directly and then
>   freediameter shouldn't fail to install
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  .../recipes-protocols/freediameter/freediameter_1.2.1.bb          | 8
> +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/meta-networking/recipes-protocols/freediameter/freedia
> meter_1.2.1.bb b/meta-networking/recipes-protocols/freediameter/freedia
> meter_1.2.1.bb
> index 92cd24c3ae..c556eb48e8 100644
> --- a/meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb
> +++ b/meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb
> @@ -7,7 +7,9 @@ Accounting needs."
>
>  HOMEPAGE = "http://www.freediameter.net"
>
> -DEPENDS = "flex bison cmake-native libgcrypt gnutls libidn lksctp-tools"
> +DEPENDS = "flex bison cmake-native libgcrypt gnutls libidn lksctp-tools
> virtual/kernel"
> +
> +PACKAGE_ARCH = "${MACHINE_ARCH}"
>
>  fd_pkgname = "freeDiameter"
>
> @@ -121,8 +123,8 @@ FILES_${PN} += "${libdir}/${fd_pkgname}/*"
>
>  RDEPENDS_${PN}  = "glib-2.0 gnutls libidn"
>  RDEPENDS_${PN} += "openssl openssl-conf openssl-engines"
> -RDEPENDS_${PN} += "kernel-module-tipc kernel-module-sctp"
> -RDEPENDS_${PN} += "kernel-module-udp-tunnel kernel-module-ipip"
> +RRECOMMENDS_${PN} += "kernel-module-tipc kernel-module-sctp"
> +RRECOMMENDS_${PN} += "kernel-module-udp-tunnel kernel-module-ipip"
>  RDEPENDS_${PN}-ptest = "cmake"
>
>  INITSCRIPT_PACKAGES = "${PN}"
> --
> 2.15.1
>
>

Re: [meta-oe][PATCH 2/3] freediameter: add dependency on virtual/kernel and use MACHINE_ARCH

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2762 bytes --]

On Wed, Feb 28, 2018 at 07:36:26PM +0100, Martin Jansa wrote:
> ping

ping2

this still isn't in origin/master-next nor contrib/stagging/master-next.

> On Fri, Jan 19, 2018 at 4:19 PM, Martin Jansa <martin.jansa@gmail.com>
> wrote:
> 
> > * TUNE_PKGARCH cannot RRECOMMEND MACHINE specific kernel-modules
> > * without virtual/kernel dependency (which isn't really build time
> >   dependency) the QA check won't traverse the dependencies correctly
> >   and shows following errors:
> >   ERROR: QA Issue: freediameter rdepends on kernel-module-ipip, but it
> > isn't a build dependency? [build-deps]
> >   ERROR: QA Issue: freediameter rdepends on kernel-module-sctp, but it
> > isn't a build dependency? [build-deps]
> >   ERROR: QA Issue: freediameter rdepends on kernel-module-tipc, but it
> > isn't a build dependency? [build-deps]
> >   ERROR: QA Issue: freediameter rdepends on kernel-module-udp-tunnel, but
> > it isn't a build dependency? [build-deps]
> > * also change kernel-module dependencies from RDEPENDS to RRECOMMENDS
> >   because the kernel config might include these directly and then
> >   freediameter shouldn't fail to install
> >
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >  .../recipes-protocols/freediameter/freediameter_1.2.1.bb          | 8
> > +++++---
> >  1 file changed, 5 insertions(+), 3 deletions(-)
> >
> > diff --git a/meta-networking/recipes-protocols/freediameter/freedia
> > meter_1.2.1.bb b/meta-networking/recipes-protocols/freediameter/freedia
> > meter_1.2.1.bb
> > index 92cd24c3ae..c556eb48e8 100644
> > --- a/meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb
> > +++ b/meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb
> > @@ -7,7 +7,9 @@ Accounting needs."
> >
> >  HOMEPAGE = "http://www.freediameter.net"
> >
> > -DEPENDS = "flex bison cmake-native libgcrypt gnutls libidn lksctp-tools"
> > +DEPENDS = "flex bison cmake-native libgcrypt gnutls libidn lksctp-tools
> > virtual/kernel"
> > +
> > +PACKAGE_ARCH = "${MACHINE_ARCH}"
> >
> >  fd_pkgname = "freeDiameter"
> >
> > @@ -121,8 +123,8 @@ FILES_${PN} += "${libdir}/${fd_pkgname}/*"
> >
> >  RDEPENDS_${PN}  = "glib-2.0 gnutls libidn"
> >  RDEPENDS_${PN} += "openssl openssl-conf openssl-engines"
> > -RDEPENDS_${PN} += "kernel-module-tipc kernel-module-sctp"
> > -RDEPENDS_${PN} += "kernel-module-udp-tunnel kernel-module-ipip"
> > +RRECOMMENDS_${PN} += "kernel-module-tipc kernel-module-sctp"
> > +RRECOMMENDS_${PN} += "kernel-module-udp-tunnel kernel-module-ipip"
> >  RDEPENDS_${PN}-ptest = "cmake"
> >
> >  INITSCRIPT_PACKAGES = "${PN}"
> > --
> > 2.15.1
> >
> >

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]