Skip to contentSkip to conversation

fix some packages (kconfig-frontends/lttng-tools/lttng-ust/qemu) loss RDEPENDS on python

PATCH In review Hongxu Jia 5 participants 18 messages Nov 21, 2013 – Dec 5, 2013

lore
Share & tools
lore

Hongxu Jia

author
#0 lore raw

cover fix some packages (kconfig-frontends/lttng-tools/lttng-ust/qemu) loss RDEPENDS on python

The following changes since commit 725fae65810c477882f7f9d02561362b3f603db0:

bitbake: toasterui: fix typo (2013-11-20 14:06:49 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib hongxu/fix-add-python
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-add-python

Hongxu Jia (4):
kconfig-frontends: add python to kconfig-frontends's RDEPENDS
lttng-ust: add python to lttng-ust's RDEPENDS
lttng-tools: add PACKAGECONFIG to support --enable-python-bindings and
lttng-ust
qemu: add bash and python to qemu's RDEPENDS

 .../kconfig-frontends/kconfig-frontends_3.12.0.0.bb  |  1 +
 meta/recipes-devtools/qemu/qemu.inc                  |  1 +
 meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb       | 20 ++++++++++++++++----
 meta/recipes-kernel/lttng/lttng-ust_2.3.1.bb         |  1 +
 4 files changed, 19 insertions(+), 4 deletions(-)
Signature · 1 line
1.8.1.2
author
#1 lore raw

PATCH 1/4 kconfig-frontends: add python to kconfig-frontends's RDEPENDS

| Note: adding Smart RPM DB channel
|
| Note: to be installed:  kconfig-frontends@x86_64 run-postinsts@x86_64 kernel-modules@qemux86_64 packagegroup-core-boot@qemux86_64
| Loading cache...
| Updating cache...               ######################################## [100%]
|
| Computing transaction...error: Can't install kconfig-frontends-3.10.0.0-r0.0@x86_64: no package provides /usr/bin/python
|
| Saving cache...
|
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_rootfs (log file is located at tmp/work/qemux86_64-wrs-linux/wrlinux-image-glibc-small/1.0-r1/temp/do_rootfs/log.do_rootfs.30959)
---
 meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb +1 -0
index 1cebd64..f225af0 100644
@@ -11,6 +11,7 @@ LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=9b8cf60ff39767ff04b671fca8302408"
 SECTION = "devel"
 DEPENDS += "ncurses flex bison gperf pkgconfig-native"
+RDEPENDS_${PN} += "python"
 SRC_URI = "http://ymorin.is-a-geek.org/download/${BPN}/${BP}.tar.xz"
 
 SRC_URI[md5sum] = "b939280dcc83f8feabd87a1d5f9b00c2"
Signature · 1 line
1.8.1.2
author
#2 lore raw

PATCH 2/4 lttng-ust: add python to lttng-ust's RDEPENDS

In reply to Hongxu Jia
| Note: adding Smart RPM DB channel
|
| Note: to be installed:  run-postinsts@x86_64 kernel-modules@qemux86_64 packagegroup-core-boot@qemux86_64 lttng-ust@x86_64
| Loading cache...
| Updating cache...               ######################################## [100%]
|
| Computing transaction...error: Can't install lttng-ust-2:2.3.0-r0.0@x86_64: no package provides /usr/bin/python
|
| Saving cache...
|
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_rootfs (log file is located at tmp/work/qemux86_64-wrs-linux/wrlinux-image-glibc-small/1.0-r1/temp/do_rootfs/log.do_rootfs.13619)
---
 meta/recipes-kernel/lttng/lttng-ust_2.3.1.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-kernel/lttng/lttng-ust_2.3.1.bb +1 -0
index ae52ee8..228054e 100644
@@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c963eb366b781252b0bf0fdf1624d9e9 \
 inherit autotools
 
 DEPENDS = "liburcu util-linux"
+RDEPENDS_${PN} = "python"
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "lttng2-ust"
Signature · 1 line
1.8.1.2
author
#3 lore raw

PATCH 3/4 lttng-tools: add PACKAGECONFIG to support --enable-python-bindings and lttng-ust

In reply to Hongxu Jia

Add PACKAGECONFIG to support --enable-python-bindings Add PACKAGECONFIG to support lttng-ust

---
 meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)
meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb +16 -4
index 2f6e504..64b6e02 100644
@@ -9,9 +9,18 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
                     file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca"
 
-DEPENDS = "liburcu popt lttng-ust"
+DEPENDS = "liburcu popt"
 RDEPENDS_${PN}-ptest += "make"
 
