diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-05-25 16:28:33 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-05-25 16:28:33 +0000 |
| commit | 990b019a04cec33468b447bbe0166c7bd970f8ed (patch) | |
| tree | 19571aa6066d3e8d9e4db1eca440a2d6481234e0 /packages/meta | |
| parent | 6cc52db97e28988e3ada9746c5e3a910571bf76f (diff) | |
| parent | 9dae835ef374adaae20d75eba1109bb307c249bd (diff) | |
merge of '30fdc7758a8b7a86b7d59101eff9bd0011257d00'
and '9ecb8a369d6f726cbe984f8c91972f2c6bc34f1f'
Diffstat (limited to 'packages/meta')
| -rw-r--r-- | packages/meta/oplinux-packages.bb | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/packages/meta/oplinux-packages.bb b/packages/meta/oplinux-packages.bb index dcbbea9f95..62513c11cd 100644 --- a/packages/meta/oplinux-packages.bb +++ b/packages/meta/oplinux-packages.bb @@ -4,7 +4,7 @@ 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 \ |