[oe-commits] org.oe.dev merge of '9fdf613358c5efcdb75a30ee08729a9e2a7ade08'
oe commit
oe at amethyst.openembedded.net
Fri Mar 28 16:06:40 UTC 2008
merge of '9fdf613358c5efcdb75a30ee08729a9e2a7ade08'
and 'ee2aa51c8eb93fa5579f4cf49a53eb0cb3e90319'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: a91112c3e784fea18d755b2f4d125e144e41fdc8
ViewMTN: http://monotone.openembedded.org/revision/info/a91112c3e784fea18d755b2f4d125e144e41fdc8
Files:
1
packages/ftpd-topfield/ftpd-topfield_0.7.4.bb
packages/ftpd-topfield/ftpd-topfield_0.7.5.bb
packages/ftpd-topfield/files/syslog.patch
classes/package.bbclass
packages/linux/linux-ixp4xx/defconfig-2.6.24.4
packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4
packages/linux/linux-ixp4xx_2.6.24.4.bb
packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch
packages/python/python-dbus_0.82.4.bb
packages/pulseaudio/files/fix-shm.patch
packages/pulseaudio/pulseaudio_0.9.9.bb
Diffs:
#
# mt diff -r9fdf613358c5efcdb75a30ee08729a9e2a7ade08 -ra91112c3e784fea18d755b2f4d125e144e41fdc8
#
#
#
# rename "packages/ftpd-topfield/ftpd-topfield_0.7.4.bb"
# to "packages/ftpd-topfield/ftpd-topfield_0.7.5.bb"
#
# add_file "packages/ftpd-topfield/files/syslog.patch"
# content [49ea172de784d2eac6f5f6d268eab53dca579f66]
#
# patch "classes/package.bbclass"
# from [906d70a366b88e9727bc076e7246c6de0874bc0f]
# to [6f3deeb912b24b09204110bd00e94e30f64d3936]
#
# patch "packages/ftpd-topfield/ftpd-topfield_0.7.5.bb"
# from [139094f9c7f3a47d4880ca6843b5ae81ca3bc526]
# to [286b7cb59ed33da44eda89da11f94c7bb318c481]
#
# patch "packages/linux/linux-ixp4xx/defconfig-2.6.24.4"
# from [1251c42b1b8b4ecdaea05b9eda83b6dc37604eff]
# to [c1b4c06be7a3fbdca153a8f990cb07da43231f80]
#
# patch "packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4"
# from [668b63370db91bbc90e20d8fc70648986af0f35c]
# to [1e2bfb62d7aa242bc8c8c76ee96145f2b157ae1d]
#
# patch "packages/linux/linux-ixp4xx_2.6.24.4.bb"
# from [493df9f1f9f80a8b08911a0846783e5101b6b828]
# to [0b69f35f287cafb1adc412c0a0ab039833d806e0]
#
# patch "packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch"
# from [f62d8545ea16f4caf506219c894df3a90724b5c2]
# to [d64355f76f4983d49aa06c5c7f5b438debf72c22]
#
# patch "packages/python/python-dbus_0.82.4.bb"
# from [aff2c48f361a7ace67a1057330cf36a822c07811]
# to [ef44ee10f31374784359fe76d1f10cabda60f104]
#
============================================================
--- packages/ftpd-topfield/files/syslog.patch 49ea172de784d2eac6f5f6d268eab53dca579f66
+++ packages/ftpd-topfield/files/syslog.patch 49ea172de784d2eac6f5f6d268eab53dca579f66
@@ -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");
+ }
============================================================
--- classes/package.bbclass 906d70a366b88e9727bc076e7246c6de0874bc0f
+++ classes/package.bbclass 6f3deeb912b24b09204110bd00e94e30f64d3936
@@ -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)
============================================================
--- packages/ftpd-topfield/ftpd-topfield_0.7.4.bb 139094f9c7f3a47d4880ca6843b5ae81ca3bc526
+++ packages/ftpd-topfield/ftpd-topfield_0.7.5.bb 286b7cb59ed33da44eda89da11f94c7bb318c481
@@ -3,9 +3,11 @@ LICENSE = "MIT"
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_4 \
- cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_7_4 \
+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
============================================================
--- packages/linux/linux-ixp4xx/defconfig-2.6.24.4 1251c42b1b8b4ecdaea05b9eda83b6dc37604eff
+++ packages/linux/linux-ixp4xx/defconfig-2.6.24.4 c1b4c06be7a3fbdca153a8f990cb07da43231f80
@@ -30,7 +30,6 @@ CONFIG_BROKEN_ON_SMP=y
#
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_HIGH_RES_TIMERS=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_TCP_DIAG=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
============================================================
--- packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4 668b63370db91bbc90e20d8fc70648986af0f35c
+++ packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4 1e2bfb62d7aa242bc8c8c76ee96145f2b157ae1d
@@ -30,7 +30,6 @@ CONFIG_BROKEN_ON_SMP=y
#
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_HIGH_RES_TIMERS=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_TCP_DIAG=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
============================================================
--- packages/linux/linux-ixp4xx_2.6.24.4.bb 493df9f1f9f80a8b08911a0846783e5101b6b828
+++ packages/linux/linux-ixp4xx_2.6.24.4.bb 0b69f35f287cafb1adc412c0a0ab039833d806e0
@@ -8,7 +8,7 @@ PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
#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 \
============================================================
--- packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch f62d8545ea16f4caf506219c894df3a90724b5c2
+++ packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch d64355f76f4983d49aa06c5c7f5b438debf72c22
@@ -6,8 +6,8 @@ Index: linux-2.6.24/drivers/input/keyboa
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 <linux/module.h>
#include <linux/slab.h>
@@ -96,11 +96,11 @@ Index: linux-2.6.24/drivers/input/keyboa
- 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/keyboa
} 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;
}
}
============================================================
--- packages/python/python-dbus_0.82.4.bb aff2c48f361a7ace67a1057330cf36a822c07811
+++ packages/python/python-dbus_0.82.4.bb ef44ee10f31374784359fe76d1f10cabda60f104
@@ -4,12 +4,12 @@ RDEPENDS = "python-threading python-io p
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}"
#
# mt diff -ree2aa51c8eb93fa5579f4cf49a53eb0cb3e90319 -ra91112c3e784fea18d755b2f4d125e144e41fdc8
#
#
#
# add_file "packages/pulseaudio/files/fix-shm.patch"
# content [fb4917430c3dda689c1c92774f519315a6978ad9]
#
# patch "packages/pulseaudio/pulseaudio_0.9.9.bb"
# from [a42f8d95ac47cb47a5e26144cc42a01d219a00e4]
# to [08f85100dead2cfb44c8bb085f028384f5674e16]
#
============================================================
--- packages/pulseaudio/files/fix-shm.patch fb4917430c3dda689c1c92774f519315a6978ad9
+++ packages/pulseaudio/files/fix-shm.patch fb4917430c3dda689c1c92774f519315a6978ad9
@@ -0,0 +1,20 @@
+# fixes building against uclibc
+# fixed upstream, see http://www.pulseaudio.org/ticket/200
+Index: pulseaudio-0.9.9/src/pulsecore/shm.c
+===================================================================
+--- pulseaudio-0.9.9/src/pulsecore/shm.c (revision 1971)
++++ pulseaudio-0.9.9/src/pulsecore/shm.c (revision 2110)
+@@ -319,4 +319,5 @@
+ int pa_shm_cleanup(void) {
+
++#ifdef HAVE_SHM_OPEN
+ #ifdef SHM_PATH
+ DIR *d;
+@@ -376,5 +377,6 @@
+
+ closedir(d);
+-#endif
++#endif /* SHM_PATH */
++#endif /* HAVE_SHM_OPEN */
+
+ return 0;
============================================================
--- packages/pulseaudio/pulseaudio_0.9.9.bb a42f8d95ac47cb47a5e26144cc42a01d219a00e4
+++ packages/pulseaudio/pulseaudio_0.9.9.bb 08f85100dead2cfb44c8bb085f028384f5674e16
@@ -1,15 +1,15 @@ DEPENDS += "dbus"
require pulse.inc
DEPENDS += "dbus"
+PR = "r4"
# this is not correct (see below)
SRC_URI += "\
file://disable-using-glibc-tls.patch;patch=1 \
file://fix-dbus-without-hal.patch;patch=1 \
+ file://fix-shm.patch;patch=1 \
"
-PR = "r3"
-
# problems w/ pulseaudio 0.9.9 atm:
# 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime)
# 2.) doesn't build w/ glibc TLS support (hence patched out)
More information about the Openembedded-commits
mailing list