diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-12-03 14:35:19 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-12-03 14:35:19 +0000 |
| commit | 3403c1c9030f97246acbb16d4214a47ed970fd41 (patch) | |
| tree | b51fa0493f9a55fa12ae2a7d3ad231461addbfb8 /packages/tasks | |
| parent | 11ff5f54d69edb71b3c5f4b7d7b56c59773b8a64 (diff) | |
| parent | 3d39e2bfc126173d0cf793eacd390dffbe6f1dae (diff) | |
merge of '5a2399197df237f82ef95027a49f2340a2303958'
and '87484c4eb87efff598e72698f1723e6aa9cd0111'
Diffstat (limited to 'packages/tasks')
| -rw-r--r-- | packages/tasks/task-base.bb | 64 | ||||
| -rw-r--r-- | packages/tasks/task-native-sdk.bb | 4 |
2 files changed, 32 insertions, 36 deletions
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index c0b39d34ff..bfb673293d 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r46" +PR = "r47" inherit task @@ -11,47 +11,43 @@ PACKAGES = ' \ task-distro-base \ task-machine-base \ \ - task-base-acpi \ - task-base-alsa \ - task-base-apm \ + ${@base_contains("MACHINE_FEATURES", "acpi", "task-base-acpi", "",d)} \ + ${@base_contains("MACHINE_FEATURES", "alsa", "task-base-alsa", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "apm", "task-base-apm", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "ext2", "task-base-ext2", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "irda", "task-base-irda", "",d)} \ + ${@base_contains("MACHINE_FEATURES", "keyboard", "task-base-keyboard", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "pci", "task-base-pci", "",d)} \ + ${@base_contains("MACHINE_FEATURES", "pcmcia", "task-base-pcmcia", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "phone", "task-base-phone", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "screen", "task-base-screen", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "serial", "task-base-serial", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "touchscreen", "task-base-touchscreen", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "usbgadget", "task-base-usbgadget", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "usbhost", "task-base-usbhost", "", d)} \ + \ + ${@base_contains("MACHINE_FEATURES", "uboot", "task-base-uboot", "",d)} \ + ${@base_contains("MACHINE_FEATURES", "redboot", "task-base-redboot", "",d)} \ + ${@base_contains("MACHINE_FEATURES", "apex", "task-base-apex", "",d)} \ + \ task-base-bluetooth \ - task-base-ext2 \ - task-base-irda \ - task-base-keyboard \ - task-base-pci \ - task-base-pcmcia \ - task-base-phone \ - task-base-screen \ - task-base-serial \ - task-base-touchscreen \ - task-base-usbgadget \ - task-base-usbhost \ task-base-wifi \ - task-base-uboot \ - task-base-redboot \ - task-base-apex \ \ - task-base-cramfs \ - task-base-ipsec \ - task-base-ipv6 \ - task-base-nfs \ - task-base-ppp \ - task-base-smbfs \ - task-base-raid \ - \ + ${@base_contains("DISTRO_FEATURES", "cramfs", "task-base-cramfs", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "ipsec", "task-base-ipsec", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "ipv6", "task-base-ipv6", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "nfs", "task-base-nfs", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "ppp", "task-base-ppp", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "smbfs", "task-base-smbfs", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "raid", "task-base-raid", "",d)} \ + \ ${@base_contains("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \ - ' + ' # # packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH # -PACKAGE_ARCH_task-base = "${MACHINE_ARCH}" -PACKAGE_ARCH_task-machine-base = "${MACHINE_ARCH}" -PACKAGE_ARCH_task-base-apm = "${MACHINE_ARCH}" -PACKAGE_ARCH_task-base-bluetooth = "${MACHINE_ARCH}" -PACKAGE_ARCH_task-base-irda = "${MACHINE_ARCH}" -PACKAGE_ARCH_task-base-pcmcia = "${MACHINE_ARCH}" -PACKAGE_ARCH_task-base-wifi = "${MACHINE_ARCH}" +PACKAGE_ARCH = "${MACHINE_ARCH}" # # linux-hotplug or none diff --git a/packages/tasks/task-native-sdk.bb b/packages/tasks/task-native-sdk.bb index d27a855c9d..b840254176 100644 --- a/packages/tasks/task-native-sdk.bb +++ b/packages/tasks/task-native-sdk.bb @@ -3,8 +3,8 @@ LICENSE = "MIT" DEPENDS = "gcc binutils make patch patchutils diffstat diffutils automake flex bison gawk sed grep" RDEPENDS = "gcc-symlinks g++-symlinks binutils-symlinks make libc6-dev \ flex flex-dev bison gawk sed grep autoconf automake make \ - patch patchutils diffstat diffutils libgcc-s-dev libstdc++-dev" -PR = "r1" + patch patchutils diffstat diffutils libstdc++-dev" +PR = "r2" ALLOW_EMPTY = "1" PACKAGES = "${PN}" |