[PATCH 0/4] meta: 4 fixes

[PATCH 0/4] meta: 4 fixes

[Robert Yang]

The following changes since commit 58b45240739da210ef2fecea931c8b8daa9a4c07:

  epiphany: Add libxml2-native to DEPENDS (2016-02-18 22:55:12 +0000)

are available in the git repository at:

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

Robert Yang (4):
  image.bbclass: fix circular dependency when IMAGE_FSTYPES append
    hddimg
  recipe_sanity.bbclass: skip DataSmart in recipe_sanity_eh()
  terminal.bbclass: import oe.terminal for oe.terminal.prioritized()
  staging.bbclass: remove trail slash from SYSROOT_DESTDIR

 meta/classes/image-live.bbclass    |   11 ++++++++++-
 meta/classes/recipe_sanity.bbclass |    5 ++---
 meta/classes/staging.bbclass       |    2 +-
 meta/classes/terminal.bbclass      |    6 ++++--
 4 files changed, 17 insertions(+), 7 deletions(-)

-- 
1.7.9.5

[PATCH 1/4] image.bbclass: fix circular dependency when IMAGE_FSTYPES append hddimg

[Robert Yang]

Fixed:
IMAGE_FSTYPES_append = " hddimg"

$ bitbake -g core-image-minimal-initramfs
NOTE: Resolving any missing task queue dependencies
NOTE: Preparing RunQueue
ERROR: Task /path/to/core-image-minimal-initramfs.bb (do_bootimg) has circular dependency on /path/to/core-image-minimal-initramfs.bb (do_image_complete)
ERROR: Command execution failed: Exited with 1

This is because IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}", and if
IMAGE_FSTYPES append hddimg, then core-image-minimal-initramfs.bb would
be circular dependency:
do_bootimg -> do_image_complete -> do_bootimg.

Now we check and error out.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/classes/image-live.bbclass |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index aafa7d5..d2314aa 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -9,7 +9,6 @@ LABELS_append = " ${SYSLINUX_LABELS} "
 
 ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4"
 
-do_bootimg[depends] += "${INITRD_IMAGE}:do_image_complete"
 do_bootimg[depends] += "${PN}:do_image_ext4"
 
 inherit bootimg
@@ -18,3 +17,13 @@ IMAGE_TYPEDEP_live = "ext4"
 IMAGE_TYPEDEP_iso = "ext4"
 IMAGE_TYPEDEP_hddimg = "ext4"
 IMAGE_TYPES_MASKED += "live hddimg iso"
+
+python() {
+    image_b = d.getVar('IMAGE_BASENAME', True)
+    initrd_i = d.getVar('INITRD_IMAGE', True)
+    if image_b == initrd_i:
+        bb.error('INITRD_IMAGE %s cannot use image live, hddimg or iso.' % initrd_i)
+        bb.fatal('Check IMAGE_FSTYPES and INITRAMFS_FSTYPES settings.')
+    else:
+        d.appendVarFlag('do_bootimg', 'depends', ' %s:do_image_complete' % initrd_i)
+}
-- 
1.7.9.5

[PATCH 2/4] recipe_sanity.bbclass: skip DataSmart in recipe_sanity_eh()

[Robert Yang]

Fixed:
$ bitbake quilt -crecipe_sanity
  File "/path/to/poky/bitbake/lib/bb/siggen.py", line 261, in dump_sigtask
    p = pickle.dump(data, stream, -1)
PicklingError: Can't pickle <COWDict Level: 1 Current Keys: 0>:
attribute lookup bb.COW.C failed

This is because of:
cfgdata[k] = d.getVar(k, 0)

