summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/machine/akita.conf1
-rw-r--r--conf/machine/c7x0.conf3
-rw-r--r--conf/machine/collie.conf18
-rw-r--r--conf/machine/include/poodle-2.4.conf10
-rw-r--r--conf/machine/include/tosa-2.4.conf20
-rw-r--r--conf/machine/include/zaurus-2.6.conf28
-rw-r--r--conf/machine/include/zaurus-clamshell-2.4.conf45
-rw-r--r--conf/machine/include/zaurus-clamshell.conf17
-rw-r--r--conf/machine/poodle.conf18
-rw-r--r--conf/machine/spitz.conf2
-rw-r--r--conf/machine/tosa.conf20
-rw-r--r--packages/angstrom/task-angstrom-x11.bb13
-rw-r--r--packages/mplayer/files/Makefile.patch12
-rw-r--r--packages/mplayer/mplayer_1.0pre8.bb4
-rw-r--r--packages/mplayer/mplayer_svn.bb4
-rw-r--r--packages/tasks/task-base.bb12
-rw-r--r--packages/tasks/task-proper-tools.bb3
-rw-r--r--packages/valgrind/.mtn2git_empty0
-rw-r--r--packages/valgrind/valgrind_3.2.1.bb14
-rw-r--r--removal.txt18
20 files changed, 110 insertions, 152 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/c7x0.conf b/conf/machine/c7x0.conf
index 893378f569..047e44707c 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -9,3 +9,6 @@ IMAGE_FSTYPES ?= "jffs2"
ROOT_FLASH_SIZE = "25"
# yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it.
+
+XSERVER = "xserver-kdrive-w100"
+
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index fcaa2ff046..deefa1b698 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -5,16 +5,20 @@
TARGET_ARCH = "arm"
PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs \
-sharp-sdmmc-support"
-BOOTSTRAP_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-sa1100-bi \
-kernel-module-usbdcore kernel-module-usbdmonitor \
-altboot"
+
+#
+# no keyboard feature because 2.4 kernel keymap works ok and we have limited flash
+# no usbgadget feature because 2.4 kernel handle it in own way on each machine
+#
+MACHINE_FEATURES = "kernel24 apm pcmcia screen irda"
+
+MACHINE_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-sa1100-bi \
+kernel-module-usbdcore kernel-module-usbdmonitor sharp-sdmmc-support"
# kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied
# This is needed for the ramdisk script to work
-BOOTSTRAP_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
+MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
@@ -29,3 +33,5 @@ ROOT_FLASH_SIZE = "14"
# Later versions are broken on kernel 2.4
PREFERRED_VERSION_orinoco-modules = "0.13e"
+
+MACHINE_TASK_PROVIDER = "task-base"
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/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb
index e72691f345..ad2b0f79f8 100644
--- a/packages/angstrom/task-angstrom-x11.bb
+++ b/packages/angstrom/task-angstrom-x11.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r24"
+PR = "r25"
ALLOW_EMPTY = "1"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -40,7 +40,8 @@ RDEPENDS_angstrom-gpe-task-base := "\
gpe-icons \
gpe-confd \
gpe-autostarter \
- libgtkstylus \
+ ${@base_contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus", "",d)} \
+ ${@base_contains("MACHINE_FEATURES", "keyboard", "", "libgtkinput",d)} \
suspend-desktop \
teleport \
xauth \
@@ -48,7 +49,9 @@ RDEPENDS_angstrom-gpe-task-base := "\
gdk-pixbuf-loader-xpm \
gdk-pixbuf-loader-jpeg \
pango-module-basic-x \
- pango-module-basic-fc"
+ pango-module-basic-fc \
+ ${@base_contains("COMBINED_FEATURES", "bluetooth", "gpe-bluetooth", "",d)} \
+ "
RDEPENDS_angstrom-gpe-task-pim := "\
gpe-timesheet \
@@ -78,9 +81,9 @@ RDEPENDS_angstrom-gpe-task-apps := "\
gpe-watch \
gpe-what \
matchbox-panel-hacks \
- gpe-aerial \
+ ${@base_contains("COMBINED_FEATURES", "wifi", "gpe-aerial", "",d)} \
gpe-soundbite \
- rosetta \
+ ${@base_contains("MACHINE_FEATURES", "touchscreen", "rosetta", "",d)} \
gpe-scap \
gpe-windowlist"
diff --git a/packages/mplayer/files/Makefile.patch b/packages/mplayer/files/Makefile.patch
index da316ad129..b9b68491c5 100644
--- a/packages/mplayer/files/Makefile.patch
+++ b/packages/mplayer/files/Makefile.patch
@@ -1,11 +1,15 @@
---- mplayer_20060519/Makefile.orig 2006-05-30 09:32:23.000000000 +0100
-+++ mplayer_20060519/Makefile 2006-05-30 09:34:07.000000000 +0100
-@@ -438,7 +438,7 @@
+Index: MPlayer-1.0pre8/Makefile
+===================================================================
+--- MPlayer-1.0pre8.orig/Makefile
++++ MPlayer-1.0pre8/Makefile
+@@ -438,8 +438,8 @@ codecs2html: mp_msg.o
$(CC) -DCODECS2HTML codec-cfg.c mp_msg.o -o $@
$(PRG_CFG): codec-cfg.c codec-cfg.h help_mp.h
- $(HOST_CC) $(HOST_CFLAGS) -I. codec-cfg.c -o $(PRG_CFG) \
+- -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC)
+ $(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -I. codec-cfg.c -o $(PRG_CFG) \
- -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC)
++ -DCODECS2HTML
install: $(ALL_PRG)
+ ifeq ($(VIDIX),yes)
diff --git a/packages/mplayer/mplayer_1.0pre8.bb b/packages/mplayer/mplayer_1.0pre8.bb
index c59c30e316..de5fa874fc 100644
--- a/packages/mplayer/mplayer_1.0pre8.bb
+++ b/packages/mplayer/mplayer_1.0pre8.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Open Source multimedia player."
-SECTION = "opie/multimedia"
+SECTION = "multimedia"
PRIORITY = "optional"
HOMEPAGE = "http://www.mplayerhq.hu/"
DEPENDS = "virtual/libsdl libmad zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame"
@@ -22,7 +22,7 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
RCONFLICTS_${PN} = "mplayer-atty"
RREPLACES_${PN} = "mplayer-atty"
-PR = "r3"
+PR = "r4"
PARALLEL_MAKE = ""
diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb
index 118e71bcea..ee0ba7921c 100644
--- a/packages/mplayer/mplayer_svn.bb
+++ b/packages/mplayer/mplayer_svn.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Open Source multimedia player."
-SECTION = "opie/multimedia"
+SECTION = "multimedia"
PRIORITY = "optional"
HOMEPAGE = "http://www.mplayerhq.hu/"
DEPENDS = "virtual/libsdl libmad zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame"
@@ -22,7 +22,7 @@ RCONFLICTS_${PN} = "mplayer-atty"
RREPLACES_${PN} = "mplayer-atty"
PV = "1.0pre8+svn${SRCDATE}"
-PR = "r0"
+PR = "r1"
DEFAULT_PREFERENCE = "-1"
PARALLEL_MAKE = ""
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 3f919c7766..1a41f13129 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r14"
+PR = "r15"
PACKAGES = "task-base \
task-base-minimal \
@@ -49,6 +49,7 @@ DISTRO_CORE_PACKAGE ?= "task-base-core-default"
RDEPENDS_task-base = "\
${DISTRO_CORE_PACKAGE} \
kernel \
+ ${@base_contains("MACHINE_FEATURES", "kernel24", "${task-base-kernel24-rdepends}", "",d)} \
${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \
${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \
${@base_contains("MACHINE_FEATURES", "acpi", "${task-base-acpi-rdepends}", "",d)} \
@@ -123,6 +124,8 @@ RDEPENDS_task-base-core-default = '\
RRECOMMENDS_task-base-core-default = '\
dropbear '
+task-base-kernel24-rdepends = "\
+ linux-hotplug "
task-base-kernel26-rdepends = "\
udev \
@@ -176,6 +179,13 @@ task-base-pcmcia-rrecommends = "\
kernel-module-pcnet-cs \
kernel-module-serial-cs \
kernel-module-ide-cs \
+ ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-pcmcia26-rrecommends}", "${task-base-pcmcia24-rrecommends}",d)} "
+
+task-base-pcmcia24-rrecommends = "\
+ ${@base_contains("DISTRO_FEATURES", "wifi", "hostap-modules-cs", "",d)} \
+ ${@base_contains("DISTRO_FEATURES", "wifi", "orinoco-modules-cs", "",d)}"
+
+task-base-pcmcia26-rrecommends = "\
${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-hostap-cs", "",d)} \
${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-orinoco-cs", "",d)} \
${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-spectrum-cs", "",d)}"
diff --git a/packages/tasks/task-proper-tools.bb b/packages/tasks/task-proper-tools.bb
index 5520864c82..dccdd13bdf 100644
--- a/packages/tasks/task-proper-tools.bb
+++ b/packages/tasks/task-proper-tools.bb
@@ -1,6 +1,7 @@
DESCRIPTION = "Proper tools for busybox haters"
-PR = "r1"
+PR = "r2"
+PACKAGE_ARCH = "all"
ALLOW_EMPTY_${PN} = "1"
RDEPENDS = "\
diff --git a/packages/valgrind/.mtn2git_empty b/packages/valgrind/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/valgrind/.mtn2git_empty
diff --git a/packages/valgrind/valgrind_3.2.1.bb b/packages/valgrind/valgrind_3.2.1.bb
new file mode 100644
index 0000000000..fedce377a8
--- /dev/null
+++ b/packages/valgrind/valgrind_3.2.1.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Valgrind memory debugger"
+HOMEPAGE = "http://www.valgrind.org/"
+SECTION = "devel"
+LICENSE = "GPL"
+DEPENDS = "virtual/libx11"
+PR = "r0"
+
+SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-tls"
+
+COMPATIBLE_HOST = "^i.86.*-linux"
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-12 12:53:32 +0000