[oe-commits] org.oe.dev merge of '21f54c80b635c2c7554e7423c333597138564f8d'
hrw commit
openembedded-commits at lists.openembedded.org
Mon Dec 3 13:11:52 UTC 2007
merge of '21f54c80b635c2c7554e7423c333597138564f8d'
and '3e1b85fb027d607397b8ae0cf0cbedfbd3f273a2'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: e604e228e5352abcedfc1416e27044c35e049d64
ViewMTN: http://monotone.openembedded.org/revision/info/e604e228e5352abcedfc1416e27044c35e049d64
Files:
1
packages/gtk-webcore/midori_0.0.12.bb
packages/perl/libxml-parser-perl_2.34.bb
packages/tasks/task-base.bb
packages/tasks/task-native-sdk.bb
Diffs:
#
# mt diff -r21f54c80b635c2c7554e7423c333597138564f8d -re604e228e5352abcedfc1416e27044c35e049d64
#
#
#
# add_file "packages/gtk-webcore/midori_0.0.12.bb"
# content [248eb3a40d4c7bdb50c581812cdbeaeb356a89fd]
#
============================================================
--- packages/gtk-webcore/midori_0.0.12.bb 248eb3a40d4c7bdb50c581812cdbeaeb356a89fd
+++ packages/gtk-webcore/midori_0.0.12.bb 248eb3a40d4c7bdb50c581812cdbeaeb356a89fd
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \
+ "
+
+
#
# mt diff -r3e1b85fb027d607397b8ae0cf0cbedfbd3f273a2 -re604e228e5352abcedfc1416e27044c35e049d64
#
#
#
# patch "packages/perl/libxml-parser-perl_2.34.bb"
# from [9fe85cf758444af63185e9cfaffa8e9c253451ce]
# to [df4c8dc1823ab29c423c8b3de34f375a43450cb0]
#
# patch "packages/tasks/task-base.bb"
# from [6f33e4ea8083953d24993dca089ae71114f8a639]
# to [b2823ec6e2856d6da043897a85b48aed6eb6d596]
#
# patch "packages/tasks/task-native-sdk.bb"
# from [7a8357c0638184a616c5933e9d5a31908b09a3e0]
# to [e9aff3af03f3423a34dcb2853582e08fdd66a6a5]
#
============================================================
--- packages/perl/libxml-parser-perl_2.34.bb 9fe85cf758444af63185e9cfaffa8e9c253451ce
+++ packages/perl/libxml-parser-perl_2.34.bb df4c8dc1823ab29c423c8b3de34f375a43450cb0
@@ -1,7 +1,7 @@ LICENSE = "Artistic"
SECTION = "libs"
LICENSE = "Artistic"
-DEPENDS += "expat-native"
-PR = "r10"
+DEPENDS += "expat expat-native"
+PR = "r11"
SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz"
============================================================
--- packages/tasks/task-base.bb 6f33e4ea8083953d24993dca089ae71114f8a639
+++ packages/tasks/task-base.bb b2823ec6e2856d6da043897a85b48aed6eb6d596
@@ -1,57 +1,54 @@ DESCRIPTION = "Merge machine and distro
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r46"
+PR = "r47"
inherit task
DEPENDS = "task-boot"
PROVIDES = "${PACKAGES}"
PACKAGES = ' \
- task-base \
- task-base-extended \
- task-distro-base \
- task-machine-base \
+ task-base task-base-dev task-base-dbg\
+ task-base-extended task-base-extended-dev task-base-extended-dbg \
+ task-distro-base task-distro-base-dev task-distro-base-dbg \
+ task-machine-base task-machine-base-dev task-machine-base-dbg \
\
- task-base-acpi \
- task-base-alsa \
- task-base-apm \
- 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 \
+ ${@base_contains("MACHINE_FEATURES", "acpi", "task-base-acpi task-base-acpi-dev task-base-acpi-dbg", "",d)} \
+ ${@base_contains("MACHINE_FEATURES", "alsa", "task-base-alsa task-base-alsa-dev task-base-alsa-dbg", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "apm", "task-base-apm task-base-apm-dev task-base-apm-dbg", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "ext2", "task-base-ext2 task-base-ext2-dev task-base-ext2-dbg", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "irda", "task-base-irda task-base-irda-dev task-base-irda-dbg", "",d)} \
+ ${@base_contains("MACHINE_FEATURES", "keyboard", "task-base-keyboard task-base-keyboard-dev task-base-keyboard-dbg", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "pci", "task-base-pci task-base-pci-dev task-base-pci-dbg", "",d)} \
+ ${@base_contains("MACHINE_FEATURES", "pcmcia", "task-base-pcmcia task-base-pcmcia-dev task-base-pcmcia-dbg", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "phone", "task-base-phone task-base-phone-dev task-base-phone-dbg", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "screen", "task-base-screen task-base-screen-dev task-base-screen-dbg", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "serial", "task-base-serial task-base-serial-dev task-base-serial-dbg", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "touchscreen", "task-base-touchscreen task-base-touchscreen-dev task-base-touchscreen-dbg", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "usbgadget", "task-base-usbgadget task-base-usbgadget-dev task-base-usbgadget-dbg", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "usbhost", "task-base-usbhost task-base-usbhost-dev task-base-usbhost-dbg", "", d)} \
\
- task-base-cramfs \
- task-base-ipsec \
- task-base-ipv6 \
- task-base-nfs \
- task-base-ppp \
- task-base-smbfs \
- task-base-raid \
- \
+ ${@base_contains("MACHINE_FEATURES", "uboot", "task-base-uboot task-base-uboot-dev task-base-uboot-dbg", "",d)} \
+ ${@base_contains("MACHINE_FEATURES", "redboot", "task-base-redboot task-base-redboot-dev task-base-redboot-dbg", "",d)} \
+ ${@base_contains("MACHINE_FEATURES", "apex", "task-base-apex task-base-apex-dev task-base-apex-dbg", "",d)} \
+ \
+ task-base-bluetooth task-base-bluetooth-dev task-base-bluetooth-dbg \
+ task-base-wifi task-base-wifi-dev task-base-wifi-dbg \
+ \
+ \
+ ${@base_contains("DISTRO_FEATURES", "cramfs", "task-base-cramfs task-base-cramfs-dev task-base-cramfs-dbg", "", d)} \
+ ${@base_contains("DISTRO_FEATURES", "ipsec", "task-base-ipsec task-base-ipsec-dev task-base-ipsec-dbg", "", d)} \
+ ${@base_contains("DISTRO_FEATURES", "ipv6", "task-base-ipv6 task-base-ipv6-dev task-base-ipv6-dbg", "", d)} \
+ ${@base_contains("DISTRO_FEATURES", "nfs", "task-base-nfs task-base-nfs-dev task-base-nfs-dbg", "", d)} \
+ ${@base_contains("DISTRO_FEATURES", "ppp", "task-base-ppp task-base-ppp-dev task-base-ppp-dbg", "", d)} \
+ ${@base_contains("DISTRO_FEATURES", "smbfs", "task-base-smbfs task-base-smbfs-dev task-base-smbfs-dbg", "", d)} \
+ ${@base_contains("DISTRO_FEATURES", "raid", "task-base-raid task-base-raid-dev task-base-raid-dbg", "",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
============================================================
--- packages/tasks/task-native-sdk.bb 7a8357c0638184a616c5933e9d5a31908b09a3e0
+++ packages/tasks/task-native-sdk.bb e9aff3af03f3423a34dcb2853582e08fdd66a6a5
@@ -1,10 +1,10 @@ RDEPENDS = "gcc-symlinks g++-symlinks bi
DESCRIPTION = "Packages required for native (on-device) SDK"
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}"
More information about the Openembedded-commits
mailing list