diff options
| -rw-r--r-- | packages/gtk-webcore/files/setHandle_segfault-fix.patch | 16 | ||||
| -rw-r--r-- | packages/gtk-webcore/osb-nrcore_20050430.bb | 5 | ||||
| -rw-r--r-- | packages/initscripts/initscripts-1.0/collie/keymap-2.4.map | 114 | ||||
| -rw-r--r-- | packages/initscripts/initscripts_1.0.bb | 2 | ||||
| -rw-r--r-- | packages/keymap-locales/files/collie/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/keymap-locales/files/collie/keymap-extension-2.4-de.map | 10 | ||||
| -rw-r--r-- | packages/keymap-locales/keymap-locales.bb | 2 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel/2.6.15/defconfig | 64 | ||||
| -rw-r--r-- | packages/nfs-utils/files/nfsserver | 2 | ||||
| -rw-r--r-- | packages/nfs-utils/nfs-utils_1.0.6.bb | 2 |
10 files changed, 210 insertions, 7 deletions
diff --git a/packages/gtk-webcore/files/setHandle_segfault-fix.patch b/packages/gtk-webcore/files/setHandle_segfault-fix.patch new file mode 100644 index 0000000000..9ebdfeebe5 --- /dev/null +++ b/packages/gtk-webcore/files/setHandle_segfault-fix.patch @@ -0,0 +1,16 @@ +--- NRCore/kwiq/KWQResourceLoader.cpp.orig 2006-01-21 00:13:32.000000000 +0200 ++++ NRCore/kwiq/KWQResourceLoader.cpp 2006-01-20 23:52:59.000000000 +0200 +@@ -56,8 +56,11 @@ + void KWQResourceLoader::setHandle(WebCoreResourceHandle* handle) + { + ASSERT(!_handle); +- handle->retain(); +- _handle = handle; ++ if (handle) ++ { ++ handle->retain(); ++ _handle = handle; ++ } + } + + void KWQResourceLoader::receivedResponse(KWIQResponse* response) diff --git a/packages/gtk-webcore/osb-nrcore_20050430.bb b/packages/gtk-webcore/osb-nrcore_20050430.bb index 758058d355..2f5f2f6046 100644 --- a/packages/gtk-webcore/osb-nrcore_20050430.bb +++ b/packages/gtk-webcore/osb-nrcore_20050430.bb @@ -7,10 +7,13 @@ SECTION = "gpe" FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" PV = "0.5.0+cvs${FIXEDSRCDATE}" +PR = "r1" DEPENDS = "glib-2.0 gtk+ pango osb-jscore" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCore;date=${FIXEDSRCDATE}" +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCore;date=${FIXEDSRCDATE} \ + file://KWIQ-mimetype-segfault.patch;patch=1 \ + file://setHandle_segfault-fix.patch;patch=1" S = "${WORKDIR}/NRCore" LEAD_SONAME = "libnrcore.so" diff --git a/packages/initscripts/initscripts-1.0/collie/keymap-2.4.map b/packages/initscripts/initscripts-1.0/collie/keymap-2.4.map new file mode 100644 index 0000000000..4cd8325bb0 --- /dev/null +++ b/packages/initscripts/initscripts-1.0/collie/keymap-2.4.map @@ -0,0 +1,114 @@ +keymaps 0-1,4-5 +alt_is_meta +keycode 1 = a +keycode 2 = b +keycode 3 = c +keycode 4 = d +keycode 5 = e +keycode 6 = f +keycode 7 = g +keycode 8 = h +keycode 9 = i +keycode 10 = j +keycode 11 = k +keycode 12 = l +keycode 13 = m +keycode 14 = n +keycode 15 = o +keycode 16 = p +keycode 17 = q +keycode 18 = r +keycode 19 = s +keycode 20 = t +keycode 21 = u +keycode 22 = v +keycode 23 = w +keycode 24 = x +keycode 25 = y +keycode 26 = z +keycode 27 = Shift +keycode 28 = Return +keycode 29 = F2 +keycode 30 = +keycode 31 = BackSpace +keycode 32 = bar +keycode 33 = +keycode 34 = Escape +keycode 35 = Left + control keycode 35 = Decr_Console +keycode 36 = Up +keycode 37 = Down +keycode 38 = Right + control keycode 38 = Incr_Console +keycode 39 = Return +keycode 40 = +keycode 41 = one +keycode 42 = two +keycode 43 = three +keycode 44 = four +keycode 45 = five +keycode 46 = six +keycode 47 = seven +keycode 48 = eight +keycode 49 = nine +keycode 50 = zero +keycode 51 = +adiaeresis +keycode 52 = +udiaeresis +keycode 53 = +odiaeresis +keycode 54 = +Adiaeresis +keycode 55 = +Udiaeresis +keycode 56 = +Odiaeresis +keycode 57 = +ssharp +keycode 58 = minus +keycode 59 = plus +keycode 60 = Shift_Lock +keycode 61 = at +keycode 62 = question +keycode 63 = comma +keycode 64 = period +keycode 65 = Tab +keycode 66 = F5 +keycode 67 = F6 +keycode 68 = F7 +keycode 69 = slash +keycode 70 = apostrophe +keycode 71 = semicolon +keycode 72 = quotedbl +keycode 73 = colon +keycode 74 = numbersign +keycode 75 = dollar +keycode 76 = percent +keycode 77 = underscore +keycode 78 = ampersand +keycode 79 = asterisk +keycode 80 = parenleft +keycode 81 = Delete +keycode 82 = F10 +keycode 83 = equal +keycode 84 = parenright +keycode 85 = asciitilde +keycode 86 = less +keycode 87 = greater +keycode 88 = Control +keycode 89 = Alt +keycode 90 = +keycode 91 = space + control keycode 91 = nul +keycode 92 = space + control keycode 92 = nul +keycode 93 = +keycode 94 = exclam +keycode 95 = +keycode 96 = +keycode 97 = +keycode 98 = +keycode 99 = +keycode 100 = +keycode 101 = +keycode 102 = +keycode 103 = Shift +keycode 104 = Control +keycode 105 = Control +keycode 106 = Alt +keycode 107 = Alt +keycode 108 = AltGr diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 18017d1e90..06140bec39 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r63" +PR = "r64" SRC_URI = "file://halt \ file://ramdisk \ diff --git a/packages/keymap-locales/files/collie/.mtn2git_empty b/packages/keymap-locales/files/collie/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/keymap-locales/files/collie/.mtn2git_empty diff --git a/packages/keymap-locales/files/collie/keymap-extension-2.4-de.map b/packages/keymap-locales/files/collie/keymap-extension-2.4-de.map new file mode 100644 index 0000000000..4ee89bbce1 --- /dev/null +++ b/packages/keymap-locales/files/collie/keymap-extension-2.4-de.map @@ -0,0 +1,10 @@ +# German keymappings +shift altgr keycode 63 = +Adiaeresis +shift altgr keycode 13 = +Odiaeresis +shift altgr keycode 12 = +Udiaeresis +altgr keycode 63 = +adiaeresis +altgr keycode 13 = +odiaeresis +altgr keycode 12 = +udiaeresis +altgr keycode 15 = ssharp + +keycode 103 = AltGr
\ No newline at end of file diff --git a/packages/keymap-locales/keymap-locales.bb b/packages/keymap-locales/keymap-locales.bb index 89cb5aa580..7f279ed6cb 100644 --- a/packages/keymap-locales/keymap-locales.bb +++ b/packages/keymap-locales/keymap-locales.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "file://*.map" diff --git a/packages/linux/ixp4xx-kernel/2.6.15/defconfig b/packages/linux/ixp4xx-kernel/2.6.15/defconfig index 31961a01ff..719c10e526 100644 --- a/packages/linux/ixp4xx-kernel/2.6.15/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.15/defconfig @@ -502,7 +502,14 @@ CONFIG_MTD_IXP4XX=y # # NAND Flash Device Drivers # -# CONFIG_MTD_NAND is not set +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_VERIFY_WRITE=y +CONFIG_MTD_NAND_IDS=y +CONFIG_MTD_NAND_DISKONCHIP=y +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set +# CONFIG_MTD_NAND_NANDSIM is not set # # OneNAND Flash Device Drivers @@ -543,7 +550,60 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 # # ATA/ATAPI/MFM/RLL support # -# CONFIG_IDE is not set +CONFIG_IDE=y +CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=y +# CONFIG_IDEDISK_MULTI_MODE is not set +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_BLK_DEV_IDESCSI is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=y +CONFIG_BLK_DEV_IDEPCI=y +# CONFIG_IDEPCI_SHARE_IRQ is not set +# CONFIG_BLK_DEV_OFFBOARD is not set +# CONFIG_BLK_DEV_GENERIC is not set +# CONFIG_BLK_DEV_OPTI621 is not set +# CONFIG_BLK_DEV_SL82C105 is not set +CONFIG_BLK_DEV_IDEDMA_PCI=y +# CONFIG_BLK_DEV_IDEDMA_FORCED is not set +# CONFIG_IDEDMA_PCI_AUTO is not set +CONFIG_BLK_DEV_AEC62XX=y +# CONFIG_BLK_DEV_ALI15X3 is not set +# CONFIG_BLK_DEV_AMD74XX is not set +# CONFIG_BLK_DEV_CMD64X is not set +# CONFIG_BLK_DEV_TRIFLEX is not set +# CONFIG_BLK_DEV_CY82C693 is not set +# CONFIG_BLK_DEV_CS5520 is not set +# CONFIG_BLK_DEV_CS5530 is not set +# CONFIG_BLK_DEV_HPT34X is not set +# CONFIG_BLK_DEV_HPT366 is not set +# CONFIG_BLK_DEV_SC1200 is not set +# CONFIG_BLK_DEV_PIIX is not set +# CONFIG_BLK_DEV_IT821X is not set +# CONFIG_BLK_DEV_NS87415 is not set +# CONFIG_BLK_DEV_PDC202XX_OLD is not set +# CONFIG_BLK_DEV_PDC202XX_NEW is not set +# CONFIG_BLK_DEV_SVWKS is not set +# CONFIG_BLK_DEV_SIIMAGE is not set +# CONFIG_BLK_DEV_SLC90E66 is not set +# CONFIG_BLK_DEV_TRM290 is not set +# CONFIG_BLK_DEV_VIA82CXXX is not set +# CONFIG_IDE_ARM is not set +CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDEDMA_IVB is not set +# CONFIG_IDEDMA_AUTO is not set +# CONFIG_BLK_DEV_HD is not set # # SCSI device support diff --git a/packages/nfs-utils/files/nfsserver b/packages/nfs-utils/files/nfsserver index 36391ee85a..1f1794f760 100644 --- a/packages/nfs-utils/files/nfsserver +++ b/packages/nfs-utils/files/nfsserver @@ -20,7 +20,7 @@ test -x "$NFS_NFSD" || exit 0 # # Default is 8 threads, value is settable between 1 and the truely # ridiculous 99 -test "$NFS_SERVERS" -gt 0 && "$NFS_SERVERS" -lt 100 || NFS_SERVERS=8 +test "$NFS_SERVERS" -gt 0 && test "$NFS_SERVERS" -lt 100 || NFS_SERVERS=8 # # The default state directory is /var/lib/nfs test -n "$NFS_STATEDIR" || NFS_STATEDIR=/var/lib/nfs diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb index 0e2fefc51b..06029dc7c9 100644 --- a/packages/nfs-utils/nfs-utils_1.0.6.bb +++ b/packages/nfs-utils/nfs-utils_1.0.6.bb @@ -3,7 +3,7 @@ PRIORITY = "optional" SECTION = "console/networking" MAINTAINER = "dyoung <dyoung@thestuffguy.com>" LICENSE = "GPL" -PR = "r4" +PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \ file://acinclude-lossage.patch;patch=1 \ |