+PYTHON_OPTION = "am_cv_python_pyexecdir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
+                 am_cv_python_pythondir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
+                 PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}' \
+"
+PACKAGECONFIG = "python lttng-ust"
+PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION}, \
+                         --disable-python-bindings, python swig-native"
+PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust, --disable-lttng-ust, lttng-ust"
+
 SRCREV = "5d985544a7ad54afa0514ea7f522a89d8d844860"
 PV = "v2.3.1"
 
@@ -26,12 +35,15 @@ inherit autotools ptest
 
 export KERNELDIR="${STAGING_KERNEL_DIR}"
 
-FILES_${PN} += "${libdir}/lttng/libexec/*"
-FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug"
+FILES_${PN} += "${libdir}/lttng/libexec/* ${libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
+FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug ${libdir}/python2.7/site-packages/.debug"
+FILES_${PN}-staticdev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a"
+FILES_${PN}-dev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la"
 
 # Since files are installed into ${libdir}/lttng/libexec we match 
 # the libexec insane test so skip it.
-INSANE_SKIP_${PN} = "libexec"
+# Python module needs to keep _lttng.so
+INSANE_SKIP_${PN} = "libexec dev-so"
 INSANE_SKIP_${PN}-dbg = "libexec"
 
 
Signature · 1 line
1.8.1.2
author
#4 lore raw

Re: [PATCH 3/4] lttng-tools: add PACKAGECONFIG to support --enable-python-bindings and lttng-ust

Quoted 15 lines · Hongxu Jia

Add PACKAGECONFIG to support --enable-python-bindings Add PACKAGECONFIG to support lttng-ust

---
  meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb | 20 ++++++++++++++++----
  1 file changed, 16 insertions(+), 4 deletions(-)
meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb +0 -0
index 2f6e504..64b6e02 100644
@@ -9,9 +9,18 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
                      file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                      file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca"

meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \ · line 19

Quoted 10 lines
meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb +6 -1
 
-DEPENDS = "liburcu popt lttng-ust"
+DEPENDS = "liburcu popt"
  RDEPENDS_${PN}-ptest += "make"
 
+PYTHON_OPTION = "am_cv_python_pyexecdir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
+                 am_cv_python_pythondir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
+                 PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}' \
+"
+PACKAGECONFIG = "python lttng-ust"

s/=/??=/

I have updated the git branch

git://git.pokylinux.org/poky-contrib hongxu/fix-add-python
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-add-python

//Hongxu

Quoted 26 lines
meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb +10 -3
+PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION}, \
+                         --disable-python-bindings, python swig-native"
+PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust, --disable-lttng-ust, lttng-ust"
+
  SRCREV = "5d985544a7ad54afa0514ea7f522a89d8d844860"
  PV = "v2.3.1"
 
@@ -26,12 +35,15 @@ inherit autotools ptest
 
  export KERNELDIR="${STAGING_KERNEL_DIR}"
 
-FILES_${PN} += "${libdir}/lttng/libexec/*"
-FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug"
+FILES_${PN} += "${libdir}/lttng/libexec/* ${libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
+FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug ${libdir}/python2.7/site-packages/.debug"
+FILES_${PN}-staticdev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a"
+FILES_${PN}-dev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la"
 
  # Since files are installed into ${libdir}/lttng/libexec we match
  # the libexec insane test so skip it.
-INSANE_SKIP_${PN} = "libexec"
+# Python module needs to keep _lttng.so
+INSANE_SKIP_${PN} = "libexec dev-so"
  INSANE_SKIP_${PN}-dbg = "libexec"
 
 
#5 lore raw

Re: [PATCH 3/4] lttng-tools: add PACKAGECONFIG to support --enable-python-bindings and lttng-ust

In reply to Hongxu Jia
Quoted 17 lines · Hongxu Jia

Add PACKAGECONFIG to support --enable-python-bindings Add PACKAGECONFIG to support lttng-ust

---
  meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb | 20 ++++++++++++++++----
  1 file changed, 16 insertions(+), 4 deletions(-)
meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb +0 -1
index 2f6e504..64b6e02 100644
@@ -9,9 +9,18 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
                      file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                      file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca"
 
-DEPENDS = "liburcu popt lttng-ust"

meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \ · line 21

Quoted 10 lines
meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb +8 -0
+DEPENDS = "liburcu popt"
  RDEPENDS_${PN}-ptest += "make"
 
+PYTHON_OPTION = "am_cv_python_pyexecdir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
+                 am_cv_python_pythondir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
+                 PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}' \
+"
+PACKAGECONFIG = "python lttng-ust"
+PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION}, \
+                         --disable-python-bindings, python swig-native"

This seems to bring in a new dependency on "swig", which is not part of OE-Core.

Sau!

Quoted 25 lines
meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb +8 -3
+PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust, --disable-lttng-ust, lttng-ust"
+
  SRCREV = "5d985544a7ad54afa0514ea7f522a89d8d844860"
  PV = "v2.3.1"
 
