[PATCH 0/3 v4][PULL] Hob: oe-core related changes

[PATCH 0/3 v4][PULL] Hob: oe-core related changes

[Dongxiao Xu]

Hi Richard,

This is the fourth pull request for Hob oe-core related changes.
There are some mistakes happen in the dxu4/hob-bitbake-changes-v3,
so please ignore that one and use this v4.

After some discussion, we found meta-hob should go to oe-core.

Please help to review and pull.

Note that this pull request has dependency on branch dxu4/hob-bitbake-changes-v3.

Changes from v2:
1. Remove the 'layers' from poky repo. We will have some indications in Hob GUI showing where to put new added layers.
2. Move dummy-image.bb and dummy-toolchain.bb to meta-hob layer.
3. Listen the specific event 'RequestPackageInfo' and then pass package information to GUI client.

Thanks,
Dongxiao


The following changes since commit 1d2697e6f00cc3771f39f5a7d4384a22d9696b16:
  Richard Purdie (1):
        multilib.conf: Clean up file and add missing entries for various dependencies

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib dxu4/hob-oecore-changes-v4
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/hob-oecore-changes-v4

Dongxiao Xu (2):
  packageinfo.bbclass: add a new bbclass to pass package information
  meta-hob: Add a new meta-hob layer

Shane Wang (1):
  package.bbclass: set package size into pkgdata for hob2's use

 meta-hob/COPYING.MIT                          |   17 ++++++++++++++
 meta-hob/conf/layer.conf                      |    9 +++++++
 meta-hob/recipes-core/images/dummy-image.bb   |    1 +
 meta-hob/recipes-core/meta/dummy-toolchain.bb |   10 ++++++++
 meta/classes/package.bbclass                  |    8 ++++++
 meta/classes/packageinfo.bbclass              |   30 +++++++++++++++++++++++++
 6 files changed, 75 insertions(+), 0 deletions(-)
 create mode 100644 meta-hob/COPYING.MIT
 create mode 100644 meta-hob/conf/layer.conf
 create mode 100644 meta-hob/recipes-core/images/dummy-image.bb
 create mode 100644 meta-hob/recipes-core/meta/dummy-toolchain.bb
 create mode 100644 meta/classes/packageinfo.bbclass

[PATCH 1/3] package.bbclass: set package size into pkgdata for hob2's use

[Dongxiao Xu]

From: Shane Wang <shane.wang@intel.com>

