[oe-commits] org.oe.dev merge of '7b1b675acdab1f2f94fa198937d17e71465a6251'
rwhitby commit
openembedded-commits at lists.openembedded.org
Thu Jun 21 17:35:53 UTC 2007
merge of '7b1b675acdab1f2f94fa198937d17e71465a6251'
and 'ea2cdd5b56f48503576d815730d28e0a97f397bf'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: eb905eee009ae6abb1d415de432f62c123e04dbb
ViewMTN: http://monotone.openembedded.org/revision.psp?id=eb905eee009ae6abb1d415de432f62c123e04dbb
Files:
1
packages/pimlico/dates_0.3.1.bb
packages/pimlico/dates_0.4.1.bb
packages/pimlico/files/tasks-single.diff
conf/distro/angstrom-2007.1.conf
packages/angstrom/angstrom-console-image.bb
packages/angstrom/angstrom-e-image.bb
packages/angstrom/angstrom-mokogateway-image.bb
packages/angstrom/angstrom-x11-image.bb
packages/angstrom/task-angstrom-e.bb
packages/angstrom/task-angstrom-x11.bb
packages/pimlico/dates.inc
packages/pimlico/dates_svn.bb
packages/pimlico/tasks_0.4.bb
packages/tasks/task-base.bb
Diffs:
#
# mt diff -r7b1b675acdab1f2f94fa198937d17e71465a6251 -reb905eee009ae6abb1d415de432f62c123e04dbb
#
#
#
# rename "packages/pimlico/dates_0.3.1.bb"
# to "packages/pimlico/dates_0.4.1.bb"
#
# add_file "packages/pimlico/files/tasks-single.diff"
# content [91bf94166ab3e76f8f8cba3de5c39146afbd34d9]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [b186a870ef6e33f8fbb4d26aac91c77dad588247]
# to [a8ba787649f76fecd099538d1b6dd5b80fa8908f]
#
# patch "packages/angstrom/angstrom-console-image.bb"
# from [4a47b718974872b9b479d7d48f0376cebb6eb42a]
# to [2e6c29b669adeba3b723961ce9efac43de9a17b6]
#
# patch "packages/angstrom/angstrom-e-image.bb"
# from [fcdd0c401e5fc4bab115d970420d078c0cbdf6ef]
# to [c2a5ff21d38b4f784a0b1e84d7cd80c0b2849ec7]
#
# patch "packages/angstrom/angstrom-mokogateway-image.bb"
# from [a3c6fd27906d4cdc87cd225089b7dca459474463]
# to [16988dcd952395b851321d1011c0025139dba5fd]
#
# patch "packages/angstrom/angstrom-x11-image.bb"
# from [dedb35b2b38b99eedac4971eb578c8bb9be3551f]
# to [de34a009455d01bbbb1d648b4d736194ba5433ee]
#
# patch "packages/angstrom/task-angstrom-e.bb"
# from [b2fff85c8aaecfee633c11666a833dadaa8a3411]
# to [689920e6bf8f732117ee2d84420375db48592387]
#
# patch "packages/angstrom/task-angstrom-x11.bb"
# from [c7a66796a27cd0b8aa837ae4931d434f8bfdbb31]
# to [b458c2ed08404bfb398f20aaa94d019a999fe56d]
#
# patch "packages/pimlico/dates.inc"
# from [9f0e88eb705aea6d26e6167c39a5b84e8fe207b8]
# to [179e622b27ffaca7f8e604468c8900cca3b3dd33]
#
# patch "packages/pimlico/dates_0.4.1.bb"
# from [9b954380ecd7dbd8298eeabeefdffbf9af723839]
# to [30761681656084c5ce37e12cf4c0c425d35cd766]
#
# patch "packages/pimlico/dates_svn.bb"
# from [30de543125fcbf1c7f67eca88c4e1fdf5b86cdc0]
# to [51e7b0887fbedf7845d738018df12d68b0943f32]
#
# patch "packages/pimlico/tasks_0.4.bb"
# from [c21fccd9b2ad183d0cc7168475f99e3f75c89937]
# to [2c6d431b07799e1a0bf45c41c19bd92845d0350e]
#
# patch "packages/tasks/task-base.bb"
# from [c9bcc6674946fa0a5e8a46c40921b23ac7bf83e2]
# to [ba167a1701e4d67cf6eb6556b68dc18ca16eabd0]
#
============================================================
--- packages/pimlico/files/tasks-single.diff 91bf94166ab3e76f8f8cba3de5c39146afbd34d9
+++ packages/pimlico/files/tasks-single.diff 91bf94166ab3e76f8f8cba3de5c39146afbd34d9
@@ -0,0 +1,9 @@
+Index: tasks/data/tasks.desktop.in
+===================================================================
+--- tasks/data/tasks.desktop.in (revision 115)
++++ tasks/data/tasks.desktop.in (working copy)
+@@ -9,3 +9,4 @@
+ Categories=GTK;Application;Office;ProjectManagement;
+ Terminal=false
+ StartupNotify=true
++SingleInstance=true
============================================================
--- conf/distro/angstrom-2007.1.conf b186a870ef6e33f8fbb4d26aac91c77dad588247
+++ conf/distro/angstrom-2007.1.conf a8ba787649f76fecd099538d1b6dd5b80fa8908f
@@ -133,6 +133,13 @@ PREFERRED_VERSION_glib-2.0 = "2.12.11"
PREFERRED_VERSION_cairo = "1.4.2"
PREFERRED_VERSION_glib-2.0 = "2.12.11"
+# older gtk-webcore releases don't work on ARM/EABI
+# We need to switch to a fixed SRCDATE or release as soon as possible
+PREFERRED_VERSION_osb-browser = "0.5.0+svn${SRCDATE}"
+PREFERRED_VERSION_osb-jscore = "0.5.2+svn${SRCDATE}"
+PREFERRED_VERSION_osb-nrcit = "0.5.2+svn${SRCDATE}"
+PREFERRED_VERSION_osb-nrcore = "0.5.2+svn${SRCDATE}"
+
#Small machines prefer kdrive, but we might ship full Xorg in other images
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
============================================================
--- packages/angstrom/angstrom-console-image.bb 4a47b718974872b9b479d7d48f0376cebb6eb42a
+++ packages/angstrom/angstrom-console-image.bb 2e6c29b669adeba3b723961ce9efac43de9a17b6
@@ -5,8 +5,7 @@ DEPENDS = "task-base"
ANGSTROM_EXTRA_INSTALL ?= ""
DEPENDS = "task-base"
-RDEPENDS = "task-base-core-default \
- task-base \
+RDEPENDS = "task-base \
${ANGSTROM_EXTRA_INSTALL} \
"
============================================================
--- packages/angstrom/angstrom-e-image.bb fcdd0c401e5fc4bab115d970420d078c0cbdf6ef
+++ packages/angstrom/angstrom-e-image.bb c2a5ff21d38b4f784a0b1e84d7cd80c0b2849ec7
@@ -1,6 +1,6 @@ LICENSE = "MIT"
#Angstrom e image
LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
PREFERRED_PROVIDER_virtual/evas ?= "evas-x11"
@@ -21,7 +21,6 @@ RDEPENDS = "\
DEPENDS = "task-base"
RDEPENDS = "\
${XSERVER} \
- task-base-core-default \
task-base \
angstrom-e-base-depends \
angstrom-e-depends \
============================================================
--- packages/angstrom/angstrom-mokogateway-image.bb a3c6fd27906d4cdc87cd225089b7dca459474463
+++ packages/angstrom/angstrom-mokogateway-image.bb 16988dcd952395b851321d1011c0025139dba5fd
@@ -1,12 +1,12 @@ LICENSE = "MIT"
#Angstrom moko gateway image
# tries to be a companion for openmoko based phones
LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
ANGSTROM_EXTRA_INSTALL ?= ""
DEPENDS = "task-base"
-RDEPENDS = "task-base-core-default \
+RDEPENDS = " \
task-base \
bluez-utils \
blue-probe \
============================================================
--- packages/angstrom/angstrom-x11-image.bb dedb35b2b38b99eedac4971eb578c8bb9be3551f
+++ packages/angstrom/angstrom-x11-image.bb de34a009455d01bbbb1d648b4d736194ba5433ee
@@ -1,6 +1,6 @@ LICENSE = "MIT"
#Angstrom X11 image
LICENSE = "MIT"
-PR = "r5"
+PR = "r6"
PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
PREFERRED_PROVIDER_tslib ?= "tslib"
@@ -16,7 +16,6 @@ RDEPENDS = "\
DEPENDS = "task-base"
RDEPENDS = "\
${XSERVER} \
- task-base-core-default \
task-base \
angstrom-x11-base-depends \
angstrom-gpe-task-base \
============================================================
--- packages/angstrom/task-angstrom-e.bb b2fff85c8aaecfee633c11666a833dadaa8a3411
+++ packages/angstrom/task-angstrom-e.bb 689920e6bf8f732117ee2d84420375db48592387
============================================================
--- packages/angstrom/task-angstrom-x11.bb c7a66796a27cd0b8aa837ae4931d434f8bfdbb31
+++ packages/angstrom/task-angstrom-x11.bb b458c2ed08404bfb398f20aaa94d019a999fe56d
@@ -109,12 +109,13 @@ RDEPENDS_angstrom-task-office := "\
gnumeric \
abiword \
imposter \
-# evince \
+ evince \
gqview"
RDEPENDS_angstrom-task-printing := "\
cups \
- gnome-cups-manager"
+# gnome-cups-manager \
+ "
RDEPENDS_angstrom-task-sectest := "\
nmap \
============================================================
--- packages/pimlico/dates.inc 9f0e88eb705aea6d26e6167c39a5b84e8fe207b8
+++ packages/pimlico/dates.inc 179e622b27ffaca7f8e604468c8900cca3b3dd33
@@ -8,6 +8,7 @@ inherit autotools pkgconfig gtk-icon-cac
inherit autotools pkgconfig gtk-icon-cache
# EXTRA_OECONF = "--disable-debug"
+EXTRA_OECONF = "--enable-owl=true"
FILES_${PN} += "${datadir}/pixmaps/dates.png"
============================================================
--- packages/pimlico/dates_0.3.1.bb 9b954380ecd7dbd8298eeabeefdffbf9af723839
+++ packages/pimlico/dates_0.4.1.bb 30761681656084c5ce37e12cf4c0c425d35cd766
@@ -1,5 +1,3 @@ require dates.inc
require dates.inc
-PR = "r3"
-
SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz"
============================================================
--- packages/pimlico/dates_svn.bb 30de543125fcbf1c7f67eca88c4e1fdf5b86cdc0
+++ packages/pimlico/dates_svn.bb 51e7b0887fbedf7845d738018df12d68b0943f32
@@ -1,10 +1,8 @@ require dates.inc
require dates.inc
-PR = "r2"
-
DEFAULT_PREFERENCE = "-1"
-PV = "0.3.1+svn${SRCDATE}"
+PV = "0.4.1+svn${SRCDATE}"
S = "${WORKDIR}/trunk"
SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http"
============================================================
--- packages/pimlico/tasks_0.4.bb c21fccd9b2ad183d0cc7168475f99e3f75c89937
+++ packages/pimlico/tasks_0.4.bb 2c6d431b07799e1a0bf45c41c19bd92845d0350e
@@ -1,3 +1,6 @@ require tasks.inc
require tasks.inc
+PR = "r1"
+
+SRC_URI = "http://projects.o-hand.com/sources/tasks/${P}.tar.gz \
+ file://tasks-single.diff;patch=1"
-SRC_URI = "http://projects.o-hand.com/sources/tasks/${P}.tar.gz"
============================================================
--- packages/tasks/task-base.bb c9bcc6674946fa0a5e8a46c40921b23ac7bf83e2
+++ packages/tasks/task-base.bb ba167a1701e4d67cf6eb6556b68dc18ca16eabd0
@@ -1,207 +1,229 @@ DESCRIPTION = "Merge machine and distro
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r23"
+PR = "r26"
-PACKAGES = "task-base \
- task-base-oh-minimal \
- task-base-core-default"
+PACKAGES = 'task-boot \
+ task-base \
+ task-distro-base \
+ task-machine-base \
+ \
+ 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-cramfs \
+ task-base-ipsec \
+ task-base-ipv6 \
+ task-base-nfs \
+ task-base-ppp \
+ task-base-smbfs \
+ \
+ ${@base_contains("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \
+ '
ALLOW_EMPTY = "1"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+PACKAGE_ARCH = "all"
-# Valid only in MACHINE_FEATURES:
#
-# kernel24
-# kernel26
-# apm
-# keyboard
-# touchscreen
-# screen
-# pci
-# acpi
-# phone
+# 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-pcmcia = "${MACHINE_ARCH}"
-# Valid only in DISTRO_FEATURES:
#
-# nfs
-# smbfs
-# ipsec
-# wifi
-# ppp
+# udev, devfsd, mdev (from busybox) or none
+#
+DISTRO_DEV_MANAGER ?= "${@base_contains("MACHINE_FEATURES", "kernel26", "udev","",d)} "
-# Valid COMBINED_FEATURES:
-# (These features need to be supported by both the machine and the distro)
#
-# alsa
-# bluetooth
-# ext2
-# irda
-# pci
-# pcmcia
-# redboot
-# uboot
-# usbgadget
-# usbhost
+# sysvinit, upstart
+#
+DISTRO_INIT_MANAGER ?= "sysvinit"
+#
+# tinylogin, getty
+#
+DISTRO_LOGIN_MANAGER ?= "tinylogin"
-DISTRO_CORE_PACKAGE ?= "task-base-core-default"
+#
+# linux-hotplug or none
+#
+HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24", "linux-hotplug","",d)} "
#
-# task-base
+# dropbear, openssh or none
#
-RDEPENDS_task-base = "\
- ${DISTRO_CORE_PACKAGE} \
- kernel \
- ${@base_contains("MACHINE_FEATURES", "kernel24", "${task-base-kernel24-rdepends}", "",d)} \
- ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \
- ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \
- ${@base_contains("MACHINE_FEATURES", "acpi", "${task-base-acpi-rdepends}", "",d)} \
- ${@base_contains("MACHINE_FEATURES", "keyboard", "${task-base-keyboard-rdepends}", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "alsa", "${task-base-alsa-rdepends}", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "ext2", "${task-base-ext2-rdepends}", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "irda", "${task-base-irda-rdepends}", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "pci", "${task-base-pci-rdepends}", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rdepends}", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rdepends}", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rdepends}", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "uboot", "${task-base-uboot-rdepends}", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "redboot", "${task-base-redboot-rdepends}", "",d)} \
- ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rdepends}", "",d)} \
- ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rdepends}", "",d)} \
- ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rdepends}", "",d)} \
- ${@base_contains("DISTRO_FEATURES", "raid", "${task-distro-raid-rdepends}", "",d)} \
- ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \
- ${MACHINE_EXTRA_RDEPENDS} \
- ${DISTRO_EXTRA_RDEPENDS}"
+DISTRO_SSH_DAEMON ?= "dropbear"
-RRECOMMENDS_task-base = "\
- ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-extras-rrecommends}", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "alsa", "${task-base-alsa-rrecommends}", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rrecommends}", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rrecommends}", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "irda", "${task-base-irda-rrecommends}", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "usbgadget", "${task-base-usbgadget-rrecommends}", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rrecommends}", "",d)} \
- ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rrecommends}", "",d)} \
- ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rrecommends}", "",d)} \
- ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rrecommends}", "",d)} \
- ${@base_contains("DISTRO_FEATURES", "wifi", "${task-distro-wifi-rrecommends}", "",d)} \
- ${@base_contains("DISTRO_FEATURES", "cramfs", "${task-distro-cramfs-rrecommends}", "",d)} \
- ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \
- ${MACHINE_EXTRA_RRECOMMENDS} \
- ${DISTRO_EXTRA_RRECOMMENDS}"
+#
+# pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others
+#
+PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} "
+#
+# those ones can be set in machine config to supply packages needed to get machine booting
+#
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
#
-# task-base-oh-minimal
-# An example of a small cut down machine configuration
+# task-base contain stuff needed for base system (machine related)
#
-RDEPENDS_task-base-oh-minimal = "\
- kernel \
- ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \
- ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "pcmcia", "${PCMCIA_MANAGER}", "",d)} \
- ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
+RDEPENDS_task-base = "\
+ task-boot \
+ task-distro-base \
+ task-machine-base \
+ ${DISTRO_SSH_DAEMON} \
+ ${HOTPLUG} \
+ \
+ ${@base_contains('MACHINE_FEATURES', 'kernel26','task-base-kernel26','task-base-kernel24',d)} \
+ ${@base_contains('MACHINE_FEATURES', 'apm', 'task-base-apm', '',d)} \
+ ${@base_contains('MACHINE_FEATURES', 'acpi', 'task-base-acpi', '',d)} \
+ ${@base_contains('MACHINE_FEATURES', 'keyboard', 'task-base-keyboard', '',d)} \
+ \
+ ${@base_contains('COMBINED_FEATURES', 'alsa', 'task-base-alsa', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', 'ext2', 'task-base-ext2', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', 'irda', 'task-base-irda', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', 'pci', 'task-base-pci', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'task-base-pcmcia', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', 'wifi', 'task-base-wifi', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', 'uboot', 'task-base-uboot', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', 'redboot', 'task-base-redboot', '',d)} \
+ \
+ ${@base_contains('DISTRO_FEATURES', 'nfs', 'task-base-nfs', '',d)} \
+ ${@base_contains('DISTRO_FEATURES%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rea2cdd5b56f48503576d815730d28e0a97f397bf -reb905eee009ae6abb1d415de432f62c123e04dbb
#
#
# no changes
#
More information about the Openembedded-commits
mailing list