[oe-commits] org.oe.dev merge of '3f7c924df24e54d34133232f41e48dd253227542'
mwester commit
oe at amethyst.openembedded.net
Fri Mar 28 06:06:58 UTC 2008
merge of '3f7c924df24e54d34133232f41e48dd253227542'
and '53456ed8edb2c9fe305ce7764182d17d7c84e129'
Author: mwester at openembedded.org
Branch: org.openembedded.dev
Revision: 8cce93e551167d7fc62b6ffd4120846caf87db3a
ViewMTN: http://monotone.openembedded.org/revision/info/8cce93e551167d7fc62b6ffd4120846caf87db3a
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
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
Diffs:
#
# mt diff -r3f7c924df24e54d34133232f41e48dd253227542 -r8cce93e551167d7fc62b6ffd4120846caf87db3a
#
#
#
# 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 "packages/ftpd-topfield/ftpd-topfield_0.7.5.bb"
# from [139094f9c7f3a47d4880ca6843b5ae81ca3bc526]
# to [286b7cb59ed33da44eda89da11f94c7bb318c481]
#
============================================================
--- 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");
+ }
============================================================
--- 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
#
# mt diff -r53456ed8edb2c9fe305ce7764182d17d7c84e129 -r8cce93e551167d7fc62b6ffd4120846caf87db3a
#
#
#
# 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]
#
============================================================
--- 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 \
More information about the Openembedded-commits
mailing list