[oe-commits] org.oe.dev merge of '42f626957035d9fc4496080e90c92e06f8a2070e'

oe commit openembedded-commits at lists.openembedded.org
Mon Dec 3 03:55:21 UTC 2007


merge of '42f626957035d9fc4496080e90c92e06f8a2070e'
     and 'b1610df18b4d8070f056d9621c7826cf30b62bca'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: c2229d2baf9f3a015f0aa6354d84590f73a5ca0a
ViewMTN: http://monotone.openembedded.org/revision/info/c2229d2baf9f3a015f0aa6354d84590f73a5ca0a
Files:
1
packages/directfb/files/fix-configure-include-path.patch
packages/directfb/directfb-examples_1.0.0.bb
packages/directfb/directfb_1.1.0.bb
packages/images/essential-image.bb
packages/images/essential-machine-image.bb
packages/libtool/libtool-1.5.10/tag1.patch
packages/psplash/files/angstrom/angstrom-psplash-qvga-img.h
packages/psplash/files/angstrom/angstrom-psplash-vga-img.h
packages/pulseaudio/pulseaudio_0.9.7.bb
packages/zaurus-updater/spitz
packages/zaurus-updater/spitz/updater.sh
packages/apex/nslu2
packages/apex/files
packages/busybox/busybox-1.7.2/defconfig
packages/busybox/busybox-1.7.2/angstrom/defconfig
packages/flite/flite_1.2.bb
packages/flite/flite_1.3.bb
packages/gsl/gsl_1.4.bb
packages/gsl/gsl_1.10.bb
packages/gtk+/gdk-pixbuf-csource_2.10.14.bb
packages/gtk+/gdk-pixbuf_2.10.14.bb
packages/initrdscripts/files/blockboot.sh
packages/initrdscripts/files/85-blockboot.sh
packages/initrdscripts/files/loopboot.sh
packages/initrdscripts/files/80-loopboot.sh
packages/initrdscripts/files/nfsboot.sh
packages/initrdscripts/files/80-nfsboot.sh
packages/initrdscripts/initramfs-module-block_0.1.bb
packages/initrdscripts/initramfs-module-block_1.0.bb
packages/initrdscripts/initramfs-module-loop_0.1.bb
packages/initrdscripts/initramfs-module-loop_1.0.bb
packages/initrdscripts/initramfs-module-nfs_0.1.bb
packages/initrdscripts/initramfs-module-nfs_1.0.bb
packages/initrdscripts/initramfs-uniboot_0.2.bb
packages/initrdscripts/initramfs-uniboot_1.0.bb
packages/keylaunch/files/80chvt-SUID
packages/keylaunch/keylaunch-conf/80chvt-SUID
packages/keylaunch/files/akita
packages/keylaunch/keylaunch-conf/akita
packages/keylaunch/files/c7x0
packages/keylaunch/keylaunch-conf/c7x0
packages/keylaunch/files/collie
packages/keylaunch/keylaunch-conf/collie
packages/keylaunch/files/corgie
packages/keylaunch/keylaunch-conf/corgie
packages/keylaunch/files/husky
packages/keylaunch/keylaunch-conf/husky
packages/keylaunch/files/keylaunchrc
packages/keylaunch/keylaunch-conf/keylaunchrc
packages/keylaunch/files/shepherd
packages/keylaunch/keylaunch-conf/shepherd
packages/keylaunch/files/spitz
packages/keylaunch/keylaunch-conf/spitz
packages/linux/linux-hackndev-2.6_svn.bb
packages/linux/linux-hackndev-2.6_git.bb
packages/mpfr/mpfr_cvs.bb
packages/mpfr/mpfr_svn.bb
packages/octave/octave_2.1.71.bb
packages/octave/octave_2.1.73.bb
contrib/angstrom
packages/busybox/busybox-1.7.2/angstrom
packages/cryptsetup
packages/dropbear/dropbear-early
packages/flite/flite-1.3
packages/gpephone/libabenabler2
packages/gpephone/libiac-0.1
packages/hostap/hostap-daemon-0.6.0
packages/inotify-tools/files
packages/keylaunch/keylaunch-conf
packages/keymap-locales/files/qemux86
packages/keymaps/files/qemux86
packages/libical
packages/libical/libical
packages/linux/ixp4xx-kernel/2.6.23
packages/linux/linux-ixp4xx
packages/matchbox-keyboard/mboxkbd-layouts-gui
packages/octave/files
packages/uclibc/uclibc-0.9.29/qemux86
packages/update-rc.d/files
packages/wesnoth
packages/xkbd/xkbd-layout-ru
classes/packaged-staging2.bbclass
contrib/angstrom/angstrom.png
contrib/angstrom/angstrom.svg
packages/autofs/autofs-4.1.4/no-bash.patch
packages/binutils/binutils-2.17.50.0.5/binutils-configure-texinfo-version.patch
packages/binutils/binutils-2.17.50.0.8/binutils-configure-texinfo-version.patch
packages/cryptsetup/cryptsetup_1.0.5.bb
packages/dropbear/dropbear-early/dropbear-early
packages/dropbear/dropbear-early_1.0.bb
packages/dtc/dtc-native_1.0.0.bb
packages/flite/flite-1.2/flite-1.2-alsa_support-1.2.diff
packages/flite/flite-1.3/flite-1.3-alsa_support-1.2.diff
packages/flite/flite.inc
packages/gcc/gcc-4.1.0/pr34130.patch
packages/gcc/gcc-4.1.1/pr34130.patch
packages/gcc/gcc-4.1.2/pr34130.patch
packages/gcc/gcc-4.2.1/pr34130.patch
packages/gcc/gcc-4.2.2/pr34130.patch
packages/gettext/gettext-0.14.1/disable_java.patch
packages/git/git-native_1.5.3.bb
packages/git/git.inc
packages/gpe-login/files/gpe-xcalibrate-rises-from-dead.patch
packages/gpe-login/files/lock-on-supend.patch
packages/gpe-login/files/size-autolock-properly.patch
packages/gpephone/contact_svn.bb
packages/gpephone/libabenabler2/i18n.patch
packages/gpephone/libabenabler2_svn.bb
packages/gpephone/libcalenabler2_svn.bb
packages/gpephone/libiac-0.1/po.patch
packages/gpephone/ptim-engine_1.0.bb
packages/gpephone/ptim-headers_1.0.bb
packages/gpephone/ptim-helper_1.0.bb
packages/gpephone/ptim-manager_1.0.bb
packages/hostap/hostap-daemon-0.6.0/init
packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff
packages/hostap/hostap-daemon_0.6.0.bb
packages/images/initramfs-bootmenu-image.bb
packages/images/nslu2-minimal-image.bb
packages/initrdscripts/files/10-initfs.sh
packages/initrdscripts/files/30-bootmenu.sh
packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
packages/initrdscripts/initramfs-module-initfs_1.0.bb
packages/initscripts/initscripts-1.0/slugos/bootclean.sh
packages/initscripts/initscripts-1.0/slugos/volatiles
packages/inotify-tools/files/no-tests.patch
packages/inotify-tools/inotify-tools_3.12.bb
packages/ipkg/files/ipkg-configure
packages/ipkg/files/ipkg_bugfix.patch
packages/keylaunch/files/unbreak-keyevents.patch
packages/keylaunch/keylaunch-conf_2.0.10.bb
packages/keymap-locales/files/qemux86/keymap-extension-2.6-fr.map
packages/keymaps/files/qemux86/keymap-2.6.map
packages/klibc/files/fstype-sane-and-vfat.patch
packages/klibc/klibc-utils-fstype_1.1.1.bb
packages/libdaemon/libdaemon_0.12.bb
packages/libical/libical/pthread-link.patch
packages/libical/libical_0.27.bb
packages/libtool/libtool-1.5.10/libdir-la2.patch
packages/libtool/libtool-1.5.10/nmedit_fix.patch
packages/libtool/libtool-1.5.10/nousrlib.patch
packages/linux/ixp4xx-kernel/2.6.23/defconfig
packages/linux/ixp4xx-kernel_2.6.23.8.bb
packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch
packages/linux/linux-2.6.23/mpc8313e-rdb/mpc831x-nand.patch
packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb
packages/linux/linux-ixp4xx/defconfig-2.6.18
packages/linux/linux-ixp4xx/defconfig-2.6.19
packages/linux/linux-ixp4xx/defconfig-2.6.20
packages/linux/linux-ixp4xx/defconfig-2.6.21.6
packages/linux/linux-ixp4xx/defconfig-2.6.22
packages/linux/linux-ixp4xx/defconfig-2.6.23.8
packages/linux/linux-ixp4xx.inc
packages/linux/linux-ixp4xx_2.6.18.bb
packages/linux/linux-ixp4xx_2.6.19.bb
packages/linux/linux-ixp4xx_2.6.20.bb
packages/linux/linux-ixp4xx_2.6.21.6.bb
packages/linux/linux-ixp4xx_2.6.23.8.bb
packages/linux/linux-openmoko/glamo-report-vram-size-to-userspace.patch
packages/matchbox-applet-inputmanager/files/visibility-protocol.patch
packages/matchbox-keyboard/mboxkbd-layouts-gui/auto-mkdir.patch
packages/matchbox-keyboard/mboxkbd-layouts-gui/mboxkbd-layouts-gui.png
packages/matchbox-keyboard/mboxkbd-layouts-gui/sanitize-desktop-file.patch
packages/midpath/midpath-pulseaudio_0.1.bb
packages/mpfr/mpfr-native_2.3.0.bb
packages/mpfr/mpfr-native_svn.bb
packages/mpfr/mpfr.inc
packages/mpfr/mpfr_2.3.0.bb
packages/octave/files/configure.patch
packages/octave/octave.inc
packages/octave/octave_2.9.17.bb
packages/openmoko2/openmoko-sample2_svn.bb
packages/portmap/portmap-6.0/no-pie.patch
packages/psplash/files/logo-math.patch
packages/pulseaudio/pulseaudio_0.9.8.bb
packages/subversion/subversion_1.4.5.bb
packages/uboot/files/glamo-ram-init.patch
packages/uboot/u-boot_1.3.0.bb
packages/uclibc/uclibc-0.9.29/qemux86/uClibc.machine
packages/update-rc.d/files/add-verbose.patch
packages/wesnoth/wesnoth_svn.bb
packages/xkbd/xkbd-0.8.15/add-default-common-slides.patch
packages/xkbd/xkbd-0.8.15/differentiate-desktop-name.patch
packages/xkbd/xkbd-layout-ru/en-ru-123.xkbd
packages/xorg-lib/libx11-native_1.1.1.bb
packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch
packages/xorg-xserver/xserver-kdrive-1.3.0.0/smedia-glamo.patch
site/arm-darwin
MAINTAINERS
classes/base.bbclass
classes/cross.bbclass
classes/debian.bbclass
classes/insane.bbclass
classes/nslu2-image.bbclass
classes/package.bbclass
classes/siteinfo.bbclass
conf/bitbake.conf
conf/checksums.ini
conf/distro/angstrom-2007.1.conf
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom-2007-preferred-versions.inc
conf/distro/include/angstrom.inc
conf/distro/include/insane-srcrevs.inc
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/include/slugos.inc
conf/distro/slugos.conf
conf/local.conf.sample
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
conf/machine/include/ixp4xx.inc
conf/machine/include/zaurus-2.6.inc
conf/machine/mpc8313e-rdb.conf
packages/angstrom/angstrom-feed-configs.bb
packages/angstrom/angstrom-gpe-task-base.bb
packages/angstrom/angstrom-gpe-task-settings.bb
packages/apex/apex-nslu2-16mb_1.5.8.bb
packages/apex/apex-nslu2_1.5.8.bb
packages/autofs/autofs_4.1.4.bb
packages/binutils/binutils-cross.inc
packages/binutils/binutils_2.17.50.0.5.bb
packages/binutils/binutils_2.17.50.0.8.bb
packages/busybox/busybox-1.2.0/angstrom/defconfig
packages/busybox/busybox-1.2.1/angstrom/defconfig
packages/busybox/busybox-1.2.1/slugos/defconfig
packages/busybox/busybox-1.2.2/angstrom/defconfig
packages/busybox/busybox-1.3.1/angstrom/defconfig
packages/busybox/busybox-1.5.0/angstrom/defconfig
packages/busybox/busybox-1.6.0/angstrom/defconfig
packages/busybox/busybox-static-1.2.1/defconfig
packages/busybox/busybox-static_1.2.1.bb
packages/busybox/busybox_1.00.bb
packages/busybox/busybox_1.01.bb
packages/busybox/busybox_1.2.0.bb
packages/busybox/busybox_1.2.1.bb
packages/busybox/busybox_1.2.2.bb
packages/busybox/busybox_1.3.1.bb
packages/busybox/busybox_1.5.0.bb
packages/busybox/busybox_1.6.0.bb
packages/busybox/busybox_1.7.2.bb
packages/cacao/cacao-cldc_0.98.bb
packages/cacao/cacao.inc
packages/cacao/cacaoh-cldc-native_0.98.bb
packages/dropbear/dropbear/init
packages/dropbear/dropbear_0.49.bb
packages/e2fsprogs/e2fsprogs-native_1.38.bb
packages/e2fsprogs/e2fsprogs.inc
packages/e2fsprogs/e2fsprogs_1.38.bb
packages/fftw/fftw.inc
packages/gcc/gcc-cross-initial_4.2.1.bb
packages/gcc/gcc-cross-initial_4.2.2.bb
packages/gcc/gcc-cross_4.1.2.bb
packages/gcc/gcc-cross_4.2.1.bb
packages/gcc/gcc-cross_4.2.2.bb
packages/gcc/gcc-package-cross.inc
packages/gcc/gcc-package.inc
packages/gcc/gcc3-build.inc
packages/gcc/gcc_4.1.0.bb
packages/gcc/gcc_4.1.1.bb
packages/gcc/gcc_4.1.2.bb
packages/gcc/gcc_4.2.1.bb
packages/gcc/gcc_4.2.2.bb
packages/gettext/gettext_0.14.1.bb
packages/gpe-login/gpe-login_0.90.bb
packages/gpephone/libabenabler2_1.0.bb
packages/gpephone/libiac_0.1.bb
packages/images/slugos-image.bb
packages/initrdscripts/files/init.sh
packages/initrdscripts/initramfs-jffs2_0.1.bb
packages/initscripts/initscripts-slugos_1.0.bb
packages/ipkg/ipkg-native_0.99.163.bb
packages/ipkg/ipkg.inc
packages/ipkg/ipkg_0.99.163.bb
packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
packages/keylaunch/keylaunch_2.0.10.bb
packages/keymap-locales/keymap-locales.bb
packages/keymaps/keymaps_1.0.bb
packages/klibc/klibc.inc
packages/klibc/klibc_1.1.1.bb
packages/liboil/liboil_0.3.11.bb
packages/libtool/libtool-cross_1.5.10.bb
packages/libtool/libtool-native_1.5.10.bb
packages/libtool/libtool_1.5.10.bb
packages/linux/ixp4xx-kernel/2.6.21/defconfig
packages/linux/ixp4xx-kernel_2.6.21.6.bb
packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig
packages/linux/linux-efika-2.6.20/defconfig
packages/linux/linux-efika_2.6.20.20.bb
packages/linux/linux-handhelds-2.6.inc
packages/linux/linux-openmoko/defconfig-2.6.22.5
packages/linux/linux-openmoko_2.6.22.5.bb
packages/linux/linux-rp.inc
packages/linux/linux-rp_2.6.21.bb
packages/linux/linux-rp_2.6.23.bb
packages/linux/linux.inc
packages/linux/linux_2.6.23.bb
packages/lyx/lyx_1.4.1.bb
packages/lyx/lyx_1.4.4.bb
packages/lyx/lyx_1.5.1.bb
packages/maemo4/hildon-libs_0.15.1.bb
packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
packages/matchbox-keyboard/matchbox-keyboard_svn.bb
packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb
packages/meta/meta-toolchain.bb
packages/meta/slugos-packages.bb
packages/midpath/midpath-alsa_0.1.bb
packages/midpath/midpath-cldc-sdl_0.1.bb
packages/midpath/midpath-cldc-x11_0.1.bb
packages/midpath/midpath-cldc_0.1.bb
packages/midpath/midpath-gtk_0.1.bb
packages/midpath/midpath-qt3x11_0.1.bb
packages/midpath/midpath-qte_0.1.bb
packages/midpath/midpath.inc
packages/mpfr/mpfr_2.1.1.bb
packages/netbase/netbase/interfaces
packages/netbase/netbase_4.21.bb
packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
packages/openmoko2/neod_svn.bb
packages/openmoko2/openmoko-dialer2_svn.bb
packages/openmoko2/openmoko-session2/etc/matchbox/session
packages/openmoko2/openmoko-session2.bb
packages/portmap/portmap_6.0.bb
packages/psplash/files/angstrom/psplash-hand-img.h
packages/psplash/files/psplash-init
packages/psplash/psplash_svn.bb
packages/pulseaudio/pulse.inc
packages/shasum/shasum-native.bb
packages/slugos-init/files/turnup
packages/slugos-init/slugos-init_0.10.bb
packages/stage-manager/files/stage-manager
packages/stage-manager/stagemanager-native_0.0.1.bb
packages/tasks/task-base.bb
packages/tasks/task-boot.bb
packages/tasks/task-openmoko.bb
packages/tasks/task-toolchain-openmoko-sdk.bb
packages/tinymail/libtinymail_svn.bb
packages/tinymail/tmut_svn.bb
packages/uboot/u-boot_git.bb
packages/uboot/uboot-openmoko_svn.bb
packages/update-rc.d/update-rc.d_0.7.bb
packages/webcam-server/webcam-server_0.50.bb
packages/wireless-tools/wireless-tools/wireless-tools.if-pre-up
packages/wireless-tools/wireless-tools_28+29pre21.bb
packages/wlan-ng/wlan-ng-modules-0.2.7/2.6.22-fixes.patch
packages/wlan-ng/wlan-ng-modules_0.2.7.bb
packages/x11vnc/x11vnc_0.9.3.bb
packages/xkbd/xkbd-layout-ru_0.1.1.bb
packages/xkbd/xkbd_0.8.15.bb
packages/xorg-driver/xorg-driver-common.inc
packages/xorg-xserver/xorg-xserver-common.inc
packages/xorg-xserver/xserver-kdrive-common.inc
packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
packages/zaurus-updater/akita/updater.sh
packages/zaurus-updater/zaurus-updater/updater.sh
packages/zaurus-updater/zaurus-updater.bb
packages/zaurusd/files/zaurus-hinge.bl-off
packages/zaurusd/files/zaurus-hinge.bl-on
packages/zaurusd/files/zaurus-hinge.matchbox-landscape
packages/zaurusd/files/zaurus-hinge.matchbox-portrait
packages/zaurusd/zaurusd_svn.bb
site/common-glibc
mtn:manual_merge
true
Diffs:

