[oe-commits] Ulf Samuelsson : Create an atmel version of x11-gpe-image

[git version control]

Module: openembedded.git
Branch: ulf/linux-2.6.30.2
Commit: d696835e24b618a2e2635bf2746695b1ff870e0c
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=d696835e24b618a2e2635bf2746695b1ff870e0c

Author: Ulf Samuelsson <ulf.samuelsson at atmel.com>
Date:   Wed Aug 19 07:23:33 2009 +0200

Create an atmel version of x11-gpe-image

Select xserver-kdrive-1300
conf/machine/include/AT91.inc defies a number
of extra packages, for multimedia.
They are removed, and are now available in
images/x11-gpe-image_atmel.bb

---

 conf/machine/include/AT91-LCD.inc     |    1 +
 conf/machine/include/AT91.inc         |   29 +++++++++++------
 recipes/images/x11-gpe-image_atmel.bb |   58 +++++++++++++++++++++++++++++++++
 3 files changed, 78 insertions(+), 10 deletions(-)

diff --git a/conf/machine/include/AT91-LCD.inc b/conf/machine/include/AT91-LCD.inc
index 2adae2b..3036295 100644
--- a/conf/machine/include/AT91-LCD.inc
+++ b/conf/machine/include/AT91-LCD.inc
@@ -12,3 +12,4 @@ MACHINE_FEATURES += "screen touchscreen keyboard"
 # MACHINE_FEATURES += "i2c spi serial"
 # MACHINE_FEATURES += "sound libogg libvorbis"
 
+
diff --git a/conf/machine/include/AT91.inc b/conf/machine/include/AT91.inc
index 981a4af..e61d92e 100644
--- a/conf/machine/include/AT91.inc
+++ b/conf/machine/include/AT91.inc
@@ -5,31 +5,40 @@ TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.30.2"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+#PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300"
+#PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+#PREFERRED_PROVIDER_xserver = "xserver-xorg"
+#PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+#XSERVER = "xserver-kdrive-fbdev"
+# Angstrom defines:
+#PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
+#PREFERRED_VERSION_xserver-kdrive = "1.6.1"
+
 PREFERRED_PROVIDER_at91bootstrap = "at91bootstrap_2.13-rc1"
 PREFERRED_PROVIDER_u-boot = "u-boot_2009.08-rc2"
 
+
 KERNEL_IMAGETYPE = "uImage"
 
 PREFERRED_VERSION_at91bootstrap = "2.13-rc1"
 PREFERRED_VERSION_u-boot = "2009.08-rc2"
 # PREFERRED_VERSION_mplayer = "svn"
 
+PREFERRED_VERSION_x11-gpe-image = "atmel"
+PREFERRED_VERSION_alsa-state = "atmel"
+
 #don't try to access tty1
 USE_VT = "0"
 
-MACHINE_FEATURES = "kernel26 alsa ext2 usbgadget vfat uboot"
-MACHINE_EXTRA_RDEPENDS += "mpg321 mpd madplay mplayer libmad"
-MACHINE_EXTRA_RDEPENDS += "kernel-modules"
-MACHINE_EXTRA_RDEPENDS += "minicom"
-MACHINE_EXTRA_RDEPENDS += "samba vsftpd"
-MACHINE_EXTRA_RDEPENDS += "nano"
-# MACHINE_EXTRA_RDEPENDS += "u-boot-utils"
-
-
+MACHINE_FEATURES = " kernel26 alsa ext2 usbgadget vfat uboot "
 EXTRA_IMAGEDEPENDS += "u-boot"
 EXTRA_IMAGEDEPENDS += "at91bootstrap"
+EXTRA_IMAGEDEPENDS += "atmel-fixes"
 
+MACHINE_EXTRA_RDEPENDS += " kernel-modules "
+MACHINE_EXTRA_RDEPENDS += " atmel-fixes "
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/recipes/images/x11-gpe-image_atmel.bb b/recipes/images/x11-gpe-image_atmel.bb
new file mode 100644
index 0000000..0a25247
--- /dev/null
+++ b/recipes/images/x11-gpe-image_atmel.bb
@@ -0,0 +1,58 @@
+#Angstrom X11 image, with apps and kernel modules included
+
+ANGSTROM_EXTRA_INSTALL += " \
+			  " 
+XSERVER ?= "xserver-kdrive"
+SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}'
+
+export IMAGE_BASENAME = "x11-gpe-image"
+
+DEPENDS = "task-base"
+IMAGE_INSTALL = "\
+    ${XSERVER} \
+	task-base-extended \
+	angstrom-x11-base-depends \
+	angstrom-gpe-task-base \
+	angstrom-gpe-task-settings \
+	kernel-modules \
+	hal \
+	angstrom-gpe-task-pim \
+	minicom \
+	samba \
+	vsftpd \
+	ncftp \
+	micro-emacs \
+	u-boot-utils \
+	perl \
+	nano \
+	bzip2 \
+	mpg321 \
+	madplay \
+	mplayer \
+	libmad \
+	libid3tag \
+	id3lib \
+	ffmpeg \
+	fbv \
+	imagemagick \
+	atmel-fixes \
+	${SPLASH} \
+	${ANGSTROM_EXTRA_INSTALL}"
+#	gftp \
+# 	gcalctool \
+# 	gstreamer \
+#	emacs \
+# 	mpd FAILS in RUNTIME \
+#	i2c FAILS \
+#	i2c-tools might FAIL\
+#	atmel-fixes \
+
+RDEPENDS_task-base-alsa += "\
+	alsa-utils-amixer"
+
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
+#zap root password for release images
+ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
+
+inherit image