[oe-commits] org.oe.dev Zaurus configs: unified all machines

hrw commit openembedded-commits at lists.openembedded.org
Thu Nov 30 12:11:07 UTC 2006 

Zaurus configs: unified all machines
- common stuff is now in include/zaurus-2.6.conf
- tosa rrecommends wlan-ng modules instead of depending on them

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: a97c08deaa64fb078313a1bd6084b0922666da7a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a97c08deaa64fb078313a1bd6084b0922666da7a
Files:
1
conf/machine/akita.conf
conf/machine/include/zaurus-2.6.conf
conf/machine/include/zaurus-clamshell.conf
conf/machine/poodle.conf
conf/machine/spitz.conf
conf/machine/tosa.conf
removal.txt
Diffs:

#
# mt diff -ra51a2e5532264f836e170c84dbb2f4a509afa26a -ra97c08deaa64fb078313a1bd6084b0922666da7a
#
# 
# 
# patch "conf/machine/akita.conf"
#  from [cb07da10ff48df80f6f38074c74c8d2200a4c34b]
#    to [8d9e28bfe230988c4525812ab9a25a5ad59d3d3d]
# 
# patch "conf/machine/include/zaurus-2.6.conf"
#  from [eaf2b718cd12e2d78c0c7e142f7b930f51049982]
#    to [7ffd0b2b750952184c36768750364a5ea0500343]
# 
# patch "conf/machine/include/zaurus-clamshell.conf"
#  from [078aba2b35bef7468016ac75b74c2a4b9d670562]
#    to [701af8ec6aa6800f18a1e570e2d4f0f3e353261c]
# 
# patch "conf/machine/poodle.conf"
#  from [98d691b84ca32adabb38692269c609d583154022]
#    to [3b5c0685355ea21e05c2ab652753d1a261c9c398]
# 
# patch "conf/machine/spitz.conf"
#  from [15ef27bf0d171f8e74c1a054528000d3af11e593]
#    to [131dcff25a354244d351c2baa5c01075fd67ca97]
# 
# patch "conf/machine/tosa.conf"
#  from [e35f703089600002a8a2d8d1bd940331841ffba5]
#    to [5dec78d44533d9ad2ccc483204b39569653db93c]
# 
# patch "removal.txt"
#  from [e49baaca013a8733206ef9c3b2db280e6bf7d9fc]
#    to [69f1271b5dc1292ac58c65fb4ce9b3cb258cc6a2]
# 
============================================================
--- conf/machine/akita.conf	cb07da10ff48df80f6f38074c74c8d2200a4c34b
+++ conf/machine/akita.conf	8d9e28bfe230988c4525812ab9a25a5ad59d3d3d
@@ -6,6 +6,5 @@ PACKAGE_EXTRA_ARCHS += "iwmmxt" 
 include conf/machine/include/zaurus-2.6.conf
 
 PACKAGE_EXTRA_ARCHS += "iwmmxt" 
-IMAGE_FSTYPES ?= "jffs2"
 
 ROOT_FLASH_SIZE = "58"
============================================================
--- conf/machine/include/zaurus-2.6.conf	eaf2b718cd12e2d78c0c7e142f7b930f51049982
+++ conf/machine/include/zaurus-2.6.conf	7ffd0b2b750952184c36768750364a5ea0500343
@@ -1,8 +1,26 @@
 # Zaurus Clamshell specific configuration for kernel 2.6
 # Don't forget to include zaurus-clamshell.conf as well
 
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
+
+MACHINE_KERNEL_VERSION = "2.6"
+
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" 
+
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}"
+
+EXTRA_IMAGEDEPENDS += "zaurus-updater"
+
+IMAGE_FSTYPES ?= "jffs2 tar.gz"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+include conf/machine/include/tune-xscale.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
-PREFERRED_VERSION_wpa_supplicant = "0.4.7"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
@@ -12,9 +30,11 @@ MACHINE_EXTRA_RDEPENDS = "zaurusd"
 MACHINE_FEATURES_append_spitz = " usbhost ext2 "
 
 MACHINE_EXTRA_RDEPENDS = "zaurusd"
-MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi"
-MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz"
-MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz"
+MACHINE_EXTRA_RRECOMMENDS_c7x0   = "kernel-module-snd-soc-corgi"
+MACHINE_EXTRA_RRECOMMENDS_akita  = "kernel-module-snd-soc-spitz"
+MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz"
 MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
 
 MACHINE_TASK_PROVIDER = "task-base"