#
# mt diff -r42f626957035d9fc4496080e90c92e06f8a2070e -rc2229d2baf9f3a015f0aa6354d84590f73a5ca0a
#
# 
# 
# add_file "packages/directfb/files/fix-configure-include-path.patch"
#  content [95a5712b69ed26362c0a8e8e8624e9b05fb506b2]
# 
# patch "packages/directfb/directfb-examples_1.0.0.bb"
#  from [88c9cc59f32b02ec4cd0c0f876b204399b265bdf]
#    to [1905769a0ea0cc18c68ea7969adaa55fe65ad9aa]
# 
# patch "packages/directfb/directfb_1.1.0.bb"
#  from [c9da95fb956d450af0c360a3364023c960f9d1af]
#    to [1af7bf22ffbfcbc869a08e6664c2dde2ff16c7d2]
# 
============================================================
--- packages/directfb/files/fix-configure-include-path.patch	95a5712b69ed26362c0a8e8e8624e9b05fb506b2
+++ packages/directfb/files/fix-configure-include-path.patch	95a5712b69ed26362c0a8e8e8624e9b05fb506b2
@@ -0,0 +1,13 @@
+--- DirectFB-1.1.0/configure.in-orig	2007-08-27 00:07:00.000000000 -0700
++++ DirectFB-1.1.0/configure.in	2007-11-26 12:05:52.000000000 -0800
+@@ -1380,8 +1380,8 @@
+ 
+ MODULEDIR=$libdir/$MODULEDIRNAME
+ DATADIR=$datadir/directfb-$VERSION
+-INCLUDEDIR=$includedir/directfb
+-INTERNALINCLUDEDIR=$includedir/directfb-internal
++INCLUDEDIR=$includedir/
++INTERNALINCLUDEDIR=$includedir/
+ 
+ SOPATH=$libdir/libdirectfb-$LT_RELEASE.so.$LT_CURRENT
+ AC_SUBST(SOPATH)
============================================================
--- packages/directfb/directfb-examples_1.0.0.bb	88c9cc59f32b02ec4cd0c0f876b204399b265bdf
+++ packages/directfb/directfb-examples_1.0.0.bb	1905769a0ea0cc18c68ea7969adaa55fe65ad9aa
@@ -1,10 +1,12 @@ LICENSE = "GPL"
 DESCRIPTION = "DirectFB extra providers"
 DEPENDS = "directfb"
 SECTION = "libs"
 LICENSE = "GPL"
 
