[oe-commits] org.oe.dev merge of '5cb43bc2478385cf9482f3ea62f124371d55a502'

[koen commit]

merge of '5cb43bc2478385cf9482f3ea62f124371d55a502'
     and 'f14dc76b249ade5d8a8c2775ca404a4f018a42b8'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 3f2a0c7f2ab0daaa12864155be2ff9e1ffa56a51
ViewMTN: http://monotone.openembedded.org/revision.psp?id=3f2a0c7f2ab0daaa12864155be2ff9e1ffa56a51
Files:
1
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
conf/machine/smdk2443.conf
packages/angstrom/angstrom-dtp-x11-image.bb
packages/angstrom/angstrom-gpe-x11-image.bb
packages/angstrom/angstrom-pimlico-x11-image.bb
packages/update-modules/update-modules_1.0.bb
Diffs:

#
# mt diff -r5cb43bc2478385cf9482f3ea62f124371d55a502 -r3f2a0c7f2ab0daaa12864155be2ff9e1ffa56a51
#
# 
# 
# patch "conf/machine/fic-gta01.conf"
#  from [1f95cfda3ceeee646ee03718c50280ea1818fa58]
#    to [d9f73e20c859e127d386a96754598fda3fba71a7]
# 
# patch "conf/machine/fic-gta02.conf"
#  from [998009f2b1180b5024ef1f0ce6e808ad71d71e1a]
#    to [c2f26e3d24a8b8e8b96b8e9937af9e001f8043fa]
# 
# patch "conf/machine/smdk2443.conf"
#  from [d70cb9710dda2522eb9d0b4b2d44e4d723babf11]
#    to [b800568c28122a7ba0477566ce850219e08ec064]
# 
============================================================
--- conf/machine/fic-gta01.conf	1f95cfda3ceeee646ee03718c50280ea1818fa58
+++ conf/machine/fic-gta01.conf	d9f73e20c859e127d386a96754598fda3fba71a7
@@ -8,6 +8,7 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
 PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-gta01"
+UBOOT_ENTRYPOINT = "30008000"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone"
 
============================================================
--- conf/machine/fic-gta02.conf	998009f2b1180b5024ef1f0ce6e808ad71d71e1a
+++ conf/machine/fic-gta02.conf	c2f26e3d24a8b8e8b96b8e9937af9e001f8043fa
@@ -8,6 +8,7 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
 PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-gta02"
+UBOOT_ENTRYPOINT = "30008000"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone wifi"
 
============================================================
--- conf/machine/smdk2443.conf	d70cb9710dda2522eb9d0b4b2d44e4d723babf11
+++ conf/machine/smdk2443.conf	b800568c28122a7ba0477566ce850219e08ec064
@@ -7,6 +7,7 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
 PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-smdk2443"
+UBOOT_ENTRYPOINT = "30008000"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttySAC0"


