[oe-commits] org.oe.dev merge of '60f8ab65a31175b75e99193102e2ec70cbdfdef8'

hrw commit openembedded-commits at lists.openembedded.org
Tue Jun 26 09:28:51 UTC 2007 

merge of '60f8ab65a31175b75e99193102e2ec70cbdfdef8'
     and '6417986ed931c354e68da472aabbf608cb98eb63'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 7e7e3315d6a3d6bdb48cad1d96cd789f6afc5025
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7e7e3315d6a3d6bdb48cad1d96cd789f6afc5025
Files:
1
conf/distro/hentges-2.0.conf
conf/machine/hentges-2.0_common.conf
conf/machine/hentges-2.0_spitz.conf
packages/images/hentges-console-image.bb
packages/images/hentges-x11-image.bb
packages/linux/ezx-kernels_2.6.bb
packages/linux/gta01-kernel_2.6.bb
packages/linux/linux-ezx
packages/linux/linux-ezx/defconfig-a780
packages/linux/linux-ezx/defconfig-a780-laforge
packages/linux/linux-ezx/defconfig-e680
packages/linux/linux-ezx/defconfig-rokr-e2
packages/linux/linux-ezx/logo_linux_clut224.ppm
packages/linux/linux-ezx/pxa-serial-gcc4.diff
packages/linux/linux-ezx/sa1100-rtc-gcc4.diff
packages/linux/linux-ezx/wyrm-ts.diff
packages/linux/linux-ezx-2.6.20.7
packages/linux/linux-ezx-2.6.20.7/defconfig-a780
packages/linux/linux-ezx-2.6.20.7/ezx-core.patch
packages/linux/linux-ezx-2.6.20.7/ezx-emu.patch
packages/linux/linux-ezx-2.6.20.7/ezx-fix-usb_pxa27x_udc-r3.patch
packages/linux/linux-ezx-2.6.20.7/ezx-mci.patch
packages/linux/linux-ezx-2.6.20.7/ezx-mtd-map.patch
packages/linux/linux-ezx-2.6.20.7/ezx-pcap.patch
packages/linux/linux-ezx-2.6.20.7/ezx-serial-bug-workaround.patch
packages/linux/linux-ezx-2.6.20.7/mux-fix-init-errorpath.patch
packages/linux/linux-ezx-2.6.20.7/mux-fix-makefile.patch
packages/linux/linux-ezx-2.6.20.7/mux-fix-tty-driver.patch
packages/linux/linux-ezx-2.6.20.7/mux-fix.patch
packages/linux/linux-ezx-2.6.20.7/mux-ifdef-ezx-features.patch
packages/linux/linux-ezx-2.6.20.7/mux-linux-2.6.20.7-fix.patch
packages/linux/linux-ezx-2.6.20.7/mux-remove-flipbuffers.patch
packages/linux/linux-ezx-2.6.20.7/mux-remove-get_halted_bit.patch
packages/linux/linux-ezx-2.6.20.7/mux-remove-usbh_finished_resume.patch
packages/linux/linux-ezx-2.6.20.7/mux_cli.patch
packages/linux/linux-ezx-2.6.20.7/mux_debug.patch
packages/linux/linux-ezx-2.6.20.7/usb_add_epalloc-r3.patch
packages/linux/linux-ezx-2.6.20.7/usb_pxa27x_udc-r3.patch
packages/linux/linux-ezx-2.6.21
packages/linux/linux-ezx-2.6.21/a780-flip.patch
packages/linux/linux-ezx-2.6.21/a780-kbd.patch
packages/linux/linux-ezx-2.6.21/a780-leds.patch
packages/linux/linux-ezx-2.6.21/a780-mci.patch
packages/linux/linux-ezx-2.6.21/a780-vibrator.patch
packages/linux/linux-ezx-2.6.21/asoc-pxa-ssp.patch
packages/linux/linux-ezx-2.6.21/defconfig-a780
packages/linux/linux-ezx-2.6.21/defconfig-e680
packages/linux/linux-ezx-2.6.21/e680-kbd.patch
packages/linux/linux-ezx-2.6.21/e680-leds.patch
packages/linux/linux-ezx-2.6.21/e680-locksw.patch
packages/linux/linux-ezx-2.6.21/e680-mci.patch
packages/linux/linux-ezx-2.6.21/ezx-backlight.patch
packages/linux/linux-ezx-2.6.21/ezx-bp.patch
packages/linux/linux-ezx-2.6.21/ezx-core.patch
packages/linux/linux-ezx-2.6.21/ezx-emu.patch
packages/linux/linux-ezx-2.6.21/ezx-kbd.patch
packages/linux/linux-ezx-2.6.21/ezx-mci.patch
packages/linux/linux-ezx-2.6.21/ezx-mtd-map.patch
packages/linux/linux-ezx-2.6.21/ezx-pcap.patch
packages/linux/linux-ezx-2.6.21/ezx-pm.patch
packages/linux/linux-ezx-2.6.21/ezx-serial-bug-workaround.patch
packages/linux/linux-ezx-2.6.21/ezx-ts.patch
packages/linux/linux-ezx-2.6.21/mux-fix-init-errorpath.patch
packages/linux/linux-ezx-2.6.21/mux-fix-makefile.patch
packages/linux/linux-ezx-2.6.21/mux-fix-tty-driver.patch
packages/linux/linux-ezx-2.6.21/mux-fix.patch
packages/linux/linux-ezx-2.6.21/mux-ifdef-ezx-features.patch
packages/linux/linux-ezx-2.6.21/mux-linux-2.6.20.7-fix.patch
packages/linux/linux-ezx-2.6.21/mux-linux-2.6.21-fix.patch
packages/linux/linux-ezx-2.6.21/mux-remove-flipbuffers.patch
packages/linux/linux-ezx-2.6.21/mux-remove-get_halted_bit.patch
packages/linux/linux-ezx-2.6.21/mux-remove-usbh_finished_resume.patch
packages/linux/linux-ezx-2.6.21/mux_cli.patch
packages/linux/linux-ezx-2.6.21/mux_debug.patch
packages/linux/linux-ezx-2.6.21/pcap-ts.patch
packages/linux/linux-ezx-2.6.21/pcap_ts.c.patch
packages/linux/linux-ezx-2.6.21/pxa-kbd.patch
packages/linux/linux-ezx-2.6.21/pxa27x-udc-support.2.patch
packages/linux/linux-ezx-2.6.21/touchscreen-fix-r0.patch
packages/linux/linux-ezx-2.6.21/wyrm-ts.diff
packages/linux/linux-ezx_2.6.16.13.bb
packages/linux/linux-ezx_2.6.19+2.6.20-rc2.bb
packages/linux/linux-ezx_2.6.20.7.bb
packages/linux/linux-gta01/defconfig-2.6.20-fic-gta01
packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01
packages/linux/linux-gta01/defconfig-fic-gta01
packages/linux/linux-gta01/udc-nomodule-misccr.patch
packages/linux/linux-gta01_2.6.17.14.bb
packages/linux/linux-gta01_2.6.17.7.bb
packages/linux/linux-gta01_2.6.20.bb
packages/linux/linux-gta01_2.6.21.1.bb
packages/tasks/task-hentges-base.bb
packages/tasks/task-hentges-x11.bb
packages/uboot/files/gta01_nand.h
packages/uboot/files/qt2410.h
packages/uboot/files/qt2410_nand.h
packages/uboot/files/qt2410_ram.h
packages/uboot/files/u-boot-20060807-qt2410.patch
packages/uboot/files/u-boot-20060907-gta01.patch
packages/uboot/files/u-boot-20061030-gta01bv2.patch
packages/uboot/files/u-boot-20061030-gta01v4.patch
packages/uboot/files/u-boot-20061030-qt2410-gta01.patch
packages/uboot/u-boot-mkimage-gta01-native
packages/uboot/u-boot-mkimage-gta01-native/bbt-create-optional.patch
packages/uboot/u-boot-mkimage-gta01-native/bbt-scan-second.patch
packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-and-nand.patch
packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-reloc.patch
packages/uboot/u-boot-mkimage-gta01-native/boot-menu.patch
packages/uboot/u-boot-mkimage-gta01-native/cmd-unzip.patch
packages/uboot/u-boot-mkimage-gta01-native/console-ansi.patch
packages/uboot/u-boot-mkimage-gta01-native/default-env.patch
packages/uboot/u-boot-mkimage-gta01-native/dontask.patch
packages/uboot/u-boot-mkimage-gta01-native/dynenv-harden.patch
packages/uboot/u-boot-mkimage-gta01-native/early-powerdown.patch
packages/uboot/u-boot-mkimage-gta01-native/enable-splash-bmp.patch
packages/uboot/u-boot-mkimage-gta01-native/env_nand_oob.patch
packages/uboot/u-boot-mkimage-gta01-native/ext2load_hex.patch
packages/uboot/u-boot-mkimage-gta01-native/lowlevel_foo.patch
packages/uboot/u-boot-mkimage-gta01-native/mmcinit-power-up.patch
packages/uboot/u-boot-mkimage-gta01-native/nand-badisbad.patch
packages/uboot/u-boot-mkimage-gta01-native/nand-createbbt.patch
packages/uboot/u-boot-mkimage-gta01-native/nand-dynamic_partitions.patch
packages/uboot/u-boot-mkimage-gta01-native/nand-otp.patch
packages/uboot/u-boot-mkimage-gta01-native/nand-read_write_oob.patch
packages/uboot/u-boot-mkimage-gta01-native/neo1973-chargefast.patch
packages/uboot/u-boot-mkimage-gta01-native/preboot-override.patch
packages/uboot/u-boot-mkimage-gta01-native/raise-limits.patch
packages/uboot/u-boot-mkimage-gta01-native/series
packages/uboot/u-boot-mkimage-gta01-native/splashimage-command.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-neo1973.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-qt2410.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920_s3c2410_irq_demux.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920t-gd_in_irq.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-bbt-quiet.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-cmd_s3c2410.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-cramfs_but_no_jffs2.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-dfu.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-gta02.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-hxd8.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-license.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-machtypes.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-mokoversion.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-nand-markbad-reallybad.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-defaultenv.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-resume.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-misccr-definitions.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-mmc.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-nand.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-norelocate_irqvec_cpy.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-warnings-fix.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_fb.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_udc.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2440.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2443.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2440.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2443.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-strtoul.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-usbtty-acm.patch
packages/uboot/u-boot-mkimage-gta01-native/unbusy-i2c.patch
packages/uboot/u-boot-mkimage-gta01-native/usbdcore-multiple_configs.patch
packages/uboot/u-boot-mkimage-gta01-native/wakeup-reason-nand-only.patch
packages/uboot/u-boot-mkimage-gta01-native_oe.bb
packages/uboot/u-boot-mkimage-gta01-native_svn.bb
packages/uboot/uboot-qt2410_0.0+cvs20061030.bb
packages/altboot/altboot_1.1.1+wip-SVNR59.bb
packages/altboot/altboot_1.1.1+wip-SVNR66.bb
packages/geoclue/geoclue_svn.bb
packages/geoclue/geoclue_git.bb
packages/glibmm/glibmm_2.8.4.bb
packages/glibmm/glibmm_2.12.10.bb
packages/asterisk/files
packages/linux/linux-ezx-2.6.21/patches
packages/psplash/files/angstrom
packages/sphyrna
packages/uclibc/uclibc-0.9.29/armeb
packages/uucp/files
conf/machine/htcwallaby.conf
packages/asterisk/files/init
packages/avahi/avahi_0.6.20.bb
packages/bluez/bluez-gnome_0.9.bb
packages/bluez/bluez-hcidump_1.37.bb
packages/bluez/bluez-libs_3.12.bb
packages/bluez/bluez-utils_3.12.bb
packages/cairo/cairomm_1.2.4.bb
packages/fbreader/files/zaurus-VGA.patch
packages/gpe-conf/gpe-conf_0.2.6.bb
packages/gpsbabel/gpsbabel_1.3.3.bb
packages/gtk-webcore/midori_0.0.2.bb
packages/images/opie-image-16mb.bb
packages/libdaemon/libdaemon_0.11.bb
packages/linux/linux-ezx-2.6.21/patches/Makefile.OpenEZX
packages/linux/linux-ezx-2.6.21/patches/a1200-mci.patch
packages/linux/linux-ezx-2.6.21/patches/a1200-ts.patch
packages/linux/linux-ezx-2.6.21/patches/a780-flip.patch
packages/linux/linux-ezx-2.6.21/patches/a780-kbd.patch
packages/linux/linux-ezx-2.6.21/patches/a780-leds.patch
packages/linux/linux-ezx-2.6.21/patches/a780-mci.patch
packages/linux/linux-ezx-2.6.21/patches/a780-ts.patch
packages/linux/linux-ezx-2.6.21/patches/a780-vibrator.patch
packages/linux/linux-ezx-2.6.21/patches/asoc-pxa-ssp.patch
packages/linux/linux-ezx-2.6.21/patches/defconfig-a1200
packages/linux/linux-ezx-2.6.21/patches/defconfig-a780
packages/linux/linux-ezx-2.6.21/patches/defconfig-e2
packages/linux/linux-ezx-2.6.21/patches/defconfig-e6
packages/linux/linux-ezx-2.6.21/patches/defconfig-e680
packages/linux/linux-ezx-2.6.21/patches/dmesg-a780.log
packages/linux/linux-ezx-2.6.21/patches/e680-kbd.patch
packages/linux/linux-ezx-2.6.21/patches/e680-leds.patch
packages/linux/linux-ezx-2.6.21/patches/e680-locksw.patch
packages/linux/linux-ezx-2.6.21/patches/e680-mci.patch
packages/linux/linux-ezx-2.6.21/patches/e680-ts.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-backlight.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-bp.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-core.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-emu.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-enable-stuart.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-mtd-map.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-pcap.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-pm.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-serial-bug-workaround.patch
packages/linux/linux-ezx-2.6.21/patches/mux-fix-init-errorpath.patch
packages/linux/linux-ezx-2.6.21/patches/mux-fix-makefile.patch
packages/linux/linux-ezx-2.6.21/patches/mux-fix-tty-driver.patch
packages/linux/linux-ezx-2.6.21/patches/mux-fix.patch
packages/linux/linux-ezx-2.6.21/patches/mux-ifdef-ezx-features.patch
packages/linux/linux-ezx-2.6.21/patches/mux-linux-2.6.21-fix.patch
packages/linux/linux-ezx-2.6.21/patches/mux-remove-flipbuffers.patch
packages/linux/linux-ezx-2.6.21/patches/mux-remove-get_halted_bit.patch
packages/linux/linux-ezx-2.6.21/patches/mux-remove-usbh_finished_resume.patch
packages/linux/linux-ezx-2.6.21/patches/mux_cli.patch
packages/linux/linux-ezx-2.6.21/patches/mux_debug.patch
packages/linux/linux-ezx-2.6.21/patches/patch-2.6.21.4
packages/linux/linux-ezx-2.6.21/patches/pcap-ts.patch
packages/linux/linux-ezx-2.6.21/patches/pxa-kbd.patch
packages/linux/linux-ezx-2.6.21/patches/pxa27x-udc-support.2.patch
packages/linux/linux-ezx-2.6.21/patches/series
packages/linux/linux-ezx-2.6.21/update_patches.sh
packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01
packages/linux/linux-gta01/fix-EVIOCGRAB-semantics.patch
packages/linux/linux-gta01_2.6.21.3.bb
packages/lyx/lyx_1.4.4+1.5.0rc1.bb
packages/lyx/lyx_1.4.4.bb
packages/pimlico/dates_0.4.3.bb
packages/pimlico/tasks_0.8.bb
packages/psplash/files/angstrom/angstrom-psplash-qvga-img.h
packages/psplash/files/angstrom/angstrom-psplash-vga-img.h
packages/psplash/files/angstrom/psplash-hand-img.h
packages/sphyrna/sphyrna_svn.bb
packages/tasks/task-opie-16mb.bb
packages/tasks/task-opie-all.bb
packages/tasks/task-opie-apps.bb
packages/tasks/task-opie-games.bb
packages/uboot/files/uboot-20070311-tools_makefile_ln_sf.patch
packages/uboot/files/uboot-eabi-fix-HACK.patch
packages/uclibc/uclibc-0.9.29/armeb/uClibc.machine
packages/uucp/files/policy.patch
classes/rootfs_ipk.bbclass
conf/machine/palmld.conf
packages/arm-kernel-shim/arm-kernel-shim_1.5.bb
packages/arm-kernel-shim/files/config-dsmg600.h
packages/bluez/bluez-utils_3.11.bb
packages/directfb/directfb_1.0.0.bb
packages/esound/esound_0.2.36.bb
packages/fbreader/fbreader_0.8.2a.bb
packages/gpsbabel/gpsbabel_1.2.5.bb
packages/gtk-webcore/osb-nrcore.inc
packages/gtk-webcore/osb-nrcore_svn.bb
packages/initscripts/initscripts-1.0/mountall.sh
packages/initscripts/initscripts_1.0.bb
packages/keymaps/files/jornada6xx/keymap-uk.map
packages/libpcap/libpcap-0.9.6/shared.patch
packages/libpcap/libpcap_0.9.6.bb
packages/librsvg/librsvg_2.16.1.bb
packages/linux/ixp4xx-kernel_2.6.21.1.bb
packages/linux/linux-ezx_2.6.21.bb
packages/linux/linux-gta01.inc
packages/linux/linux-handhelds-2.6/aximx50/defconfig
packages/linux/linux-handhelds-2.6/h2200/defconfig
packages/linux/linux-handhelds-2.6/h3600/defconfig
packages/linux/linux-handhelds-2.6/h3800/defconfig
packages/linux/linux-handhelds-2.6/h3900/defconfig
packages/linux/linux-handhelds-2.6/h4000/defconfig
packages/linux/linux-handhelds-2.6/h5000/defconfig
packages/linux/linux-handhelds-2.6/htcblueangel/defconfig
packages/linux/linux-handhelds-2.6/htcuniversal/defconfig
packages/linux/linux-handhelds-2.6/htcwallaby/defconfig
packages/linux/linux-handhelds-2.6/hx4700/defconfig
packages/linux/linux-handhelds-2.6/magician/defconfig
packages/linux/linux-handhelds-2.6_2.6.21-hh9.bb
packages/linux/linux.inc
packages/psplash/psplash_svn.bb
packages/slugos-init/files/reflash
packages/slugos-init/files/sysconf
packages/slugos-init/files/turnup
packages/slugos-init/slugos-init_0.10.bb
packages/sysvinit/sysvinit_2.86.bb
packages/tasks/task-opie.bb
packages/tetex/tetex-native_3.0.bb
packages/tetex/tetex_3.0.bb
packages/uboot/u-boot_1.1.4.bb
packages/uboot/uboot-gta01_svn.bb
packages/util-linux/util-linux.inc
packages/util-linux/util-linux_2.12r.bb
packages/uucp/uucp_1.07.bb
mtn:execute
true
packages/pcmciautils/pcmciautils
packages/pcmciautils/pcmciautils/modalias_update.patch
packages/pcmciautils/pcmciautils_013.bb
packages/pcmciautils/pcmciautils_014.bb
Diffs:

