diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/gdb/gdb_6.3.bb | 5 | ||||
| -rw-r--r-- | packages/ixp425-eth/files/2.6.14.patch | 16 | ||||
| -rw-r--r-- | packages/ixp425-eth/ixp425-eth_1.1.bb | 21 | ||||
| -rw-r--r-- | packages/linux/nslu2-kernel/2.6.14/15-ixp4xx-writesb-l-w.patch | 31 | ||||
| -rw-r--r-- | packages/linux/nslu2-kernel_2.6.14-rc2.bb | 1 | ||||
| -rw-r--r-- | packages/meta/openslug-packages.bb | 3 |
6 files changed, 54 insertions, 23 deletions
diff --git a/packages/gdb/gdb_6.3.bb b/packages/gdb/gdb_6.3.bb index cbd7d3ff15..98825500f6 100644 --- a/packages/gdb/gdb_6.3.bb +++ b/packages/gdb/gdb_6.3.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>" DEPENDS = "ncurses readline" RDEPENDS_openmn = "libthread-db1" -PR = "r1" +PR = "r2" PACKAGES =+ 'gdbserver ' FILES_gdbserver = '${bindir}/gdbserver' @@ -17,9 +17,6 @@ SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \ file://uclibc.patch;patch=1 \ file://gdbserver-cflags-last.diff;patch=1;pnum=0" -# Patch the swi gdb is using for arm thumb code -SRC_URI += "file://thumb-breakpoint.patch;patch=1" - LDFLAGS_append = " -s" export CC_FOR_BUILD = "${BUILD_CC}" export CXX_FOR_BUILD = "${BUILD_CXX}" diff --git a/packages/ixp425-eth/files/2.6.14.patch b/packages/ixp425-eth/files/2.6.14.patch new file mode 100644 index 0000000000..c86ff971ed --- /dev/null +++ b/packages/ixp425-eth/files/2.6.14.patch @@ -0,0 +1,16 @@ +# change in field semantic in 2.6.14 +--- dir/ixp425_eth.c 2005-09-24 17:50:57.828607113 -0700 ++++ dir/ixp425_eth.c 2005-09-24 17:54:19.593303365 -0700 +@@ -1300,8 +1300,12 @@ + skb->len -= header_len; + + /* fill the pkt arrival time (set at the irq callback entry) */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) + skb->stamp.tv_sec = irq_stamp.tv_sec; + skb->stamp.tv_usec = irq_stamp.tv_usec; ++#else ++ skb_set_timestamp(skb, &irq_stamp); ++#endif + + /* fill the input device field */ + skb->dev = dev; diff --git a/packages/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb index dec772b7b6..cbf7e106ce 100644 --- a/packages/ixp425-eth/ixp425-eth_1.1.bb +++ b/packages/ixp425-eth/ixp425-eth_1.1.bb @@ -9,7 +9,8 @@ SRC_URI = "http://www.intel.com/design/network/swsup/ixp400LinuxEthernetDriverPa file://pollcontroller.patch;patch=1 \ file://mm4.patch;patch=1" SRC_URI += "file://2.6.13.patch;patch=1" -PR = "r9" +SRC_URI += "file://2.6.14.patch;patch=1" +PR = "r10" S = "${WORKDIR}" @@ -23,22 +24,6 @@ inherit module KERNEL_CC += "${TARGET_CC_KERNEL_ARCH}" KERNEL_LD += "${TARGET_LD_KERNEL_ARCH}" -#do_ixp425_c_patch_fetch () { -# if test ! -e ${DL_DIR}/ixp425_eth.c.patch.md5; then -# cd ${DL_DIR} -# wget -Oixp425_eth.c.patch http://sourceforge.net/tracker/download.php?group_id=74209\&atid=544386\&file_id=90129\&aid=970193 -# md5sum > ixp425_eth.c.patch.md5 -# fi -#} -# -#addtask ixp425_c_patch_fetch after do_fetch before do_unpack - -#do_ixp425_c_patch_unpack () { -# install -m 0644 ${DL_DIR}/ixp425_eth.c.patch ${WORKDIR}/ -#} - -#addtask ixp425_c_patch_unpack after do_unpack before do_pre_patch - do_pre_patch () { patcher -p 0 -i ixp425_eth_1_1_update_nf_bridge.patch patcher -f -p 0 -i ixp425_eth.c.patch @@ -51,7 +36,7 @@ do_compile () { oe_runmake 'KDIR=${STAGING_KERNEL_DIR}' \ 'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ - 'EXTRA_CFLAGS=-I${STAGING_INCDIR}/linux/ixp4xx-csr -I${STAGING_KERNEL_DIR}/include' + 'EXTRA_CFLAGS=-I${STAGING_INCDIR}/linux/ixp4xx-csr -I${STAGING_KERNEL_DIR}/include -DCPU=33 -DXSCALE=33' } do_install () { diff --git a/packages/linux/nslu2-kernel/2.6.14/15-ixp4xx-writesb-l-w.patch b/packages/linux/nslu2-kernel/2.6.14/15-ixp4xx-writesb-l-w.patch new file mode 100644 index 0000000000..6ac0807f1e --- /dev/null +++ b/packages/linux/nslu2-kernel/2.6.14/15-ixp4xx-writesb-l-w.patch @@ -0,0 +1,31 @@ +# The inline caller of these APIs were changed to have +# const vaddr parameters... +--- linux-2.6.13/include/asm-arm/arch-ixp4xx/io.h.orig 2005-09-24 17:06:19.968099976 -0700 ++++ linux-2.6.13/include/asm-arm/arch-ixp4xx/io.h 2005-09-24 17:06:52.542149731 -0700 +@@ -113,7 +113,7 @@ + } + + static inline void +-__ixp4xx_writesb(u32 bus_addr, u8 *vaddr, int count) ++__ixp4xx_writesb(u32 bus_addr, const u8 *vaddr, int count) + { + while (count--) + writeb(*vaddr++, bus_addr); +@@ -136,7 +136,7 @@ + } + + static inline void +-__ixp4xx_writesw(u32 bus_addr, u16 *vaddr, int count) ++__ixp4xx_writesw(u32 bus_addr, const u16 *vaddr, int count) + { + while (count--) + writew(*vaddr++, bus_addr); +@@ -154,7 +154,7 @@ + } + + static inline void +-__ixp4xx_writesl(u32 bus_addr, u32 *vaddr, int count) ++__ixp4xx_writesl(u32 bus_addr, const u32 *vaddr, int count) + { + while (count--) + writel(*vaddr++, bus_addr); diff --git a/packages/linux/nslu2-kernel_2.6.14-rc2.bb b/packages/linux/nslu2-kernel_2.6.14-rc2.bb index 601003e0cf..6430abc86a 100644 --- a/packages/linux/nslu2-kernel_2.6.14-rc2.bb +++ b/packages/linux/nslu2-kernel_2.6.14-rc2.bb @@ -27,6 +27,7 @@ N2K_PATCHES = "\ file://10-ixp4xx-copy-from.patch;patch=1 \ file://10-ixp4xx-gpio.patch;patch=1 \ file://10-ixp4xx-ticks.patch;patch=1 \ + file://15-ixp4xx-writesb-l-w.patch;patch=1 \ file://30-i2c-x1205.patch;patch=1 \ file://50-nslu2-arch.patch;patch=1 \ file://50-nslu2-general.patch;patch=1 \ diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index f864187cad..2bb137df35 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Packages that are compatible with the OpenSlug firmware" LICENSE = MIT -PR = "r6" +PR = "r7" INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY = 1 @@ -97,6 +97,7 @@ OPENSLUG_PACKAGES = "\ procps \ psmisc \ puppy \ + pvrusb2-mci \ pwc \ python \ qc-usb-messenger \ |