@@ -26,12 +35,15 @@ inherit autotools ptest
 
  export KERNELDIR="${STAGING_KERNEL_DIR}"
 
-FILES_${PN} += "${libdir}/lttng/libexec/*"
-FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug"
+FILES_${PN} += "${libdir}/lttng/libexec/* ${libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
+FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug ${libdir}/python2.7/site-packages/.debug"
+FILES_${PN}-staticdev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a"
+FILES_${PN}-dev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la"
 
  # Since files are installed into ${libdir}/lttng/libexec we match
  # the libexec insane test so skip it.
-INSANE_SKIP_${PN} = "libexec"
+# Python module needs to keep _lttng.so
+INSANE_SKIP_${PN} = "libexec dev-so"
  INSANE_SKIP_${PN}-dbg = "libexec"
 
 
author
#6 lore raw

Re: [PATCH 3/4] lttng-tools: add PACKAGECONFIG to support --enable-python-bindings and lttng-ust

Quoted 23 lines · Saul Wold
Quoted 22 lines · Hongxu Jia

Add PACKAGECONFIG to support --enable-python-bindings Add PACKAGECONFIG to support lttng-ust

---
  meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb | 20 
++++++++++++++++----
  1 file changed, 16 insertions(+), 4 deletions(-)
meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb +0 -0
index 2f6e504..64b6e02 100644
@@ -9,9 +9,18 @@ LIC_FILES_CHKSUM = 
 "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
 file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \

file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca"

meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb +1 -1
-DEPENDS = "liburcu popt lttng-ust"
+DEPENDS = "liburcu popt"
  RDEPENDS_${PN}-ptest += "make"
Quoted 12 lines

meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \ · line 21

Quoted 9 lines

+PYTHON_OPTION = "am_cv_python_pyexecdir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
+ am_cv_python_pythondir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
+ PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}' \
+"

meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb +3 -0
+PACKAGECONFIG = "python lttng-ust"
+PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION}, \
+                         --disable-python-bindings, python swig-native"

This seems to bring in a new dependency on "swig", which is not part of OE-Core.

Oh, The Windriver Linux have swig by default, we should disable python for OE-Core.

s/PACKAGECONFIG = "python lttng-ust" /PACKAGECONFIG ??= "lttng-ust"/

//Hongxu

Quoted 33 lines

Sau!

Quoted 30 lines

+PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust, --disable-lttng-ust, lttng-ust"

meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb +2 -2
+
  SRCREV = "5d985544a7ad54afa0514ea7f522a89d8d844860"
  PV = "v2.3.1"
@@ -26,12 +35,15 @@ inherit autotools ptest
 
  export KERNELDIR="${STAGING_KERNEL_DIR}"
 
-FILES_${PN} += "${libdir}/lttng/libexec/*"
-FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug"
+FILES_${PN} += "${libdir}/lttng/libexec/* 

${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" +FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug ${libdir}/python2.7/site-packages/.debug" +FILES_${PN}-staticdev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a" +FILES_${PN}-dev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la"

# Since files are installed into ${libdir}/lttng/libexec we match

  # the libexec insane test so skip it.
meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb +2 -1
-INSANE_SKIP_${PN} = "libexec"
+# Python module needs to keep _lttng.so
+INSANE_SKIP_${PN} = "libexec dev-so"
  INSANE_SKIP_${PN}-dbg = "libexec"
author
#7 lore raw

Re: [PATCH 3/4] lttng-tools: add PACKAGECONFIG to support --enable-python-bindings and lttng-ust

Quoted 38 lines · Hongxu Jia
Quoted 23 lines · Saul Wold
Quoted 22 lines · Hongxu Jia

Add PACKAGECONFIG to support --enable-python-bindings Add PACKAGECONFIG to support lttng-ust

---
  meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb | 20 
++++++++++++++++----
  1 file changed, 16 insertions(+), 4 deletions(-)
meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb +0 -0
index 2f6e504..64b6e02 100644
@@ -9,9 +9,18 @@ LIC_FILES_CHKSUM = 
 "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
 file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \

file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca"

meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb +1 -1
-DEPENDS = "liburcu popt lttng-ust"
+DEPENDS = "liburcu popt"
  RDEPENDS_${PN}-ptest += "make"
Quoted 13 lines
Quoted 10 lines

+PYTHON_OPTION = "am_cv_python_pyexecdir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
+ am_cv_python_pythondir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
+ PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}' \
+"

meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb +3 -0
+PACKAGECONFIG = "python lttng-ust"
+PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION}, \
+                         --disable-python-bindings, python 

swig-native"

This seems to bring in a new dependency on "swig", which is not part of OE-Core.