#
# mt diff -r60f8ab65a31175b75e99193102e2ec70cbdfdef8 -r7e7e3315d6a3d6bdb48cad1d96cd789f6afc5025
#
# 
# 
# delete "conf/distro/hentges-2.0.conf"
# 
# delete "conf/machine/hentges-2.0_common.conf"
# 
# delete "conf/machine/hentges-2.0_spitz.conf"
# 
# delete "packages/images/hentges-console-image.bb"
# 
# delete "packages/images/hentges-x11-image.bb"
# 
# delete "packages/linux/ezx-kernels_2.6.bb"
# 
# delete "packages/linux/gta01-kernel_2.6.bb"
# 
# delete "packages/linux/linux-ezx"
# 
# delete "packages/linux/linux-ezx/defconfig-a780"
# 
# delete "packages/linux/linux-ezx/defconfig-a780-laforge"
# 
# delete "packages/linux/linux-ezx/defconfig-e680"
# 
# delete "packages/linux/linux-ezx/defconfig-rokr-e2"
# 
# delete "packages/linux/linux-ezx/logo_linux_clut224.ppm"
# 
# delete "packages/linux/linux-ezx/pxa-serial-gcc4.diff"
# 
# delete "packages/linux/linux-ezx/sa1100-rtc-gcc4.diff"
# 
# delete "packages/linux/linux-ezx/wyrm-ts.diff"
# 
# delete "packages/linux/linux-ezx-2.6.20.7"
# 
# delete "packages/linux/linux-ezx-2.6.20.7/defconfig-a780"
# 
# delete "packages/linux/linux-ezx-2.6.20.7/ezx-core.patch"
# 
# delete "packages/linux/linux-ezx-2.6.20.7/ezx-emu.patch"
# 
# delete "packages/linux/linux-ezx-2.6.20.7/ezx-fix-usb_pxa27x_udc-r3.patch"
# 
# delete "packages/linux/linux-ezx-2.6.20.7/ezx-mci.patch"
# 
# delete "packages/linux/linux-ezx-2.6.20.7/ezx-mtd-map.patch"
# 
# delete "packages/linux/linux-ezx-2.6.20.7/ezx-pcap.patch"
# 
# delete "packages/linux/linux-ezx-2.6.20.7/ezx-serial-bug-workaround.patch"
# 
# delete "packages/linux/linux-ezx-2.6.20.7/mux-fix-init-errorpath.patch"
# 
# delete "packages/linux/linux-ezx-2.6.20.7/mux-fix-makefile.patch"
# 
# delete "packages/linux/linux-ezx-2.6.20.7/mux-fix-tty-driver.patch"
# 
# delete "packages/linux/linux-ezx-2.6.20.7/mux-fix.patch"
# 
# delete "packages/linux/linux-ezx-2.6.20.7/mux-ifdef-ezx-features.patch"
# 
# delete "packages/linux/linux-ezx-2.6.20.7/mux-linux-2.6.20.7-fix.patch"
# 
# delete "packages/linux/linux-ezx-2.6.20.7/mux-remove-flipbuffers.patch"
# 
# delete "packages/linux/linux-ezx-2.6.20.7/mux-remove-get_halted_bit.patch"
# 
# delete "packages/linux/linux-ezx-2.6.20.7/mux-remove-usbh_finished_resume.patch"
# 
# delete "packages/linux/linux-ezx-2.6.20.7/mux_cli.patch"
# 
# delete "packages/linux/linux-ezx-2.6.20.7/mux_debug.patch"
# 
# delete "packages/linux/linux-ezx-2.6.20.7/usb_add_epalloc-r3.patch"
# 
# delete "packages/linux/linux-ezx-2.6.20.7/usb_pxa27x_udc-r3.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21"
# 
# delete "packages/linux/linux-ezx-2.6.21/a780-flip.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/a780-kbd.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/a780-leds.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/a780-mci.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/a780-vibrator.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/asoc-pxa-ssp.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/defconfig-a780"
# 
# delete "packages/linux/linux-ezx-2.6.21/defconfig-e680"
# 
# delete "packages/linux/linux-ezx-2.6.21/e680-kbd.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/e680-leds.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/e680-locksw.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/e680-mci.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/ezx-backlight.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/ezx-bp.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/ezx-core.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/ezx-emu.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/ezx-kbd.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/ezx-mci.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/ezx-mtd-map.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/ezx-pcap.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/ezx-pm.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/ezx-serial-bug-workaround.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/ezx-ts.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/mux-fix-init-errorpath.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/mux-fix-makefile.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/mux-fix-tty-driver.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/mux-fix.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/mux-ifdef-ezx-features.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/mux-linux-2.6.20.7-fix.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/mux-linux-2.6.21-fix.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/mux-remove-flipbuffers.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/mux-remove-get_halted_bit.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/mux-remove-usbh_finished_resume.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/mux_cli.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/mux_debug.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/pcap-ts.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/pcap_ts.c.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/pxa-kbd.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/pxa27x-udc-support.2.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/touchscreen-fix-r0.patch"
# 
# delete "packages/linux/linux-ezx-2.6.21/wyrm-ts.diff"
# 
# delete "packages/linux/linux-ezx_2.6.16.13.bb"
# 
# delete "packages/linux/linux-ezx_2.6.19+2.6.20-rc2.bb"
# 
# delete "packages/linux/linux-ezx_2.6.20.7.bb"
# 
# delete "packages/linux/linux-gta01/defconfig-2.6.20-fic-gta01"
# 
# delete "packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01"
# 
# delete "packages/linux/linux-gta01/defconfig-fic-gta01"
# 
# delete "packages/linux/linux-gta01/udc-nomodule-misccr.patch"
# 
# delete "packages/linux/linux-gta01_2.6.17.14.bb"
# 
# delete "packages/linux/linux-gta01_2.6.17.7.bb"
# 
# delete "packages/linux/linux-gta01_2.6.20.bb"
# 
# delete "packages/linux/linux-gta01_2.6.21.1.bb"
# 
# delete "packages/tasks/task-hentges-base.bb"
# 
# delete "packages/tasks/task-hentges-x11.bb"
# 
# delete "packages/uboot/files/gta01_nand.h"
# 
# delete "packages/uboot/files/qt2410.h"
# 
# delete "packages/uboot/files/qt2410_nand.h"
# 
# delete "packages/uboot/files/qt2410_ram.h"
# 
# delete "packages/uboot/files/u-boot-20060807-qt2410.patch"
# 
# delete "packages/uboot/files/u-boot-20060907-gta01.patch"
# 
# delete "packages/uboot/files/u-boot-20061030-gta01bv2.patch"
# 
# delete "packages/uboot/files/u-boot-20061030-gta01v4.patch"
# 
# delete "packages/uboot/files/u-boot-20061030-qt2410-gta01.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/bbt-create-optional.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/bbt-scan-second.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-and-nand.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-reloc.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/boot-menu.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/cmd-unzip.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/console-ansi.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/default-env.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/dontask.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/dynenv-harden.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/early-powerdown.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/enable-splash-bmp.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/env_nand_oob.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/ext2load_hex.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/lowlevel_foo.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/mmcinit-power-up.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/nand-badisbad.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/nand-createbbt.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/nand-dynamic_partitions.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/nand-otp.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/nand-read_write_oob.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/neo1973-chargefast.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/preboot-override.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/raise-limits.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/series"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/splashimage-command.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-neo1973.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-qt2410.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920_s3c2410_irq_demux.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920t-gd_in_irq.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-bbt-quiet.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-cmd_s3c2410.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-cramfs_but_no_jffs2.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-dfu.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-gta02.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-hxd8.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-license.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-machtypes.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-mokoversion.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-nand-markbad-reallybad.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-defaultenv.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-resume.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-misccr-definitions.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-mmc.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-nand.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-norelocate_irqvec_cpy.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-warnings-fix.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_fb.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_udc.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2440.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2443.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2440.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2443.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-strtoul.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-usbtty-acm.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/unbusy-i2c.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/usbdcore-multiple_configs.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/wakeup-reason-nand-only.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native_oe.bb"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native_svn.bb"
# 
# delete "packages/uboot/uboot-qt2410_0.0+cvs20061030.bb"
# 
# rename "packages/altboot/altboot_1.1.1+wip-SVNR59.bb"
#     to "packages/altboot/altboot_1.1.1+wip-SVNR66.bb"
# 
# rename "packages/geoclue/geoclue_svn.bb"
#     to "packages/geoclue/geoclue_git.bb"
# 
# rename "packages/glibmm/glibmm_2.8.4.bb"
#     to "packages/glibmm/glibmm_2.12.10.bb"
# 
# add_dir "packages/asterisk/files"
# 
# add_dir "packages/linux/linux-ezx"
# 
# add_dir "packages/linux/linux-ezx-2.6.21"
# 
# add_dir "packages/linux/linux-ezx-2.6.21/patches"
# 
# add_dir "packages/psplash/files/angstrom"
# 
# add_dir "packages/sphyrna"
# 
# add_dir "packages/uboot/u-boot-mkimage-gta01-native"
# 
# add_dir "packages/uclibc/uclibc-0.9.29/armeb"
# 
# add_dir "packages/uucp/files"
# 
# add_file "conf/machine/htcwallaby.conf"
#  content [9eb8958a34abb017fe40020f1493f5bd050a6e52]
# 
# add_file "packages/asterisk/files/init"
#  content [d70d85235c177b497d38a40ca5aab2ac04dcff74]
# 
# add_file "packages/avahi/avahi_0.6.20.bb"
#  content [efe6d7c1e1a4684e2c363eb2dd156224be266a30]
# 
# add_file "packages/bluez/bluez-gnome_0.9.bb"
#  content [6841233421c5e08a0657919d990abdc76ffac9e7]
# 
# add_file "packages/bluez/bluez-hcidump_1.37.bb"
#  content [d6f52cd2d74e198d022f5fd58a152c8d4eb73945]
# 
# add_file "packages/bluez/bluez-libs_3.12.bb"
#  content [dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d]
# 
# add_file "packages/bluez/bluez-utils_3.12.bb"
#  content [d055686db47812d24a22cc691636452724043cdd]
# 
# add_file "packages/cairo/cairomm_1.2.4.bb"
#  content [dd66a4dedd593fd19a3dbdd501692b451e67cc22]
# 
# add_file "packages/fbreader/files/zaurus-VGA.patch"
#  content [3993e8eb74f417adf2f1ed86a1db46f5d7a91602]
# 
# add_file "packages/gpe-conf/gpe-conf_0.2.6.bb"
#  content [ab00b228e49cc53742b5fcd1ecb6dd579a926ef3]
# 
# add_file "packages/gpsbabel/gpsbabel_1.3.3.bb"
#  content [524afce07a57a4126e2b92cbade218085eccfd80]
# 
# add_file "packages/gtk-webcore/midori_0.0.2.bb"
#  content [348a9809fd18122ce67287221b19ca29e74da891]
# 
# add_file "packages/images/opie-image-16mb.bb"
#  content [3961c821470050fd70488a1688a142f074ae5a4a]
# 
# add_file "packages/libdaemon/libdaemon_0.11.bb"
#  content [096ac098f123427d223ff699f237de9e4c87e0fa]
# 
# add_file "packages/linux/linux-ezx/logo_linux_clut224.ppm"
#  content [803a654c1f3fb5729fa2dabf4ba50e82aa5321dc]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/Makefile.OpenEZX"
#  content [0957542823ce200c987b90229c09b1f241b31129]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/a1200-mci.patch"
#  content [6636c1cdc2eaaf0f6a0587d9c9965ff437e34fcf]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/a1200-ts.patch"
#  content [1ca575b3c635943719aa22662953f9d030297fc3]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/a780-flip.patch"
#  content [69d4a3f5a75636cfdf89bd86e0db5cca103b51ae]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/a780-kbd.patch"
#  content [ff4a674ab00e773d72997022c5155d9e820de982]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/a780-leds.patch"
#  content [31fed77fdd9a093bd42261f7abfd71bdaacbfa6d]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/a780-mci.patch"
#  content [cfeaeff44c4a3f4ad3cb29aed3cdc8b1c638d7c6]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/a780-ts.patch"
#  content [893517c5ae33c6beebf296a6da1d5a2b8465b993]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/a780-vibrator.patch"
#  content [712d0391f4a5f3dafc0feaca39b7c340d0695218]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/asoc-pxa-ssp.patch"
#  content [9db4415e11942ffb94911eea3de1ca4fc4ae35aa]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/defconfig-a1200"
#  content [5e1971d2895f08cc848308ca0844d49ceb85fc74]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/defconfig-a780"
#  content [534ed07d7adf5375435eb1f38731092fc0dbbdb1]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/defconfig-e2"
#  content [f4a6f1f07fd56b9da645a8355138f92701ac2e1f]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/defconfig-e6"
#  content [66fa1989943d53225ef5dd187a85ec040f5161dc]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/defconfig-e680"
#  content [e9f4dd7e96629ce9bd66356061a11aec1cd2590a]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/dmesg-a780.log"
#  content [88c9d6144371391bfd6bd11714d849115041b9b6]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/e680-kbd.patch"
#  content [1745111b7d811226eb0a93b1aef9368f3f02e51e]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/e680-leds.patch"
#  content [f7fa9260d0d60bb38b483f284f50a9f6ae952c95]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/e680-locksw.patch"
#  content [e1b3994b1e867bde0f0d64de50ee790479b83709]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/e680-mci.patch"
#  content [2350f8448c387384bd08c545a78cae3d06aa9e60]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/e680-ts.patch"
#  content [565ef830d2db32d41e2d912171e2a65bbd2e0a32]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/ezx-backlight.patch"
#  content [edfc8a976a822dddd374a110bccee12a8adb96e6]
# 
# add_file "packages/linux/linux-ezx-2.6.21/pa%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -r6417986ed931c354e68da472aabbf608cb98eb63 -r7e7e3315d6a3d6bdb48cad1d96cd789f6afc5025
#
# 
# 
# add_dir "packages/pcmciautils/pcmciautils"
# 
# add_file "packages/pcmciautils/pcmciautils/modalias_update.patch"
#  content [98c8edb8b30172c6fe310eb1aeceb774d11c1e48]
# 
# patch "packages/pcmciautils/pcmciautils_013.bb"
#  from [a4fe429355a025947dae4e87515f73a7c0a28d0f]
#    to [fa6ec31351d5f580bd06c24b1672862ccf9c59ee]
# 
# patch "packages/pcmciautils/pcmciautils_014.bb"
#  from [a4fe429355a025947dae4e87515f73a7c0a28d0f]
#    to [fa6ec31351d5f580bd06c24b1672862ccf9c59ee]
# 
============================================================
--- packages/pcmciautils/pcmciautils/modalias_update.patch	98c8edb8b30172c6fe310eb1aeceb774d11c1e48
+++ packages/pcmciautils/pcmciautils/modalias_update.patch	98c8edb8b30172c6fe310eb1aeceb774d11c1e48
@@ -0,0 +1,56 @@
+From: Miklos Vajna <vmiklos at frugalware.org>
+Date: Fri, 3 Nov 2006 16:33:38 +0000 (-0500)
+Subject: [PATCH] fix for udev-094
+X-Git-Url: http://git.kernel.org/?p=linux%2Fpcmcia%2Fpcmciautils.git;a=commitdiff_plain;h=3a5217492c1f95711b30f4e27c51563dff6ceb3e
+
+[PATCH] fix for udev-094
+
+from udev's release notes:
+
+"udev 094
+========
+The built-in MODALIAS key and substitution is removed.
+(...)
+udev 080
+========
+(...)
+MODALIAS and $modalias is not needed and will be removed from one of
+the next udev versions, replace it in all rules with ENV{MODALIAS} or
+the sysfs "modalias" value."
+
+here is a patch to fix this issue
+
+Signed-off-by: Miklos Vajna <vmiklos at frugalware.org>
+Signed-off-by: Dominik Brodowski <linux at dominikbrodowski.net>
+---
+
+diff --git a/udev/rules-base b/udev/rules-base
+index c6d14de..6ed3a27 100644
+--- a/udev/rules-base
++++ b/udev/rules-base
+@@ -3,12 +3,12 @@
+ # are so broken that we need to read out random bytes of it
+ # instead of the manufactor, card or product ID. Then the
+ # matching is done in userspace.
+-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
++ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
+ 		RUN+="/sbin/pcmcia-check-broken-cis"
+ 
+ # However, the "weak" matching by func_id is only allowed _after_ modprobe
+ # returns, so that "strong" matches have a higher priority.
+-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
++ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
+ 		RUN+="/bin/sh -c 'echo 1 > /sys/$devpath/allow_func_id_match'"
+ 
+ # PCMCIA sockets:
+diff --git a/udev/rules-modprobe b/udev/rules-modprobe
+index ea1f44a..a13b2ad 100644
+--- a/udev/rules-modprobe
++++ b/udev/rules-modprobe
+@@ -1,3 +1,3 @@
+-# modprobe $modalias loads all possibly appropriate modules
+-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
+-		RUN+="/sbin/modprobe $modalias"
++# modprobe $env{MODALIAS} loads all possibly appropriate modules
++ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
++		RUN+="/sbin/modprobe $env{MODALIAS}"
============================================================
--- packages/pcmciautils/pcmciautils_013.bb	a4fe429355a025947dae4e87515f73a7c0a28d0f
+++ packages/pcmciautils/pcmciautils_013.bb	fa6ec31351d5f580bd06c24b1672862ccf9c59ee
@@ -1,6 +1,7 @@ require pcmciautils.inc
 require pcmciautils.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "file://makefile_fix.patch;patch=1 \
+            file://version_workaround.patch;patch=1 \
+	    file://modalias_update.patch;patch=1"
-            file://version_workaround.patch;patch=1"
============================================================
--- packages/pcmciautils/pcmciautils_014.bb	a4fe429355a025947dae4e87515f73a7c0a28d0f
+++ packages/pcmciautils/pcmciautils_014.bb	fa6ec31351d5f580bd06c24b1672862ccf9c59ee
@@ -1,6 +1,7 @@ require pcmciautils.inc
 require pcmciautils.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "file://makefile_fix.patch;patch=1 \
+            file://version_workaround.patch;patch=1 \
+	    file://modalias_update.patch;patch=1"
-            file://version_workaround.patch;patch=1"

More information about the Openembedded-commits mailing list