From 8fb289de060b5778d79f0ffa16f5bdfccf28112c Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 28 Mar 2008 03:55:03 +0000 Subject: ftpd-topfield: Updated to 0.7.5 and added the syslog patch --- packages/ftpd-topfield/files/syslog.patch | 26 ++++++++++++++++++++ packages/ftpd-topfield/ftpd-topfield_0.7.4.bb | 32 ------------------------- packages/ftpd-topfield/ftpd-topfield_0.7.5.bb | 34 +++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 32 deletions(-) create mode 100644 packages/ftpd-topfield/files/syslog.patch delete mode 100755 packages/ftpd-topfield/ftpd-topfield_0.7.4.bb create mode 100755 packages/ftpd-topfield/ftpd-topfield_0.7.5.bb diff --git a/packages/ftpd-topfield/files/syslog.patch b/packages/ftpd-topfield/files/syslog.patch new file mode 100644 index 0000000000..8c2bf294f5 --- /dev/null +++ b/packages/ftpd-topfield/files/syslog.patch @@ -0,0 +1,26 @@ +--- ftpd-topfield/ftpd.c~ 2008-02-16 09:49:30.000000000 +1030 ++++ ftpd-topfield/ftpd.c 2008-03-24 21:45:15.000000000 +1030 +@@ -1190,6 +1190,7 @@ + if (debug) { + fprintf(stderr, "Transfer failed %lld bytes %s\n", (long long)current, srcpath); + } ++ syslog(LOG_INFO, "retrieve: Failed transfer of %s @%Ld", srcpath, (long long)current); + perror_reply (550, name); + } + +@@ -1363,6 +1364,7 @@ + #endif + + if (ret != 0) { ++ syslog(LOG_INFO, "store: Failed transfer of %s @%Ld", destpath, (long long)current); + perror_reply (553, name); + + LOGCMD (*mode == 'w' ? "put" : "append", name); +@@ -1451,6 +1453,7 @@ + } + } + ++ syslog(LOG_INFO, "store: Failed transfer of %s @%Ld", destpath, (long long)current); + /* Failed to cancel the put, so give up */ + perror_reply (426, "Data Connection"); + } diff --git a/packages/ftpd-topfield/ftpd-topfield_0.7.4.bb b/packages/ftpd-topfield/ftpd-topfield_0.7.4.bb deleted file mode 100755 index 356a6018a2..0000000000 --- a/packages/ftpd-topfield/ftpd-topfield_0.7.4.bb +++ /dev/null @@ -1,32 +0,0 @@ -# This package builds the ftpd-topfield program -DESCRIPTION = "ftpd-topfield - FTP access to TopField PVR" -HOMEPAGE = "http://sourceforge.net/projects/puppy" -SECTION = "net" -LICENSE = "MIT" - -SRC_URI = "cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_7_4 \ - cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_7_4 \ - file://init" - -# The source will end up in the subdirectory 'ftpd-topfield' - no release name -S = "${WORKDIR}/ftpd-topfield" - -inherit update-rc.d - -INITSCRIPT_NAME = "ftpd-topfield" -INITSCRIPT_PARAMS = "defaults" - -# Just the one package at present - -inherit autotools - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}${sbindir} - install -m 0755 ${S}/ftpd ${D}${sbindir}/ftpd-topfield - install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ftpd-topfield -} diff --git a/packages/ftpd-topfield/ftpd-topfield_0.7.5.bb b/packages/ftpd-topfield/ftpd-topfield_0.7.5.bb new file mode 100755 index 0000000000..74a3743b1e --- /dev/null +++ b/packages/ftpd-topfield/ftpd-topfield_0.7.5.bb @@ -0,0 +1,34 @@ +# This package builds the ftpd-topfield program +DESCRIPTION = "ftpd-topfield - FTP access to TopField PVR" +HOMEPAGE = "http://sourceforge.net/projects/puppy" +SECTION = "net" +LICENSE = "MIT" +PR = "r1" + +SRC_URI = "cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_7_5 \ + cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_7_5 \ + file://syslog.patch;patch=1 \ + file://init" + +# The source will end up in the subdirectory 'ftpd-topfield' - no release name +S = "${WORKDIR}/ftpd-topfield" + +inherit update-rc.d + +INITSCRIPT_NAME = "ftpd-topfield" +INITSCRIPT_PARAMS = "defaults" + +# Just the one package at present + +inherit autotools + +do_compile() { + oe_runmake +} + +do_install() { + install -d ${D}${sbindir} + install -m 0755 ${S}/ftpd ${D}${sbindir}/ftpd-topfield + install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ftpd-topfield +} -- cgit v1.2.3 From 1996478c0eaa363bb1a3e2d7cb4e0def12ab3bd9 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 28 Mar 2008 05:59:37 +0000 Subject: defconfigs: Update ixp4xxx 2.6.24.4 defconfigs to disable PREEMPT, and switch from "cubic" to "reno" as the default TCP congestion control algorithm (avoids a kernel crash) --- packages/linux/linux-ixp4xx/defconfig-2.6.24.4 | 24 ++++++++++++++++++---- .../linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4 | 24 ++++++++++++++++++---- packages/linux/linux-ixp4xx_2.6.24.4.bb | 2 +- 3 files changed, 41 insertions(+), 9 deletions(-) diff --git a/packages/linux/linux-ixp4xx/defconfig-2.6.24.4 b/packages/linux/linux-ixp4xx/defconfig-2.6.24.4 index 0a3c0eb47d..de78fc3741 100644 --- a/packages/linux/linux-ixp4xx/defconfig-2.6.24.4 +++ b/packages/linux/linux-ixp4xx/defconfig-2.6.24.4 @@ -30,7 +30,6 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y -CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set @@ -217,7 +216,7 @@ CONFIG_PCI_SYSCALL=y CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y +# CONFIG_PREEMPT is not set CONFIG_HZ=100 CONFIG_AEABI=y CONFIG_OABI_COMPAT=y @@ -304,9 +303,26 @@ CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y -# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_ADVANCED=y +# CONFIG_TCP_CONG_BIC is not set CONFIG_TCP_CONG_CUBIC=y -CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_CONG_WESTWOOD is not set +# CONFIG_TCP_CONG_HTCP is not set +# CONFIG_TCP_CONG_HSTCP is not set +# CONFIG_TCP_CONG_HYBLA is not set +# CONFIG_TCP_CONG_VEGAS is not set +# CONFIG_TCP_CONG_SCALABLE is not set +# CONFIG_TCP_CONG_LP is not set +# CONFIG_TCP_CONG_VENO is not set +# CONFIG_TCP_CONG_YEAH is not set +# CONFIG_TCP_CONG_ILLINOIS is not set +# CONFIG_DEFAULT_BIC is not set +# CONFIG_DEFAULT_CUBIC is not set +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +CONFIG_DEFAULT_RENO=y +CONFIG_DEFAULT_TCP_CONG="reno" # CONFIG_TCP_MD5SIG is not set # CONFIG_IP_VS is not set CONFIG_IPV6=m diff --git a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4 b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4 index 01f91b572a..2a382b34b3 100644 --- a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4 +++ b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4 @@ -30,7 +30,6 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y -CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set @@ -217,7 +216,7 @@ CONFIG_PCI_SYSCALL=y CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y +# CONFIG_PREEMPT is not set CONFIG_HZ=100 CONFIG_AEABI=y CONFIG_OABI_COMPAT=y @@ -305,9 +304,26 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_DIAG=m CONFIG_INET_TCP_DIAG=m -# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_ADVANCED=y +# CONFIG_TCP_CONG_BIC is not set CONFIG_TCP_CONG_CUBIC=y -CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_CONG_WESTWOOD is not set +# CONFIG_TCP_CONG_HTCP is not set +# CONFIG_TCP_CONG_HSTCP is not set +# CONFIG_TCP_CONG_HYBLA is not set +# CONFIG_TCP_CONG_VEGAS is not set +# CONFIG_TCP_CONG_SCALABLE is not set +# CONFIG_TCP_CONG_LP is not set +# CONFIG_TCP_CONG_VENO is not set +# CONFIG_TCP_CONG_YEAH is not set +# CONFIG_TCP_CONG_ILLINOIS is not set +# CONFIG_DEFAULT_BIC is not set +# CONFIG_DEFAULT_CUBIC is not set +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +CONFIG_DEFAULT_RENO=y +CONFIG_DEFAULT_TCP_CONG="reno" # CONFIG_TCP_MD5SIG is not set # CONFIG_IP_VS is not set CONFIG_IPV6=m diff --git a/packages/linux/linux-ixp4xx_2.6.24.4.bb b/packages/linux/linux-ixp4xx_2.6.24.4.bb index d7ccb4c096..1964c23839 100644 --- a/packages/linux/linux-ixp4xx_2.6.24.4.bb +++ b/packages/linux/linux-ixp4xx_2.6.24.4.bb @@ -8,7 +8,7 @@ KERNEL_RELEASE = "2.6.24.4" #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}" PV = "${KERNEL_RELEASE}+svnr${SRCREV}" -PR = "r0" +PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \ -- cgit v1.2.3 From afe5d3df5c2cbf5c41436c522fb7a3e78f0052fd Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Fri, 28 Mar 2008 13:16:26 +0000 Subject: Sharp Remote sharpsl-rc-r2.patch fix. --- packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch b/packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch index 3927ffeccf..6fb34ec179 100644 --- a/packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch +++ b/packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch @@ -6,8 +6,8 @@ This patch is a bit ugly: Index: linux-2.6.24/drivers/input/keyboard/sharpsl_rc.c =================================================================== ---- linux-2.6.24.orig/drivers/input/keyboard/sharpsl_rc.c 2008-03-07 20:47:28.000000000 +0000 -+++ linux-2.6.24/drivers/input/keyboard/sharpsl_rc.c 2008-03-07 22:36:40.000000000 +0000 +--- linux-2.6.24.orig/drivers/input/keyboard/sharpsl_rc.c 2008-03-08 19:29:02.000000000 +0000 ++++ linux-2.6.24/drivers/input/keyboard/sharpsl_rc.c 2008-03-08 22:23:35.000000000 +0000 @@ -21,12 +21,10 @@ #include #include @@ -96,11 +96,11 @@ Index: linux-2.6.24/drivers/input/keyboard/sharpsl_rc.c - reset_scoop_gpio(&REMOTE_SCOOP_DEVICE.dev, REMOTE_AKIN_PULLUP); - + if (machine_is_borzoi() || machine_is_spitz()) -+ reset_scoop_gpio(&platform_scoop_config->devs[1].dev, SPITZ_SCP2_AKIN_PULLUP); ++ reset_scoop_gpio(platform_scoop_config->devs[1].dev, SPITZ_SCP2_AKIN_PULLUP); + else if (machine_is_akita()) + akita_reset_ioexp(&akitaioexp_device.dev, AKITA_IOEXP_AKIN_PULLUP); + else -+ reset_scoop_gpio(&platform_scoop_config->devs[0].dev, CORGI_SCP_AKIN_PULLUP); ++ reset_scoop_gpio(platform_scoop_config->devs[0].dev, CORGI_SCP_AKIN_PULLUP); mod_timer(&data->rctimer, jiffies + msecs_to_jiffies(RC_POLL_MS)); } return IRQ_HANDLED; @@ -110,11 +110,11 @@ Index: linux-2.6.24/drivers/input/keyboard/sharpsl_rc.c } else { - set_scoop_gpio(&REMOTE_SCOOP_DEVICE.dev, REMOTE_AKIN_PULLUP); + if (machine_is_borzoi() || machine_is_spitz()) -+ set_scoop_gpio(&platform_scoop_config->devs[1].dev, SPITZ_SCP2_AKIN_PULLUP); ++ set_scoop_gpio(platform_scoop_config->devs[1].dev, SPITZ_SCP2_AKIN_PULLUP); + else if (machine_is_akita()) + akita_set_ioexp(&akitaioexp_device.dev, AKITA_IOEXP_AKIN_PULLUP); + else -+ set_scoop_gpio(&platform_scoop_config->devs[0].dev, CORGI_SCP_AKIN_PULLUP); ++ set_scoop_gpio(platform_scoop_config->devs[0].dev, CORGI_SCP_AKIN_PULLUP); data->handling_press = 0; } } -- cgit v1.2.3 From 85039a6820d07a4cdcb7485dff31c3045a314c7d Mon Sep 17 00:00:00 2001 From: Thomas Kunze Date: Fri, 28 Mar 2008 14:45:21 +0000 Subject: package.bbclass: fix handling of kernel-modules which end with '-dev' Kernel-modules which end with -dev get update-modules-dev as RRECOMMENDS so update-modules-dev gets pulled in images. So we blacklist kernel-module packages for now. --- classes/package.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/package.bbclass b/classes/package.bbclass index eb43856c55..814715e1fa 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -904,7 +904,7 @@ python package_depchains() { for suffix in pkgs: for pkg in pkgs[suffix]: (base, func) = pkgs[suffix][pkg] - if suffix == "-dev": + if suffix == "-dev" and not pkg.startswith("kernel-module-"): pkg_adddeprrecs(pkg, base, suffix, func, depends, d) if len(pkgs[suffix]) == 1: pkg_addrrecs(pkg, base, suffix, func, rdepends, d) -- cgit v1.2.3 From 927702f5c5888a272366de915ae873a714a771ed Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 28 Mar 2008 15:05:43 +0000 Subject: python-dbus 0.82.4 this is using pkgconfig, so inherit pkgconfig --- packages/python/python-dbus_0.82.4.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/python/python-dbus_0.82.4.bb b/packages/python/python-dbus_0.82.4.bb index 8e80882a30..08cdbf7f44 100644 --- a/packages/python/python-dbus_0.82.4.bb +++ b/packages/python/python-dbus_0.82.4.bb @@ -4,12 +4,12 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus" LICENSE = "MIT" DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native" RDEPENDS = "python-threading python-io python-stringold python-logging" -PR = "ml2" +PR = "ml3" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz" S = "${WORKDIR}/dbus-python-${PV}" -inherit distutils-base autotools +inherit distutils-base autotools pkgconfig export BUILD_SYS := "${BUILD_SYS}" export HOST_SYS := "${HOST_SYS}" -- cgit v1.2.3