Quoted 5 lines

Oh, The Windriver Linux have swig by default, we should disable python for OE-Core.

s/PACKAGECONFIG = "python lttng-ust" /PACKAGECONFIG ??= "lttng-ust"/

Have updated the git tree to do this.

//Hongxu

Quoted 39 lines

//Hongxu

Quoted 23 lines

Sau!

Quoted 21 lines
meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb +3 -3
+PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust, 
--disable-lttng-ust, lttng-ust"
+
  SRCREV = "5d985544a7ad54afa0514ea7f522a89d8d844860"
  PV = "v2.3.1"
@@ -26,12 +35,15 @@ inherit autotools ptest
 
  export KERNELDIR="${STAGING_KERNEL_DIR}"
 
-FILES_${PN} += "${libdir}/lttng/libexec/*"
-FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug"
+FILES_${PN} += "${libdir}/lttng/libexec/* 

${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" +FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug ${libdir}/python2.7/site-packages/.debug" +FILES_${PN}-staticdev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a" +FILES_${PN}-dev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la"

Quoted 10 lines

meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb inherit autotools ptest · line 47

Quoted 9 lines

# Since files are installed into ${libdir}/lttng/libexec we match

  # the libexec insane test so skip it.
meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb +2 -1
-INSANE_SKIP_${PN} = "libexec"
+# Python module needs to keep _lttng.so
+INSANE_SKIP_${PN} = "libexec dev-so"
  INSANE_SKIP_${PN}-dbg = "libexec"

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

#8 lore raw

Re: [PATCH 3/4] lttng-tools: add PACKAGECONFIG to support --enable-python-bindings and lttng-ust

Quoted 43 lines · Hongxu Jia
Quoted 42 lines · Hongxu Jia
Quoted 40 lines · Saul Wold
Quoted 34 lines · Hongxu Jia

Add PACKAGECONFIG to support --enable-python-bindings Add PACKAGECONFIG to support lttng-ust

---
  meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb | 20
++++++++++++++++----
  1 file changed, 16 insertions(+), 4 deletions(-)
meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb +0 -0
index 2f6e504..64b6e02 100644
@@ -9,9 +9,18 @@ LIC_FILES_CHKSUM =
 "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
 file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \

file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca"

meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb +2 -1
-DEPENDS = "liburcu popt lttng-ust"
+DEPENDS = "liburcu popt"
  RDEPENDS_${PN}-ptest += "make"
 
+PYTHON_OPTION =

"am_cv_python_pyexecdir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
+ am_cv_python_pythondir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
+ PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}' \
+"

meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb +3 -0
+PACKAGECONFIG = "python lttng-ust"
+PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION}, \
+                         --disable-python-bindings, python
Quoted 1 line

swig-native"

This seems to bring in a new dependency on "swig", which is not part of OE-Core.

Quoted 8 lines
Quoted 5 lines

Oh, The Windriver Linux have swig by default, we should disable python for OE-Core.

s/PACKAGECONFIG = "python lttng-ust" /PACKAGECONFIG ??= "lttng-ust"/

Have updated the git tree to do this.

There still seems to be an issue with this patch, but it might be a problem with lttng-tool's configure.ac. When --disable-python-bindings is set, it still tries to check for SWIG (which you might have in your build).

Please verify this.

Thanks

Quoted 45 lines

//Hongxu

Quoted 39 lines

//Hongxu

Quoted 23 lines

Sau!

Quoted 21 lines
meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb +3 -3
+PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust,
--disable-lttng-ust, lttng-ust"
+
  SRCREV = "5d985544a7ad54afa0514ea7f522a89d8d844860"
  PV = "v2.3.1"
@@ -26,12 +35,15 @@ inherit autotools ptest
 
  export KERNELDIR="${STAGING_KERNEL_DIR}"
 
-FILES_${PN} += "${libdir}/lttng/libexec/*"
-FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug"
+FILES_${PN} += "${libdir}/lttng/libexec/*

