Skip to contentSkip to conversation

Miscellaneous fixes

PATCH Applied Christopher Larson 2 participants 10 messages Aug 11, 2011 – Aug 12, 2011

lore
Share & tools
lore
#0 lore raw

cover Miscellaneous fixes

From: Chris Larson <[email protected]>

A variety of unrelated fixes I've had local for a while.

The following changes since commit a752b23767189f2678367e47ca0b41f49c56a631:

sstate: Add level 2 debug so its possible to see what sstate is doing (2011-08-11 17:19:51 +0100)

are available in the git repository at:
github:kergoth/oe-core misc-fixes

go here for github's branch comparison interface:
https://github.com/kergoth/oe-core/compare/master...misc-fixes

Chris Larson (7):
busybox: don't strip the main binary
insane: add linux-gnu to the platform data
nativesdk: inherit relocatable
sanity: shift the required utils into a variable
package: include SECTION in the pkgdata
package: allow setting a section for locale packages
cross: also empty PACKAGES_DYNAMIC

 meta/classes/cross.bbclass                  |    2 ++
 meta/classes/insane.bbclass                 |    3 +++
 meta/classes/nativesdk.bbclass              |    2 ++
 meta/classes/package.bbclass                |    6 ++++++
 meta/classes/sanity.bbclass                 |    4 +++-
 meta/recipes-core/busybox/busybox.inc       |    3 ++-
 meta/recipes-core/busybox/busybox_1.18.4.bb |    2 +-
 7 files changed, 19 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.4.1
#1 lore raw

PATCH 1/7 busybox: don't strip the main binary

From: Chris Larson <[email protected]>

With this, we get a useful busybox-dbg package.

---
 meta/recipes-core/busybox/busybox.inc       |    3 ++-
 meta/recipes-core/busybox/busybox_1.18.4.bb |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
meta/recipes-core/busybox/busybox.inc +2 -1
index 5eba0ca..d46c135 100644
@@ -120,7 +120,8 @@ do_configure () {
 
 do_compile() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-	base_do_compile
+	oe_runmake busybox_unstripped
+	cp busybox_unstripped busybox
 }
 
 do_install () {
meta/recipes-core/busybox/busybox_1.18.4.bb +1 -1
index d18af6f..b4681a4 100644
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://udhcpscript.patch \
Signature · 1 line
1.7.4.1
#2 lore raw

PATCH 2/7 insane: add linux-gnu to the platform data

In reply to Christopher Larson

From: Chris Larson <[email protected]>

---
 meta/classes/insane.bbclass |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
meta/classes/insane.bbclass +3 -0
index 0267fad..a660a06 100644
@@ -80,6 +80,9 @@ def package_qa_get_machine_dict():
                         "arm" :       (40,     0,    0,          True,          32),
                         "armeb" :     (40,     0,    0,          False,         32),
                       },
+            "linux-gnu" : {
+                        "powerpc":    (20,     0,    0,          False,         32),
+                      },
             "linux-gnuspe" : {
                         "powerpc":    (20,     0,    0,          False,         32),
                       },
Signature · 1 line
1.7.4.1
#3 lore raw

PATCH 3/7 nativesdk: inherit relocatable

In reply to Christopher Larson

From: Chris Larson <[email protected]>

---
 meta/classes/nativesdk.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
meta/classes/nativesdk.bbclass +2 -0
index 152d053..a495555 100644
@@ -1,3 +1,5 @@
+inherit relocatable
+
 # SDK packages are built either explicitly by the user,
 # or indirectly via dependency.  No need to be in 'world'.
 EXCLUDE_FROM_WORLD = "1"
Signature · 1 line
1.7.4.1
#4 lore raw

PATCH 4/7 sanity: shift the required utils into a variable

In reply to Christopher Larson

From: Chris Larson <[email protected]>

---
 meta/classes/sanity.bbclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
meta/classes/sanity.bbclass +3 -1
index 999e15d..d50c843 100644
@@ -2,6 +2,8 @@
 # Sanity check the users setup for common misconfigurations
 #
 