-SRC_URI = "http://www.directfb.org/downloads/Extras/DirectFB-extra-${PV}.tar.gz"
-S = "${WORKDIR}/DirectFB-extra-${PV}"
+SRC_URI = " \
+           http://www.directfb.org/downloads/Extras/DirectFB-examples-${PV}.tar.gz \
+          "
+S = "${WORKDIR}/DirectFB-examples-${PV}"
 
 inherit autotools
 
============================================================
--- packages/directfb/directfb_1.1.0.bb	c9da95fb956d450af0c360a3364023c960f9d1af
+++ packages/directfb/directfb_1.1.0.bb	1af7bf22ffbfcbc869a08e6664c2dde2ff16c7d2
@@ -10,12 +10,15 @@ RV = "1.1-0"
 PR = "r1"
 RV = "1.1-0"
 
-SRC_URI = "http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
-           file://fix-pkgconfig-cflags.patch;patch=1 \
-	   file://fix-font-missing-char.patch;patch=1 \
-           file://getpagesize.patch;patch=1 \
-           file://fix-includes.patch;patch=1 \
-	   file://mkdfiff.patch;patch=1"
+SRC_URI = " \
+    http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
+    file://fix-configure-include-path.patch;patch=1 \
+    file://fix-pkgconfig-cflags.patch;patch=1 \
+    file://fix-font-missing-char.patch;patch=1 \
+    file://getpagesize.patch;patch=1 \
+    file://fix-includes.patch;patch=1 \
+    file://mkdfiff.patch;patch=1 \
+   "
 
 S = "${WORKDIR}/DirectFB-${PV}"
 