${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" +FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug ${libdir}/python2.7/site-packages/.debug" +FILES_${PN}-staticdev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a" +FILES_${PN}-dev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la"

Quoted 10 lines

meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb inherit autotools ptest · line 47

Quoted 9 lines

# Since files are installed into ${libdir}/lttng/libexec we match

  # the libexec insane test so skip it.
meta/recipes-kernel/lttng/lttng-tools_2.3.1.bb +2 -1
-INSANE_SKIP_${PN} = "libexec"
+# Python module needs to keep _lttng.so
+INSANE_SKIP_${PN} = "libexec dev-so"
  INSANE_SKIP_${PN}-dbg = "libexec"

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

author
#9 lore raw

PATCH 4/4 qemu: add bash and python to qemu's RDEPENDS

In reply to Hongxu Jia
| Note: adding Smart RPM DB channel
|
| Note: to be installed:  qemu@x86_64 run-postinsts@x86_64 kernel-modules@qemux86_64 packagegroup-core-boot@qemux86_64
| Loading cache...
| Updating cache...               ######################################## [100%]
|
| Computing transaction...error: Can't install qemu-1.5.0-r0.0@x86_64: no package provides /usr/bin/python
|
| Saving cache...
|
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_rootfs (log file is located at tmp/work/qemux86_64-wrs-linux/wrlinux-image-glibc-small/1.0-r1/temp/do_rootfs/log.do_rootfs.21373)
---
 meta/recipes-devtools/qemu/qemu.inc | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-devtools/qemu/qemu.inc +1 -0
index 21ce489..3f3431d 100644
@@ -5,6 +5,7 @@ DEPENDS = "glib-2.0 zlib alsa-lib virtual/libx11 pixman dtc libsdl"
 DEPENDS_class-native = "zlib-native alsa-lib-native glib-2.0-native pixman-native dtc-native"
 DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-libsdl nativesdk-glib-2.0 nativesdk-pixman nativesdk-dtc"
 RDEPENDS_${PN}_class-nativesdk = "nativesdk-libsdl"
+RDEPENDS_${PN}_class-target += "bash python"
 
 require qemu-targets.inc
 inherit autotools
Signature · 1 line
1.8.1.2
#10 lore raw

Re: [PATCH 4/4] qemu: add bash and python to qemu's RDEPENDS

Why are you adding bash to qemu?

Sau!

Quoted 31 lines · Hongxu Jia
| Note: adding Smart RPM DB channel
|
| Note: to be installed:  qemu@x86_64 run-postinsts@x86_64 kernel-modules@qemux86_64 packagegroup-core-boot@qemux86_64
| Loading cache...
| Updating cache...               ######################################## [100%]
|
| Computing transaction...error: Can't install qemu-1.5.0-r0.0@x86_64: no package provides /usr/bin/python
|
| Saving cache...
|
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_rootfs (log file is located at tmp/work/qemux86_64-wrs-linux/wrlinux-image-glibc-small/1.0-r1/temp/do_rootfs/log.do_rootfs.21373)
---
  meta/recipes-devtools/qemu/qemu.inc | 1 +
  1 file changed, 1 insertion(+)
meta/recipes-devtools/qemu/qemu.inc +1 -0
index 21ce489..3f3431d 100644
@@ -5,6 +5,7 @@ DEPENDS = "glib-2.0 zlib alsa-lib virtual/libx11 pixman dtc libsdl"
  DEPENDS_class-native = "zlib-native alsa-lib-native glib-2.0-native pixman-native dtc-native"
  DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-libsdl nativesdk-glib-2.0 nativesdk-pixman nativesdk-dtc"
  RDEPENDS_${PN}_class-nativesdk = "nativesdk-libsdl"
+RDEPENDS_${PN}_class-target += "bash python"
 
  require qemu-targets.inc
  inherit autotools
#11 lore raw

Re: [PATCH 4/4] qemu: add bash and python to qemu's RDEPENDS

Quoted 2 lines · Saul Wold

Why are you adding bash to qemu?

My understanding is that there was a bash script that was added as well, once the python rdepends was resolved.

--Mark

Quoted 41 lines

Sau!

Quoted 24 lines · Hongxu Jia
| Note: adding Smart RPM DB channel
|
| Note: to be installed:  qemu@x86_64 run-postinsts@x86_64 kernel-modules@qemux86_64 packagegroup-core-boot@qemux86_64
| Loading cache...
| Updating cache...               ######################################## [100%]
|
| Computing transaction...error: Can't install qemu-1.5.0-r0.0@x86_64: no package provides /usr/bin/python
|
| Saving cache...
|
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_rootfs (log file is located at tmp/work/qemux86_64-wrs-linux/wrlinux-image-glibc-small/1.0-r1/temp/do_rootfs/log.do_rootfs.21373)
---
   meta/recipes-devtools/qemu/qemu.inc | 1 +
   1 file changed, 1 insertion(+)
meta/recipes-devtools/qemu/qemu.inc +0 -0
index 21ce489..3f3431d 100644

meta/recipes-devtools/qemu/qemu.inc DEPENDS = "glib-2.0 zlib alsa-lib virtual/libx11 pixman dtc libsdl" · line 11

Quoted 7 lines
meta/recipes-devtools/qemu/qemu.inc +1 -0
@@ -5,6 +5,7 @@ DEPENDS = "glib-2.0 zlib alsa-lib virtual/libx11 pixman dtc libsdl"
   DEPENDS_class-native = "zlib-native alsa-lib-native glib-2.0-native pixman-native dtc-native"
   DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-libsdl nativesdk-glib-2.0 nativesdk-pixman nativesdk-dtc"
   RDEPENDS_${PN}_class-nativesdk = "nativesdk-libsdl"
+RDEPENDS_${PN}_class-target += "bash python"
 
   require qemu-targets.inc
   inherit autotools

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

#12 lore raw

Re: [PATCH 4/4] qemu: add bash and python to qemu's RDEPENDS

Quoted 7 lines · Mark Hatle
Quoted 2 lines · Saul Wold

Why are you adding bash to qemu?

My understanding is that there was a bash script that was added as well, once the python rdepends was resolved.

Any chance of "de-bashing" the script?

Sau!

Quoted 59 lines

--Mark

Quoted 41 lines

Sau!

Quoted 37 lines · Hongxu Jia
| Note: adding Smart RPM DB channel
|
| Note: to be installed:  qemu@x86_64 run-postinsts@x86_64

kernel-modules@qemux86_64 packagegroup-core-boot@qemux86_64 | Loading cache...
| Updating cache... ######################################## [100%]
|
| Computing transaction...error: Can't install qemu-1.5.0-r0.0@x86_64: no package provides /usr/bin/python

|
| Saving cache...
|
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_rootfs (log file is located at

tmp/work/qemux86_64-wrs-linux/wrlinux-image-glibc-small/1.0-r1/temp/do_rootfs/log.do_rootfs.21373)

---
   meta/recipes-devtools/qemu/qemu.inc | 1 +
   1 file changed, 1 insertion(+)
meta/recipes-devtools/qemu/qemu.inc +0 -0
index 21ce489..3f3431d 100644
@@ -5,6 +5,7 @@ DEPENDS = "glib-2.0 zlib alsa-lib virtual/libx11

pixman dtc libsdl"
DEPENDS_class-native = "zlib-native alsa-lib-native
glib-2.0-native pixman-native dtc-native"
DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-libsdl
nativesdk-glib-2.0 nativesdk-pixman nativesdk-dtc"
RDEPENDS_${PN}_class-nativesdk = "nativesdk-libsdl"
+RDEPENDS_${PN}_class-target += "bash python"

Quoted 9 lines
Quoted 3 lines

require qemu-targets.inc
inherit autotools

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

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

author
#13 lore raw

Re: [PATCH 4/4] qemu: add bash and python to qemu's RDEPENDS

Quoted 7 lines · Saul Wold
Quoted 6 lines · Mark Hatle
Quoted 2 lines · Saul Wold

Why are you adding bash to qemu?

My understanding is that there was a bash script that was added as well, once the python rdepends was resolved.

Actually the bash script break the build first, and then the python's.

Quoted 2 lines
Quoted 1 line

Any chance of "de-bashing" the script?

I will try it.

//Hongxu

Quoted 66 lines

Sau!

Quoted 54 lines

--Mark

Quoted 42 lines

Sau!

Quoted 38 lines · Hongxu Jia
| Note: adding Smart RPM DB channel
|
| Note: to be installed:  qemu@x86_64 run-postinsts@x86_64

kernel-modules@qemux86_64 packagegroup-core-boot@qemux86_64 | Loading cache...
| Updating cache... ######################################## [100%]
|
| Computing transaction...error: Can't install qemu-1.5.0-r0.0@x86_64: no package provides /usr/bin/python

|
| Saving cache...
|
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_rootfs (log file is located at

tmp/work/qemux86_64-wrs-linux/wrlinux-image-glibc-small/1.0-r1/temp/do_rootfs/log.do_rootfs.21373)

---
   meta/recipes-devtools/qemu/qemu.inc | 1 +
   1 file changed, 1 insertion(+)
meta/recipes-devtools/qemu/qemu.inc +0 -0
index 21ce489..3f3431d 100644
@@ -5,6 +5,7 @@ DEPENDS = "glib-2.0 zlib alsa-lib virtual/libx11

pixman dtc libsdl"
DEPENDS_class-native = "zlib-native alsa-lib-native
glib-2.0-native pixman-native dtc-native"
DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-libsdl
nativesdk-glib-2.0 nativesdk-pixman nativesdk-dtc"
RDEPENDS_${PN}_class-nativesdk = "nativesdk-libsdl"
+RDEPENDS_${PN}_class-target += "bash python"

Quoted 9 lines
Quoted 3 lines

require qemu-targets.inc
inherit autotools

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

Quoted 6 lines

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

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

author
#14 lore raw

Re: [PATCH 4/4] qemu: add bash and python to qemu's RDEPENDS

In reply to Saul Wold
Quoted 10 lines · Saul Wold
Quoted 7 lines · Mark Hatle
Quoted 2 lines · Saul Wold

Why are you adding bash to qemu?

My understanding is that there was a bash script that was added as well, once the python rdepends was resolved.

Any chance of "de-bashing" the script?

Hi Saul,

How about to de-bash the script by the following patch:
...

meta/recipes-devtools/qemu/qemu.inc +0 -0
@@ -5,6 +5,7 @@ DEPENDS = "glib-2.0 zlib alsa-lib virtual/libx11 pixman dtc libsdl"
 DEPENDS_class-native = "zlib-native alsa-lib-native glib-2.0-native 

pixman-native dtc-native"
DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-libsdl
nativesdk-glib-2.0 nativesdk-pixman nativesdk-dtc"
RDEPENDS_${PN}_class-nativesdk = "nativesdk-libsdl"
+RDEPENDS_${PN}_class-target += "python"

require qemu-targets.inc
inherit autotools

@@ -76,6 +77,12 @@ do_install_append() {
                create_wrapper ${D}/${bindir}/qemu-mips \
                        QEMU_RESERVED_VA=0x0
        fi
+
+       # De-bashing the script
+       files=`grep "^\#\! *.*\/bash" ${D} -rl`
+       for f in $files; do

+ sed -i "s:^#! *.*/bash:#! /bin/sh:" $f
+ done
}
# END of qemu-mips workaround
...

The build test is ok.

//Hongxu

Quoted 65 lines

Sau!

Quoted 54 lines

--Mark

Quoted 42 lines

Sau!

Quoted 38 lines · Hongxu Jia
| Note: adding Smart RPM DB channel
|
| Note: to be installed:  qemu@x86_64 run-postinsts@x86_64

kernel-modules@qemux86_64 packagegroup-core-boot@qemux86_64 | Loading cache...
| Updating cache... ######################################## [100%]
|
| Computing transaction...error: Can't install qemu-1.5.0-r0.0@x86_64: no package provides /usr/bin/python

|
| Saving cache...
|
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_rootfs (log file is located at

tmp/work/qemux86_64-wrs-linux/wrlinux-image-glibc-small/1.0-r1/temp/do_rootfs/log.do_rootfs.21373)

---
   meta/recipes-devtools/qemu/qemu.inc | 1 +
   1 file changed, 1 insertion(+)
meta/recipes-devtools/qemu/qemu.inc +0 -0
index 21ce489..3f3431d 100644
@@ -5,6 +5,7 @@ DEPENDS = "glib-2.0 zlib alsa-lib virtual/libx11

pixman dtc libsdl"
DEPENDS_class-native = "zlib-native alsa-lib-native
glib-2.0-native pixman-native dtc-native"
DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-libsdl
nativesdk-glib-2.0 nativesdk-pixman nativesdk-dtc"
RDEPENDS_${PN}_class-nativesdk = "nativesdk-libsdl"
+RDEPENDS_${PN}_class-target += "bash python"

Quoted 9 lines
Quoted 3 lines

require qemu-targets.inc
inherit autotools

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

Quoted 6 lines

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

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

author
#15 lore raw

Re: [PATCH 4/4] qemu: add bash and python to qemu's RDEPENDS

Quoted 4 lines · Hongxu Jia
Quoted 3 lines · Saul Wold
Quoted 2 lines · Mark Hatle
Quoted 1 line · Saul Wold
Quoted 8 lines
Quoted 7 lines
Quoted 5 lines
Quoted 1 line

Why are you adding bash to qemu?

My understanding is that there was a bash script that was added as well, once the python rdepends was resolved.

Any chance of "de-bashing" the script?

Hi Saul,

The script could not be de-bashed, it was made by create_wrapper which is bashism:
Vim image/usr/bin/qemu-mips
...
#! /bin/bash
realpath=readlink -fn $0
export QEMU_RESERVED_VA=0x0
exec -a dirname $realpath/qemu-mips dirname $realpath/qemu-mips.real "$@"
...

The exec's -a option is bashism, so we need to add bash to RDEPENDS.

//Hongxu

Quoted 105 lines

Hi Saul,

How about to de-bash the script by the following patch:
...

meta/recipes-devtools/qemu/qemu.inc +0 -0
@@ -5,6 +5,7 @@ DEPENDS = "glib-2.0 zlib alsa-lib virtual/libx11 

pixman dtc libsdl"
DEPENDS_class-native = "zlib-native alsa-lib-native glib-2.0-native
pixman-native dtc-native"
DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-libsdl
nativesdk-glib-2.0 nativesdk-pixman nativesdk-dtc"
RDEPENDS_${PN}_class-nativesdk = "nativesdk-libsdl"

meta/recipes-devtools/qemu/qemu.inc +7 -0
+RDEPENDS_${PN}_class-target += "python"
 
 require qemu-targets.inc
 inherit autotools
@@ -76,6 +77,12 @@ do_install_append() {
                create_wrapper ${D}/${bindir}/qemu-mips \
                        QEMU_RESERVED_VA=0x0
        fi
+
+       # De-bashing the script
+       files=`grep "^\#\! *.*\/bash" ${D} -rl`
+       for f in $files; do
+                 sed -i "s:^#! *.*/bash:#! /bin/sh:" $f
+       done
 }
 # END of qemu-mips workaround
...

The build test is ok.

//Hongxu

Quoted 61 lines

Sau!

Quoted 54 lines

--Mark

Quoted 42 lines

Sau!

Quoted 38 lines · Hongxu Jia
| Note: adding Smart RPM DB channel
|
| Note: to be installed:  qemu@x86_64 run-postinsts@x86_64

kernel-modules@qemux86_64 packagegroup-core-boot@qemux86_64 | Loading cache...
| Updating cache... ######################################## [100%]
|
| Computing transaction...error: Can't install qemu-1.5.0-r0.0@x86_64: no package provides /usr/bin/python

|
| Saving cache...
|
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_rootfs (log file is located at

tmp/work/qemux86_64-wrs-linux/wrlinux-image-glibc-small/1.0-r1/temp/do_rootfs/log.do_rootfs.21373)

---
   meta/recipes-devtools/qemu/qemu.inc | 1 +
   1 file changed, 1 insertion(+)
meta/recipes-devtools/qemu/qemu.inc +0 -0
index 21ce489..3f3431d 100644
@@ -5,6 +5,7 @@ DEPENDS = "glib-2.0 zlib alsa-lib virtual/libx11

pixman dtc libsdl"
DEPENDS_class-native = "zlib-native alsa-lib-native
glib-2.0-native pixman-native dtc-native"
DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-libsdl
nativesdk-glib-2.0 nativesdk-pixman nativesdk-dtc"
RDEPENDS_${PN}_class-nativesdk = "nativesdk-libsdl"
+RDEPENDS_${PN}_class-target += "bash python"

Quoted 9 lines
Quoted 3 lines

require qemu-targets.inc
inherit autotools

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

Quoted 6 lines

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

Quoted 4 lines

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

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

#16 lore raw

Re: [PATCH 4/4] qemu: add bash and python to qemu's RDEPENDS

Quoted 12 lines · Hongxu Jia

Hi Saul,

The script could not be de-bashed, it was made by create_wrapper which is bashism:
Vim image/usr/bin/qemu-mips
...
#! /bin/bash
realpath=readlink -fn $0
export QEMU_RESERVED_VA=0x0
exec -a dirname $realpath/qemu-mips dirname $realpath/qemu-mips.real "$@"
...

Quoted 1 line

The exec's -a option is bashism, so we need to add bash to RDEPENDS.

1) Is the wrapper still necessary?