+SANITY_REQUIRED_UTILITIES ?= "patch diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk chrpath wget cpio"
+
 def raise_sanity_error(msg):
     bb.fatal(""" Poky's config sanity checker detected a potential misconfiguration.
     Either fix the cause of this error or at your own risk disable the checker (see sanity.conf).
@@ -213,7 +215,7 @@ def check_sanity(e):
     if not check_app_exists('${BUILD_PREFIX}g++', e.data):
         missing = missing + "C++ Compiler (%sg++)," % data.getVar("BUILD_PREFIX", e.data, True)
 
-    required_utilities = "patch diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk chrpath wget cpio"
+    required_utilities = e.data.getVar('SANITY_REQUIRED_UTILITIES', True)
 
     if "qemu-native" in assume_provided:
         if not check_app_exists("qemu-arm", e.data):
Signature · 1 line
1.7.4.1
#5 lore raw

PATCH 5/7 package: include SECTION in the pkgdata

In reply to Christopher Larson

From: Chris Larson <[email protected]>

---
 meta/classes/package.bbclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
meta/classes/package.bbclass +1 -0
index bb0ba68..0a954ef 100644
@@ -1051,6 +1051,7 @@ python emit_pkgdata() {
 		write_if_exists(sf, pkg, 'RSUGGESTS')
 		write_if_exists(sf, pkg, 'RREPLACES')
 		write_if_exists(sf, pkg, 'RCONFLICTS')
+		write_if_exists(sf, pkg, 'SECTION')
 		write_if_exists(sf, pkg, 'PKG')
 		write_if_exists(sf, pkg, 'ALLOW_EMPTY')
 		write_if_exists(sf, pkg, 'FILES')
Signature · 1 line
1.7.4.1
#6 lore raw

PATCH 6/7 package: allow setting a section for locale packages

In reply to Christopher Larson

From: Chris Larson <[email protected]>

---
 meta/classes/package.bbclass |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
meta/classes/package.bbclass +5 -0
index 0a954ef..100f465 100644
@@ -44,6 +44,8 @@ inherit prserv
 PKGD    = "${WORKDIR}/package"
 PKGDEST = "${WORKDIR}/packages-split"
 
+LOCALE_SECTION ?= ''
+
 # rpm is used for the per-file dependency identification
 PACKAGE_DEPENDS += "rpm-native"
 
@@ -401,6 +403,7 @@ python package_do_split_locales() {
 
 	summary = bb.data.getVar('SUMMARY', d, True) or pn
 	description = bb.data.getVar('DESCRIPTION', d, True) or "" 
+        locale_section = bb.data.getVar('LOCALE_SECTION', d, True)
 	for l in locales:
 		ln = legitimize_package_name(l)
 		pkg = pn + '-locale-' + ln
@@ -410,6 +413,8 @@ python package_do_split_locales() {
 		bb.data.setVar('RPROVIDES_' + pkg, '%s-locale %s-translation' % (pn, ln), d)
 		bb.data.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l), d)
 		bb.data.setVar('DESCRIPTION_' + pkg, '%s  This package contains language translation files for the %s locale.' % (description, l), d)
+		if locale_section:
+			bb.data.setVar('SECTION_' + pkg, locale_section, d)
 
 	bb.data.setVar('PACKAGES', ' '.join(packages), d)
 
Signature · 1 line
1.7.4.1
#7 lore raw

PATCH 7/7 cross: also empty PACKAGES_DYNAMIC

In reply to Christopher Larson

From: Chris Larson <[email protected]>

---
 meta/classes/cross.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
meta/classes/cross.bbclass +2 -0
index 519aa0d..5681ab9 100644
@@ -5,6 +5,8 @@ inherit relocatable
 EXCLUDE_FROM_WORLD = "1"
 
 PACKAGES = ""
+PACKAGES_DYNAMIC = ""
+PACKAGES_DYNAMIC_virtclass-native = ""
 
 HOST_ARCH = "${BUILD_ARCH}"
 HOST_VENDOR = "${BUILD_VENDOR}"
Signature · 1 line
1.7.4.1
#8 lore raw
In reply to Christopher Larson
Quoted 3 lines · Christopher Larson

are available in the git repository at:
 github:kergoth/oe-core misc-fixes

Erm, forgot to adjust this before sending, the url is
git://github.com/kergoth/oe-core (I use url insteadOf/pushInsteadOf in .gitconfig to use the above url).

Signature · 5 lines
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
Applied
#9 lore raw
In reply to Christopher Larson
Quoted 23 lines · Christopher Larson

From: Chris Larson<[email protected]>

A variety of unrelated fixes I've had local for a while.

The following changes since commit a752b23767189f2678367e47ca0b41f49c56a631:

sstate: Add level 2 debug so its possible to see what sstate is doing (2011-08-11 17:19:51 +0100)

are available in the git repository at:
github:kergoth/oe-core misc-fixes

go here for github's branch comparison interface:
https://github.com/kergoth/oe-core/compare/master...misc-fixes

Chris Larson (7):
busybox: don't strip the main binary
insane: add linux-gnu to the platform data
nativesdk: inherit relocatable
sanity: shift the required utils into a variable
package: include SECTION in the pkgdata
package: allow setting a section for locale packages
cross: also empty PACKAGES_DYNAMIC

Quoted 9 lines
  meta/classes/cross.bbclass                  |    2 ++
  meta/classes/insane.bbclass                 |    3 +++
  meta/classes/nativesdk.bbclass              |    2 ++
  meta/classes/package.bbclass                |    6 ++++++
  meta/classes/sanity.bbclass                 |    4 +++-
  meta/recipes-core/busybox/busybox.inc       |    3 ++-
  meta/recipes-core/busybox/busybox_1.18.4.bb |    2 +-
  7 files changed, 19 insertions(+), 3 deletions(-)

Merged into OE-Core

Thanks
Sau!