From 6555d4f084871fc3932752516b80af9d2e9724e0 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 30 Nov 2006 12:07:38 +0000 Subject: 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 --- conf/machine/akita.conf | 1 - conf/machine/include/zaurus-2.6.conf | 28 ++++++++++++++++++++++++---- conf/machine/include/zaurus-clamshell.conf | 17 ++--------------- conf/machine/poodle.conf | 16 ---------------- conf/machine/spitz.conf | 2 -- conf/machine/tosa.conf | 20 +------------------- removal.txt | 18 ++++++++++++++++++ 7 files changed, 45 insertions(+), 57 deletions(-) diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index 27695be4bb..5685c3d0f3 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -6,6 +6,5 @@ include conf/machine/include/zaurus-clamshell.conf include conf/machine/include/zaurus-2.6.conf PACKAGE_EXTRA_ARCHS += "iwmmxt" -IMAGE_FSTYPES ?= "jffs2" ROOT_FLASH_SIZE = "58" diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.conf index 7a5b90e68e..45d8891b44 100644 --- a/conf/machine/include/zaurus-2.6.conf +++ b/conf/machine/include/zaurus-2.6.conf @@ -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_FEATURES_append_akita = " usbhost " 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" diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf index 3c02f7bfd9..83d17aeb78 100644 --- a/conf/machine/include/zaurus-clamshell.conf +++ b/conf/machine/include/zaurus-clamshell.conf @@ -1,10 +1,4 @@ -TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" - -PREFERRED_PROVIDER_xserver = "xserver-kdrive" - -EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n" -EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700 zaurus-updater" +EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ --output=${T}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}; \ @@ -15,13 +9,6 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ 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" diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index c17da96dd4..a548f513d3 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -2,22 +2,6 @@ #@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" - diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 2c4e10935e..9a54643b3f 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -11,5 +11,3 @@ PACKAGE_EXTRA_ARCHS += "iwmmxt" 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 diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index 9f720404db..e893cf8ed0 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -2,27 +2,9 @@ #@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" - -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}" +MACHINE_EXTRA_RRECOMMENDS += "wlan-ng-modules-usb" -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" diff --git a/removal.txt b/removal.txt index 0e669b896f..785afa9c12 100644 --- a/removal.txt +++ b/removal.txt @@ -47,6 +47,24 @@ Maintainer: None 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 -- cgit 1.2.3-korg