Write the size of a package into its pkgdata for hob2 to get the size
and show on the UI for image making.

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
 meta/classes/package.bbclass |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index f8f0a12..19616bd 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1057,6 +1057,13 @@ python emit_pkgdata() {
 			f.write('%s: %s\n' % (var, encode(val)))
 		return
 
+	def get_directory_size(dir):
+		if os.listdir(dir):
+			size = int(os.popen('du -sk %s' % dir).readlines()[0].split('\t')[0])
+		else:
+			size = 0
+		return size
+
 	packages = d.getVar('PACKAGES', True)
 	pkgdest = d.getVar('PKGDEST', 1)
 	pkgdatadir = d.getVar('PKGDESTWORK', True)
@@ -1105,6 +1112,7 @@ python emit_pkgdata() {
 		for dfile in (d.getVar('FILERDEPENDSFLIST_' + pkg, True) or "").split():
 			write_if_exists(sf, pkg, 'FILERDEPENDS_' + dfile)
 
+		sf.write('%s_%s: %s\n' % ('PKGSIZE', pkg, get_directory_size(pkgdest + "/%s" % pkg)))
 		sf.close()
 
 
-- 
1.7.0.4

[PATCH 2/3] packageinfo.bbclass: add a new bbclass to pass package information

[Dongxiao Xu]

packageinfo.bbclass is to pass the accurate package information to
clients (e.g. Hob), including PN, PV, RDEPENDS, PKGSIZE, etc.

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
 meta/classes/packageinfo.bbclass |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)
 create mode 100644 meta/classes/packageinfo.bbclass

diff --git a/meta/classes/packageinfo.bbclass b/meta/classes/packageinfo.bbclass
new file mode 100644
index 0000000..53551c4
--- /dev/null
+++ b/meta/classes/packageinfo.bbclass
@@ -0,0 +1,30 @@
+python packageinfo_handler () {
+    if isinstance(e, bb.event.RequestPackageInfo):
+        import oe.packagedata
+        pkginfolist = []
+        tmpdir = e.data.getVar('TMPDIR', True)
+        target_vendor = e.data.getVar('TARGET_VENDOR', True)
+        target_os = e.data.getVar('TARGET_OS', True)
+        package_archs = e.data.getVar('PACKAGE_ARCHS', True)
+        packaging = e.data.getVar('PACKAGE_CLASSES', True).split()[0].split('_')[1]
+        deploy_dir = e.data.getVar('DEPLOY_DIR', True) + '/' + packaging
+        for arch in package_archs.split():
+            pkgdata_dir = tmpdir + '/pkgdata/' + arch + target_vendor + '-' + target_os + '/runtime/'
+            if os.path.exists(pkgdata_dir):
+                for root, dirs, files in os.walk(pkgdata_dir):
+                    for pkgname in files:
+                        if pkgname.endswith('.packaged'):
+                            continue
+                        sdata = oe.packagedata.read_pkgdatafile(root + pkgname)
+                        sdata['PKG'] = pkgname
+                        pkgrename = sdata['PKG_%s' % pkgname]
+                        pkgv = sdata['PKGV']
+                        pkgr = sdata['PKGR']
+                        pkgname_path = deploy_dir + '/' + arch + '/' + pkgname + '-' + pkgv + '-' + pkgr + '.' + arch + '.' + packaging
+                        pkgrename_path = deploy_dir + '/' + arch + '/' + pkgrename + '-' + pkgv + '-' + pkgr + '.' + arch + '.' + packaging
+                        if os.path.exists(pkgname_path) or os.path.exists(pkgrename_path):
+                            pkginfolist.append(sdata)
+        bb.event.fire(bb.event.PackageInfo(pkginfolist), e.data)
+}
+
+addhandler packageinfo_handler
-- 
1.7.0.4

Re: [PATCH 2/3] packageinfo.bbclass: add a new bbclass to pass package information

[Koen Kooi]

Op 13 jan. 2012, om 12:38 heeft Dongxiao Xu het volgende geschreven:

> packageinfo.bbclass is to pass the accurate package information to
> clients (e.g. Hob), including PN, PV, RDEPENDS, PKGSIZE, etc.

How many classes for package/recipe info do we actually need?

Re: [PATCH 2/3] packageinfo.bbclass: add a new bbclass to pass package information

[Richard Purdie]

On Fri, 2012-01-13 at 13:05 +0100, Koen Kooi wrote:
> Op 13 jan. 2012, om 12:38 heeft Dongxiao Xu het volgende geschreven:
> 
> > packageinfo.bbclass is to pass the accurate package information to
> > clients (e.g. Hob), including PN, PV, RDEPENDS, PKGSIZE, etc.
> 
> How many classes for package/recipe info do we actually need?

I appreciate that the number of emails on the list on this topic make it
look like we have a lot of overlap.

If you look carefully at this patch you'll see that what this code does
is pull together information and generate a bitbake event containing
that information.

This is not something any other existing code does. It takes the data
from an existing data store and does not create any new one.

This is IMO a vast improvement over some of the earlier versions of
these patches so I'm planning to take this one.

Longer term we do need to reconcile buildhistory and packagedata as two
stores of very similar data but this patch doesn't complicate that
issue.

Cheers,

Richard

[PATCH 3/3] meta-hob: Add a new meta-hob layer

[Dongxiao Xu]

This new layer contains dummy-image.bb and dummy-toolchain.bb that
are used by hob to build images or toolchain.

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
 meta-hob/COPYING.MIT                          |   17 +++++++++++++++++
 meta-hob/conf/layer.conf                      |    9 +++++++++
 meta-hob/recipes-core/images/dummy-image.bb   |    1 +
 meta-hob/recipes-core/meta/dummy-toolchain.bb |   10 ++++++++++
 4 files changed, 37 insertions(+), 0 deletions(-)
 create mode 100644 meta-hob/COPYING.MIT
 create mode 100644 meta-hob/conf/layer.conf
 create mode 100644 meta-hob/recipes-core/images/dummy-image.bb
 create mode 100644 meta-hob/recipes-core/meta/dummy-toolchain.bb

diff --git a/meta-hob/COPYING.MIT b/meta-hob/COPYING.MIT
new file mode 100644
index 0000000..fb950dc
--- /dev/null
+++ b/meta-hob/COPYING.MIT
@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal 
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
+THE SOFTWARE.
diff --git a/meta-hob/conf/layer.conf b/meta-hob/conf/layer.conf
new file mode 100644
index 0000000..5f5eb82
--- /dev/null
+++ b/meta-hob/conf/layer.conf
@@ -0,0 +1,9 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH := "${BBPATH}:${LAYERDIR}"
+
+# We have a packages directory, add to BBFILES
+BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb"
+
+BBFILE_COLLECTIONS += "hob"
+BBFILE_PATTERN_hob := "^${LAYERDIR}/"
+BBFILE_PRIORITY_hob = "1"
diff --git a/meta-hob/recipes-core/images/dummy-image.bb b/meta-hob/recipes-core/images/dummy-image.bb
new file mode 100644
index 0000000..c8d6f49
--- /dev/null
+++ b/meta-hob/recipes-core/images/dummy-image.bb
@@ -0,0 +1 @@
+inherit image
diff --git a/meta-hob/recipes-core/meta/dummy-toolchain.bb b/meta-hob/recipes-core/meta/dummy-toolchain.bb
new file mode 100644
index 0000000..6535253
--- /dev/null
+++ b/meta-hob/recipes-core/meta/dummy-toolchain.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "dummy toolchain"
+LICENSE = "MIT"
+
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+IMAGETEST ?= "dummy"
+inherit populate_sdk imagetest-${IMAGETEST}
-- 
1.7.0.4

[PATCH 0/3][PULL] Hob2: OE-Core related changes

[Dongxiao Xu]

Hi Richard,

This is the hob2 related OE-Core changes. Please help to review and pull.

Compared with previous version:
 - packageinfo.bbclass: Fix the way to construct ipk/deb package names.
 - meta-hob: rename dummy-image and dummy-toolchain to hob-image and hob-toolchain

Note that this pull request depends on the following pull requests:
 - hob2-bitbake-changes

Thanks,
Dongxiao

The following changes since commit 55f72b98f606c1554eb6edd151292ffdfddf1384:

  texi2html: Fix for multilib (2012-02-22 23:01:45 +0000)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib dxu4/hob2-oecore-changes
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/hob2-oecore-changes

Dongxiao Xu (2):
  packageinfo.bbclass: add a new bbclass to pass package information
  meta-hob: Add a new meta-hob layer

Shane Wang (1):
  package.bbclass: set package size into pkgdata for hob2's use

 meta-hob/COPYING.MIT                        |   17 +++++++++++++
 meta-hob/conf/layer.conf                    |    9 +++++++
 meta-hob/recipes-core/images/hob-image.bb   |    1 +
 meta-hob/recipes-core/meta/hob-toolchain.bb |   10 +++++++
 meta/classes/package.bbclass                |    8 ++++++
 meta/classes/packageinfo.bbclass            |   35 +++++++++++++++++++++++++++
 6 files changed, 80 insertions(+), 0 deletions(-)
 create mode 100644 meta-hob/COPYING.MIT
 create mode 100644 meta-hob/conf/layer.conf
 create mode 100644 meta-hob/recipes-core/images/hob-image.bb
 create mode 100644 meta-hob/recipes-core/meta/hob-toolchain.bb
 create mode 100644 meta/classes/packageinfo.bbclass

-- 
1.7.4.1

[PATCH 2/3] packageinfo.bbclass: add a new bbclass to pass package information

[Dongxiao Xu]

packageinfo.bbclass is to pass the accurate package information to
clients (e.g. Hob), including PN, PV, RDEPENDS, PKGSIZE, etc.

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
 meta/classes/packageinfo.bbclass |   35 +++++++++++++++++++++++++++++++++++
 1 files changed, 35 insertions(+), 0 deletions(-)
 create mode 100644 meta/classes/packageinfo.bbclass

diff --git a/meta/classes/packageinfo.bbclass b/meta/classes/packageinfo.bbclass
new file mode 100644
index 0000000..46b9097
--- /dev/null
+++ b/meta/classes/packageinfo.bbclass
@@ -0,0 +1,35 @@
+python packageinfo_handler () {
+    if isinstance(e, bb.event.RequestPackageInfo):
+        import oe.packagedata
+        pkginfolist = []
+        tmpdir = e.data.getVar('TMPDIR', True)
+        target_vendor = e.data.getVar('TARGET_VENDOR', True)
+        target_os = e.data.getVar('TARGET_OS', True)
+        package_archs = e.data.getVar('PACKAGE_ARCHS', True)
+        packaging = e.data.getVar('PACKAGE_CLASSES', True).split()[0].split('_')[1]
+        deploy_dir = e.data.getVar('DEPLOY_DIR', True) + '/' + packaging
+        for arch in package_archs.split():
+            pkgdata_dir = tmpdir + '/pkgdata/' + arch + target_vendor + '-' + target_os + '/runtime/'
+            if os.path.exists(pkgdata_dir):
+                for root, dirs, files in os.walk(pkgdata_dir):
+                    for pkgname in files:
+                        if pkgname.endswith('.packaged'):
+                            continue
+                        sdata = oe.packagedata.read_pkgdatafile(root + pkgname)
+                        sdata['PKG'] = pkgname
+                        pkgrename = sdata['PKG_%s' % pkgname]
+                        pkgv = sdata['PKGV'].replace('-', '+')
+                        pkgr = sdata['PKGR']
+                        if os.path.exists(deploy_dir + '/' + arch + '/' + \
+                                          pkgname + '-' + pkgv + '-' + pkgr + '.' + arch + '.' + packaging) or \
+                           os.path.exists(deploy_dir + '/' + arch + '/' + \
+                                          pkgrename + '-' + pkgv + '-' + pkgr + '.' + arch + '.' + packaging) or \
+                           os.path.exists(deploy_dir + '/' + arch + '/' + \
+                                          pkgname + '_' + pkgv + '-' + pkgr + '_' + arch + '.' + packaging) or \
+                           os.path.exists(deploy_dir + '/' + arch + '/' + \
+                                          pkgrename + '_' + pkgv + '-' + pkgr + '_' + arch + '.' + packaging):
+                            pkginfolist.append(sdata)
+        bb.event.fire(bb.event.PackageInfo(pkginfolist), e.data)
+}
+
+addhandler packageinfo_handler
-- 
1.7.4.1

[PATCH 0/3 v3][PULL] Hob: oe-core related changes

[Dongxiao Xu]

Hi Richard,

This is the third pull request for Hob oe-core related changes.

Please help to review and pull.

Note that this pull request has dependency on branch dxu4/hob-bitbake-changes-v3.

Changes from v2:
1. Remove the 'layers' from poky repo. We will have some indications in Hob GUI showing where to put new added layers.
2. Move dummy-image.bb and dummy-toolchain.bb to meta-hob layer.
3. Listen the specific event 'RequestPackageInfo' and then pass package information to GUI client.

Thanks,
Dongxiao

The following changes since commit 1d2697e6f00cc3771f39f5a7d4384a22d9696b16:
  Richard Purdie (1):
        multilib.conf: Clean up file and add missing entries for various dependencies

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib dxu4/hob-oecore-changes-v3
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/hob-oecore-changes-v3

Dongxiao Xu (2):
  packageinfo.bbclass: add a new bbclass to pass package information
  meta-hob: Add a new meta-hob layer

Shane Wang (1):
  package.bbclass: set package size into pkgdata for hob2's use

 meta-hob/COPYING.MIT                          |   17 ++++++++++++++
 meta-hob/conf/layer.conf                      |    9 +++++++
 meta-hob/recipes-core/images/dummy-image.bb   |    1 +
 meta-hob/recipes-core/meta/dummy-toolchain.bb |   10 ++++++++
 meta/classes/package.bbclass                  |    8 ++++++
 meta/classes/packageinfo.bbclass              |   30 +++++++++++++++++++++++++
 6 files changed, 75 insertions(+), 0 deletions(-)
 create mode 100644 meta-hob/COPYING.MIT
 create mode 100644 meta-hob/conf/layer.conf
 create mode 100644 meta-hob/recipes-core/images/dummy-image.bb
 create mode 100644 meta-hob/recipes-core/meta/dummy-toolchain.bb
 create mode 100644 meta/classes/packageinfo.bbclass

[PATCH 2/3] packageinfo.bbclass: add a new bbclass to pass package information

[Dongxiao Xu]

packageinfo.bbclass is to pass the accurate package information to
clients (e.g. Hob), including PN, PV, RDEPENDS, PKGSIZE, etc.

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
 meta/classes/packageinfo.bbclass |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)
 create mode 100644 meta/classes/packageinfo.bbclass

