Move default PROVIDES (P, PF, PN, CATEGORY/P, CATEGORY/PF, CATEGORY/PN) into oe.conf...

diff --git a/bin/oemake b/bin/oemake
index ae19b4c..69a2047 100644 (file)
--- a/bin/oemake
+++ b/bin/oemake
@@ -273,13 +273,6 @@ for f in files:
                        pkg.append(data.getVar('PR', pkgdata[f], 1))
                        root = "%s/%s-%s-%s" % (pkg[0], pkg[1], pkg[2], pkg[3])
                        provides = []
-                       # w/ category
-                       provides.append("%s/%s-%s" % (pkg[0], pkg[1], pkg[2]))
-                       provides.append("%s/%s" % (pkg[0], pkg[1]))
-                       # w/o category
-                       provides.append("%s" % pkg[1])
-                       provides.append("%s-%s" % (pkg[1], pkg[2]))
-                       provides.append("%s-%s-%s" % (pkg[1], pkg[2], pkg[3]))
                        providestr = data.getVar("PROVIDES", pkgdata[f], 1)
                        if providestr is not None:
                                provides += providestr.split()

diff --git a/doc/TODO b/doc/TODO
index 2d3510e..f263253 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -3,7 +3,7 @@ TODO:
 [x] oe package
        [x] Define CONFIG_SITE to point to a "SYS" specific config.site.
 
-       [ ] .oe needs access to PROVIDES information that oemake is
+       [x] .oe needs access to PROVIDES information that oemake is
            currently populating.  Move the default set of the .oe
            provides into the .oe parser rather than oemake.
        [ ] Remove duplicated implementations, and convert everyone to the new