[oe-commits] org.oe.dev packages/meta/oplinux-packages.bb : Fix "identation error" when used with bitbake 1.8 (thanks to zecke for the info)

ifaistos commit openembedded-commits at lists.openembedded.org
Thu May 24 19:44:47 UTC 2007


packages/meta/oplinux-packages.bb : Fix "identation error" when used with bitbake 1.8 (thanks to zecke for the info)
Varius typos fixed

Author: ifaistos at openembedded.org
Branch: org.openembedded.dev
Revision: ad877be1bbb8c338e6468b1c34ab69d89d54161b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ad877be1bbb8c338e6468b1c34ab69d89d54161b
Files:
1
packages/meta/oplinux-packages.bb
Diffs:

#
# mt diff -r882b6a3af2db48cf9b813c1da6649256fcec396d -rad877be1bbb8c338e6468b1c34ab69d89d54161b
#
# 
# 
# patch "packages/meta/oplinux-packages.bb"
#  from [56af752034de0e6e5dde6d4b6d94e158d34f6da6]
#    to [f020e9c1d3a786bfa6bff00cb43713a88924070e]
# 
============================================================
--- packages/meta/oplinux-packages.bb	56af752034de0e6e5dde6d4b6d94e158d34f6da6
+++ packages/meta/oplinux-packages.bb	f020e9c1d3a786bfa6bff00cb43713a88924070e
@@ -1,10 +1,10 @@ LICENSE = "MIT"
 # Meta package containing all the packages which build for OPLinux and OPLinux uclibc distro
 # Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
 DESCRIPTION = "Packages that are compatible with the OPLinux distro"
 HOMEPAGE = "http://www.digital-opsis/oplinux"
 LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
 PROVIDES += "${OPLINUX_IMAGENAME}-packages"
 
 EXCLUDE_FROM_WORLD = "1"
@@ -16,37 +16,38 @@ python __anonymous () {
 
     import bb
 
-#Get all the packages we can build/exist in OE
+   #Get all the packages we can build/exist in OE
     package_list =  bb.data.getVar('PACKAGES_LIST', d) or "none"
-    package_list = package_list.split()
- 
-#Get the packages that are broken on all architectures
+    package_list=package_list.split()
+
+   #Get the packages that are broken on all architectures
     broken_package_list =  bb.data.expand('${OPLINUX_BROKEN_PACKAGES}', d)
 
-#Get the arch we are building for
+   # Get the arch we are building for
     building_arch = bb.data.getVar('FEED_ARCH',d) 
 
-#Now add the broken packages list the ones that fail for the arch we build now
+   #Now add the broken packages list the ones that fail for the arch we build now
     if (building_arch=="i486") or (building_arch=="i586") or (building_arch=="i686"):
-        broken_package_list = broken_package_list + bb.data.expand('${OPLINUX_BROKEN_PACKAGES_ARCH_x8}', d)
+       broken_package_list = broken_package_list + bb.data.expand('${OPLINUX_BROKEN_PACKAGES_ARCH_x86}', d)
 
     elif  (building_arch=="ppc405"):
-        broken_package_list = broken_package_list + bb.data.expand('${OPLINUX_BROKEN_PACKAGES_ARCH_PPC}', d)
+           broken_package_list = broken_package_list + bb.data.expand('${OPLINUX_BROKEN_PACKAGES_ARCH_PPC}', d)
 
     elif (building_arch=="ppc603e"):       
-        broken_package_list = broken_package_list + bb.data.expand('${OPLINUX_BROKEN_PACKAGES_ARCH_POWERPC}', d)
+           broken_package_list = broken_package_list + bb.data.expand('${OPLINUX_BROKEN_PACKAGES_ARCH_POWERPC}', d)
 
+
     for chk_package in package_list :
         build_package="yes"
+        if chk_package in broken_package_list:
+           build_package="no"
+        else :
+              bb.data.setVar('DEPENDS', (bb.data.getVar('DEPENDS', d) + chk_package +" "), d)   
 
-    if chk_package in broken_package_list:
-        build_package="no"
-    else :
-        bb.data.setVar('DEPENDS', (bb.data.getVar('DEPENDS', d) + chk_package +" "), d)   
-
 #add the OPLinux extra packages to the DEPENDS list
     bb.data.setVar('DEPENDS', (bb.data.getVar('DEPENDS', d) + bb.data.getVar('OPLINUX_EXTRA_PACKAGES', d)), d)   
 
+
     bb.data.setVar('DEPENDS', (bb.data.getVar('DEPENDS', d) + "package-index"), d)   
 }
 
@@ -453,7 +454,7 @@ OPLINUX_BROKEN_PACKAGES_ARCH_x86 =" \
 "
 #
 #ppc405
-OPLINUX_BROKEN_PACKAGES_ARC_PPC = " \
+OPLINUX_BROKEN_PACKAGES_ARCH_PPC = " \
         aircrack \
         appweb \
         apt \






More information about the Openembedded-commits mailing list