classes: Remove bitbake 1.6 compatibility code

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 9998982..32f7fcb 100644 (file)
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -864,54 +864,7 @@ def base_after_parse(d):
                 bb.data.setVar('PACKAGE_ARCH', "${MACHINE_ARCH}", d)
                 return
 
-#
-# Various backwards compatibility stuff to be removed
-# when we switch to bitbake 1.8.2+ as a minimum version
-#
-def base_oldbitbake_workarounds(d):
-    import bb
-    from bb import __version__
-    from distutils.version import LooseVersion
-
-    if (LooseVersion(__version__) > "1.8.0"):
-        return
-
-    pn = bb.data.getVar('PN', d, True)
-    srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, True)
-    if srcdate != None:
-        bb.data.setVar('SRCDATE', srcdate, d)
-    depends = bb.data.getVar('DEPENDS', d, False)
-    patchdeps = bb.data.getVar("PATCHTOOL", d, True)
-    if patchdeps:
-        patchdeps = "%s-native " % patchdeps
-        if not patchdeps in bb.data.getVar("PROVIDES", d, True):
-            depends = patchdeps + depends 
-    if bb.data.inherits_class('rootfs_ipk', d):
-        depends = "ipkg-native ipkg-utils-native fakeroot-native " + depends
-    if bb.data.inherits_class('rootfs_deb', d):
-        depends = "dpkg-native apt-native fakeroot-native " + depends
-    if bb.data.inherits_class('image', d):
-        depends = "makedevs-native " + depends
-        for type in (bb.data.getVar('IMAGE_FSTYPES', d, True) or "").split():
-            deps = bb.data.getVar('IMAGE_DEPENDS_%s' % type, d) or ""
-            if deps:
-                depends = depends + " %s" % deps
-        for dep in (bb.data.getVar('EXTRA_IMAGEDEPENDS', d, True) or "").split():
-            depends =  depends + " %s" % dep
-
-    packages = bb.data.getVar('PACKAGES', d, True)
-    if packages != '':
-        if bb.data.inherits_class('package_ipk', d):
-            depends = "ipkg-utils-native " + depends
-        if bb.data.inherits_class('package_deb', d):
-            depends = "dpkg-native " + depends
-        if bb.data.inherits_class('package', d):
-            depends = "${PACKAGE_DEPENDS} fakeroot-native " + depends
-
-    bb.data.setVar('DEPENDS', depends, d)
-
 python () {
-    base_oldbitbake_workarounds(d)
     base_after_parse(d)
 }
 

diff --git a/classes/debian.bbclass b/classes/debian.bbclass
index a0c78a2..403c38c 100644 (file)
--- a/classes/debian.bbclass
+++ b/classes/debian.bbclass
@@ -4,8 +4,7 @@ STAGING_PKGMAPS_DIR = "${STAGING_DIR}/pkgmaps/debian"
 # We therefore have to make sure we build all runtime packages
 # before building the current package to make the packages runtime
 # depends are correct
-BUILD_ALL_DEPS = "1"
-
+#
 # Better expressed as ensure all RDEPENDS package before we package
 # This means we can't have circular RDEPENDS/RRECOMMENDS
 do_package_write[rdeptask] = "do_package"

diff --git a/classes/image.bbclass b/classes/image.bbclass
index 91e6326..38e19df 100644 (file)
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -3,7 +3,6 @@ inherit rootfs_${IMAGE_PKGTYPE}
 PACKAGES = ""
 
 # We need to recursively follow RDEPENDS and RRECOMMENDS for images
-BUILD_ALL_DEPS = "1"
 do_rootfs[recrdeptask] = "do_package_write do_deploy do_populate_staging"
 
 # Images are generally built explicitly, do not need to be part of world.

diff --git a/classes/meta.bbclass b/classes/meta.bbclass
index f7d41ee..d35c40b 100644 (file)
--- a/classes/meta.bbclass
+++ b/classes/meta.bbclass
@@ -1,5 +1,4 @@
 
 PACKAGES = ""
 
-BUILD_ALL_DEPS = "1"
 do_build[recrdeptask] = "do_build"
\ No newline at end of file

diff --git a/classes/native.bbclass b/classes/native.bbclass
index 43000f9..16026f5 100644 (file)
--- a/classes/native.bbclass
+++ b/classes/native.bbclass
@@ -11,9 +11,6 @@ PACKAGE_ARCH = "${BUILD_ARCH}"
 # RPROVIDES becomes unnecessary.
 RPROVIDES = "${PN}"
 
-# Need to resolve package RDEPENDS as well as DEPENDS
-BUILD_ALL_DEPS = "1"
-
 # Break the circular dependency as a result of DEPENDS
 # in package.bbclass
 PACKAGE_DEPENDS = ""