diff options
| author | Matthias Hentges <oe@hentges.net> | 2005-07-21 20:19:17 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-21 20:19:17 +0000 |
| commit | 0f1d1982b7905f3dae21837a7a2ecf0448991d72 (patch) | |
| tree | 490c44cf0cf5fb0a73eb4b060d2b1b405c13c4ce /packages | |
| parent | 5c8f0ac921d317857f53af063b6158fe450e3977 (diff) | |
| parent | e40c5b40e67325fd054d160367f0d52c4bfc91b9 (diff) | |
merge of 92eb0d6f08f5ac3bdb8b69280bd69145bd2b42ab
and f4954b87346baa782592647d49aced9350906ce0
Diffstat (limited to 'packages')
29 files changed, 1472 insertions, 26 deletions
diff --git a/packages/apex/.mtn2git_empty b/packages/apex/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/apex/.mtn2git_empty diff --git a/packages/apex/apex_1.2.19.bb b/packages/apex/apex_1.2.19.bb new file mode 100644 index 0000000000..2b022e94e7 --- /dev/null +++ b/packages/apex/apex_1.2.19.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "APEX Boot Loader" +SECTION = "" +PRIORITY = "optional" +MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>" +HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ + file://defconfig" + +EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" + +oe_runmake() { + oenote make ${PARALLEL_MAKE} CROSS_COMPILE=/home/slug/openslug/tmp/cross/bin/armeb-linux- "$@" + make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=/home/slug/openslug/tmp/cross/bin/armeb-linux- "$@" || die "oe_runmake failed" +} + +do_configure() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config + oe_runmake oldconfig +} + +do_populate_staging() { + install -d ${STAGING_LOADER_DIR} + install -m 0755 src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex.bin +} diff --git a/packages/apex/nslu2/.mtn2git_empty b/packages/apex/nslu2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/apex/nslu2/.mtn2git_empty diff --git a/packages/apex/nslu2/defconfig b/packages/apex/nslu2/defconfig new file mode 100644 index 0000000000..138ed749a4 --- /dev/null +++ b/packages/apex/nslu2/defconfig @@ -0,0 +1,88 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: +# Tue May 17 09:42:40 2005 +# +CONFIG_ARM=y +# CONFIG_ARCH_LH7952X is not set +# CONFIG_ARCH_LH7A40X is not set +CONFIG_ARCH_IXP42X=y +# CONFIG_EXPERIMENTAL is not set + +# +# General Setup +# +CONFIG_CROSS_COMPILE="/usr/armv5b-softfloat-linux/gcc-3.4.2-glibc-2.3.3/bin/armv5b-softfloat-linux-" +# CONFIG_SMALL is not set +# CONFIG_DEBUG_LL is not set +CONFIG_SPINNER=y +CONFIG_ATAG=y +CONFIG_DISABLE_MMU_AT_BOOT=y +CONFIG_ATAG_PHYS=0x00000100 +CONFIG_ARCH_NUMBER=597 +CONFIG_APEX_VMA=0x00200000 +CONFIG_KERNEL_LMA=0x00008000 +CONFIG_SDRAM_BANK0=y +# CONFIG_SDRAM_BANK1 is not set +CONFIG_NOR_BUSWIDTH=16 +CONFIG_NOR_BANK0=y +CONFIG_NOR_BANK0_START=0x50000000 +CONFIG_NOR_BANK0_LENGTH=0x00800000 +CONFIG_ENV_STARTUP="" +CONFIG_MACH="ixp42x" +CONFIG_MACH_NSLU2=y +# CONFIG_MACH_AVILA2347 is not set + +# +# Platform Setup +# +CONFIG_USE_RAMDISK=y +CONFIG_RAMDISK_LMA=0x01000000 +CONFIG_SDRAM_BANK_LENGTH=0x02000000 +CONFIG_ARCH_IXP420=y + +# +# Commands +# +CONFIG_ALLHELP=y +CONFIG_CMD_CHECKSUM=y +CONFIG_CMD_COPY=y +CONFIG_CMD_COMPARE=y +CONFIG_CMD_DRVINFO=y +CONFIG_CMD_DUMP=y +CONFIG_CMD_ENV=y +# CONFIG_CMD_ERASEENV is not set +CONFIG_CMD_SETENV=y +CONFIG_CMD_ERASE=y +CONFIG_CMD_FILL=y +CONFIG_CMD_INFO=y +CONFIG_CMD_GO=y +# CONFIG_CMD_PAUSE is not set +CONFIG_CMD_WAIT=y +CONFIG_CMD_XRECEIVE=y + +# +# Generic Drivers +# +# CONFIG_DRIVER_FAT is not set +# CONFIG_DRIVER_EXT2 is not set +# CONFIG_DRIVER_JFFS2 is not set +CONFIG_DRIVER_NOR_CFI=y +CONFIG_USES_NOR_CFI=y + +# +# Environment +# +CONFIG_NOR_BOOT=y +# CONFIG_NAND_BOOT is not set +CONFIG_AUTOBOOT=y +CONFIG_AUTOBOOT_DELAY=10 +CONFIG_ENV_MUTABLE=y +CONFIG_ENV_REGION="nor:128k+64k" +CONFIG_ENV_STARTUP_KERNEL_COPY=y +CONFIG_ENV_REGION_KERNEL="nor:0x60010+0xffff0" +CONFIG_ENV_STARTUP_RAMDISK_COPY=y +CONFIG_ENV_REGION_RAMDISK="nor:0x160010+0x69fff0" +# CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE is not set +CONFIG_USES_NOR_BOOTFLASH=y +CONFIG_BIGENDIAN=y diff --git a/packages/gpe-filemanager/gpe-filemanager_0.23.bb b/packages/gpe-filemanager/gpe-filemanager_0.23.bb new file mode 100644 index 0000000000..2beee83596 --- /dev/null +++ b/packages/gpe-filemanager/gpe-filemanager_0.23.bb @@ -0,0 +1,12 @@ + +inherit gpe + +PR = "r0" +LICENSE = "GPL" +DESCRIPTION = "GPE file manager" +DEPENDS = "libgpewidget gnome-vfs dbus" +SECTION = "gpe" +RDEPENDS = "gpe-icons" +RRECOMMENDS = "gnome-vfs-plugin-file" + +FILES_${PN} += " ${datadir}/gpe" diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index e7863ff28d..8c735b7a5e 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 = "r49" +PR = "r47" SRC_URI = "file://halt \ file://ramdisk \ @@ -30,17 +30,13 @@ SRC_URI = "file://halt \ file://umountnfs.sh \ file://sysfs.sh \ file://device_table.txt \ - file://populate-volatile.sh \ - file://volatiles \ file://corgikeymap-2.6.map \ - file://tosakeymap-2.6.map \ - file://akitakeymap.map" + file://tosakeymap-2.6.map" SRC_URI_append_arm = " file://alignment.sh" SRC_URI_append_openzaurus = " file://checkversion" SRC_URI_append_c7x0 = " file://keymap" SRC_URI_append_tosa = " file://keymap" -SRC_URI_append_akita = " file://keymap" def read_kernel_version(d): import bb @@ -86,8 +82,6 @@ do_install () { install -m 0755 ${WORKDIR}/devpts.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/devpts ${D}${sysconfdir}/default install -m 0755 ${WORKDIR}/sysfs.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/populate-volatile.sh ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default if [ "${TARGET_ARCH}" = "arm" ]; then install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d fi @@ -113,12 +107,6 @@ do_install () { ln -sf ../init.d/keymap ${D}${sysconfdir}/rcS.d/S00keymap fi - if [ "${MACHINE}" == "akita" ]; then - install -m 0644 ${WORKDIR}/akitakeymap.map ${D}${sysconfdir} - install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d - ln -sf ../init.d/keymap ${D}${sysconfdir}/rcS.d/S00keymap - fi - install -m 0755 ${WORKDIR}/banner ${D}${sysconfdir}/init.d/banner install -m 0755 ${WORKDIR}/devices ${D}${sysconfdir}/init.d/devices install -m 0755 ${WORKDIR}/umountfs ${D}${sysconfdir}/init.d/umountfs @@ -152,7 +140,6 @@ do_install () { ln -sf ../init.d/devices ${D}${sysconfdir}/rcS.d/S05devices # udev will run at S04 if installed ln -sf ../init.d/sysfs.sh ${D}${sysconfdir}/rcS.d/S03sysfs - ln -sf ../init.d/populate-volatile.sh ${D}${sysconfdir}/rcS.d/S37populate-volatile.sh ln -sf ../init.d/devpts.sh ${D}${sysconfdir}/rcS.d/S38devpts.sh if [ "${TARGET_ARCH}" = "arm" ]; then ln -sf ../init.d/alignment.sh ${D}${sysconfdir}/rcS.d/S06alignment diff --git a/packages/lineak/.mtn2git_empty b/packages/lineak/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/lineak/.mtn2git_empty diff --git a/packages/lineak/files/.mtn2git_empty b/packages/lineak/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/lineak/files/.mtn2git_empty diff --git a/packages/lineak/files/add-zaurus-remote-support.patch b/packages/lineak/files/add-zaurus-remote-support.patch new file mode 100644 index 0000000000..a5cfe9f474 --- /dev/null +++ b/packages/lineak/files/add-zaurus-remote-support.patch @@ -0,0 +1,26 @@ +--- lineakd-0.8.3/lineakd/lineakkb.def 2005-03-02 04:15:39.000000000 -0800 ++++ lineakd-0.8.3/lineakd/lineakkb.def.new 2005-07-14 20:50:40.000000000 -0700 +@@ -1166,6 +1166,23 @@ + + #### END CodeGen Keyboards #### + ++#### Sharp Zaurus Remotes #### ++ ++[CE-RH2] ++ brandname = "Sharp" ++ modelname = "Sharp CE-RH2" ++ [KEYS] ++ AudioPlay|Pause = 72 ++ AudioRaiseVolume = 126 ++ AudioLowerVolume = 127 ++ AudioMute = 128 ++ AudioStop = 76 ++ AudioPrev = 124 ++ AudioNext = 116 ++ [END KEYS] ++[END CE-RH2] ++ ++#### END Sharp Zaurus Remotes #### + + #### Compaq keyboards #### + diff --git a/packages/lineak/lineak_0.8.3.bb b/packages/lineak/lineak_0.8.3.bb new file mode 100644 index 0000000000..7b04db572d --- /dev/null +++ b/packages/lineak/lineak_0.8.3.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "lineakd" +SECTION = "gpe/multimedia" +HOMEPAGE = "http://lineak.sourceforge.net" +LICENSE = "GPLv2" +MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" +DEPENDS = "x11 xext" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/lineak/lineakd-${PV}.tar.gz \ + file://add-zaurus-remote-support.patch;patch=1" + +inherit autotools + +do_install () { + oe_runmake 'mandir=${D}/usr/share/man' 'pkglibdir=${D}/usr/lib' 'sysconfdir=${D}/etc' 'DESTDIR=${D}' install +} + +PACKAGES += "${PN}-lib" + +FILES_${PN}-lib += " \ + ${libdir}/liblineak*" + diff --git a/packages/linux/linux-omap1_2.6.12-rc2.bb b/packages/linux/linux-omap1_2.6.12-rc2.bb index a4be0b995e..e3dc282017 100644 --- a/packages/linux/linux-omap1_2.6.12-rc2.bb +++ b/packages/linux/linux-omap1_2.6.12-rc2.bb @@ -1,4 +1,4 @@ -PR = "r2" +PR = "r3" SECTION = "kernel" DESCRIPTION = "Linux kernel for OMAP processors" LICENSE = "GPL" @@ -12,7 +12,7 @@ S = "${WORKDIR}/linux-2.6.12-rc2" KERNEL_IMAGETYPE = "vmlinux" KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}" -KERNEL_CCSUFFIX = "-3.3.3" +KERNEL_CCSUFFIX = "-3.3.4" #DEPENDS = "uboot" diff --git a/packages/linux/linux-openzaurus_2.6.12-mm1.bb b/packages/linux/linux-openzaurus_2.6.12-mm1.bb index fe94202c9d..fc519ecfbc 100644 --- a/packages/linux/linux-openzaurus_2.6.12-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.12-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r5" +PR = "r4" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" diff --git a/packages/linux/linux-wrt_2.4.30.bb b/packages/linux/linux-wrt_2.4.30.bb index e17bfdfe6a..444fb5b7ea 100644 --- a/packages/linux/linux-wrt_2.4.30.bb +++ b/packages/linux/linux-wrt_2.4.30.bb @@ -1,15 +1,14 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the Linksys WRT54 devices" HOMEPAGE = "http://openwrt.org" +DEPENDS = "lzma-native" LICENSE = "GPL" PR = "r2" -DEPENDS = "lzma-native" - SRC_URI = "http://www.fi.kernel.org/pub/linux/kernel/v2.4/linux-2.4.30.tar.bz2 \ cvs://anonymous@openwrt.org/openwrt;module=openwrt/package/linux/kernel-source;tag=TESTED \ - http://downloads.openwrt.org/kernel-binary-wl-0.2.tar.gz \ - http://downloads.openwrt.org/kernel-source-et-0.6.tar.gz \ + http://downloads.openwrt.org/sources/kernel-binary-wl-0.2.tar.gz \ + http://downloads.openwrt.org/sources/kernel-source-et-0.6.tar.gz \ file://000-linux-mips-2_4_30.patch;patch=1 \ file://001-Makefile;patch=1 \ file://002-Rules_make;patch=1 \ diff --git a/packages/modutils/files/gcc4.patch b/packages/modutils/files/gcc4.patch index 187a677158..e204898f05 100644 --- a/packages/modutils/files/gcc4.patch +++ b/packages/modutils/files/gcc4.patch @@ -51,3 +51,16 @@ xrealloc(a_hdr, a_hdr->total_size); p = (char *)a_hdr + a_hdr->symbol_off; memcpy(p, symbols, a_hdr->symbols*a_hdr->symbol_size); +--- modutils-2.4.27/obj/obj_mips.c.orig 2003-04-05 00:47:17.000000000 +0200 ++++ modutils-2.4.27/obj/obj_mips.c 2005-07-21 12:51:48.000000000 +0200 +@@ -244,7 +244,9 @@ + archdata_sec->header.sh_size = 0; + sec = obj_find_section(f, "__dbe_table"); + if (sec) { +- ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad)); ++/* ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad));*/ ++ archdata_sec->contents = xmalloc(sizeof(*ad)); ++ ad = (struct archdata *) (archdata_sec->contents); + memset(ad, 0, sizeof(*ad)); + archdata_sec->header.sh_size = sizeof(*ad); + ad->__start___dbe_table = sec->header.sh_addr; diff --git a/packages/modutils/modutils-cross_2.4.27.bb b/packages/modutils/modutils-cross_2.4.27.bb index c990b354f3..2b301d7d09 100644 --- a/packages/modutils/modutils-cross_2.4.27.bb +++ b/packages/modutils/modutils-cross_2.4.27.bb @@ -1,6 +1,6 @@ SECTION = "base" include modutils_${PV}.bb -PR = "r5" +PR = "r6" inherit cross S = "${WORKDIR}/modutils-${PV}" DEPENDS = "" diff --git a/packages/sdcc/.mtn2git_empty b/packages/sdcc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sdcc/.mtn2git_empty diff --git a/packages/sdcc/sdcc-native_2.5.0.bb b/packages/sdcc/sdcc-native_2.5.0.bb new file mode 100644 index 0000000000..2a05d5e628 --- /dev/null +++ b/packages/sdcc/sdcc-native_2.5.0.bb @@ -0,0 +1,10 @@ +include sdcc_${PV}.bb + +inherit native + +# yes, we usually don't want to do this in order to prevent staging pollution, +# however sdcc behaves pretty nice here, so we can do an exception here (ML). +do_stage() { + oe_runmake install +} + diff --git a/packages/sdcc/sdcc_2.5.0.bb b/packages/sdcc/sdcc_2.5.0.bb new file mode 100644 index 0000000000..65eaf02d44 --- /dev/null +++ b/packages/sdcc/sdcc_2.5.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION= "SDCC - Small Device C Compiler" +LICENSE = "GPL" +SECTION = "devel" +HOMEPAGE = "http://sdcc.sourceforge.net" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/sdcc/sdcc-${PV}.tar.gz" +S = "${WORKDIR}/sdcc" + +PARALLEL_MAKE = "" + +inherit autotools + +do_configure() { + gnu-configize + oe_runconf +} + diff --git a/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb b/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb index 569bf8dad2..d7b285e8ec 100644 --- a/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb +++ b/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb @@ -1,6 +1,8 @@ -SECTION = "base" -PN_BASE = "squashfs-tools" include ${PN_BASE}_${PV}.bb + +DEPENDS = "lzma-native" +PN_BASE = "squashfs-tools" + inherit native FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${PN_BASE}-${PV}', '${FILE_DIRNAME}/${PN_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/packages/squashfs-tools/squashfs-tools_2.0r2.bb b/packages/squashfs-tools/squashfs-tools_2.0r2.bb index f99cdb798e..ccc6b33697 100644 --- a/packages/squashfs-tools/squashfs-tools_2.0r2.bb +++ b/packages/squashfs-tools/squashfs-tools_2.0r2.bb @@ -1,7 +1,9 @@ -SECTION = "base" DESCRIPTION = "Squashfs is a highly compressed read-only filesystem for Linux." MAINTAINER = "Chris Larson <kergoth@handhelds.org>" +DEPENDS = "lzma" +SECTION = "base" LICENSE = "GPLv2" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/squashfs/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}.tar.gz \ file://flags.patch;patch=1 \ diff --git a/packages/sylpheed/files/sylpheed-gnutls-extra.patch b/packages/sylpheed/files/sylpheed-gnutls-extra.patch new file mode 100644 index 0000000000..ba24b5a1d7 --- /dev/null +++ b/packages/sylpheed/files/sylpheed-gnutls-extra.patch @@ -0,0 +1,37 @@ +--- sylpheed-2.0.0beta6/src/ssl.c.orig 2005-07-20 15:45:12.882201824 +0100 ++++ sylpheed-2.0.0beta6/src/ssl.c 2005-07-20 16:10:04.006516472 +0100 +@@ -54,9 +54,9 @@ + debug_print(_("SSLv23 not available\n")); + } else { + debug_print(_("SSLv23 available\n")); +- if (certs_dir && ++ if (certs_dir /*&& + !SSL_CTX_load_verify_locations(ssl_ctx_SSLv23, NULL, +- certs_dir)) ++ certs_dir)*/) + g_warning("SSLv23 SSL_CTX_load_verify_locations failed.\n"); + } + +@@ -65,9 +65,9 @@ + debug_print(_("TLSv1 not available\n")); + } else { + debug_print(_("TLSv1 available\n")); +- if (certs_dir && ++ if (certs_dir /*&& + !SSL_CTX_load_verify_locations(ssl_ctx_TLSv1, NULL, +- certs_dir)) ++ certs_dir)*/) + g_warning("TLSv1 SSL_CTX_load_verify_locations failed.\n"); + } + +@@ -151,8 +151,8 @@ + g_free(str); + } + +- verify_result = SSL_get_verify_result(sockinfo->ssl); +- if (verify_result == X509_V_OK) ++ verify_result = 0; /*SSL_get_verify_result(sockinfo->ssl);*/ ++ if (verify_result == 1) + debug_print("SSL verify OK\n"); + else + g_warning("%s: SSL certificate verify failed (%ld: %s)\n", diff --git a/packages/usrp/.mtn2git_empty b/packages/usrp/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/usrp/.mtn2git_empty diff --git a/packages/usrp/files/.mtn2git_empty b/packages/usrp/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/usrp/files/.mtn2git_empty diff --git a/packages/usrp/files/usb11.patch b/packages/usrp/files/usb11.patch new file mode 100644 index 0000000000..a0f1f548a6 --- /dev/null +++ b/packages/usrp/files/usb11.patch @@ -0,0 +1,96 @@ +diff -ur usrp-0.8/firmware/include/fpga_regs_standard.h usrp-0.8-usb11/firmware/include/fpga_regs_standard.h +--- usrp-0.8/firmware/include/fpga_regs_standard.h 2004-12-10 23:25:42.000000000 -0500 ++++ usrp-0.8-usb11/firmware/include/fpga_regs_standard.h 2005-04-18 15:48:58.000000000 -0400 +@@ -103,6 +103,7 @@ + // 3 chan 1 Q + + #define FR_TX_MUX 39 ++#define FR_USB_PACKET_SIZE 40 + + #endif /* INCLUDED_FPGA_REGS_STANDARD_H */ + +diff -ur usrp-0.8/firmware/src/common/usrp_common.c usrp-0.8-usb11/firmware/src/common/usrp_common.c +--- usrp-0.8/firmware/src/common/usrp_common.c 2004-03-28 17:28:58.000000000 -0500 ++++ usrp-0.8-usb11/firmware/src/common/usrp_common.c 2005-04-17 12:10:26.000000000 -0400 +@@ -101,9 +101,13 @@ + // set autoin length for EP6 + // FIXME should be f(enumeration) + +- EP6AUTOINLENH = (512) >> 8; SYNCDELAY; // this is the length for high speed +- EP6AUTOINLENL = (512) & 0xff; SYNCDELAY; +- ++ if (USBCS & bmHSM) { ++ EP6AUTOINLENH = (512) >> 8; SYNCDELAY; // this is the length for high speed ++ EP6AUTOINLENL = (512) & 0xff; SYNCDELAY; ++ } else { ++ EP6AUTOINLENH = (64) >> 8; SYNCDELAY; // this is the length for full speed ++ EP6AUTOINLENL = (64) & 0xff; SYNCDELAY; ++ } + init_board (); + } + +diff -ur usrp-0.8/firmware/src/usrp2/usb_descriptors.a51 usrp-0.8-usb11/firmware/src/usrp2/usb_descriptors.a51 +--- usrp-0.8/firmware/src/usrp2/usb_descriptors.a51 2004-12-08 16:11:24.000000000 -0500 ++++ usrp-0.8-usb11/firmware/src/usrp2/usb_descriptors.a51 2005-04-14 11:51:07.000000000 -0400 +@@ -236,7 +236,7 @@ + .db DSCR_CONFIG + .db <(_full_speed_config_descr_end - _full_speed_config_descr) ; LSB + .db >(_full_speed_config_descr_end - _full_speed_config_descr) ; MSB +- .db 1 ; bNumInterfaces ++ .db 3 ; bNumInterfaces + .db 1 ; bConfigurationValue + .db 0 ; iConfiguration + .db 0x80 | bmSELF_POWERED ; bmAttributes +@@ -253,7 +253,53 @@ + .db 0xff ; bInterfaceSubClass (vendor specific) + .db 0xff ; bInterfaceProtocol (vendor specific) + .db SI_COMMAND_AND_STATUS ; iInterface (description) ++ ++ ;; interface descriptor 1 (transmit path, ep2 OUT BULK) ++ ++ .db DSCR_INTRFC_LEN ++ .db DSCR_INTRFC ++ .db 1 ; bInterfaceNumber (zero based) ++ .db 0 ; bAlternateSetting ++ .db 1 ; bNumEndpoints ++ .db 0xff ; bInterfaceClass (vendor specific) ++ .db 0xff ; bInterfaceSubClass (vendor specific) ++ .db 0xff ; bInterfaceProtocol (vendor specific) ++ .db SI_TX_PATH ; iInterface (description) ++ ++ ;; interface 1's end point ++ ++ .db DSCR_ENDPNT_LEN ++ .db DSCR_ENDPNT ++ .db 0x02 ; bEndpointAddress (ep 2 OUT) ++ .db ET_BULK ; bmAttributes ++ .db <64 ; wMaxPacketSize (LSB) ++ .db >64 ; wMaxPacketSize (MSB) ++ .db 0 ; bInterval (iso only) ++ ++ ;; interface descriptor 2 (receive path, ep6 IN BULK) ++ ++ .db DSCR_INTRFC_LEN ++ .db DSCR_INTRFC ++ .db 2 ; bInterfaceNumber (zero based) ++ .db 0 ; bAlternateSetting ++ .db 1 ; bNumEndpoints ++ .db 0xff ; bInterfaceClass (vendor specific) ++ .db 0xff ; bInterfaceSubClass (vendor specific) ++ .db 0xff ; bInterfaceProtocol (vendor specific) ++ .db SI_RX_PATH ; iInterface (description) ++ ++ ;; interface 2's end point ++ ++ .db DSCR_ENDPNT_LEN ++ .db DSCR_ENDPNT ++ .db 0x86 ; bEndpointAddress (ep 6 IN) ++ .db ET_BULK ; bmAttributes ++ .db <64 ; wMaxPacketSize (LSB) ++ .db >64 ; wMaxPacketSize (MSB) ++ .db 0 ; bInterval (iso only) ++ + ++ + _full_speed_config_descr_end: + diff --git a/packages/usrp/usrp_0.8.bb b/packages/usrp/usrp_0.8.bb new file mode 100644 index 0000000000..1b9966f1ce --- /dev/null +++ b/packages/usrp/usrp_0.8.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Support software for the Universal Software Radio Peripheral (USRP)" +LICENSE = "GPL" +MAINTAINER = "Philip Balister philip@balister.org" +HOMEPAGE = "http://comsec.com/wiki?UniversalSoftwareRadioPeripheral" +SECTION = "devel" +DEPENDS = "swig-native sdcc-native libusb" +PR = "r0" + +SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/usrp-${PV}.tar.gz \ + file://usb11.patch;patch=1" +S = "${WORKDIR}/usrp-${PV}" + +inherit autotools + +do_stage () { + oe_libinstall -so -C host/lib/.libs/ libusrp ${STAGING_LIBDIR} + + install -m 644 host/lib/usrp0.h ${STAGING_INCDIR} + install -m 644 host/lib/usrp_basic.h ${STAGING_INCDIR} + install -m 644 host/lib/usrp_bytesex.h ${STAGING_INCDIR} + install -m 644 host/lib/usrp_config.h ${STAGING_INCDIR} + install -m 644 host/lib/usrp_daughterboards.h ${STAGING_INCDIR} + install -m 644 host/lib/usrp_prims.h ${STAGING_INCDIR} + install -m 644 host/lib/usrp_slots.h ${STAGING_INCDIR} + install -m 644 host/lib/usrp_standard.h ${STAGING_INCDIR} + + install -m 644 firmware/include/usrp_i2c_addr.h ${STAGING_INCDIR} +} + +PACKAGES += "python-pyursp" +FILES_python-pyursp = "${libdir}/python*" diff --git a/packages/zlib/zlib-1.2.3/.mtn2git_empty b/packages/zlib/zlib-1.2.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/zlib/zlib-1.2.3/.mtn2git_empty diff --git a/packages/zlib/zlib-1.2.3/visibility.patch b/packages/zlib/zlib-1.2.3/visibility.patch new file mode 100644 index 0000000000..a4e7ae907a --- /dev/null +++ b/packages/zlib/zlib-1.2.3/visibility.patch @@ -0,0 +1,1034 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- zlib-1.2.3-orig/adler32.c~visibility ++++ zlib-1.2.3-orig/adler32.c +@@ -54,7 +54,7 @@ + #endif + + /* ========================================================================= */ +-uLong ZEXPORT adler32(adler, buf, len) ++ZEXPORT uLong adler32(adler, buf, len) + uLong adler; + const Bytef *buf; + uInt len; +--- zlib-1.2.3-orig/compress.c~visibility ++++ zlib-1.2.3-orig/compress.c +@@ -19,7 +19,7 @@ + memory, Z_BUF_ERROR if there was not enough room in the output buffer, + Z_STREAM_ERROR if the level parameter is invalid. + */ +-int ZEXPORT compress2 (dest, destLen, source, sourceLen, level) ++ZEXPORT int compress2 (dest, destLen, source, sourceLen, level) + Bytef *dest; + uLongf *destLen; + const Bytef *source; +@@ -59,7 +59,7 @@ + + /* =========================================================================== + */ +-int ZEXPORT compress (dest, destLen, source, sourceLen) ++ZEXPORT int compress (dest, destLen, source, sourceLen) + Bytef *dest; + uLongf *destLen; + const Bytef *source; +@@ -72,7 +72,7 @@ + If the default memLevel or windowBits for deflateInit() is changed, then + this function needs to be updated. + */ +-uLong ZEXPORT compressBound (sourceLen) ++ZEXPORT uLong compressBound (sourceLen) + uLong sourceLen; + { + return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11; +--- zlib-1.2.3-orig/crc32.c~visibility ++++ zlib-1.2.3-orig/crc32.c +@@ -202,7 +202,7 @@ + /* ========================================================================= + * This function can be used by asm versions of crc32() + */ +-const unsigned long FAR * ZEXPORT get_crc_table() ++ZEXPORT const unsigned long FAR * get_crc_table() + { + #ifdef DYNAMIC_CRC_TABLE + if (crc_table_empty) +@@ -216,7 +216,7 @@ + #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 + + /* ========================================================================= */ +-unsigned long ZEXPORT crc32(crc, buf, len) ++ZEXPORT unsigned long crc32(crc, buf, len) + unsigned long crc; + const unsigned char FAR *buf; + unsigned len; +--- zlib-1.2.3-orig/deflate.c~visibility ++++ zlib-1.2.3-orig/deflate.c +@@ -201,7 +201,7 @@ + zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head)); + + /* ========================================================================= */ +-int ZEXPORT deflateInit_(strm, level, version, stream_size) ++ZEXPORT int deflateInit_(strm, level, version, stream_size) + z_streamp strm; + int level; + const char *version; +@@ -213,7 +213,7 @@ + } + + /* ========================================================================= */ +-int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, ++ZEXPORT int deflateInit2_(strm, level, method, windowBits, memLevel, strategy, + version, stream_size) + z_streamp strm; + int level; +@@ -312,7 +312,7 @@ + } + + /* ========================================================================= */ +-int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) ++ZEXPORT int deflateSetDictionary (strm, dictionary, dictLength) + z_streamp strm; + const Bytef *dictionary; + uInt dictLength; +@@ -354,7 +354,7 @@ + } + + /* ========================================================================= */ +-int ZEXPORT deflateReset (strm) ++ZEXPORT int deflateReset (strm) + z_streamp strm; + { + deflate_state *s; +@@ -401,7 +401,7 @@ + } |