8 files changed, 41 insertions, 14 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 7893fd75cf..d446d40b8f 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -102,7 +102,7 @@ PROVIDES = ""
 PROVIDES_prepend = "${P} ${PF} ${PN} "
 RPROVIDES = ""
 
-PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
+PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
 FILES = ""
 FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
             ${sysconfdir} ${sharedstatedir} ${localstatedir} \
@@ -118,6 +118,8 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
                 ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
                 /lib/*.a /lib/*.o ${datadir}/aclocal"
 FILES_${PN}-locale = "${datadir}/locale"
+FILES_${PN}-dbg = "${bindir}/*.dbg ${sbindir}/*.dbg ${libexecdir}/*.dbg ${libdir}/lib*.so.*.dbg \
+            /bin/*.dbg /sbin/*.dbg /lib/*.so*.dbg ${libdir}/${PN}/*.dbg"
 
 # File manifest
 
@@ -223,6 +225,7 @@ export AR = "${HOST_PREFIX}ar"
 export AS = "${HOST_PREFIX}as"
 export RANLIB = "${HOST_PREFIX}ranlib"
 export STRIP = "${HOST_PREFIX}strip"
+export OBJCOPY = "${HOST_PREFIX}objcopy"
 
 export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}"
 export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}"
diff --git a/conf/distro/ezx.conf b/conf/distro/ezx.conf
index 5a24d22a8c..1e156dd363 100644
--- a/conf/distro/ezx.conf
+++ b/conf/distro/ezx.conf
@@ -57,7 +57,7 @@ PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
 #
 # Utilities
 #
-BOOTSTRAP_EXTRA_DEPENDS += "ezx-boot-usb-native"
+EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
 BOOTSTRAP_EXTRA_RDEPENDS += "ezx-gpiotool strace"
 
 #
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 13ac2b16bf..8203c000f7 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -37,7 +37,6 @@ BUILD_OPTIMIZATION = "-Os"
 TARGET_FPU_arm = "soft"
 
 #Always ship these packages
-BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version coreutils dropbear sysvinit"
 BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version coreutils dropbear sysvinit"
 
 #Name the generated images in a sane way
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index cd1462f408..3c2d8e560b 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -77,8 +77,6 @@ TARGET_OS = "linux"
 #<>
 BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-tools udev \
                              e2tools e2fsprogs kernel-modules spectrum-fw keymaps"
-BOOTSTRAP_EXTRA_DEPENDS  += "pcmciautils ncurses nano wireless-tools console-tools udev \
-                             e2tools e2fsprogs kernel-modules spectrum-fw keymaps"
 
 #<>
 #<>What Qte, libqte.. versions should we use.
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index 8fa440e155..bf653d9e97 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -10,8 +10,6 @@ PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 
 ROOT_FLASH_SIZE = "32"
 
-BOOTSTRAP_EXTRA_DEPENDS_append = " mtd-utils virtual/kernel udev module-init-tools"
-
 BOOT_MODULES = " ${@linux_module_packages('${H4000_MODULES}', d)}"
 BOOTSTRAP_EXTRA_RRECOMMENDS = " ${BOOT_MODULES}"
 BOOTSTRAP_EXTRA_RDEPENDS_append = " mtd-utils kernel udev module-init-tools"
diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf
new file mode 100644
index 0000000000..758793f7a7
--- /dev/null
+++ b/conf/machine/h5xxx.conf
@@ -0,0 +1,35 @@
+#@TYPE: Machine
+#@NAME: Compaq iPAQ 51xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx
+#@DESCRIPTION: Machine configuration for the Compaq iPAQ 51xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices
+
+KERNEL ?= "kernel24"
+#KERNEL ?= "kernel26"
+
+OVERRIDES =. "${KERNEL}:"
+
+TARGET_ARCH = "arm"
+IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa"
+PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6"
+EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p"
+
+ROOT_FLASH_SIZE = "32"
+
+BOOT_MODULES = "${@linux_module_packages('${H5XXX_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${BOOT_MODULES}"
+BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules"
+BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools"
+
+H5XXX_MODULES_kernel24 = " g_ether pxa2xx_udc h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400 mtdchar h5400-audio"
+H5XXX_MODULES_kernel26 = " h5400_lcd g_ether apm h5400_battery pcmcia-core"
+# pxa2xx_udc is built in to the kernel
+
+SERIAL_CONSOLE = "115200 tts/0 vt100"
+
+USE_DEVFS_kernel24 = "1"
+USE_VT = "0"
+
+GUI_MACHINE_CLASS = "smallscreen"
+
+include conf/machine/tune-xscale.conf
diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf
index 33855e3a66..42eabeb588 100644
--- a/conf/machine/h6300.conf
+++ b/conf/machine/h6300.conf
@@ -28,11 +28,6 @@ module_autoload_snd-omap-alsa-tsc2101 = "snd-omap-alsa-tsc2101"
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_snd-mixer-oss = "snd-mixer-oss"
 
-BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils console-tools module-init-tools"
-BOOTSTRAP_EXTRA_DEPENDS += "apmd alsa-utils"
-BOOTSTRAP_EXTRA_DEPENDS  += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin"
-BOOTSTRAP_EXTRA_DEPENDS  += "scap minicom nano gdb strace network-suspend-scripts pciutils usbutils"
-
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils console-tools module-init-tools"
 BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${H6300_MODULES}', d)}"
 BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd alsa-utils"
@@ -40,7 +35,6 @@ BOOTSTRAP_EXTRA_RDEPENDS += "alsa-utils-aconnect alsa-utils-alsactl alsa-utils-a
 BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin"
 BOOTSTRAP_EXTRA_RRECOMMENDS += "scap minicom nano gdb strace network-suspend-scripts pciutils usbutils"
 
-GPE_EXTRA_DEPENDS += "gaim gpe-filemanager sylpheed gpe-mini-browser gomunicator gpe-tetris gpe-othello gpe-go gstreamer"
 GPE_EXTRA_INSTALL += "gaim gpe-filemanager sylpheed gpe-mini-browser gomunicator gpe-tetris gpe-othello gpe-go gstreamer"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 0e377a151f..8ce77e7449 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -47,4 +47,4 @@ module_autoload_htcuniversal-acx = "htcuniversal_acx"
 #FIXME: this should be controlled by a userspace utility later.
 module_autoload_g_ether = "g_ether"
 
-#GPE_EXTRA_DEPENDS += " gomunicator"
+#GPE_EXTRA_INSTALL += " gomunicator"