#
# mt diff -rf14dc76b249ade5d8a8c2775ca404a4f018a42b8 -r3f2a0c7f2ab0daaa12864155be2ff9e1ffa56a51
#
# 
# 
# add_file "packages/angstrom/angstrom-dtp-x11-image.bb"
#  content [f86fa34e73c6c16ad31ba50f5e7949aeb804ed4b]
# 
# add_file "packages/angstrom/angstrom-gpe-x11-image.bb"
#  content [0de0219cb07aa14a5dfb92a4d594557fea1e0693]
# 
# add_file "packages/angstrom/angstrom-pimlico-x11-image.bb"
#  content [0d01ef64a17910501224379961acdaafafb9b70c]
# 
# patch "packages/update-modules/update-modules_1.0.bb"
#  from [9298b5e1e0a79fd18419cb436b8247d24fca403e]
#    to [c826ebfc84c887b036affefdc32161fd9f4c103c]
# 
============================================================
--- packages/angstrom/angstrom-dtp-x11-image.bb	f86fa34e73c6c16ad31ba50f5e7949aeb804ed4b
+++ packages/angstrom/angstrom-dtp-x11-image.bb	f86fa34e73c6c16ad31ba50f5e7949aeb804ed4b
@@ -0,0 +1,40 @@
+#Angstrom X11 image, with apps and kernel modules included
+LICENSE = "MIT"
+PR = "r0"
+
+PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
+PREFERRED_PROVIDER_tslib 		?= "tslib"
+PREFERRED_PROVIDER_virtual/libsdl 	?= "libsdl-x11"
+PREFERRED_PROVIDER_virtual/libxine 	?= "libxine-x11"
+PREFERRED_PROVIDER_virtual/libx11       ?= "diet-x11"
+
+ANGSTROM_EXTRA_INSTALL += " \
+                           ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
+			  " 
+XSERVER ?= "xserver-kdrive-fbdev"
+
+export IMAGE_BASENAME = "x11-image"
+
+DEPENDS = "task-base"
+RDEPENDS = "\
+    ${XSERVER} \
+    task-base-extended \
+    angstrom-x11-base-depends \
+    angstrom-gpe-task-base \
+    angstrom-gpe-task-settings \
+    kernel-modules \
+    hal \
+    abiword \
+    gnumeric \
+    cups \
+    claws-mail claws-mail claws-plugin-maildir claws-plugin-mailmbox claws-plugin-rssyl \
+    midori minimo \
+    ${ANGSTROM_EXTRA_INSTALL}"
+
+
+export PACKAGE_INSTALL = "${RDEPENDS}"
+
+#zap root password for release images
+ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
+
+inherit image
============================================================
--- packages/angstrom/angstrom-gpe-x11-image.bb	0de0219cb07aa14a5dfb92a4d594557fea1e0693
+++ packages/angstrom/angstrom-gpe-x11-image.bb	0de0219cb07aa14a5dfb92a4d594557fea1e0693
@@ -0,0 +1,36 @@
+#Angstrom X11 image, with apps and kernel modules included
+LICENSE = "MIT"
+PR = "r0"
+
+PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
+PREFERRED_PROVIDER_tslib 		?= "tslib"
+PREFERRED_PROVIDER_virtual/libsdl 	?= "libsdl-x11"
+PREFERRED_PROVIDER_virtual/libxine 	?= "libxine-x11"
+PREFERRED_PROVIDER_virtual/libx11       ?= "diet-x11"
+
+ANGSTROM_EXTRA_INSTALL += " \
+                           ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
+			  " 
+XSERVER ?= "xserver-kdrive-fbdev"
+
+export IMAGE_BASENAME = "x11-image"
+
+DEPENDS = "task-base"
+RDEPENDS = "\
+    ${XSERVER} \
+    task-base-extended \
+    angstrom-x11-base-depends \
+    angstrom-gpe-task-base \
+    angstrom-gpe-task-settings \
+    kernel-modules \
+    hal \
+    angstrom-gpe-task-pim \
+    ${ANGSTROM_EXTRA_INSTALL}"
+
+
+export PACKAGE_INSTALL = "${RDEPENDS}"
+
+#zap root password for release images
+ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
+
+inherit image
============================================================
--- packages/angstrom/angstrom-pimlico-x11-image.bb	0d01ef64a17910501224379961acdaafafb9b70c
+++ packages/angstrom/angstrom-pimlico-x11-image.bb	0d01ef64a17910501224379961acdaafafb9b70c
@@ -0,0 +1,36 @@
+#Angstrom X11 image, with apps and kernel modules included
+LICENSE = "MIT"
+PR = "r0"
+
+PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
+PREFERRED_PROVIDER_tslib 		?= "tslib"
+PREFERRED_PROVIDER_virtual/libsdl 	?= "libsdl-x11"
+PREFERRED_PROVIDER_virtual/libxine 	?= "libxine-x11"
+PREFERRED_PROVIDER_virtual/libx11       ?= "diet-x11"
+
+ANGSTROM_EXTRA_INSTALL += " \
+                           ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
+			  " 
+XSERVER ?= "xserver-kdrive-fbdev"
+
+export IMAGE_BASENAME = "x11-image"
+
+DEPENDS = "task-base"
+RDEPENDS = "\
+    ${XSERVER} \
+    task-base-extended \
+    angstrom-x11-base-depends \
+    angstrom-gpe-task-base \
+    angstrom-gpe-task-settings \
+    kernel-modules \
+    hal \
+    angstrom-ohand-task-pim \
+    ${ANGSTROM_EXTRA_INSTALL}"
+
+
+export PACKAGE_INSTALL = "${RDEPENDS}"
+
+#zap root password for release images
+ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
+
+inherit image
============================================================
--- packages/update-modules/update-modules_1.0.bb	9298b5e1e0a79fd18419cb436b8247d24fca403e
+++ packages/update-modules/update-modules_1.0.bb	c826ebfc84c887b036affefdc32161fd9f4c103c
@@ -1,8 +1,9 @@ PACKAGE_ARCH = "all"
 SECTION = "base"
 DESCRIPTION = "Script to manage module configuration files"
 LICENSE = "GPLv2"
 PACKAGE_ARCH = "all"
-PR = "r4"
+RDEPENDS = "${@base_contains("MACHINE_FEATURES", "kernel26",  "module-init-tools-depmod","modutils-depmod",d)} "
+PR = "r5"
 
 SRC_URI = "file://update-modules"