+GUI_MACHINE_CLASS = "bigscreen"
+GUI_MACHINE_CLASS_poodle = "smallscreen"
============================================================
--- conf/machine/include/zaurus-clamshell.conf	078aba2b35bef7468016ac75b74c2a4b9d670562
+++ conf/machine/include/zaurus-clamshell.conf	701af8ec6aa6800f18a1e570e2d4f0f3e353261c
@@ -1,11 +1,5 @@
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
+EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
 
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n"
-EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700 zaurus-updater"
-
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
 		   --output=${T}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}; \
 		   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
@@ -15,13 +9,6 @@ EXTRA_IMAGECMD_jffs2 += "&& sumtool -i $
 EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
                          -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
                          --eraseblock=0x4000 -l -p"
+
 IMAGE_CMD_jffs2 +=	"; cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
 		         ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.img"
-
-GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim sylpheed"
-
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-xscale.conf
-
-SERIAL_CONSOLE = "115200 ttyS0"
============================================================
--- conf/machine/poodle.conf	98d691b84ca32adabb38692269c609d583154022
+++ conf/machine/poodle.conf	3b5c0685355ea21e05c2ab652753d1a261c9c398
@@ -1,23 +1,7 @@
 #@TYPE: Machine
 #@NAME: Sharp Zaurus SL-B500, Sharp Zaurus SL-5600
 #@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices
 
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
-
-MACHINE_KERNEL_VERSION = "2.6"
 require conf/machine/include/zaurus-2.6.conf
 
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" 
-
-IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}"
-
-EXTRA_IMAGEDEPENDS += "zaurus-updater"
-
 ROOT_FLASH_SIZE = "22"
-
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-xscale.conf
-
-SERIAL_CONSOLE = "115200 ttyS0"
-
============================================================
--- conf/machine/spitz.conf	15ef27bf0d171f8e74c1a054528000d3af11e593
+++ conf/machine/spitz.conf	131dcff25a354244d351c2baa5c01075fd67ca97
@@ -11,5 +11,3 @@ ROOT_FLASH_SIZE = "100"
 IMAGE_FSTYPES ?= "tar.gz"
 
 ROOT_FLASH_SIZE = "100"
-# actually that should really read ROOTFS_SIZE = "100", because with modern kernels,
-# we boot from the built-in harddisk in C3000. ROOT_FLASH_SIZE is really 5 MegaByte
============================================================
--- conf/machine/tosa.conf	e35f703089600002a8a2d8d1bd940331841ffba5
+++ conf/machine/tosa.conf	5dec78d44533d9ad2ccc483204b39569653db93c
@@ -1,28 +1,10 @@
 #@TYPE: Machine
 #@NAME: Sharp Zaurus SL-6000
 #@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device
 
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
-
-MACHINE_KERNEL_VERSION = "2.6"
-
 include conf/machine/include/zaurus-2.6.conf
 
 # wlan-ng Modules
-MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb"
+MACHINE_EXTRA_RRECOMMENDS += "wlan-ng-modules-usb"
 
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime"
-
-IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
-
-EXTRA_IMAGEDEPENDS += "zaurus-updater"
-
-GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim"
 ROOT_FLASH_SIZE = "28"
-
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-xscale.conf
-
-SERIAL_CONSOLE = "115200 ttyS0"
============================================================
--- removal.txt	e49baaca013a8733206ef9c3b2db280e6bf7d9fc
+++ removal.txt	69f1271b5dc1292ac58c65fb4ce9b3cb258cc6a2
@@ -47,6 +47,24 @@
 Reason:         Not fetchable, all search results points to OE related infos
 Proposed by:    Marcin 'Hrw' Juszkiewicz
  
+Package Name:   ipac-ng
+Removal Date:   2006-12-12
+Maintainer:     None
+Reason:         Depends on libgd-perl which is not in metada
+Proposed by:    Marcin 'Hrw' Juszkiewicz
+ 
+Package Name:   
+Removal Date:   2006-12-12
+Maintainer:     None
+Reason:         Obsolete version
+Proposed by:    Marcin 'Hrw' Juszkiewicz
+ 
+Package Name:   
+Removal Date:   2006-12-12
+Maintainer:     None
+Reason:         Obsolete version
+Proposed by:    Marcin 'Hrw' Juszkiewicz
+ 
 Package Name:   nsqld
 Removal Date:   2006-12-12
 Maintainer:     None

More information about the Openembedded-commits mailing list