diff options
Diffstat (limited to 'packages')
17 files changed, 137 insertions, 81 deletions
diff --git a/packages/linux/linux-turbostation/2.6.20.1/.mtn2git_empty b/packages/exmap-console/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/linux/linux-turbostation/2.6.20.1/.mtn2git_empty +++ b/packages/exmap-console/.mtn2git_empty diff --git a/packages/exmap-console/exmap-console.inc b/packages/exmap-console/exmap-console.inc new file mode 100644 index 0000000000..4c107d5f07 --- /dev/null +++ b/packages/exmap-console/exmap-console.inc @@ -0,0 +1,61 @@ +DESCRIPTION = "Console based version of exmap, a memory usage analysis tool" +HOMEPAGE = "http://projects.o-hand.com/exmap-console" +SECTION = "devel" +LICENSE = "GPL" +DEPENDS = "virtual/kernel" + +SRC_URI = "http://projects.o-hand.com/sources/exmap-console/exmap-console-${PV}.tgz" + +inherit module-base +inherit autotools + +MYPV := "${PV}" + +PACKAGES += "exmap-server kernel-module-exmap" + +FILES_exmap-console = "${bindir}/exmap ${bindir}/exmapd" +PACKAGE_ARCH_exmap-console = "${TARGET_ARCH}" +RDEPENDS_exmap-console += "kernel-module-exmap" + +FILES_exmap-server = "${bindir}/exmapserver" +PACKAGE_ARCH_exmap-server = "${TARGET_ARCH}" +RDEPENDS_exmap-server += "kernel-module-exmap" + +FILES_kernel-module-exmap = "${base_libdir}" +PACKAGE_ARCH_kernel-module-exmap = "${MACHINE_ARCH}" +PV_kernel-module-exmap = "${MYPV}-${KERNEL_VERSION}" +RDEPENDS_kernel-module-exmap += "kernel (${KERNEL_VERSION})" + +S = "${WORKDIR}/exmap-console-${PV}" + +export MODULE_PATH="${D}${base_libdir}/modules/${KERNEL_VERSION}" + +do_compile() { + cd ${S}/src + make + + cd ${S}/kernel + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ + KERNEL_SRC=${STAGING_KERNEL_DIR} \ + KERNEL_VERSION=${KERNEL_VERSION} \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + ${MAKE_TARGETS} +} + +do_install() { + oe_runmake 'DESTDIR=${D}' 'DEPMOD=/bin/true' install +} + +pkg_postinst_append_kernel-module-exmap () { + if [ -n "$D" ]; then + exit 1 + fi + depmod -a + update-modules || true +} + +pkg_postrm_append_kernel-module-exmap () { + update-modules || true +} + diff --git a/packages/exmap-console/exmap-console_0.4.bb b/packages/exmap-console/exmap-console_0.4.bb new file mode 100644 index 0000000000..5d89f04937 --- /dev/null +++ b/packages/exmap-console/exmap-console_0.4.bb @@ -0,0 +1,2 @@ +require exmap-console.inc + diff --git a/packages/exmap-console/exmap-console_svn.bb b/packages/exmap-console/exmap-console_svn.bb new file mode 100644 index 0000000000..9e6ca80dc0 --- /dev/null +++ b/packages/exmap-console/exmap-console_svn.bb @@ -0,0 +1,10 @@ +PR = "r10" +PV = "0.4+svn${SRCDATE}" + +SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=exmap-console;proto=http" + +S = "${WORKDIR}/exmap-console" + +MYPV := "${PV}" +PV_kernel-module-exmap = "${MYPV}-${KERNEL_VERSION}" + diff --git a/packages/gcc/gcc-4.1.1/gcc-ignore-cache.patch b/packages/gcc/gcc-4.1.1/gcc-ignore-cache.patch new file mode 100644 index 0000000000..396b4b2345 --- /dev/null +++ b/packages/gcc/gcc-4.1.1/gcc-ignore-cache.patch @@ -0,0 +1,15 @@ +--- /gcc/orig-configure 2007-03-11 21:50:28.000000000 +0200 ++++ /gcc/configure 2007-03-11 21:53:27.000000000 +0200 +@@ -12272,9 +12272,11 @@ + esac + saved_CFLAGS="${CFLAGS}" + CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ ++ CONFIG_SITE="" + ${realsrcdir}/configure \ + --enable-languages=${enable_languages-all} \ +- --target=$target_alias --host=$build_alias --build=$build_alias ++ --target=$target_alias --host=$build_alias --build=$build_alias \ ++ --cache-file=./tmp-cache + CFLAGS="${saved_CFLAGS}" + + # We just finished tests for the build machine, so rename diff --git a/packages/gcc/gcc-4.1.2/gcc-ignore-cache.patch b/packages/gcc/gcc-4.1.2/gcc-ignore-cache.patch new file mode 100644 index 0000000000..396b4b2345 --- /dev/null +++ b/packages/gcc/gcc-4.1.2/gcc-ignore-cache.patch @@ -0,0 +1,15 @@ +--- /gcc/orig-configure 2007-03-11 21:50:28.000000000 +0200 ++++ /gcc/configure 2007-03-11 21:53:27.000000000 +0200 +@@ -12272,9 +12272,11 @@ + esac + saved_CFLAGS="${CFLAGS}" + CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ ++ CONFIG_SITE="" + ${realsrcdir}/configure \ + --enable-languages=${enable_languages-all} \ +- --target=$target_alias --host=$build_alias --build=$build_alias ++ --target=$target_alias --host=$build_alias --build=$build_alias \ ++ --cache-file=./tmp-cache + CFLAGS="${saved_CFLAGS}" + + # We just finished tests for the build machine, so rename diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb index 104a8abb76..08ec8a0fa0 100644 --- a/packages/gcc/gcc_4.1.1.bb +++ b/packages/gcc/gcc_4.1.1.bb @@ -1,4 +1,4 @@ -PR = "r10" +PR = "r11" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" @@ -32,6 +32,7 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \ file://unbreak-armv4t.patch;patch=1 \ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ file://gcc-4.1.1-pr13685-1.patch;patch=1 \ + file://gcc-ignore-cache.patch;patch=1 \ " SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb index 91f6624aa1..2794ffca8b 100644 --- a/packages/gcc/gcc_4.1.2.bb +++ b/packages/gcc/gcc_4.1.2.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" @@ -24,6 +24,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 \ file://arm-nolibfloat.patch;patch=1 \ file://arm-softfloat.patch;patch=1 \ file://gcc41-configure.in.patch;patch=1 \ + file://gcc-ignore-cache.patch;patch=1 \ file://arm-thumb.patch;patch=1 \ file://arm-thumb-cache.patch;patch=1 \ file://ldflags.patch;patch=1 \ diff --git a/packages/images/foonas-image.bb b/packages/images/foonas-image.bb index f5a258b3d9..8d3541c114 100644 --- a/packages/images/foonas-image.bb +++ b/packages/images/foonas-image.bb @@ -75,7 +75,7 @@ turbostation_pack_image() { PADFILE=${DEPLOY_DIR_IMAGE}/padfile.zzz HEX_MAX_KERN_SIZE=200000 DEC_MAX_KERN_SIZE=`echo "ibase=16; $HEX_MAX_KERN_SIZE" | bc ` - HEX_MAX_ROOT_SIZE=C80000 + HEX_MAX_ROOT_SIZE=D00000 DEC_MAX_ROOT_SIZE=`echo "ibase=16; $HEX_MAX_ROOT_SIZE" | bc ` KERNEL_SIZE=`ls -l $KERNEL | awk '{print $5}'` if [ $KERNEL_SIZE -gt $DEC_MAX_KERN_SIZE ]; then diff --git a/packages/linux/linux-turbostation/defconfig b/packages/linux/linux-turbostation/defconfig index 4930877637..094f6f3708 100644 --- a/packages/linux/linux-turbostation/defconfig +++ b/packages/linux/linux-turbostation/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.20.1 -# Thu Mar 8 19:11:26 2007 +# Linux kernel version: 2.6.20.2 +# Sun Mar 11 15:29:33 2007 # CONFIG_MMU=y CONFIG_GENERIC_HARDIRQS=y @@ -958,7 +958,6 @@ CONFIG_I2C_MPC=y # CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_M41T00 is not set # CONFIG_SENSORS_MAX6875 is not set -# CONFIG_SENSORS_S35390A is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set diff --git a/packages/linux/linux-turbostation/linux-2.6.16_arch_ppc_syslib_open_pic.c b/packages/linux/linux-turbostation/linux-2.6.16_arch_ppc_syslib_open_pic.c deleted file mode 100644 index 05b2a41e7f..0000000000 --- a/packages/linux/linux-turbostation/linux-2.6.16_arch_ppc_syslib_open_pic.c +++ /dev/null @@ -1,14 +0,0 @@ -Index: linux-2.6.20.1/arch/ppc/syslib/open_pic.c -=================================================================== ---- linux-2.6.20.1.orig/arch/ppc/syslib/open_pic.c 2007-02-20 07:34:32.000000000 +0100 -+++ linux-2.6.20.1/arch/ppc/syslib/open_pic.c 2007-02-26 02:26:56.000000000 +0100 -@@ -318,7 +318,8 @@ - #ifdef CONFIG_EPIC_SERIAL_MODE - /* Have to start from ground zero. - */ -- openpic_reset(); -+ // 2005.09.06, JohnsonCheng Fixed USB device Oops bug -+ //openpic_reset(); - #endif - - if (ppc_md.progress) ppc_md.progress("openpic: enter", 0x122); diff --git a/packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Kconfig b/packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Kconfig deleted file mode 100644 index 6cd91368f4..0000000000 --- a/packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Kconfig +++ /dev/null @@ -1,17 +0,0 @@ -Index: linux-2.6.20.1/drivers/i2c/chips/Kconfig -=================================================================== ---- linux-2.6.20.1.orig/drivers/i2c/chips/Kconfig 2007-02-20 07:34:32.000000000 +0100 -+++ linux-2.6.20.1/drivers/i2c/chips/Kconfig 2007-02-26 02:27:27.000000000 +0100 -@@ -125,4 +125,12 @@ - This driver can also be built as a module. If so, the module - will be called max6875. - -+config SENSORS_S35390A -+ tristate "S-35390A RTC chip" -+ depends on I2C && PPC32 && SANDPOINT -+ help -+ If you say yes here you get support for the S-35390A RTC chip/ -+ -+ This driver can also be built as a module. If so, the module -+ will be called i2c-s3531a - endmenu diff --git a/packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Makefile b/packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Makefile deleted file mode 100644 index 3378609724..0000000000 --- a/packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Makefile +++ /dev/null @@ -1,12 +0,0 @@ -Index: linux-2.6.20.1/drivers/i2c/chips/Makefile -=================================================================== ---- linux-2.6.20.1.orig/drivers/i2c/chips/Makefile 2007-02-20 07:34:32.000000000 +0100 -+++ linux-2.6.20.1/drivers/i2c/chips/Makefile 2007-02-26 02:27:43.000000000 +0100 -@@ -12,6 +12,7 @@ - obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o - obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o - obj-$(CONFIG_TPS65010) += tps65010.o -+obj-$(CONFIG_SENSORS_S35390A) += i2c-s3531a.o - - ifeq ($(CONFIG_I2C_DEBUG_CHIP),y) - EXTRA_CFLAGS += -DDEBUG diff --git a/packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c b/packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c index b73b227220..e1895af53a 100644 --- a/packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c +++ b/packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c @@ -1,8 +1,8 @@ -Index: linux-2.6.21-rc2-git3/drivers/mtd/maps/physmap.c +Index: linux-2.6.20.2/drivers/mtd/maps/physmap.c =================================================================== ---- linux-2.6.21-rc2-git3.orig/drivers/mtd/maps/physmap.c 2007-03-06 01:06:56.000000000 +0100 -+++ linux-2.6.21-rc2-git3/drivers/mtd/maps/physmap.c 2007-03-06 01:12:35.000000000 +0100 -@@ -134,13 +134,43 @@ +--- linux-2.6.20.2.orig/drivers/mtd/maps/physmap.c 2007-03-11 15:22:25.000000000 +0100 ++++ linux-2.6.20.2/drivers/mtd/maps/physmap.c 2007-03-11 15:28:18.000000000 +0100 +@@ -134,13 +134,53 @@ } info->mtd->owner = THIS_MODULE; @@ -11,27 +11,37 @@ Index: linux-2.6.21-rc2-git3/drivers/mtd/maps/physmap.c + .name = "u-boot", + .offset = 0x00F00000, + .size = 0x00040000, -+ .mask_flags = MTD_WRITEABLE, /* force read-only */ ++ .mask_flags = MTD_WRITEABLE, + }, + { -+ .name = "kernel", /* default kernel image */ ++ .name = "kernel", + .offset = 0x00000000, -+ .size = 0x00280000, ++ .size = 0x00200000, + }, + { + .name = "rootfs", -+ .offset = 0x00280000, -+ .size = 0x00C80000, ++ .offset = 0x00200000, ++ .size = 0x00D00000, + }, + { -+ .name = "empty", ++ .name = "u-boot env", + .offset = 0x00F40000, -+ .size = 0x000A0000, ++ .size = 0x00020000, + }, + { -+ .name = "u-boot env", -+ .offset = 0x00FE0000, ++ .name = "u-boot2", ++ .offset = 0x00F60000, ++ .size = 0x00040000, ++ }, ++ { ++ .name = "u-boot2 env", ++ .offset = 0x00FA0000, + .size = 0x00020000, ++ }, ++ { ++ .name = "sysconf", ++ .offset = 0x00FC0000, ++ .size = 0x00040000, + } +}; + @@ -43,7 +53,7 @@ Index: linux-2.6.21-rc2-git3/drivers/mtd/maps/physmap.c return 0; } - -+ physmap_set_partitions(TS101_partitions, 5); ++ physmap_set_partitions(TS101_partitions, 7); if (physmap_data->nr_parts) { printk(KERN_NOTICE "Using physmap partition information\n"); add_mtd_partitions(info->mtd, physmap_data->parts, diff --git a/packages/linux/linux-turbostation/linux-2.6.16_drivers_net_r8169.c b/packages/linux/linux-turbostation/linux-2.6.16_drivers_net_r8169.c deleted file mode 100644 index 8ba15e1a84..0000000000 --- a/packages/linux/linux-turbostation/linux-2.6.16_drivers_net_r8169.c +++ /dev/null @@ -1,13 +0,0 @@ -Index: linux-2.6.20.1/drivers/net/r8169.c -=================================================================== ---- linux-2.6.20.1.orig/drivers/net/r8169.c 2007-02-26 03:33:53.000000000 +0100 -+++ linux-2.6.20.1/drivers/net/r8169.c 2007-02-26 03:34:21.000000000 +0100 -@@ -1522,7 +1522,7 @@ - goto err_out_disable_2; - - /* save power state before pci_enable_device overwrites it */ -- pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM); -+ pm_cap = 220; // pci_find_capability(pdev, PCI_CAP_ID_PM) - if (pm_cap) { - u16 pwr_command, acpi_idle_state; - diff --git a/packages/linux/linux-turbostation_2.6.20.1.bb b/packages/linux/linux-turbostation_2.6.20.2.bb index a74bf1475a..84701e4a6a 100644 --- a/packages/linux/linux-turbostation_2.6.20.1.bb +++ b/packages/linux/linux-turbostation_2.6.20.2.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Linux Kernel for the QNAP TurboStation platform" SECTION = "kernel" LICENSE = "GPL" DEPENDS = "uboot-utils" -PR = "r6" +PR = "r1" COMPATIBLE_MACHINE = "turbostation" @@ -11,17 +11,13 @@ RDEPENDS_kernel-module-zd1211rw += "zd1211-firmware" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://001_r1000.diff;patch=1 \ file://linux-2.6.16_arch_ppc_platforms_sandpoint.h;patch=1 \ - file://linux-2.6.16_drivers_i2c_chips_Makefile;patch=1 \ file://002_qnap-pic.diff;patch=1 \ file://linux-2.6.16_arch_ppc_syslib_Makefile;patch=1 \ file://linux-2.6.16_drivers_mtd_maps_physmap.c;patch=1 \ file://linux-2.6.16_arch_ppc_syslib_mpc10x_common.c;patch=1 \ - file://linux-2.6.16_drivers_net_r8169.c;patch=1 \ file://linux-2.6.16_arch_ppc_platforms_Makefile;patch=1 \ - file://linux-2.6.16_arch_ppc_syslib_open_pic.c;patch=1 \ file://linux-2.6.16_include_asm-ppc_mpc10x.h;patch=1 \ file://linux-2.6.16_arch_ppc_platforms_sandpoint.c;patch=1 \ - file://linux-2.6.16_drivers_i2c_chips_Kconfig;patch=1 \ file://defconfig" S = "${WORKDIR}/linux-${PV}" diff --git a/packages/meta/foonas-packages.bb b/packages/meta/foonas-packages.bb index 822b7afb2d..da3cb40de7 100644 --- a/packages/meta/foonas-packages.bb +++ b/packages/meta/foonas-packages.bb @@ -45,6 +45,7 @@ FOONAS_PACKAGES = "\ flite \ gallery \ gawk \ + gcc \ gdbm \ gnu-config \ grep \ @@ -119,6 +120,7 @@ FOONAS_PACKAGES = "\ syslog-ng \ tar \ thttpd \ + tzdata \ tiff \ unzip \ usbutils \ |