[oe-commits] org.oe.dev merge of '86dacb8c8e579fd5d42ab61a0c0f344bcf74146d'
oe commit
oe at amethyst.openembedded.net
Mon May 5 23:19:21 UTC 2008
merge of '86dacb8c8e579fd5d42ab61a0c0f344bcf74146d'
and 'd4a97f257158aba4fde91347580030110ef215bf'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 3ed57a19d01165b8bf3de02acb883e37b19fc372
ViewMTN: http://monotone.openembedded.org/revision/info/3ed57a19d01165b8bf3de02acb883e37b19fc372
Files:
1
conf/distro/include/preferred-om-2008-versions.inc
packages/asterisk/asterisk-1.4.10
packages/asterisk/asterisk-1.4.10/Makefile.patch
packages/asterisk/asterisk-1.4.10/init
packages/asterisk/asterisk-1.4.10/logrotate
packages/asterisk/asterisk-1.4.10/sounds.xml.patch
packages/asterisk/asterisk-1.4.10/volatiles
packages/asterisk/asterisk-1.4.11
packages/asterisk/asterisk-1.4.11/Makefile.patch
packages/asterisk/asterisk-1.4.11/init
packages/asterisk/asterisk-1.4.11/logrotate
packages/asterisk/asterisk-1.4.11/sounds.xml.patch
packages/asterisk/asterisk-1.4.11/volatiles
packages/asterisk/asterisk-1.6.0-beta6
packages/asterisk/asterisk-1.6.0-beta6/Makefile.patch
packages/asterisk/asterisk-1.6.0-beta6/init
packages/asterisk/asterisk-1.6.0-beta6/logrotate
packages/asterisk/asterisk-1.6.0-beta6/sounds.xml.patch
packages/asterisk/asterisk-1.6.0-beta6/volatiles
packages/asterisk/asterisk_1.4.10.bb
packages/asterisk/asterisk_1.4.11.bb
packages/asterisk/asterisk_1.6.0-beta6.bb
packages/gnash/gnash.inc
packages/gnash/gnash_0.8.1.bb
packages/gpsdrive/gpsdrive-2.10pre4
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
packages/gpsdrive/gpsdrive_2.10pre4.bb
packages/gtk+/gtk+-2.10.14/gtklabel-resize-patch
packages/gtk+/gtk+-2.10.14/xsettings.patch
packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch
packages/gtk+/gtk+-2.12.0/xsettings.patch
packages/gtk+/gtk+-2.6.10/gtklabel-resize-patch
packages/gtk+/gtk+-2.6.10/xsettings.patch
packages/gtk+/gtk+-2.8.16/gtklabel-resize-patch
packages/gtk+/gtk+-2.8.16/xsettings.patch
packages/gtk+/gtk+-2.8.9/gtklabel-resize-patch
packages/gtk+/gtk+-2.8.9/xsettings.patch
packages/hostap/hostap-daemon-0.6.3
packages/hostap/hostap-daemon-0.6.3/init
packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff
packages/hostap/hostap-daemon_0.3.7.bb
packages/hostap/hostap-daemon_0.5.1.bb
packages/hostap/hostap-daemon_0.6.3.bb
packages/hostap/hostap-modules_0.3.10.bb
packages/hostap/hostap-modules_0.3.7.bb
packages/hostap/hostap-modules_0.3.9.bb
packages/hostap/hostap-utils_0.3.7.bb
packages/ipkg/files/ipkg_bugfix.patch
packages/linux/linux-2.6.22+2.6.23-rc5
packages/linux/linux-2.6.22.6/ts72xx
packages/linux/linux-2.6.22.6/ts72xx/ep93xx-gpio-interrupt-debounce.diff
packages/linux/linux-2.6.22.6/ts72xx/ep93xx-i2c-bus.diff
packages/linux/linux-2.6.22.6/ts72xx/ep93xx-i2c.diff
packages/linux/linux-2.6.22.6/ts72xx/ep93xx-leds.diff
packages/linux/linux-2.6.22.6/ts72xx/ep93xx-maverick-uniqid.patch
packages/linux/linux-2.6.22.6/ts72xx/ep93xx-serial-clocks.diff
packages/linux/linux-2.6.22.6/ts72xx/ep93xx-serial-uartbaud.diff
packages/linux/linux-2.6.22.6/ts72xx/ep93xx-timer-accuracy.diff
packages/linux/linux-2.6.22.6/ts72xx/series
packages/linux/linux-2.6.22.6/ts72xx/ts72xx-machine-id-fix.patch
packages/linux/linux-2.6.22.6/ts72xx/ts72xx-nfbit-fix.patch
packages/linux/linux-2.6.22.6/ts72xx/ts72xx-use-cpld-reset.patch
packages/linux/linux-2.6.22.6/ts72xx/ts72xx-watchdog.patch
packages/linux/linux-omap2-git/beagleboard/1-rearrange-omap3.patch
packages/linux/linux-omap2-git/beagleboard/2-update-omap3evm-kconfig.patch
packages/linux/linux-omap2-git/beagleboard/3-omap3evm-board.patch
packages/linux/linux-omap2-git/beagleboard/4-omap3evm-config.patch
packages/linux/linux-omap2-git/beagleboard/5-omap3evm-header.patch
packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff
packages/linux/linux-omap2-git/beagleboard/beagle-board-file.diff
packages/linux/linux-omap2-git/beagleboard/beagle-board-header.diff
packages/linux/linux-omap2-git/beagleboard/beagle-board-patch-dirk.diff
packages/linux/linux-omap2-git/beagleboard/beagle-kconfig-makefile.diff
packages/madwifi/madwifi-ng_r1844-20061208.bb
packages/madwifi/madwifi-ng_r2100-20070210.bb
packages/madwifi/madwifi-ng_r2156-20070225.bb
packages/madwifi/madwifi-ng_r2182-20070308.bb
packages/madwifi/madwifi-ng_r2187-20070309.bb
packages/madwifi/madwifi-ng_r2518-20070626.bb
packages/madwifi/madwifi-ng_r2702-20070903.bb
packages/multitap-pad
packages/multitap-pad/files
packages/multitap-pad/files/80multitappad
packages/multitap-pad/multitap-pad_svn.bb
packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
packages/perl/libwww-perl-native_5.808.bb
packages/perl/libwww-perl_5.808.bb
packages/wpa-supplicant/wpa-supplicant
packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch
packages/wpa-supplicant/wpa-supplicant-0.5.inc
packages/wpa-supplicant/wpa-supplicant-nossl
packages/wpa-supplicant/wpa-supplicant-nossl/wpa-defconfig
packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb
packages/wpa-supplicant/wpa-supplicant-ssl
packages/wpa-supplicant/wpa-supplicant-ssl/wpa-defconfig
packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb
packages/wpa-supplicant/wpa-supplicant_0.2.6.inc
packages/wpa-supplicant/wpa-supplicant_0.3.6.bb
packages/wpa-supplicant/wpa-supplicant_0.3.8.bb
packages/wpa-supplicant/wpa-supplicant_0.5.5.bb
packages/wpa-supplicant/wpa-supplicant_0.5.7.bb
packages/wpa-supplicant/wpa-supplicant_cvs.bb
packages/altboot/altboot_1.1.1+wip-SVNR80.bb
packages/altboot/altboot_1.1.1+wip-SVNR83.bb
packages/busybox/busybox-1.9.1
packages/busybox/busybox-1.9.2
packages/busybox/busybox_1.9.1.bb
packages/busybox/busybox_1.9.2.bb
packages/freesmartphone/gsm0710muxd_svn.bb
packages/freesmartphone/gsm0710muxd_git.bb
packages/freesmartphone/py-odeviced
packages/freesmartphone/python-odeviced
packages/freesmartphone/py-odeviced_svn.bb
packages/freesmartphone/python-odeviced_git.bb
packages/freesmartphone/pyneod_svn.bb
packages/freesmartphone/pyneod_git.bb
packages/freesmartphone/pyneog_svn.bb
packages/freesmartphone/pyneog_git.bb
packages/gqview/gqview-2.1.1
packages/gqview/gqview-2.1.5
packages/gqview/gqview_2.1.1.bb
packages/gqview/gqview_2.1.5.bb
packages/gtk+/gtk+-2.12.3/gtklabel-resize-patch
packages/gtk+/files/gtklabel-resize-patch
packages/gtk+/gtk+-2.12.3/xsettings.patch
packages/gtk+/files/xsettings.patch
packages/libc-client/libc-client_2007.bb
packages/libc-client/libc-client_2007a1.bb
packages/libxsettings-client/make_pkgconfig_x11.patch
packages/libxsettings-client/files/make_pkgconfig_x11.patch
packages/libxsettings-client/no-host-includes.patch
packages/libxsettings-client/files/no-host-includes.patch
packages/linux/linux-mainstone_2.6.25-rc4.bb
packages/linux/linux-mainstone_2.6.25.bb
packages/popt/popt-native_1.13.bb
packages/popt/popt-native_1.14.bb
packages/popt/popt_1.13.bb
packages/popt/popt_1.14.bb
packages/python/python-pyrtc_svn.bb
packages/python/python-pyrtc_git.bb
packages/ulxmlrpcpp/ulxmlrpcpp_1.5.2.bb
packages/ulxmlrpcpp/ulxmlrpcpp_1.7.3.bb
packages/xapian/xapian-quickstartindex_1.0.bb
packages/xapian/xapian-quickstart.inc
packages/asterisk/asterisk-1.2.28
packages/asterisk/asterisk-1.4.19.1
packages/asterisk/asterisk-1.6.0-beta8
packages/bluez/bluez-utils-3.30
packages/ezx/files
packages/ezx/files/asm-arm
packages/freesmartphone/python-ophoned
packages/gdb/gdb-6.8
packages/geany
packages/hostap/hostap-daemon-0.5.10
packages/libgcrypt/libgcrypt-1.4.1
packages/libxsettings-client/files
packages/linux/linux-2.6.25/sequoia
packages/netbase/netbase/mpc8313e-rdb
packages/pth/files
packages/pulseaudio/pulseaudio-0.9.10
packages/sailcut
packages/u-boot/u-boot-1.1.4/at32stk1000
packages/u-boot/u-boot-1.3.2
packages/uclibc/uclibc-0.9.29/dht-walnut
packages/uclibc/uclibc-0.9.29/kilauea
packages/uclibc/uclibc-0.9.29/sequoia
packages/webkit/webkit-gtk
conf/distro/include/fso-autorev.inc
conf/distro/jlime-henchman.conf
conf/distro/jlime-mongo.conf
conf/machine/d201gly2.conf
conf/machine/htckaiser.conf
conf/machine/include/tune-at32ap7000.inc
conf/machine/include/tune-pentium4c.inc
conf/machine/mp900c.conf
packages/asterisk/asterisk-1.2.28/asterisk.patch
packages/asterisk/asterisk-1.2.28/enable-speex.patch
packages/asterisk/asterisk-1.2.28/uclibc-compat-getloadavg.patch
packages/asterisk/asterisk-1.2.28/uclibc-dns.patch
packages/asterisk/asterisk-1.4.19.1/Makefile.patch
packages/asterisk/asterisk-1.4.19.1/init
packages/asterisk/asterisk-1.4.19.1/logrotate
packages/asterisk/asterisk-1.4.19.1/sounds.xml.patch
packages/asterisk/asterisk-1.4.19.1/volatiles
packages/asterisk/asterisk-1.6.0-beta8/Makefile.patch
packages/asterisk/asterisk-1.6.0-beta8/init
packages/asterisk/asterisk-1.6.0-beta8/logrotate
packages/asterisk/asterisk-1.6.0-beta8/sounds.xml.patch
packages/asterisk/asterisk-1.6.0-beta8/volatiles
packages/asterisk/asterisk_1.2.28.bb
packages/asterisk/asterisk_1.4.19.1.bb
packages/asterisk/asterisk_1.6.0-beta8.bb
packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2
packages/binutils/binutils-avr32.inc
packages/bluez/bluez-gnome_0.26.bb
packages/bluez/bluez-libs_3.30.bb
packages/bluez/bluez-utils-3.30/hciattach-ti-bts.patch
packages/bluez/bluez-utils_3.30.bb
packages/boost/files/atomic_count_gcc_atomicity.patch
packages/dosbox/dosbox.inc
packages/dosbox/dosbox_0.72.bb
packages/ezx/ezx-boot-usb-native_0.2.0.bb
packages/ezx/files/asm-arm/setup.h
packages/freesmartphone/pygsm_git.bb
packages/freesmartphone/python-ophoned_git.bb
packages/gcc/gcc-4.2.2/901-avr32-no-cond-exec-before-reload-by-default.patch
packages/gcc/gcc-4.2.2/gcc-4.2.2.atmel.1.0.8.patch.bz2
packages/gdb/gdb-6.8/early_debug_in_nptl.patch
packages/gdb/gdb-avr32.inc
packages/gdb/gdb-cross-sdk_6.8.bb
packages/gdb/gdb-cross_6.8.bb
packages/gdb/gdb_6.8.bb
packages/geany/geany_0.14.bb
packages/gnash/gnash-minimal.inc
packages/gnash/gnash-minimal_0.8.2.bb
packages/gnash/gnash-minimal_cvs.bb
packages/gnome/epiphany_2.22.1.bb
packages/gnome/libsoup_2.4.1.bb
packages/gpsd/gpsd_2.37.bb
packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff
packages/hostap/hostap-daemon_0.5.10.bb
packages/keymaps/files/jornada6xx/keymap-620lx-660lx.map
packages/keymaps/files/jornada6xx/keymap-br.map
packages/libgcrypt/libgcrypt-1.4.1/add-pkgconfig-support.patch
packages/libgcrypt/libgcrypt_1.4.1.bb
packages/libgpg-error/libgpg-error.inc
packages/libxsettings-client/libxsettings-client.inc
packages/linux/linux-2.6.24/ts72xx/ts72xx-rs485.patch
packages/linux/linux-2.6.25/sequoia/defconfig
packages/linux/linux-kaiser_2.6.24+git.bb
packages/linux/linux-omap2-git/beagleboard/l2-cache.patch
packages/linux/linux-omap2-git/beagleboard/no-harry-potter.diff
packages/linux/linux-omap2-git/beagleboard/usb-timout.patch
packages/netbase/netbase/mpc8313e-rdb/interfaces
packages/pth/files/m4-warning.patch
packages/pulseaudio/pulseaudio-0.9.10/libpulsedsp-references-libpulsecore.patch
packages/pulseaudio/pulseaudio-0.9.10/pa-drop-caps-returns-void.patch
packages/pulseaudio/pulseaudio_0.9.10.bb
packages/python/python-netfilter_0.5.4.bb
packages/python/python-setuptools-native_0.6c6.bb
packages/sailcut/sailcut_1.3.2.bb
packages/u-boot/u-boot-1.1.4/at32stk1000/ap7000-add-spi-device-and-lcdc-base-address.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-define-for-sdram-test.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-framebuffer-address.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-spi-initcalls.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-system-manager-header-file.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-add-lcd-and-spi-to-config.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-ltv350qv-display-support.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-spi-support.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/avr32-boards-fix-flash-read.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/cmd-bmp-add-gzip-compressed-bmp.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/fix-mmc-data-timeout.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/lcd-add-24-bpp-support-and-atmel-lcdc-support.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/lcdc-driver-for-avr32.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/libavr32-add-spi-and-lcd-board-support.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/spi-driver-for-avr32.patch
packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-autoboot.patch
packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-mtdparts.patch
packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-nand.patch
packages/uclibc/uclibc-0.9.29/dht-walnut/uClibc.machine
packages/uclibc/uclibc-0.9.29/kilauea/uClibc.machine
packages/uclibc/uclibc-0.9.29/sequoia/uClibc.machine
packages/uclibc/uclibc-cvs/errno_values.h.patch
packages/uclibc/uclibc-cvs/uclibc-arm-ftruncate64.patch
packages/ulxmlrpcpp/files/remove-local-includes.patch
packages/webkit/webkit-gtk/GNUmakefile.am
packages/webkit/webkit-gtk/Makefile
packages/webkit/webkit-gtk/Makefile.shared
packages/webkit/webkit-gtk/WebKit.pri
packages/webkit/webkit-gtk/WebKit.pro
packages/webkit/webkit-gtk/autogen.sh
packages/webkit/webkit-gtk/configure.ac
packages/wpa-supplicant/wpa-supplicant_0.5.10.bb
packages/xapian/xapian-core-native_1.0.5.bb
packages/xapian/xapian-quickstartindex-native_1.0.bb
packages/xapian/xapian-quickstartsearch_1.0.bb
MAINTAINERS
classes/base.bbclass
classes/kernel.bbclass
classes/packaged-staging.bbclass
classes/sdk.bbclass
classes/seppuku.bbclass
classes/setuptools.bbclass
conf/bitbake.conf
conf/distro/angstrom-2008.1.conf
conf/distro/generic-uclibc.conf
conf/distro/include/angstrom-2007-for-openmoko.inc
conf/distro/include/angstrom-2008-preferred-versions.inc
conf/distro/include/angstrom-eglibc.inc
conf/distro/include/angstrom-glibc.inc
conf/distro/include/angstrom-uclibc.inc
conf/distro/include/angstrom.inc
conf/distro/include/moko-autorev.inc
conf/distro/include/oplinux.inc
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/include/slugos.inc
conf/distro/jlime-donkey.conf
conf/distro/oplinux-uclibc.conf
conf/documentation.conf
conf/machine/at32stk1000.conf
conf/machine/atngw100.conf
conf/machine/beagleboard.conf
conf/machine/include/qemu.inc
conf/machine/lsarm.conf
conf/machine/mpc8313e-rdb.conf
conf/machine/mpc8323e-rdb.conf
conf/machine/mx31ads.conf
conf/machine/mx31moboard.conf
conf/machine/n2100.conf
conf/machine/nokia800.conf
conf/machine/om-gta02.conf
conf/machine/sequoia.conf
conf/machine/storcenter.conf
conf/machine/turbostation.conf
contrib/mtn2cl/mtn2cl.sh
contrib/mtn2git/update-script.example
packages/alsa/alsa-state.bb
packages/alsa/alsa-utils_1.0.13.bb
packages/angstrom/angstrom-gpe-task-base.bb
packages/asterisk/asterisk_1.2.24.bb
packages/binutils/binutils.inc
packages/binutils/binutils_2.17.bb
packages/bitchx/bitchx_1.1.bb
packages/boost/boost_1.33.1.bb
packages/busybox/busybox-1.9.2/defconfig
packages/dbus/dbus-1.2.1/dbus-1.init
packages/dbus/dbus_1.2.1.bb
packages/diffutils/diffutils_2.8.1.bb
packages/dosbox/dosbox_0.63.bb
packages/dosbox/dosbox_0.70.bb
packages/efl1/imlib2_cvs.bb
packages/gcc/gcc-4.2.2.inc
packages/gdb/gdb-cross.inc
packages/gnome/libsoup_2.2.100.bb
packages/gnuradio/gnuradio.inc
packages/gnuradio/gnuradio_3.0.4.bb
packages/gnuradio/gnuradio_3.1.2.bb
packages/gnuradio/gnuradio_svn.bb
packages/gpgme/gpgme.inc
packages/gpgme/gpgme_1.0.0.bb
packages/gpgme/gpgme_1.0.3.bb
packages/gpgme/gpgme_1.1.4.bb
packages/hal/files/20hal
packages/hal/hal_0.5.9.bb
packages/hostap/hostap-daemon/init
packages/images/sdr-image.bb
packages/images/unslung-image.bb
packages/keymaps/files/jornada6xx/keymap-de.map
packages/keymaps/files/jornada6xx/keymap-sp.map
packages/keymaps/files/jornada6xx/keymap-uk.map
packages/libgcrypt/libgcrypt.inc
packages/libgpg-error/libgpg-error_0.7.bb
packages/libgpg-error/libgpg-error_1.0.bb
packages/libgpg-error/libgpg-error_1.3.bb
packages/libgpg-error/libgpg-error_1.4.bb
packages/libpcre/libpcre_7.6.bb
packages/libxsettings-client/libxsettings-client_0.14.bb
packages/libxsettings-client/libxsettings-client_0.16.bb
packages/libxsettings-client/libxsettings-client_0.17.bb
packages/libxsettings-client/libxsettings-client_svn.bb
packages/linux/linux-ixp4xx/defconfig-2.6.24.4
packages/linux/linux-ixp4xx_2.6.24.4.bb
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2_git.bb
packages/linux/linux-rp-2.6.24/defconfig-qemux86
packages/linux/linux-rp_2.6.24.bb
packages/linux/linux.inc
packages/linux/linux_2.6.25.bb
packages/madwifi/madwifi-ng_r.inc
packages/madwifi/madwifi-ng_r3314-20080131.bb
packages/make/make.inc
packages/meta/slugos-packages.bb
packages/mozilla/minimo/bug-322806.diff
packages/openocd/openocd_svn.bb
packages/opkg/opkg_svn.bb
packages/perl/files/perl-5.8.8-gcc-4.2.patch
packages/perl/perl-5.8.8/native-ssp.patch
packages/popt/popt.inc
packages/postfix/postfix_2.0.20.bb
packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
packages/pth/pth_2.0.2.bb
packages/python/python-2.5-manifest.inc
packages/python/python-setuptools_0.6c6.bb
packages/python/python-simplejson_1.7.1.bb
packages/python/python_2.5.2.bb
packages/qt4/qt4-x11-free.inc
packages/qt4/qt_staging.inc
packages/rsync/rsync.inc
packages/rsync/rsync_2.6.9.bb
packages/rsync/rsync_3.0.0.bb
packages/tasks/task-base.bb
packages/u-boot/u-boot_1.1.4.bb
packages/u-boot/u-boot_1.3.2.bb
packages/uclibc/uclibc-0.9.29/avr32/uClibc.machine
packages/uclibc/uclibc-0.9.29/uClibc.distro
packages/uclibc/uclibc-initial_0.9.29.bb
packages/uclibc/uclibc-initial_svn.bb
packages/uclibc/uclibc.inc
packages/uclibc/uclibc_0.9.26.bb
packages/uclibc/uclibc_0.9.27.bb
packages/uclibc/uclibc_0.9.28.bb
packages/uclibc/uclibc_0.9.29.bb
packages/uclibc/uclibc_svn.bb
packages/uim/uim-native_1.3.1.bb
packages/uim/uim.inc
packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb
packages/xserver-common/files/kdrive-1.4-fixes.patch
packages/xserver-common/xserver-common_1.22.bb
packages/zaurusd/files/alsa-cxx00-default.state.patch
mtn:manual_merge
true
packages/portmap/portmap_6.0.bb
Diffs:
#
# mt diff -r86dacb8c8e579fd5d42ab61a0c0f344bcf74146d -r3ed57a19d01165b8bf3de02acb883e37b19fc372
#
#
#
# delete "conf/distro/include/preferred-om-2008-versions.inc"
#
# delete "packages/asterisk/asterisk-1.4.10"
#
# delete "packages/asterisk/asterisk-1.4.10/Makefile.patch"
#
# delete "packages/asterisk/asterisk-1.4.10/init"
#
# delete "packages/asterisk/asterisk-1.4.10/logrotate"
#
# delete "packages/asterisk/asterisk-1.4.10/sounds.xml.patch"
#
# delete "packages/asterisk/asterisk-1.4.10/volatiles"
#
# delete "packages/asterisk/asterisk-1.4.11"
#
# delete "packages/asterisk/asterisk-1.4.11/Makefile.patch"
#
# delete "packages/asterisk/asterisk-1.4.11/init"
#
# delete "packages/asterisk/asterisk-1.4.11/logrotate"
#
# delete "packages/asterisk/asterisk-1.4.11/sounds.xml.patch"
#
# delete "packages/asterisk/asterisk-1.4.11/volatiles"
#
# delete "packages/asterisk/asterisk-1.6.0-beta6"
#
# delete "packages/asterisk/asterisk-1.6.0-beta6/Makefile.patch"
#
# delete "packages/asterisk/asterisk-1.6.0-beta6/init"
#
# delete "packages/asterisk/asterisk-1.6.0-beta6/logrotate"
#
# delete "packages/asterisk/asterisk-1.6.0-beta6/sounds.xml.patch"
#
# delete "packages/asterisk/asterisk-1.6.0-beta6/volatiles"
#
# delete "packages/asterisk/asterisk_1.4.10.bb"
#
# delete "packages/asterisk/asterisk_1.4.11.bb"
#
# delete "packages/asterisk/asterisk_1.6.0-beta6.bb"
#
# delete "packages/gnash/gnash.inc"
#
# delete "packages/gnash/gnash_0.8.1.bb"
#
# delete "packages/gpsdrive/gpsdrive-2.10pre4"
#
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch"
#
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch"
#
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch"
#
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop"
#
# delete "packages/gpsdrive/gpsdrive_2.10pre4.bb"
#
# delete "packages/gtk+/gtk+-2.10.14/gtklabel-resize-patch"
#
# delete "packages/gtk+/gtk+-2.10.14/xsettings.patch"
#
# delete "packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch"
#
# delete "packages/gtk+/gtk+-2.12.0/xsettings.patch"
#
# delete "packages/gtk+/gtk+-2.6.10/gtklabel-resize-patch"
#
# delete "packages/gtk+/gtk+-2.6.10/xsettings.patch"
#
# delete "packages/gtk+/gtk+-2.8.16/gtklabel-resize-patch"
#
# delete "packages/gtk+/gtk+-2.8.16/xsettings.patch"
#
# delete "packages/gtk+/gtk+-2.8.9/gtklabel-resize-patch"
#
# delete "packages/gtk+/gtk+-2.8.9/xsettings.patch"
#
# delete "packages/hostap/hostap-daemon-0.6.3"
#
# delete "packages/hostap/hostap-daemon-0.6.3/init"
#
# delete "packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff"
#
# delete "packages/hostap/hostap-daemon_0.3.7.bb"
#
# delete "packages/hostap/hostap-daemon_0.5.1.bb"
#
# delete "packages/hostap/hostap-daemon_0.6.3.bb"
#
# delete "packages/hostap/hostap-modules_0.3.10.bb"
#
# delete "packages/hostap/hostap-modules_0.3.7.bb"
#
# delete "packages/hostap/hostap-modules_0.3.9.bb"
#
# delete "packages/hostap/hostap-utils_0.3.7.bb"
#
# delete "packages/ipkg/files/ipkg_bugfix.patch"
#
# delete "packages/linux/linux-2.6.22+2.6.23-rc5"
#
# delete "packages/linux/linux-2.6.22.6/ts72xx"
#
# delete "packages/linux/linux-2.6.22.6/ts72xx/ep93xx-gpio-interrupt-debounce.diff"
#
# delete "packages/linux/linux-2.6.22.6/ts72xx/ep93xx-i2c-bus.diff"
#
# delete "packages/linux/linux-2.6.22.6/ts72xx/ep93xx-i2c.diff"
#
# delete "packages/linux/linux-2.6.22.6/ts72xx/ep93xx-leds.diff"
#
# delete "packages/linux/linux-2.6.22.6/ts72xx/ep93xx-maverick-uniqid.patch"
#
# delete "packages/linux/linux-2.6.22.6/ts72xx/ep93xx-serial-clocks.diff"
#
# delete "packages/linux/linux-2.6.22.6/ts72xx/ep93xx-serial-uartbaud.diff"
#
# delete "packages/linux/linux-2.6.22.6/ts72xx/ep93xx-timer-accuracy.diff"
#
# delete "packages/linux/linux-2.6.22.6/ts72xx/series"
#
# delete "packages/linux/linux-2.6.22.6/ts72xx/ts72xx-machine-id-fix.patch"
#
# delete "packages/linux/linux-2.6.22.6/ts72xx/ts72xx-nfbit-fix.patch"
#
# delete "packages/linux/linux-2.6.22.6/ts72xx/ts72xx-use-cpld-reset.patch"
#
# delete "packages/linux/linux-2.6.22.6/ts72xx/ts72xx-watchdog.patch"
#
# delete "packages/linux/linux-omap2-git/beagleboard/1-rearrange-omap3.patch"
#
# delete "packages/linux/linux-omap2-git/beagleboard/2-update-omap3evm-kconfig.patch"
#
# delete "packages/linux/linux-omap2-git/beagleboard/3-omap3evm-board.patch"
#
# delete "packages/linux/linux-omap2-git/beagleboard/4-omap3evm-config.patch"
#
# delete "packages/linux/linux-omap2-git/beagleboard/5-omap3evm-header.patch"
#
# delete "packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff"
#
# delete "packages/linux/linux-omap2-git/beagleboard/beagle-board-file.diff"
#
# delete "packages/linux/linux-omap2-git/beagleboard/beagle-board-header.diff"
#
# delete "packages/linux/linux-omap2-git/beagleboard/beagle-board-patch-dirk.diff"
#
# delete "packages/linux/linux-omap2-git/beagleboard/beagle-kconfig-makefile.diff"
#
# delete "packages/madwifi/madwifi-ng_r1844-20061208.bb"
#
# delete "packages/madwifi/madwifi-ng_r2100-20070210.bb"
#
# delete "packages/madwifi/madwifi-ng_r2156-20070225.bb"
#
# delete "packages/madwifi/madwifi-ng_r2182-20070308.bb"
#
# delete "packages/madwifi/madwifi-ng_r2187-20070309.bb"
#
# delete "packages/madwifi/madwifi-ng_r2518-20070626.bb"
#
# delete "packages/madwifi/madwifi-ng_r2702-20070903.bb"
#
# delete "packages/multitap-pad"
#
# delete "packages/multitap-pad/files"
#
# delete "packages/multitap-pad/files/80multitappad"
#
# delete "packages/multitap-pad/multitap-pad_svn.bb"
#
# delete "packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb"
#
# delete "packages/perl/libwww-perl-native_5.808.bb"
#
# delete "packages/perl/libwww-perl_5.808.bb"
#
# delete "packages/wpa-supplicant/wpa-supplicant"
#
# delete "packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch"
#
# delete "packages/wpa-supplicant/wpa-supplicant-0.5.inc"
#
# delete "packages/wpa-supplicant/wpa-supplicant-nossl"
#
# delete "packages/wpa-supplicant/wpa-supplicant-nossl/wpa-defconfig"
#
# delete "packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb"
#
# delete "packages/wpa-supplicant/wpa-supplicant-ssl"
#
# delete "packages/wpa-supplicant/wpa-supplicant-ssl/wpa-defconfig"
#
# delete "packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb"
#
# delete "packages/wpa-supplicant/wpa-supplicant_0.2.6.inc"
#
# delete "packages/wpa-supplicant/wpa-supplicant_0.3.6.bb"
#
# delete "packages/wpa-supplicant/wpa-supplicant_0.3.8.bb"
#
# delete "packages/wpa-supplicant/wpa-supplicant_0.5.5.bb"
#
# delete "packages/wpa-supplicant/wpa-supplicant_0.5.7.bb"
#
# delete "packages/wpa-supplicant/wpa-supplicant_cvs.bb"
#
# rename "packages/altboot/altboot_1.1.1+wip-SVNR80.bb"
# to "packages/altboot/altboot_1.1.1+wip-SVNR83.bb"
#
# rename "packages/busybox/busybox-1.9.1"
# to "packages/busybox/busybox-1.9.2"
#
# rename "packages/busybox/busybox_1.9.1.bb"
# to "packages/busybox/busybox_1.9.2.bb"
#
# rename "packages/freesmartphone/gsm0710muxd_svn.bb"
# to "packages/freesmartphone/gsm0710muxd_git.bb"
#
# rename "packages/freesmartphone/py-odeviced"
# to "packages/freesmartphone/python-odeviced"
#
# rename "packages/freesmartphone/py-odeviced_svn.bb"
# to "packages/freesmartphone/python-odeviced_git.bb"
#
# rename "packages/freesmartphone/pyneod_svn.bb"
# to "packages/freesmartphone/pyneod_git.bb"
#
# rename "packages/freesmartphone/pyneog_svn.bb"
# to "packages/freesmartphone/pyneog_git.bb"
#
# rename "packages/gqview/gqview-2.1.1"
# to "packages/gqview/gqview-2.1.5"
#
# rename "packages/gqview/gqview_2.1.1.bb"
# to "packages/gqview/gqview_2.1.5.bb"
#
# rename "packages/gtk+/gtk+-2.12.3/gtklabel-resize-patch"
# to "packages/gtk+/files/gtklabel-resize-patch"
#
# rename "packages/gtk+/gtk+-2.12.3/xsettings.patch"
# to "packages/gtk+/files/xsettings.patch"
#
# rename "packages/libc-client/libc-client_2007.bb"
# to "packages/libc-client/libc-client_2007a1.bb"
#
# rename "packages/libxsettings-client/make_pkgconfig_x11.patch"
# to "packages/libxsettings-client/files/make_pkgconfig_x11.patch"
#
# rename "packages/libxsettings-client/no-host-includes.patch"
# to "packages/libxsettings-client/files/no-host-includes.patch"
#
# rename "packages/linux/linux-mainstone_2.6.25-rc4.bb"
# to "packages/linux/linux-mainstone_2.6.25.bb"
#
# rename "packages/popt/popt-native_1.13.bb"
# to "packages/popt/popt-native_1.14.bb"
#
# rename "packages/popt/popt_1.13.bb"
# to "packages/popt/popt_1.14.bb"
#
# rename "packages/python/python-pyrtc_svn.bb"
# to "packages/python/python-pyrtc_git.bb"
#
# rename "packages/ulxmlrpcpp/ulxmlrpcpp_1.5.2.bb"
# to "packages/ulxmlrpcpp/ulxmlrpcpp_1.7.3.bb"
#
# rename "packages/xapian/xapian-quickstartindex_1.0.bb"
# to "packages/xapian/xapian-quickstart.inc"
#
# add_dir "packages/asterisk/asterisk-1.2.28"
#
# add_dir "packages/asterisk/asterisk-1.4.19.1"
#
# add_dir "packages/asterisk/asterisk-1.6.0-beta8"
#
# add_dir "packages/bluez/bluez-utils-3.30"
#
# add_dir "packages/ezx/files"
#
# add_dir "packages/ezx/files/asm-arm"
#
# add_dir "packages/freesmartphone/python-ophoned"
#
# add_dir "packages/gdb/gdb-6.8"
#
# add_dir "packages/geany"
#
# add_dir "packages/hostap/hostap-daemon-0.5.10"
#
# add_dir "packages/libgcrypt/libgcrypt-1.4.1"
#
# add_dir "packages/libxsettings-client/files"
#
# add_dir "packages/linux/linux-2.6.25/sequoia"
#
# add_dir "packages/multitap-pad"
#
# add_dir "packages/multitap-pad/files"
#
# add_dir "packages/netbase/netbase/mpc8313e-rdb"
#
# add_dir "packages/pth/files"
#
# add_dir "packages/pulseaudio/pulseaudio-0.9.10"
#
# add_dir "packages/sailcut"
#
# add_dir "packages/u-boot/u-boot-1.1.4/at32stk1000"
#
# add_dir "packages/u-boot/u-boot-1.3.2"
#
# add_dir "packages/uclibc/uclibc-0.9.29/dht-walnut"
#
# add_dir "packages/uclibc/uclibc-0.9.29/kilauea"
#
# add_dir "packages/uclibc/uclibc-0.9.29/sequoia"
#
# add_dir "packages/webkit/webkit-gtk"
#
# add_file "conf/distro/include/fso-autorev.inc"
# content [0c8a1a3299beccbe5038925b40819e352a7c865f]
#
# add_file "conf/distro/include/preferred-om-2008-versions.inc"
# content [1fa5768d601b1fc24f2f64c740c2e5fc96c4fce3]
#
# add_file "conf/distro/jlime-henchman.conf"
# content [c5c0029ec6fcea5daaf00874e1a20e1d514d7586]
#
# add_file "conf/distro/jlime-mongo.conf"
# content [649596799adddbe974beb9a95120de0c9db17b28]
#
# add_file "conf/machine/d201gly2.conf"
# content [7e34b9738d6c1869f61708e1fec04db2564f9d89]
#
# add_file "conf/machine/htckaiser.conf"
# content [daed3c3a075ede90bec1e6302f724e7805689cfb]
#
# add_file "conf/machine/include/tune-at32ap7000.inc"
# content [e5e452b43a8e689bee19061e97ddd89ec6361c59]
#
# add_file "conf/machine/include/tune-pentium4c.inc"
# content [6d4588e5e8c363a3883c76fc49befb8c4e75864d]
#
# add_file "conf/machine/mp900c.conf"
# content [41f2c85c9af298c3c7eca1d376f152b85701d980]
#
# add_file "packages/asterisk/asterisk-1.2.28/asterisk.patch"
# content [cd980f6cc48c01f2394a731d2cf247809e5c2231]
#
# add_file "packages/asterisk/asterisk-1.2.28/enable-speex.patch"
# content [123420f2bb25f198d687ae8cfad1eef6e90725bb]
#
# add_file "packages/asterisk/asterisk-1.2.28/uclibc-compat-getloadavg.patch"
# content [750cd99592c157b993f2ccb9f63edbe274d9edd1]
#
# add_file "packages/asterisk/asterisk-1.2.28/uclibc-dns.patch"
# content [9dbcc47d6cfeefd0f4c1071f982806f49ffc262d]
#
# add_file "packages/asterisk/asterisk-1.4.19.1/Makefile.patch"
# content [ce55873b5855c020f4d4e987a386223d1a211911]
#
# add_file "packages/asterisk/asterisk-1.4.19.1/init"
# content [66ddc677ff3831fb4be746a9222e69f65a2c6a22]
#
# add_file "packages/asterisk/asterisk-1.4.19.1/logrotate"
# content [d1ec36f2b07760a1a2cd1c2b18215fc5e06b2f4f]
#
# add_file "packages/asterisk/asterisk-1.4.19.1/sounds.xml.patch"
# content [17999e17bf9a130a9e6e8a7a687092b2231d86c7]
#
# add_file "packages/asterisk/asterisk-1.4.19.1/volatiles"
# content [66814aff0fd07e02c83bf90010a95c0845067557]
#
# add_file "packages/asterisk/asterisk-1.6.0-beta8/Makefile.patch"
# content [83b3bcf804f60d8438696a8b8e54698c9c1dff09]
#
# add_file "packages/asterisk/asterisk-1.6.0-beta8/init"
# content [ab9f4c6af832cc4a94d2a5e256988be381675969]
#
# add_file "packages/asterisk/asterisk-1.6.0-beta8/logrotate"
# content [d1ec36f2b07760a1a2cd1c2b18215fc5e06b2f4f]
#
# add_file "packages/asterisk/asterisk-1.6.0-beta8/sounds.xml.patch"
# content [17999e17bf9a130a9e6e8a7a687092b2231d86c7]
#
# add_file "packages/asterisk/asterisk-1.6.0-beta8/volatiles"
# content [66814aff0fd07e02c83bf90010a95c0845067557]
#
# add_file "packages/asterisk/asterisk_1.2.28.bb"
# content [59adcd07ce9843da6a5209dbe439320b4e024fbc]
#
# add_file "packages/asterisk/asterisk_1.4.19.1.bb"
# content [04072cabaeacd15aab238077b9b08e107ebec94b]
#
# add_file "packages/asterisk/asterisk_1.6.0-beta8.bb"
# content [8fbf9884c3ab370083c2125640d541c7f0fc0388]
#
# add_file "packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2"
# content [61afa951e7c1dbe064e1134cfd7c2c4e9f919fb7]
#
# add_file "packages/binutils/binutils-avr32.inc"
# content [f542652a8b7f98688665946ef7a8f4643be2419b]
#
# add_file "packages/bluez/bluez-gnome_0.26.bb"
# content [5607b4f3a5823d6172b07db03a58bc2f7e42c47f]
#
# add_file "packages/bluez/bluez-libs_3.30.bb"
# content [dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d]
#
# add_file "packages/bluez/bluez-utils-3.30/hciattach-ti-bts.patch"
# content [2325160feaae636c3e834dcf0b73984945c0899f]
#
# add_file "packages/bluez/bluez-utils_3.30.bb"
# content [bd21943c7ca29d617bfd9492d34e92de11134575]
#
# add_file "packages/boost/files/atomic_count_gcc_atomicity.patch"
# content [b9084da134967c9093506c230f9af87b2bf74373]
#
# add_file "packages/dosbox/dosbox.inc"
# content [ccb4d2e04255395c6bbafbd819de1cbcfcfd1717]
#
# add_file "packages/dosbox/dosbox_0.72.bb"
# content [d741fb28a35e080a6eac4e463c5e848482bd08a7]
#
# add_file "packages/ezx/ezx-boot-usb-native_0.2.0.bb"
# content [863acca2c65f303392cb171c0b332215e6cbcca2]
#
# add_file "packages/ezx/files/asm-arm/setup.h"
# content [a79afc6ca95d338e4a7f8a52d0b8f8a499543685]
#
# add_file "packages/freesmartphone/pygsm_git.bb"
# content [2f5aa7a70f246de80fd5d36410850bfa781ced98]
#
# add_file "packages/freesmartphone/python-ophoned_git.bb"
# content [ea7c430a6835bdc3187fcd080d1ad5d9128f77ac]
#
# add_file "packages/gcc/gcc-4.2.2/901-avr32-no-cond-exec-before-reload-by-default.patch"
# content [a993a533b9e9b03a015aae1cbf427aa4e7f323e7]
#
# add_file "packages/gcc/gcc-4.2.2/gcc-4.2.2.atmel.1.0.8.patch.bz2"
# content [65d3733847d1b916ba3fafcf88127711a6fec8ba]
#
# add_file "packages/gdb/gdb-6.8/early_debug_in_nptl.patch"
# content [6e027b2499da589384a40847de046842934ba44e]
#
# add_file "packages/gdb/gdb-avr32.inc"
# content [7494151dbc5adbc235fbc5181d3392875c7f4e35]
#
# add_file "packages/gdb/gdb-cross-sdk_6.8.bb"
# content [9444a910f04467593c5c669381d5ed60212c8324]
#
# add_file "packages/gdb/gdb-cross_6.8.bb"
# content [0ea423cc4dde24b7f31c9c213c5c9016bcee6ed5]
#
# add_file "packages/gdb/gdb_6.8.bb"
# content [46a7734cc95c48722b3546e977c35ed0591233c9]
#
# add_file "packages/geany/geany_0.14.bb"
# content [e9b4cac4e48f2bb791e6ae247a3a3c18a516e6e5]
#
# add_file "packages/gnash/gnash-minimal.inc"
# content [1bee048015c6fd48b776cf485a13dbb2f2e82b77]
#
# add_file "packages/gnash/gnash-minimal_0.8.2.bb"
# content [6f9e794c7a411a20a0fdc6da96482dbd8f0f3ff2]
#
# add_file "packages/gnash/gnash-minimal_cvs.bb"
# content [45d3e8586ab4b439c6c9a0ac9f0be39825b96ac2]
#
# add_file "packages/gnash/gnash.inc"
# content [9c8c4d5fbf73bb78dc1770d8b3fbc18052b41d0d]
#
# add_file "packages/gnash/gnash_0.8.1.bb"
# content [50014de2c3904a6950c775be0eda4815399cb573]
#
# add_file "packages/gnome/epiphany_2.22.1.bb"
# content [e11dacf27365b72ec178166a6d92a04de4366667]
#
# add_file "packages/gnome/libsoup_2.4.1.bb"
# content [e6b86e13ebc986c00649745b8980213d3a4641d2]
#
# add_file "packages/gpsd/gpsd_2.37.bb"
# content [fcf9fa136398ac80a6cb1c8408ac6df26d0ddeaf]
#
# add_file "packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff"
# content [e291454f9d39e1948a9b6487276aa4d641662bde]
#
# add_file "packages/hostap/hostap-daemon_0.5.10.bb"
# content [1ef529afd5463790fc19d5fa6b3768c4b672ced8]
#
# add_file "packages/keymaps/files/jornada6xx/keymap%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rd4a97f257158aba4fde91347580030110ef215bf -r3ed57a19d01165b8bf3de02acb883e37b19fc372
#
#
#
# patch "packages/portmap/portmap_6.0.bb"
# from [f844fd769b365a5762b53a1ef409cc08f2fd15ff]
# to [adcd93ca925598a47ec40783fe2c373f406eba7d]
#
============================================================
--- packages/portmap/portmap_6.0.bb f844fd769b365a5762b53a1ef409cc08f2fd15ff
+++ packages/portmap/portmap_6.0.bb adcd93ca925598a47ec40783fe2c373f406eba7d
@@ -1,6 +1,6 @@ require portmap.inc
require portmap.inc
-PR = "r2"
+PR = "r3"
SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/portmap-6.0.tgz \
file://destdir-no-strip.patch;patch=1 \
@@ -17,6 +17,6 @@ fakeroot do_install() {
fakeroot do_install() {
install -d ${D}${mandir}/man8/ ${D}${base_sbindir} ${D}${sysconfdir}/init.d
- install -m 0757 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap
+ install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap
oe_runmake install DESTDIR=${D}
}
More information about the Openembedded-commits
mailing list