diff options
| -rw-r--r-- | conf/machine/akita.conf | 1 | ||||
| -rw-r--r-- | conf/machine/include/poodle-2.4.conf | 10 | ||||
| -rw-r--r-- | conf/machine/include/tosa-2.4.conf | 20 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-2.6.conf | 28 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-clamshell-2.4.conf | 45 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-clamshell.conf | 17 | ||||
| -rw-r--r-- | conf/machine/poodle.conf | 18 | ||||
| -rw-r--r-- | conf/machine/spitz.conf | 2 | ||||
| -rw-r--r-- | conf/machine/tosa.conf | 20 | ||||
| -rw-r--r-- | removal.txt | 18 |
10 files changed, 48 insertions, 131 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/poodle-2.4.conf b/conf/machine/include/poodle-2.4.conf deleted file mode 100644 index cbf150f3ec..0000000000 --- a/conf/machine/include/poodle-2.4.conf +++ /dev/null @@ -1,10 +0,0 @@ -PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" - -# Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules = "0.13e" - -BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs sharp-sdmmc-support \ -hostap-utils prism3-firmware prism3-support" -BOOTSTRAP_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \ -kernel-module-usbdcore kernel-module-usbdmonitor" - diff --git a/conf/machine/include/tosa-2.4.conf b/conf/machine/include/tosa-2.4.conf deleted file mode 100644 index 2fad9b2d91..0000000000 --- a/conf/machine/include/tosa-2.4.conf +++ /dev/null @@ -1,20 +0,0 @@ -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" - -# Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules = "0.13e" - -BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils keymaps \ - kernel-module-acm \ - kernel-module-evdev kernel-module-net-fd \ - kernel-module-pxa-bi kernel-module-registers \ - kernel-module-storage-fd kernel-module-usb-ohci-tc6393 \ - kernel hostap-modules-cs \ - sharp-sdmmc-support kernel-module-pxa-bi \ - kernel-module-ip-gre kernel-module-irnet kernel-module-ipip \ - kernel-module-usbcore kernel-module-usbdcore kernel-module-usbdmonitor kernel-module-usb-storage" - -RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd \ - kernel-module-usbmouse kernel-module-hid usbutils \ - kernel-module-evdev" - 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-2.4.conf b/conf/machine/include/zaurus-clamshell-2.4.conf deleted file mode 100644 index 75de007233..0000000000 --- a/conf/machine/include/zaurus-clamshell-2.4.conf +++ /dev/null @@ -1,45 +0,0 @@ -# Zaurus Clamshell specific configuration for kernel 2.4 -# Don't forget to include zaurus-clamshell.conf as well - -PREFERRED_PROVIDERS_append_c7x0 = " virtual/kernel:c7x0-kernels-2.4-embedix" -PREFERRED_PROVIDERS_append_akita = " virtual/kernel:openzaurus-pxa27x" -PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x" -PREFERRED_PROVIDERS_append_borzoi = " virtual/kernel:openzaurus-pxa27x" - -# Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules = "0.13e" - -BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs sharp-sdmmc-support \ -pcmcia-cs apmd apm wireless-tools keymaps irda-utils hostap-utils prism3-firmware prism3-support \ -wpa-supplicant-nossl ppp ppp-dialin " - -# Misc Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-net-fd kernel-module-registers" - -# USB Client Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-usbdcore kernel-module-usbdmonitor" - -# Bluetooth Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluez kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \ - kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \ - kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs \ - kernel-module-firmware-class kernel-module-bt3c-cs" - -# BI Module -BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 = " kernel-module-pxa-bi" -BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-pxa27x-bi" -BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-pxa27x-bi" -BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi = " kernel-module-pxa27x-bi" - -# USB Host Modules -BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \ - kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \ - kernel-module-usb-ohci-pxa27x kernel-module-bfusb" -BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \ - kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \ - kernel-module-usb-ohci-pxa27x kernel-module-bfusb" -BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \ - kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \ - kernel-module-usb-ohci-pxa27x kernel-module-bfusb" - -GPE_EXTRA_INSTALL += "chkhinge" 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 c904372535..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.4" -include conf/machine/include/poodle-${MACHINE_KERNEL_VERSION}.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" +require conf/machine/include/zaurus-2.6.conf 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 1d7b04e24e..e893cf8ed0 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -2,23 +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" +include conf/machine/include/zaurus-2.6.conf -MACHINE_KERNEL_VERSION ?= "2.6" -include conf/machine/include/tosa-${MACHINE_KERNEL_VERSION}.conf +# wlan-ng Modules +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" 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 |