If d.getVar(k, 0) is a DataSmart (for example, BB_ORIGENV), it won't
have the attribute of bb.COW.C, so the error happend.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/classes/recipe_sanity.bbclass |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/classes/recipe_sanity.bbclass b/meta/classes/recipe_sanity.bbclass
index ee04e33..295611f 100644
--- a/meta/classes/recipe_sanity.bbclass
+++ b/meta/classes/recipe_sanity.bbclass
@@ -143,9 +143,8 @@ python recipe_sanity_eh () {
 
     cfgdata = {}
     for k in d.keys():
-    #for k in ["S", "PR", "PV", "PN", "DESCRIPTION", "LICENSE", "DEPENDS",
-    #          "SECTION"]:
-        cfgdata[k] = d.getVar(k, 0)
+        if not isinstance(d.getVar(k, 0), bb.data_smart.DataSmart):
+            cfgdata[k] = d.getVar(k, 0)
 
     d.setVar("__recipe_sanity_cfgdata", cfgdata)
     #d.setVar("__recipe_sanity_cfgdata", d)
-- 
1.7.9.5

[PATCH 3/4] terminal.bbclass: import oe.terminal for oe.terminal.prioritized()

[Robert Yang]

Fixed:
INHERIT += "typecheck"
$ bitbake -p
ERROR: Failure expanding expression auto none ${@" ".join(o.name for o in oe.terminal.prioritized())}
which triggered exception AttributeError: 'module' object has no attribute 'terminal'

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/classes/terminal.bbclass |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/classes/terminal.bbclass b/meta/classes/terminal.bbclass
index fd87cfe..9f4c24e 100644
--- a/meta/classes/terminal.bbclass
+++ b/meta/classes/terminal.bbclass
@@ -1,8 +1,7 @@
 OE_TERMINAL ?= 'auto'
 OE_TERMINAL[type] = 'choice'
 OE_TERMINAL[choices] = 'auto none \
-                        ${@" ".join(o.name \
-                                    for o in oe.terminal.prioritized())}'
+                        ${@oe_terminal_prioritized()}'
 
 OE_TERMINAL_EXPORTS += 'EXTRA_OEMAKE'
 OE_TERMINAL_EXPORTS[type] = 'list'
@@ -10,6 +9,9 @@ OE_TERMINAL_EXPORTS[type] = 'list'
 XAUTHORITY ?= "${HOME}/.Xauthority"
 SHELL ?= "bash"
 
+def oe_terminal_prioritized():
+    import oe.terminal
+    return " ".join(o.name for o in oe.terminal.prioritized())
 
 def emit_terminal_func(command, envdata, d):
     cmd_func = 'do_terminal'
-- 
1.7.9.5

[PATCH 4/4] staging.bbclass: remove trail slash from SYSROOT_DESTDIR

[Robert Yang]

Fixed path:
QA Issue: <foo> sysroot-destdir//usr/lib/ <foo>

Note the 2 slashes "//".

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/classes/staging.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 243bcdf..bc5dfa8 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -161,7 +161,7 @@ do_populate_sysroot[umask] = "022"
 addtask populate_sysroot after do_install
 
 SYSROOT_PREPROCESS_FUNCS ?= ""
-SYSROOT_DESTDIR = "${WORKDIR}/sysroot-destdir/"
+SYSROOT_DESTDIR = "${WORKDIR}/sysroot-destdir"
 SYSROOT_LOCK = "${STAGING_DIR}/staging.lock"
 
 # We clean out any existing sstate from the sysroot if we rerun configure
-- 
1.7.9.5

[PATCH 0/4] meta: 4 fixes

[Robert Yang]

The following changes since commit 2106a567820bad438ff78d54a49e3d87da428dcf:

  python3: python3: Fix build error x86->x86 (2019-06-19 13:15:55 +0100)

are available in the git repository at:

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

Robert Yang (4):
  linux-dummy: Add do_compile_kernelmodules
  make-mod-scripts: Depends on bison-native
  update-alternatives.bbclass: run update-alternatives firstly in
    postinst script
  gtk-icon-cache.bbclass: Depends on gtk+3

 meta/classes/gtk-icon-cache.bbclass                        | 14 ++++++++++----
 meta/classes/update-alternatives.bbclass                   |  7 +++++--
 meta/recipes-kernel/linux/linux-dummy.bb                   |  5 +++++
 .../make-mod-scripts/make-mod-scripts_1.0.bb               |  2 +-
 4 files changed, 21 insertions(+), 7 deletions(-)

-- 
2.7.4

[PATCH 0/4] meta: 4 fixes

[Robert Yang]

The following changes since commit e41c90b852167bbcb434da57b84280e855acae33:

  busybox: In defconfig enable ASH_CMDCMD for built-in 'command' (2017-04-12 15:18:42 +0100)

are available in the git repository at:

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

Robert Yang (4):
  binconfig.bbclass: fix typo in get_binconfig_mangle()
  apt: fix libdir path for apt.systemd.daily
  autogen: update libopts.m4's patch
  grep: do_configure: fix "Argument list too long"

 meta/classes/binconfig.bbclass                                        | 2 +-
 meta/recipes-devtools/apt/apt-package.inc                             | 4 +++-
 .../0001-config-libopts.m4-regenerate-it-from-config-libopts..patch   | 2 +-
 meta/recipes-extended/grep/grep_3.0.bb                                | 3 +++
 4 files changed, 8 insertions(+), 3 deletions(-)

-- 
2.10.2

[PATCH 0/4] meta: 4 fixes

[Robert Yang]

The following changes since commit 99f209a49a4390192b95184ff86bd6f973010111:

  layer.conf: bump version as error-report interface changed (2015-03-10 17:44:56 +0000)

are available in the git repository at:

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

Robert Yang (4):
  license.bbclass: set dirs for do_populate_lic_setscene
  mailx: disable parallel build
  kernelsrc.bbclass: fix KERNEL_VERSION
  pixbufcache.bbclass: add harfbuzz-native to PIXBUFCACHE_SYSROOT_DEP

 meta/classes/kernelsrc.bbclass            |    2 +-
 meta/classes/license.bbclass              |    2 ++
 meta/classes/pixbufcache.bbclass          |    7 ++++++-
 meta/recipes-extended/mailx/mailx_12.5.bb |    5 +++++
 4 files changed, 14 insertions(+), 2 deletions(-)

-- 
1.7.9.5

[PATCH 0/4] meta: 4 fixes

[Robert Yang]

The following changes since commit 2bb8b2abb689d91b7b7e28e6bd528747bde94dd2:

  license.bbclass: fix unexpected operator for LICENSE values with space (2015-02-17 22:29:27 +0000)

are available in the git repository at:

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

Robert Yang (4):
  meta: fix build with gettext 0.16.1
  gettext 0.16.1: disable native
  btrfs-tools: fix for parallel build
  bind: fix paralle issue

 .../bind/bind/bind-confgen-build-unix.o-once.patch |   44 ++++++++++++++++++++
 meta/recipes-connectivity/bind/bind_9.9.5.bb       |    1 +
 .../connman/connman-gnome_0.7.bb                   |    2 +-
 meta/recipes-core/gettext/gettext_0.16.1.bb        |    4 +-
 .../btrfs-tools/btrfs-tools/fix-parallel.patch     |   32 ++++++++++++++
 .../btrfs-tools/btrfs-tools_git.bb                 |    5 ++-
 .../gtk-engines/gtk-engines_2.20.2.bb              |    2 +-
 meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb   |    2 +-
 .../oprofile/oprofileui-server_git.bb              |    2 +-
 meta/recipes-kernel/oprofile/oprofileui_git.bb     |    2 +-
 meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb      |    2 +-
 meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb         |    2 +-
 meta/recipes-sato/puzzles/oh-puzzles_git.bb        |    2 +-
 meta/recipes-support/atk/at-spi2-core_2.14.1.bb    |    2 +-
 meta/recipes-support/libfm/libfm-extra_1.2.3.bb    |    2 +-
 meta/recipes-support/libfm/libfm_1.2.3.bb          |    2 +-
 meta/recipes-support/pinentry/pinentry_0.9.0.bb    |    2 +
 17 files changed, 95 insertions(+), 15 deletions(-)
 create mode 100644 meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch
 create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch

-- 
1.7.9.5

[PATCH 0/4] meta: 4 fixes

[Robert Yang]

Hello,

I had sent the patch "cpan-base.bbclass: avoid using xxx" before, now
send it again. The other 3 are new.

// Robert

The following changes since commit eaea05c88661a88a89fa6b139f7e6b243155d492:

  depmodwrapper-cross: Update to use STAGING_KERNEL_BUILDDIR (2015-01-17 17:05:25 +0000)

are available in the git repository at:

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

Robert Yang (4):
  cpan-base.bbclass: avoid using immmediate assignment for PERLLIBDIRS
  python3: fix for cross compiling
  gnutls: fix sed command
  perf: fix for rebuilding

 meta/classes/cpan-base.bbclass                     |    4 +-
 .../python/python3-native_3.3.3.bb                 |    2 +
 ...p.py-check-cross_compiling-when-get-FLAGS.patch |   50 ++++++++++++++++++
 .../sysconfig.py-add-_PYTHON_PROJECT_SRC.patch     |   54 ++++++++++++++++++++
 meta/recipes-devtools/python/python3_3.3.3.bb      |   10 ++--
 meta/recipes-kernel/perf/perf.bb                   |    3 ++
 .../gnutls/configure.ac-fix-sed-command.patch      |   31 +++++++++++
 meta/recipes-support/gnutls/gnutls_3.3.11.bb       |    1 +
 8 files changed, 149 insertions(+), 6 deletions(-)
 create mode 100644 meta/recipes-devtools/python/python3/setup.py-check-cross_compiling-when-get-FLAGS.patch
 create mode 100644 meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch
 create mode 100644 meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch

-- 
1.7.9.5

[PATCH 0/4] meta: 4 fixes

[Robert Yang]

The following changes since commit b61a2acc321489c3427f0afa3059486dc144a13b:

  bind: Update libxml2 check to make it deterministic. (2015-01-08 09:21:18 +0000)

are available in the git repository at:

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

Robert Yang (4):
  libical: use BPN in SRC_URI
  cups: remove fakeroot from do_install()
  man: remove fakeroot from do_install()
  portmap: remove obsolete lines

 meta/recipes-connectivity/portmap/portmap.inc      |   19 +------------------
 .../destdir-no-strip.patch                         |    0
 .../{portmap-6.0 => portmap}/tcpd-config.patch     |    0
 meta/recipes-connectivity/portmap/portmap_6.0.bb   |    2 +-
 meta/recipes-extended/cups/cups.inc                |    2 +-
 meta/recipes-extended/man/man_1.6g.bb              |    2 +-
 meta/recipes-support/libical/libical_1.0.0.bb      |    2 +-
 7 files changed, 5 insertions(+), 22 deletions(-)
 rename meta/recipes-connectivity/portmap/{portmap-6.0 => portmap}/destdir-no-strip.patch (100%)
 rename meta/recipes-connectivity/portmap/{portmap-6.0 => portmap}/tcpd-config.patch (100%)

-- 
1.7.9.5