[PATCH 0/3] meta: 3 fixes for nativesdk

[PATCH 0/3] meta: 3 fixes for nativesdk

[Robert Yang]

The following changes since commit 95ad5626296380358c8a502a3e04879dab653d78:

  build-appliance-image: Update to master head revision (2019-09-19 20:32:47 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/sdk
  http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/sdk

Robert Yang (3):
  net-tools: Fix installed-vs-shipped for nativesdk
  expect: Fix configure error for nativesdk
  apr: Fix configure error for nativesdk

 meta/recipes-devtools/expect/expect_5.45.4.bb        | 1 +
 meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 8 ++++++++
 meta/recipes-support/apr/apr_1.7.0.bb                | 2 ++
 3 files changed, 11 insertions(+)

-- 
2.7.4

[PATCH 1/3] net-tools: Fix installed-vs-shipped for nativesdk

[Robert Yang]

Fixed:
$ bitbake nativesdk-net-tools
ERROR: nativesdk-net-tools-1.60-26-r0 do_package: QA Issue: nativesdk-net-tools: Files/directories were installed but not shipped in any package:
  /usr
  /usr/share
  /usr/share/man
[snip]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
index b565fd0..0be9913 100644
--- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
+++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
@@ -109,6 +109,14 @@ do_install() {
 	fi
 }
 
+do_install_append_class-nativesdk() {
+    install -d ${D}${datadir}
+    src_dir="${D}${target_datadir}"
+    mv $src_dir/* ${D}${datadir}
+    par_dir=`dirname $src_dir`
+    rmdir $src_dir $par_dir
+}
+
 inherit update-alternatives
 
 base_sbindir_progs = "arp ifconfig ipmaddr iptunnel mii-tool nameif plipconfig rarp route slattach"
-- 
2.7.4

[PATCH 2/3] expect: Fix configure error for nativesdk

[Robert Yang]

Fixed:
$ bitbake nativesdk-expect
checking for Tcl public headers... configure: error: tcl.h not found.  Please specify its location with --with-tclinclude

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/expect/expect_5.45.4.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-devtools/expect/expect_5.45.4.bb b/meta/recipes-devtools/expect/expect_5.45.4.bb
index 96eacd9..de8e141 100644
--- a/meta/recipes-devtools/expect/expect_5.45.4.bb
+++ b/meta/recipes-devtools/expect/expect_5.45.4.bb
@@ -47,6 +47,7 @@ do_install_append() {
 # when building for the target.
 TCL_INCLUDE_PATH = ""
 TCL_INCLUDE_PATH_class-target = "--with-tclinclude=${STAGING_INCDIR}/tcl8.6"
+TCL_INCLUDE_PATH_class-nativesdk = "--with-tclinclude=${STAGING_INCDIR}/tcl8.6"
 
 EXTRA_OECONF += "--with-tcl=${STAGING_LIBDIR} \
                  --enable-shared \
-- 
2.7.4

[PATCH 3/3] apr: Fix configure error for nativesdk

[Robert Yang]

Fixed:
$ bitbake nativesdk-expect
buildconf: libtool not found.
           You need libtool version 1.4 or newer installed

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-support/apr/apr_1.7.0.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-support/apr/apr_1.7.0.bb b/meta/recipes-support/apr/apr_1.7.0.bb
index 09a65bf..02df068 100644
--- a/meta/recipes-support/apr/apr_1.7.0.bb
+++ b/meta/recipes-support/apr/apr_1.7.0.bb
@@ -3,6 +3,8 @@ HOMEPAGE = "http://apr.apache.org/"
 SECTION = "libs"
 DEPENDS = "util-linux"
 
+DEPENDS_class-nativesdk = "nativesdk-libtool"
+
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4dfd4cd216828c8cae5de5a12f3844c8 \
                     file://include/apr_lib.h;endline=15;md5=823b3d1a7225df8f7b68a69c3c2b4c71"
-- 
2.7.4

Re: [PATCH 1/3] net-tools: Fix installed-vs-shipped for nativesdk

[Ross Burton]

On 25/09/2019 10:30, Robert Yang wrote:
> Fixed:
> $ bitbake nativesdk-net-tools
> ERROR: nativesdk-net-tools-1.60-26-r0 do_package: QA Issue: nativesdk-net-tools: Files/directories were installed but not shipped in any package:
>    /usr
>    /usr/share
>    /usr/share/man
> [snip]
> 
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>   meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 8 ++++++++
>   1 file changed, 8 insertions(+)
> 
> diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
> index b565fd0..0be9913 100644
> --- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
> +++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
> @@ -109,6 +109,14 @@ do_install() {
>   	fi
>   }
>   
> +do_install_append_class-nativesdk() {
> +    install -d ${D}${datadir}
> +    src_dir="${D}${target_datadir}"
> +    mv $src_dir/* ${D}${datadir}
> +    par_dir=`dirname $src_dir`
> +    rmdir $src_dir $par_dir
> +}
> +

Isn't this solved better by fixing the currently hardcoded value in 
man/Makefile:

mandir=/usr/share/man

Ross

Re: [PATCH 2/3] expect: Fix configure error for nativesdk

[Ross Burton]

On 25/09/2019 10:30, Robert Yang wrote:
>   TCL_INCLUDE_PATH = ""
>   TCL_INCLUDE_PATH_class-target = "--with-tclinclude=${STAGING_INCDIR}/tcl8.6"
> +TCL_INCLUDE_PATH_class-nativesdk = "--with-tclinclude=${STAGING_INCDIR}/tcl8.6"

Did you test just always passing --with-tclinclude=... in all classes?

Ross

Re: [PATCH 3/3] apr: Fix configure error for nativesdk

[Ross Burton]

On 25/09/2019 10:30, Robert Yang wrote:
> Fixed:
> $ bitbake nativesdk-expect

You meant nativesdk-apr

>   DEPENDS = "util-linux"
>   
> +DEPENDS_class-nativesdk = "nativesdk-libtool"

As we're explicitly calling libtool, why not just DEPEND on libtool always?

Ross

Re: [PATCH 3/3] apr: Fix configure error for nativesdk

[Robert Yang]

On 9/25/19 5:48 PM, Ross Burton wrote:
> On 25/09/2019 10:30, Robert Yang wrote:
>> Fixed:
>> $ bitbake nativesdk-expect
> 
> You meant nativesdk-apr
> 
>>   DEPENDS = "util-linux"
>> +DEPENDS_class-nativesdk = "nativesdk-libtool"
> 
> As we're explicitly calling libtool, why not just DEPEND on libtool always?

Thanks, all of these are good suggestions, I will send a V2.

// Robert

> 
> Ross

Re: [PATCH 2/3] expect: Fix configure error for nativesdk

[Robert Yang]

On 9/25/19 5:47 PM, Ross Burton wrote:
> On 25/09/2019 10:30, Robert Yang wrote:
>>   TCL_INCLUDE_PATH = ""
>>   TCL_INCLUDE_PATH_class-target = "--with-tclinclude=${STAGING_INCDIR}/tcl8.6"
>> +TCL_INCLUDE_PATH_class-nativesdk = "--with-tclinclude=${STAGING_INCDIR}/tcl8.6"
> 
> Did you test just always passing --with-tclinclude=... in all classes?

I tried it just now, it didn't work for native, I will make it simpler in V2:

# Apparently the public Tcl headers are only in /usr/include/tcl8.6
# when building for the target and nativesdk.
TCL_INCLUDE_PATH = "--with-tclinclude=${STAGING_INCDIR}/tcl8.6"
TCL_INCLUDE_PATH_class-native = ""

// Robert

> 
> Ross