@@ -23,11 +26,12 @@ inherit autotools pkgconfig
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--with-gfxdrivers=none \
+EXTRA_OECONF = " \
+    --with-gfxdrivers=none \
 		--enable-libmpeg3=no \
 		--enable-freetype=yes \
 		--enable-sdl=no \
-	        --enable-vnc=no \
+		--enable-vnc=no \
 		--disable-x11 \
 		"
 


#
# mt diff -rb1610df18b4d8070f056d9621c7826cf30b62bca -rc2229d2baf9f3a015f0aa6354d84590f73a5ca0a
#
# 
# 
# delete "packages/images/essential-image.bb"
# 
# delete "packages/images/essential-machine-image.bb"
# 
# delete "packages/libtool/libtool-1.5.10/tag1.patch"
# 
# delete "packages/psplash/files/angstrom/angstrom-psplash-qvga-img.h"
# 
# delete "packages/psplash/files/angstrom/angstrom-psplash-vga-img.h"
# 
# delete "packages/pulseaudio/pulseaudio_0.9.7.bb"
# 
# delete "packages/zaurus-updater/spitz"
# 
# delete "packages/zaurus-updater/spitz/updater.sh"
# 
# rename "packages/apex/nslu2"
#     to "packages/apex/files"
# 
# rename "packages/busybox/busybox-1.7.2/defconfig"
#     to "packages/busybox/busybox-1.7.2/angstrom/defconfig"
# 
# rename "packages/flite/flite_1.2.bb"
#     to "packages/flite/flite_1.3.bb"
# 
# rename "packages/gsl/gsl_1.4.bb"
#     to "packages/gsl/gsl_1.10.bb"
# 
# rename "packages/gtk+/gdk-pixbuf-csource_2.10.14.bb"
#     to "packages/gtk+/gdk-pixbuf_2.10.14.bb"
# 
# rename "packages/initrdscripts/files/blockboot.sh"
#     to "packages/initrdscripts/files/85-blockboot.sh"
# 
# rename "packages/initrdscripts/files/loopboot.sh"
#     to "packages/initrdscripts/files/80-loopboot.sh"
# 
# rename "packages/initrdscripts/files/nfsboot.sh"
#     to "packages/initrdscripts/files/80-nfsboot.sh"
# 
# rename "packages/initrdscripts/initramfs-module-block_0.1.bb"
#     to "packages/initrdscripts/initramfs-module-block_1.0.bb"
# 
# rename "packages/initrdscripts/initramfs-module-loop_0.1.bb"
#     to "packages/initrdscripts/initramfs-module-loop_1.0.bb"
# 
# rename "packages/initrdscripts/initramfs-module-nfs_0.1.bb"
#     to "packages/initrdscripts/initramfs-module-nfs_1.0.bb"
# 
# rename "packages/initrdscripts/initramfs-uniboot_0.2.bb"
#     to "packages/initrdscripts/initramfs-uniboot_1.0.bb"
# 
# rename "packages/keylaunch/files/80chvt-SUID"
#     to "packages/keylaunch/keylaunch-conf/80chvt-SUID"
# 
# rename "packages/keylaunch/files/akita"
#     to "packages/keylaunch/keylaunch-conf/akita"
# 
# rename "packages/keylaunch/files/c7x0"
#     to "packages/keylaunch/keylaunch-conf/c7x0"
# 
# rename "packages/keylaunch/files/collie"
#     to "packages/keylaunch/keylaunch-conf/collie"
# 
# rename "packages/keylaunch/files/corgie"
#     to "packages/keylaunch/keylaunch-conf/corgie"
# 
# rename "packages/keylaunch/files/husky"
#     to "packages/keylaunch/keylaunch-conf/husky"
# 
# rename "packages/keylaunch/files/keylaunchrc"
#     to "packages/keylaunch/keylaunch-conf/keylaunchrc"
# 
# rename "packages/keylaunch/files/shepherd"
#     to "packages/keylaunch/keylaunch-conf/shepherd"
# 
# rename "packages/keylaunch/files/spitz"
#     to "packages/keylaunch/keylaunch-conf/spitz"
# 
# rename "packages/linux/linux-hackndev-2.6_svn.bb"
#     to "packages/linux/linux-hackndev-2.6_git.bb"
# 
# rename "packages/mpfr/mpfr_cvs.bb"
#     to "packages/mpfr/mpfr_svn.bb"
# 
# rename "packages/octave/octave_2.1.71.bb"
#     to "packages/octave/octave_2.1.73.bb"
# 
# add_dir "contrib/angstrom"
# 
# add_dir "packages/busybox/busybox-1.7.2/angstrom"
# 
# add_dir "packages/cryptsetup"
# 
# add_dir "packages/dropbear/dropbear-early"
# 
# add_dir "packages/flite/flite-1.3"
# 
# add_dir "packages/gpephone/libabenabler2"
# 
# add_dir "packages/gpephone/libiac-0.1"
# 
# add_dir "packages/hostap/hostap-daemon-0.6.0"
# 
# add_dir "packages/inotify-tools/files"
# 
# add_dir "packages/keylaunch/keylaunch-conf"
# 
# add_dir "packages/keymap-locales/files/qemux86"
# 
# add_dir "packages/keymaps/files/qemux86"
# 
# add_dir "packages/libical"
# 
# add_dir "packages/libical/libical"
# 
# add_dir "packages/linux/ixp4xx-kernel/2.6.23"
# 
# add_dir "packages/linux/linux-ixp4xx"
# 
# add_dir "packages/matchbox-keyboard/mboxkbd-layouts-gui"
# 
# add_dir "packages/octave/files"
# 
# add_dir "packages/uclibc/uclibc-0.9.29/qemux86"
# 
# add_dir "packages/update-rc.d/files"
# 
# add_dir "packages/wesnoth"
# 
# add_dir "packages/xkbd/xkbd-layout-ru"
# 
# add_file "classes/packaged-staging2.bbclass"
#  content [59a91d125afea47071a318c45a9942ffd3d8111b]
# 
# add_file "contrib/angstrom/angstrom.png"
#  content [9213fe50ab828fe0492d8c97cfdaf90e1c6c15cd]
# 
# add_file "contrib/angstrom/angstrom.svg"
#  content [447e9be910fbd6667c31c1b301ee9896fd5e0b96]
# 
# add_file "packages/autofs/autofs-4.1.4/no-bash.patch"
#  content [4eb3ed80313c234e6bd2311751e62211135fe24e]
# 
# add_file "packages/binutils/binutils-2.17.50.0.5/binutils-configure-texinfo-version.patch"
#  content [dd2d68bee35e9e5f58ff6382572fb0da04b6c991]
# 
# add_file "packages/binutils/binutils-2.17.50.0.8/binutils-configure-texinfo-version.patch"
#  content [dd2d68bee35e9e5f58ff6382572fb0da04b6c991]
# 
# add_file "packages/cryptsetup/cryptsetup_1.0.5.bb"
#  content [2523bf24ec0cfefc7fdd530d42d221ada86b4894]
# 
# add_file "packages/dropbear/dropbear-early/dropbear-early"
#  content [e2408ee87210f48cc8b47a8f34b5bb1bf49cdba6]
# 
# add_file "packages/dropbear/dropbear-early_1.0.bb"
#  content [cdaf892564086415c02630de43886143350b375b]
# 
# add_file "packages/dtc/dtc-native_1.0.0.bb"
#  content [a6cfb4d12568399421737e9db3bec79674a9c14a]
# 
# add_file "packages/flite/flite-1.2/flite-1.2-alsa_support-1.2.diff"
#  content [1323b9a20a5ae18f6e810e3bfd2f87deba1fac32]
# 
# add_file "packages/flite/flite-1.3/flite-1.3-alsa_support-1.2.diff"
#  content [a6996dbf165f003c1ed309b24fffdc611695c242]
# 
# add_file "packages/flite/flite.inc"
#  content [85bb5fbc859a7afa126494a7ae04c8024d9e2dd7]
# 
# add_file "packages/flite/flite_1.2.bb"
#  content [e32b2aed362684c9c359d98839bc237d62603eef]
# 
# add_file "packages/gcc/gcc-4.1.0/pr34130.patch"
#  content [23564cf74db7c5330d103f2b44e167ad2ef97eba]
# 
# add_file "packages/gcc/gcc-4.1.1/pr34130.patch"
#  content [23564cf74db7c5330d103f2b44e167ad2ef97eba]
# 
# add_file "packages/gcc/gcc-4.1.2/pr34130.patch"
#  content [23564cf74db7c5330d103f2b44e167ad2ef97eba]
# 
# add_file "packages/gcc/gcc-4.2.1/pr34130.patch"
#  content [23564cf74db7c5330d103f2b44e167ad2ef97eba]
# 
# add_file "packages/gcc/gcc-4.2.2/pr34130.patch"
#  content [23564cf74db7c5330d103f2b44e167ad2ef97eba]
# 
# add_file "packages/gettext/gettext-0.14.1/disable_java.patch"
#  content [3cb235c3528f9fea47f41d0f6ce9967545e09d2b]
# 
# add_file "packages/git/git-native_1.5.3.bb"
#  content [0eee3955b85d6ba2bd393cc5e7525c848366f62c]
# 
# add_file "packages/git/git.inc"
#  content [ce7e34b4dd8490461c6e668e1fc0f228df6a0f62]
# 
# add_file "packages/gpe-login/files/gpe-xcalibrate-rises-from-dead.patch"
#  content [6fa3a2c1e0cb701a608210a0843aabcb82734d4d]
# 
# add_file "packages/gpe-login/files/lock-on-supend.patch"
#  content [20c5d7dd021d07ef26f5bd6ac589a5a43f3e2ea9]
# 
# add_file "packages/gpe-login/files/size-autolock-properly.patch"
#  content [63db2b126d2eaaa270c82ccc859e7c367b7912e5]
# 
# add_file "packages/gpephone/contact_svn.bb"
#  content [2bdcfd37fa7331f354b090527f502870cee6fea5]
# 
# add_file "packages/gpephone/libabenabler2/i18n.patch"
#  content [a7ab56662050689df45614de35f395c80c7a8521]
# 
# add_file "packages/gpephone/libabenabler2_svn.bb"
#  content [6cedd4eaaae17335f9912cbdd4124a86765aae34]
# 
# add_file "packages/gpephone/libcalenabler2_svn.bb"
#  content [ca595393866e1e0b2240421e240db9ddbefbedff]
# 
# add_file "packages/gpephone/libiac-0.1/po.patch"
#  content [3d352daa975484e6165f89f57d100c5ec902d26d]
# 
# add_file "packages/gpephone/ptim-engine_1.0.bb"
#  content [a480d44e3eaf64f94932940abe59e48577d0190e]
# 
# add_file "packages/gpephone/ptim-headers_1.0.bb"
#  content [7760280d3c672c98d814d47e933ae1f2dd67c9f1]
# 
# add_file "packages/gpephone/ptim-helper_1.0.bb"
#  content [cded5e98aa2f79ce810ac489797a71b0fadcb1d2]
# 
# add_file "packages/gpephone/ptim-manager_1.0.bb"
#  content [0ae91fb3d366635ebd26ef4a7c29c4962b2b338a]
# 
# add_file "packages/hostap/hostap-daemon-0.6.0/init"
#  content [80bfdea40d350f7069665dbcaf302de3874d55b3]
# 
# add_file "packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff"
#  content [8ff0a526fa703041b901ba825fab2cca7fbe1ca8]
# 
# add_file "packages/hostap/hostap-daemon_0.6.0.bb"
#  content [5eb3e365f82dc33607030d0705fdf7c84d502cdd]
# 
# add_file "packages/images/initramfs-bootmenu-image.bb"
#  content [8f1db3a032593d55326052d8031210f27d4194a9]
# 
# add_file "packages/images/nslu2-minimal-image.bb"
#  content [14898795bea95dfcd88ed66ae25730964af725c5]
# 
# add_file "packages/initrdscripts/files/10-initfs.sh"
#  content [31e75b6e96fa83b4f7cf734dd5852b1f4aab02e9]
# 
# add_file "packages/initrdscripts/files/30-bootmenu.sh"
#  content [f75b0281709f790d2341265a880b463f53e674d2]
# 
# add_file "packages/initrdscripts/initramfs-module-bootmenu_1.0.bb"
#  content [3be3bf803a686aab18297d3d48a928bc8c6d1084]
# 
# add_file "packages/initrdscripts/initramfs-module-initfs_1.0.bb"
#  content [e8b2ca5b6f8808155c08371d32e7b42f94caa7bb]
# 
# add_file "packages/initscripts/initscripts-1.0/slugos/bootclean.sh"
#  content [5ee9d16c6ee82710382962de81f55e894d4eb076]
# 
# add_file "packages/initscripts/initscripts-1.0/slugos/volatiles"
#  content [018cdf15373dbc496fd5aabfbb165ecaab713d78]
# 
# add_file "packages/inotify-tools/files/no-tests.patch"
#  content [b129a0d5d40b2462f017c71aad8910e3a0e5a3df]
# 
# add_file "packages/inotify-tools/inotify-tools_3.12.bb"
#  content [a9474ce08f3f156053ea4090f1a5c01f28d42d80]
# 
# add_file "packages/ipkg/files/ipkg-configure"
#  content [38012e0e1b7b0690b187e43e83c2e33fbc0bc9e8]
# 
# add_file "packages/ipkg/files/ipkg_bugfix.patch"
#  content [7196e094a6eea0772015cde5f3c119ebec352085]
# 
# add_file "packages/keylaunch/files/unbreak-keyevents.patch"
#  content [2adb5ed37a6c319f1de6d797029f20c67ba92bb6]
# 
# add_file "packages/keylaunch/keylaunch-conf_2.0.10.bb"
#  content [b8e18f25c3e21dde6097c8016a88909f2ea48c7a]
# 
# add_file "packages/keymap-locales/files/qemux86/keymap-extension-2.6-fr.map"
#  content [dcda4f8d7c74eaca57d330079644ded92cb2af23]
# 
# add_file "packages/keymaps/files/qemux86/keymap-2.6.map"
#  content [d1ec3472c997035f52b4ac59e2c2821a39f40c98]
# 
# add_file "packages/klibc/files/fstype-sane-and-vfat.patch"
#  content [d4a15a94ce1fcbe5660e3ae975c493c18920219b]
# 
# add_file "packages/klibc/klibc-utils-fstype_1.1.1.bb"
#  content [aee9890849d771d8cb3019aa6ec1ac6af845eea7]
# 
# add_file "packages/libdaemon/libdaemon_0.12.bb"
#  content [096ac098f123427d223ff699f237de9e4c87e0fa]
# 
# add_file "packages/libical/libical/pthread-link.patch"
#  content [c55dae0b017df7935e2310bbd89f8b588f524f6b]
# 
# add_file "packages/libical/libical_0.27.bb"
#  content [b786a23b25f8ce8c2e7b5ba0cfca389cb0a733bc]
# 
# add_file "packages/libtool/libtool-1.5.10/libdir-la2.patch"
#  content [d1963c450f45aec334ceb0c17f3a8beeb5f990df]
# 
# add_file "packages/libtool/libtool-1.5.10/nmedit_fix.patch"
#  content [aab94763555e9c9e126cfe1aa734e1c23e4acc70]
# 
# add_file "packages/libtool/libtool-1.5.10/nousrlib.patch"
#  content [538e988983e99646792a9cd6ddc81d748cf8eaa1]
# 
# add_file "packages/linux/ixp4xx-kernel/2.6.23/defconfig"
#  content [de9465ffd409f23080029d85f44acbbc0b148eb7]
# 
# add_file "packages/linux/ixp4xx-kernel_2.6.23.8.bb"
#  content [40629ef0c93b593f7d9b64bc49c0c859be2e0680]
# 
# add_file "packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
#  content [17503c55f830f3a3deb1876d7d390a42edb3bc6b]
# 
# add_file "packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch"
#  content [ff0d1ce1d75cdce073d98a76611e56dc14eaa2bc]
# 
# add_file "packages/linux/linux-2.6.23/mpc8313e-rdb/mpc831x-nand.patch"
#  content [ff71d36374ddc75c81a9a36be82543a7ebd0c0f9]
# 
# add_file "packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb"
#  content [252b9c26ddd2fda4271f4352999ce0facbfece99]
# 
# add_file "packages/linux/linux-ixp4xx/defconfig-2.6.18"
#  content [cdcea03246810de7302f1baefcc57d83a46cf1cc]
# 
# add_file "packages/linux/linux-ixp4xx/defconfig-2.6.19"
#  content [fda5517f2f279d5dc7d1032423bd09803c24d834]
# 
# add_file "packages/linux/linux-ixp4xx/defconfig-2.6.20"
#  content [d9deebc942c5950daead1cba30fbf9686ad1d9d3]
# 
# add_file "packages/linux/linux-ixp4xx/defconfig-2.6.21.6"
#  content [9ca518ef9fe19819dabdafe4129c5c8b3bc39729]
# 
# add_file "packages/linux/linux-ixp4xx/defconfig-2.6.22"
#  content [1cb9cbc470259061b12e46464f67295c60df26dd]
# 
# add_file "packages/linux/linux-ixp4xx/defconfig-2.6.23.8"
#  content [de9465ffd409f23080029d85f44acbbc0b148eb7]
# 
# add_file "packages/linux/linux-ixp4xx.inc"
#  content [104c898701b243728e14a24a5ac89d50ede467ad]
# 
# add_file "packages/linux/linux-ixp4xx_2.6.18.bb"
#  content [2a24b7141f003d05f2fcb1c51e20f7ac132f49aa]
# 
# add_file "packages/linux/linux-ixp4xx_2.6.19.bb"
#  content [c7ecf27563b708812153c987f5f93f001e1bc4fb]
# 
# add_file "packages/linux/linux-ixp4xx_2.6.20.bb"
#  content [8bbe91f941ad937cf4067ccef4fb6a670b07081c]
# 
# add_file "packages/linux/linux-ixp4xx_2.6.21.6.bb"
#  content [432d1186db63f39ff236b15e6d5206fd96c5470e]
# 
# add_file "packages/linux/linux-ixp4xx_2.6.23.8.bb"
#  content [5072d1cda9fcc89b0db1894b9225812ec971acc9]
# 
# add_file "packages/linux/linux-openmoko/glamo-report-vram-size-to-userspace.patch"
#  content [c9d35297bee6c1f0e66123fe4919e96dc632cf70]
# 
# add_file "packages/matchbox-applet-inputmanager/files/visibility-protocol.patch"
#  content [799b8565843ed42198f73e6a69c4dbb841a1fa87]
# 
# add_file "packages/matchbox-keyboard/mboxkbd-layouts-gui/auto-mkdir.patch"
#  content [74bbaabad86fc467bc01de331c18f0797a56169c]
# 
# add_file "packages/matchbox-keyboard/mboxkbd-layouts-gui/mboxkbd-layouts-gui.png"
#  content [3a64c92f7f036bca12c7b29c3b3c7b73acab7912]
# 
# add_file "packages/matchbox-keyboard/mboxkbd-layouts-gui/sanitize-desktop-file.patch"
#  content [4eb896267100555d1575098445ea7771e42000a9]
# 
# add_file "packages/midpath/midpath-pulseaudio_0.1.bb"
#  content [eb944e221aa04ed0c5a06788cd304f5aee0476da]
# 
# add_file "packages/mpfr/mpfr-native_2.3.0.bb"
#  content [41f0822f894ea44761b8d80834b7ded6ed91ad66]
# 
# add_file "packages/mpfr/mpfr-native_svn.bb"
#  content [8ff1cc81cccc445e359ee00d067e65bfa6263e3b]
# 
# add_file "packages/mpfr/mpfr.inc"
#  content [a746d3e6115a9ef6e4eaeaf4132ae3bc4e048780]
# 
# add_file "packages/mpfr/mpfr_2.3.0.bb"
#  content [6b48dfd071b1323f69f1aa09faf6ac6a3ab1a06f]
# 
# add_file "packages/octave/files/configure.patch"
#  content [70d1b41778702736488c58c82728937a3091901e]
# 
# add_file "packages/octave/octave.inc"
#  content [ee444b2bd09390c3cf0f543fd839457a3a0fb8c3]
# 
# add_file "packages/octave/octave_2.9.17.bb"
#  content [028a53a764b76cb30a096e4ddaa61129061e6629]
# 
# add_file "packages/openmoko2/openmoko-sample2_svn.bb"
#  content [8dfb2ad71843cf6a80cb46f17623565dbd5a95fa]
# 
# add_file "packages/portmap/portmap-6.0/no-pie.patch"
#  content [39990f66702db50dd93420291a2edf4e018b16f0]
# 
# add_file "packages/psplash/files/logo-math.patch"
#  content [3863c6539054b0633895cdd79f7940fde4987c4f]
# 
# add_file "packages/pulseaudio/pulseaudio_0.9.8.bb"
#  content [815657961892febee8418dbc92e3e829a156e821]
# 
# add_file "packages/subversion/subversion_1.4.5.bb"
#  content [680bf01cbd49adaec6a24e728327d7aec6fbaa94]
# 
# add_file "packages/uboot/files/glamo-ram-init.patch"
#  content [fc727ca648dfa92f317ae5a8e1a4959157972f8b]
# 
# add_file "packages/uboot/u-boot_1.3.0.bb"
#  content [8cfd5293c0214179a38b2304fbd10c77a3912aff]
# 
# add_file "packages/uclibc/uclibc-0.9.29/qemux86/uClibc.machine"
#  content [0ba5bf1dcc968c90b49471fe12c3dee50977813a]
# 
# add_file "packages/update-rc.d/files/add-verbose.patch"
#  content [048e2e241d96d7bbd0f1a8a75440348719c9a168]
# 
# add_file "packages/wesnoth/wesnoth_svn.bb"
#  content [de8bbc9e99d99055231c5edc26d756f2d06012dc]
# 
# add_file "packages/xkbd/xkbd-0.8.15/add-default-common-slides.patch"
#  content [4957122498068bf57792326573ba5a501d74fc75]
# 
# add_file "packages/xkbd/xkbd-0.8.15/differentiate-desktop-name.patch"
#  content [5b3f1a05266b9f5386bba4d560d28692b8d75e45]
# 
# add_file "packages/xkbd/xkbd-layout-ru/en-ru-123.xkbd"
#  content [fbe00f80ca40257ecff86fb7d211b925edfa7b5b]
# 
# add_file "packages/xorg-lib/libx11-native_1.1.1.bb"
#  content [6b2349caf20881e34dd3f21904c38aaa714c9e9c]
# 
# add_file "packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch"
#  content [fafdfc3854b5e99219b8730f6e4eec6426b59ec8]
# 
# add_file "packages/xorg-xserver/xserver-kdrive-1.3.0.0/smedia-glamo.patch"
#  content [9e6bb0c7c7556483765850cbd03efcd3fd9a55d8]
# 
# add_file "site/arm-darwin"
#  content [000e65302e528d3c33819d531644b3142ca15c92]
# 
# %s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list