Skip to contentSkip to conversation

SDK related misc changes

PATCH Applied Mark Hatle 2 participants 3 messages Jul 2, 2012 – Jul 3, 2012

lore
Share & tools
lore

Mark Hatle

author
#0 lore raw

v2 cover SDK related misc changes

Commit contents are the same, patch 1/2's commit message was rewritten to avoid confusion.

----

Two minor changes related to SDK generations. One is a bug fix, the other allows for better control over the per-file dependency generation.

The following changes since commit 64422f7c5da160050a5454817c8fa9d070104b34:

package.bbclass: Add missing PKGR, PKGV, PKGE and ALTERNATIVE variables from PACKAGEVARS (2012-07-02 16:44:57 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib mhatle/misc
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/misc

Mark Hatle (2):
libc-common: Allow -dbg package to append, and not just set package
variables
package.bbclass: Allow a package to skip per file dependency
generation

 meta/classes/libc-common.bbclass |    6 +++---
 meta/classes/package.bbclass     |    3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.3.4
author
#1 lore raw

PATCH v2 1/2 libc-common: Allow -dbg package to append, and not just set package variables

The libc-common attempts to rewrite the package information in a way similar to debian.bbclass. When it does this, it should be appending to the dependency variables (RPROVIDES, RREPLACES, and RCONFLICTS), instead of simply setting a hard coded value. Otherwise the lib package can not tailor the dependency variables to suite it's needs.

---
 meta/classes/libc-common.bbclass |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
meta/classes/libc-common.bbclass +3 -3
index 9b91f0a..8145d64 100644
@@ -29,7 +29,7 @@ python populate_packages_prepend () {
 		d.setVar('PKG_'+bpn+'-dev', 'libc6-dev')
 		d.setVar('PKG_'+bpn+'-dbg', 'libc6-dbg')
 		# For backward compatibility with old -dbg package
-		d.setVar('RPROVIDES_' + bpn + '-dbg', 'libc-dbg')
-		d.setVar('RCONFLICTS_' + bpn + '-dbg', 'libc-dbg')
-		d.setVar('RREPLACES_' + bpn + '-dbg', 'libc-dbg')
+		d.appendVar('RPROVIDES_' + bpn + '-dbg', ' libc-dbg')
+		d.appendVar('RCONFLICTS_' + bpn + '-dbg', ' libc-dbg')
+		d.appendVar('RREPLACES_' + bpn + '-dbg', ' libc-dbg')
 }
Signature · 1 line
1.7.3.4
Applied
#2 lore raw
In reply to Mark Hatle
Quoted 22 lines · Mark Hatle

Commit contents are the same, patch 1/2's commit message was rewritten to avoid confusion.

----

Two minor changes related to SDK generations. One is a bug fix, the other allows for better control over the per-file dependency generation.

The following changes since commit 64422f7c5da160050a5454817c8fa9d070104b34:

package.bbclass: Add missing PKGR, PKGV, PKGE and ALTERNATIVE variables from PACKAGEVARS (2012-07-02 16:44:57 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib mhatle/misc
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/misc

Mark Hatle (2):
libc-common: Allow -dbg package to append, and not just set package
variables
package.bbclass: Allow a package to skip per file dependency
generation

Quoted 4 lines
  meta/classes/libc-common.bbclass |    6 +++---
  meta/classes/package.bbclass     |    3 +++
  2 files changed, 6 insertions(+), 3 deletions(-)

Merged into OE-Core

Thanks
Sau!