org.openmoko.dev: a22e00eca1cde64d3c8960b073ab7fac1ca4488f

oe at monotone.openmoko.org oe at monotone.openmoko.org
Tue Apr 8 21:31:21 CEST 2008 

revision:            a22e00eca1cde64d3c8960b073ab7fac1ca4488f
date:                2008-04-08T19:04:59
author:              john_lee at openembedded.org
branch:              org.openmoko.dev
changelog:
pkg tags support: first attempt
* add default PKG_TAGS in bitbake.conf
* package_ipk use PKG_TAGS in 'Tags' field
* ipkg-utils is updated to read and write Tags field.

manifest:
format_version "1"

new_manifest [f0455214c4c32fd9c7581fb5719d78d9dccade30]

old_revision [d82fe687640694ff8b4483475f1d8a2729ad965c]

patch "classes/package_ipk.bbclass"
 from [74c1d60c5b62a72c229c78bd65e5a0a0cf6486f1]
   to [242c256c8e04a09f38c2935be0882b1dee651600]

patch "conf/bitbake.conf"
 from [86fdaa0747310ea3f83914cbb3f62e00cd500cec]
   to [6ff864c9de6f26e92c7ab40bc46eddef334a4df4]

patch "packages/ipkg-utils/ipkg-utils/fields_tweaks.patch"
 from [bcce07d7c1acb2892a59f8be552f77994e17e98c]
   to [e66a4afa1f9a57edd969a060f0b99fc5bfb33e50]

patch "packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb"
 from [054d2acb3ff8284167043e5554633713ebdba2cf]
   to [2fffa65764b445bac4b2ec9f7b7b01d1b11a0651]

patch "packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb"
 from [53716efd0be08661e891166feef9298502f1ff73]
   to [6ca2e19f7611e0124df8a7be84f3cab7f69e1963]
