Skip to contentSkip to conversation

Hob collateral removal for OE-Core

PATCH New Paul Eggleton 1 participant 5 messages Mar 4, 2016

lore
Share & tools
lore

Paul Eggleton

author
#0 lore raw

cover Hob collateral removal for OE-Core

Drop a few things relating to Hob from OE-Core.

There's still a remaining reference in the build appliance; I've filed a bug to track that:

https://bugzilla.yoctoproject.org/show_bug.cgi?id=9210

The following changes since commit 092984669d8590627cfb188a0aa00244e22c4671:

e2fsprogs: do not enable non-stable features by default (2016-03-03 10:48:46 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/hob-remove-oecore
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/hob-remove-oecore

Paul Eggleton (4):
bblayers.conf.sample: remove BBLAYERS_NON_REMOVABLE conf/documentation.conf: remove BBLAYERS_NON_REMOVABLE classes/packageinfo: remove
scripts/hob: drop

 meta/classes/packageinfo.bbclass | 22 ----------------------
 meta/conf/bblayers.conf.sample   |  5 -----
 meta/conf/documentation.conf     |  1 -
 scripts/hob                      |  6 ------
 4 files changed, 34 deletions(-)
 delete mode 100644 meta/classes/packageinfo.bbclass
 delete mode 100755 scripts/hob
Signature · 1 line
2.5.0
author
#1 lore raw

PATCH 1/4 bblayers.conf.sample: remove BBLAYERS_NON_REMOVABLE

Hob was the only thing paying attention to this, and now Hob itself has been removed we can remove this as well.

Signed-off-by Paul Eggleton <[email protected]>
---
 meta/conf/bblayers.conf.sample | 5 -----
 1 file changed, 5 deletions(-)
meta/conf/bblayers.conf.sample +0 -5
index 46126df..c985f4f 100644
@@ -8,8 +8,3 @@ BBFILES ?= ""
 BBLAYERS ?= " \
   ##OEROOT##/meta \
   "
-
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  "
-
Signature · 1 line
2.5.0
author
#2 lore raw

PATCH 2/4 conf/documentation.conf: remove BBLAYERS_NON_REMOVABLE

In reply to Paul Eggleton

Hob was the only thing paying attention to this, and now Hob itself has been removed we can remove this as well.

Signed-off-by Paul Eggleton <[email protected]>
---
 meta/conf/documentation.conf | 1 -
 1 file changed, 1 deletion(-)
meta/conf/documentation.conf +0 -1
index 00a69da..4234d75 100644
@@ -90,7 +90,6 @@ BBFILES[doc] = "List of recipe files used by BitBake to build software."
 BBINCLUDELOGS[doc] = "Variable that controls how BitBake displays logs on build failure."
 BBINCLUDELOGS_LINES[doc] = "Amount of log lines printed on failure."
 BBLAYERS[doc] = "Lists the layers to enable during the build. This variable is defined in the bblayers.conf configuration file."
-BBLAYERS_NON_REMOVABLE[doc] = "Lists core layers that cannot be removed from the bblayers.conf file."
 BBMASK[doc] = "Prevents BitBake from processing specific recipes or recipe append files."
 BBPATH[doc] = "Used by BitBake to locate .bbclass and configuration files. This variable is analogous to the PATH variable."
 BBSERVER[doc] = "Points to the server that runs memory-resident BitBake."
Signature · 1 line
2.5.0
author
#3 lore raw

PATCH 3/4 classes/packageinfo: remove

In reply to Paul Eggleton

This class was only used by Hob, and since Hob has now been removed we can drop it as well.

Signed-off-by Paul Eggleton <[email protected]>
---
 meta/classes/packageinfo.bbclass | 22 ----------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 meta/classes/packageinfo.bbclass
meta/classes/packageinfo.bbclass deleted +0 -22
deleted file mode 100644
index 7d60ace..0000000
@@ -1,22 +0,0 @@
-python packageinfo_handler () {
-    import oe.packagedata
-    pkginfolist = []
-
-    pkgdata_dir = e.data.getVar("PKGDATA_DIR", True) + '/runtime/'
-    if os.path.exists(pkgdata_dir):
-        for root, dirs, files in os.walk(pkgdata_dir):
-            for pkgname in files:
-                if pkgname.endswith('.packaged'):
-                    pkgname = pkgname[:-9]
-                    pkgdatafile = root + pkgname
-                    try:
-                        sdata = oe.packagedata.read_pkgdatafile(pkgdatafile)
-                        sdata['PKG'] = pkgname
-                        pkginfolist.append(sdata)
-                    except Exception as e:
-                        bb.warn("Failed to read pkgdata file %s: %s: %s" % (pkgdatafile, e.__class__, str(e)))
-    bb.event.fire(bb.event.PackageInfo(pkginfolist), e.data)
-}
-
-addhandler packageinfo_handler
-packageinfo_handler[eventmask] = "bb.event.RequestPackageInfo"
Signature · 1 line
2.5.0
author
#4 lore raw

PATCH 4/4 scripts/hob: drop

In reply to Paul Eggleton

The Hob UI is gone from BitBake, so we should remove this shortcut script.

Signed-off-by Paul Eggleton <[email protected]>
---
 scripts/hob | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100755 scripts/hob
scripts/hob deleted +0 -6
deleted file mode 100755
index 8d33ab1..0000000
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-export BB_ENV_EXTRAWHITE="DISABLE_SANITY_CHECKS $BB_ENV_EXTRAWHITE"
-DISABLE_SANITY_CHECKS=1 bitbake -u hob $@
-
-ret=$?
-exit $ret
Signature · 1 line
2.5.0