The comment above the do_install_append in the recipe:

# The following fragment will create a wrapper for qemu-mips user emulation

# binary in order to work around a segmentation fault issue. Basically, by
# default, the reserved virtual address space for 32-on-64 bit is set to 4GB.
# This will trigger a MMU access fault in the virtual CPU. With this change,
# the qemu-mips works fine.
# IMPORTANT: This piece needs to be removed once the root cause is fixed!

2) More generally, is -a generally necessary when exec'ing like this? Can't this be solved in another way?

Signature · 1 line
olofjn
#17 lore raw

Re: [PATCH 4/4] qemu: add bash and python to qemu's RDEPENDS

Quoted 17 lines · Olof Johansson
Quoted 12 lines · Hongxu Jia

Hi Saul,

The script could not be de-bashed, it was made by create_wrapper which is bashism:
Vim image/usr/bin/qemu-mips
...
#! /bin/bash
realpath=readlink -fn $0
export QEMU_RESERVED_VA=0x0
exec -a dirname $realpath/qemu-mips dirname $realpath/qemu-mips.real "$@"
...

Quoted 1 line

The exec's -a option is bashism, so we need to add bash to RDEPENDS.

1) Is the wrapper still necessary?

Quoted 8 lines

The comment above the do_install_append in the recipe:

# The following fragment will create a wrapper for qemu-mips user emulation

# binary in order to work around a segmentation fault issue. Basically, by
# default, the reserved virtual address space for 32-on-64 bit is set to 4GB.
# This will trigger a MMU access fault in the virtual CPU. With this change,
# the qemu-mips works fine.
# IMPORTANT: This piece needs to be removed once the root cause is fixed!

Someone could retest it but as far as I know the issue still exists.

Quoted 2 lines

2) More generally, is -a generally necessary when exec'ing like this? Can't this be solved in another way?

We've gone around in circles on this and yes, execing using -a is needed and if we don't do that we hit other bugs. See the history of the create_wrapper function.

Cheers,

Richard