-------------- next part --------------
#
#
# patch "classes/package_ipk.bbclass"
#  from [74c1d60c5b62a72c229c78bd65e5a0a0cf6486f1]
#    to [242c256c8e04a09f38c2935be0882b1dee651600]
# 
# patch "conf/bitbake.conf"
#  from [86fdaa0747310ea3f83914cbb3f62e00cd500cec]
#    to [6ff864c9de6f26e92c7ab40bc46eddef334a4df4]
# 
# patch "packages/ipkg-utils/ipkg-utils/fields_tweaks.patch"
#  from [bcce07d7c1acb2892a59f8be552f77994e17e98c]
#    to [e66a4afa1f9a57edd969a060f0b99fc5bfb33e50]
# 
# patch "packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb"
#  from [054d2acb3ff8284167043e5554633713ebdba2cf]
#    to [2fffa65764b445bac4b2ec9f7b7b01d1b11a0651]
# 
# patch "packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb"
#  from [53716efd0be08661e891166feef9298502f1ff73]
#    to [6ca2e19f7611e0124df8a7be84f3cab7f69e1963]
#
============================================================
--- classes/package_ipk.bbclass	74c1d60c5b62a72c229c78bd65e5a0a0cf6486f1
+++ classes/package_ipk.bbclass	242c256c8e04a09f38c2935be0882b1dee651600
@@ -203,20 +203,21 @@ python do_package_ipk () {
 		fields.append(["Architecture: %s\n", ['PACKAGE_ARCH']])
 		fields.append(["OE: %s\n", ['PN']])
 		fields.append(["Homepage: %s\n", ['HOMEPAGE']])
+		fields.append(["Tags: %s\n", ['PKG_TAGS']])
 
 		def pullData(l, d):
 			l2 = []
 			for i in l:
-				l2.append(bb.data.getVar(i, d, 1))
+				v = bb.data.getVar(i, d, 1)
+				if v is None:
+					raise KeyError(f)
+				l2.append(v)
 			return l2
 
 		ctrlfile.write("Package: %s\n" % pkgname)
 		# check for required fields
 		try:
 			for (c, fs) in fields:
-				for f in fs:
-					if bb.data.getVar(f, localdata) is None:
-						raise KeyError(f)
 				ctrlfile.write(c % tuple(pullData(fs, localdata)))
 		except KeyError:
 			(type, value, traceback) = sys.exc_info()
============================================================
--- conf/bitbake.conf	86fdaa0747310ea3f83914cbb3f62e00cd500cec
+++ conf/bitbake.conf	6ff864c9de6f26e92c7ab40bc46eddef334a4df4
@@ -143,6 +143,7 @@ HOMEPAGE = "unknown"
 LICENSE = "unknown"
 MAINTAINER = "OpenEmbedded Team <openembedded-devel at lists.openembedded.org>"
 HOMEPAGE = "unknown"
+PKG_TAGS = ""
 
 # Package dependencies and provides.
 
============================================================
--- packages/ipkg-utils/ipkg-utils/fields_tweaks.patch	bcce07d7c1acb2892a59f8be552f77994e17e98c
+++ packages/ipkg-utils/ipkg-utils/fields_tweaks.patch	e66a4afa1f9a57edd969a060f0b99fc5bfb33e50
@@ -6,9 +6,9 @@ Index: ipkg-utils/Makefile
 
 Index: ipkg-utils/Makefile
 ===================================================================
---- ipkg-utils.orig/Makefile	2007-06-13 22:45:47.000000000 +0100
-+++ ipkg-utils/Makefile	2007-06-13 22:46:50.000000000 +0100
-@@ -15,6 +15,8 @@ install: ${UTILS}
+--- ipkg-utils.orig/Makefile	2004-12-28 23:32:20.000000000 +0800
++++ ipkg-utils/Makefile	2008-04-08 18:42:36.000000000 +0800
+@@ -15,6 +15,8 @@
  	python setup.py install
  	chmod agu+rx ipkg-make-index
  	cp -f ipkg-make-index $(PREFIX)/bin
@@ -20,7 +20,7 @@ Index: ipkg-utils/ipkg-list-fields
 Index: ipkg-utils/ipkg-list-fields
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ipkg-utils/ipkg-list-fields	2007-06-13 22:43:32.000000000 +0100
++++ ipkg-utils/ipkg-list-fields	2008-04-08 18:42:36.000000000 +0800
 @@ -0,0 +1,13 @@
 +#!/usr/bin/python
 +
@@ -37,19 +37,20 @@ Index: ipkg-utils/ipkg.py
 +
 Index: ipkg-utils/ipkg.py
 ===================================================================
---- ipkg-utils.orig/ipkg.py	2007-06-13 22:44:50.000000000 +0100
-+++ ipkg-utils/ipkg.py	2007-06-13 22:39:44.000000000 +0100
-@@ -139,6 +139,9 @@ class Package:
+--- ipkg-utils.orig/ipkg.py	2008-04-08 18:42:35.000000000 +0800
++++ ipkg-utils/ipkg.py	2008-04-08 18:45:28.000000000 +0800
+@@ -139,6 +139,10 @@
          self.installed_size = None
          self.filename = None
          self.isdeb = 0
 +        self.homepage = None
 +        self.oe = None
 +        self.priority = None
++        self.tags = None
          self.fn = fn
  
  	if fn:
-@@ -211,7 +214,7 @@ class Package:
+@@ -212,7 +216,7 @@
                  elif self.__dict__.has_key(name):
                      self.__dict__[name] = value
  		else:
@@ -58,13 +59,14 @@ Index: ipkg-utils/ipkg.py
                      pass
  
                  if line and line[0] == '\n':
-@@ -402,6 +405,9 @@ class Package:
+@@ -413,6 +417,10 @@
          if self.filename: out = out + "Filename: %s\n" % (self.filename)
          if self.source: out = out + "Source: %s\n" % (self.source)
          if self.description: out = out + "Description: %s\n" % (self.description)
 +        if self.oe: out = out + "OE: %s\n" % (self.oe)
 +        if self.homepage: out = out + "HomePage: %s\n" % (self.homepage)
 +        if self.priority: out = out + "Priority: %s\n" % (self.priority)
++        if self.tags: out = out + "Tags: %s\n" % (self.tags)
  	out = out + "\n"
  
  	return out
============================================================
--- packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb	054d2acb3ff8284167043e5554633713ebdba2cf
+++ packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb	2fffa65764b445bac4b2ec9f7b7b01d1b11a0651
@@ -1,7 +1,7 @@ RDEPENDS = ""
 require ipkg-utils_${PV}.bb
 
 RDEPENDS = ""
-PR = "r16"
+PR = "r16.01"
 
 inherit native
 
============================================================
--- packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb	53716efd0be08661e891166feef9298502f1ff73
+++ packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb	6ca2e19f7611e0124df8a7be84f3cab7f69e1963
@@ -5,7 +5,7 @@ SRCDATE = "20050404"
 CONFLICTS = "ipkg-link"
 RDEPENDS = "python"
 SRCDATE = "20050404"
-PR = "r18"
+PR = "r18.01"
 
 SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
            file://ipkg-utils-fix.patch;patch=1 \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080408/7bdbcb1f/attachment.htm

More information about the commitlog mailing list