diff --git a/meta/classes/packageinfo.bbclass b/meta/classes/packageinfo.bbclass
new file mode 100644
index 0000000..53551c4
--- /dev/null
+++ b/meta/classes/packageinfo.bbclass
@@ -0,0 +1,30 @@
+python packageinfo_handler () {
+    if isinstance(e, bb.event.RequestPackageInfo):
+        import oe.packagedata
+        pkginfolist = []
+        tmpdir = e.data.getVar('TMPDIR', True)
+        target_vendor = e.data.getVar('TARGET_VENDOR', True)
+        target_os = e.data.getVar('TARGET_OS', True)
+        package_archs = e.data.getVar('PACKAGE_ARCHS', True)
+        packaging = e.data.getVar('PACKAGE_CLASSES', True).split()[0].split('_')[1]
+        deploy_dir = e.data.getVar('DEPLOY_DIR', True) + '/' + packaging
+        for arch in package_archs.split():
+            pkgdata_dir = tmpdir + '/pkgdata/' + arch + target_vendor + '-' + target_os + '/runtime/'
+            if os.path.exists(pkgdata_dir):
+                for root, dirs, files in os.walk(pkgdata_dir):
+                    for pkgname in files:
+                        if pkgname.endswith('.packaged'):
+                            continue
+                        sdata = oe.packagedata.read_pkgdatafile(root + pkgname)
+                        sdata['PKG'] = pkgname
+                        pkgrename = sdata['PKG_%s' % pkgname]
+                        pkgv = sdata['PKGV']
+                        pkgr = sdata['PKGR']
+                        pkgname_path = deploy_dir + '/' + arch + '/' + pkgname + '-' + pkgv + '-' + pkgr + '.' + arch + '.' + packaging
+                        pkgrename_path = deploy_dir + '/' + arch + '/' + pkgrename + '-' + pkgv + '-' + pkgr + '.' + arch + '.' + packaging
+                        if os.path.exists(pkgname_path) or os.path.exists(pkgrename_path):
+                            pkginfolist.append(sdata)
+        bb.event.fire(bb.event.PackageInfo(pkginfolist), e.data)
+}
+
+addhandler packageinfo_handler
-- 
1.7.0.4