summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>2007-02-26 11:01:56 +0000
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>2007-02-26 11:01:56 +0000
commitf2ed01f2fa999207df71846d58f719e77f297e83 (patch)
tree0eacba61a0c075edd2091dbc4e374fe596c5a358
parentc398f399bf7f2f674440dc78574b372b6498dd20 (diff)
parente44b82a0670457f1440c84a81813e11767afd54f (diff)
merge of '0cc484607260a013c209789586a468c114c20254'
and 'a3c39ebb70f0eef815ed0f3759e0be1354e112f8'
-rw-r--r--conf/distro/angstrom-2007.1.conf1
-rwxr-xr-xpackages/ftpd-topfield/ftpd-topfield_0.7.1.bb (renamed from packages/ftpd-topfield/ftpd-topfield_0.7.0.bb)5
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 92e8a4b255..5198055136 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -185,6 +185,7 @@ PREFERRED_VERSION_linux-libc-headers_i486 ?= "2.6.18"
PREFERRED_VERSION_linux-libc-headers_i586 ?= "2.6.18"
PREFERRED_VERSION_linux-libc-headers_i686 ?= "2.6.18"
PREFERRED_VERSION_linux-libc-headers_powerpc ?= "2.6.18"
+PREFERRED_VERSION_linux-libc-headers_ixp4xx ?= "2.6.18"
PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
PREFERRED_VERSION_glibc ?= "2.5"
diff --git a/packages/ftpd-topfield/ftpd-topfield_0.7.0.bb b/packages/ftpd-topfield/ftpd-topfield_0.7.1.bb
index 9e2ff9bc23..5ba92e0930 100755
--- a/packages/ftpd-topfield/ftpd-topfield_0.7.0.bb
+++ b/packages/ftpd-topfield/ftpd-topfield_0.7.1.bb
@@ -5,9 +5,8 @@ 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_0 \
- cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_7_0 \
- file://usb-header-name.patch;patch=1 \
+SRC_URI = "cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_7_1 \
+ cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_7_1 \
file://init"
# The source will end up in the subdirectory 'ftpd-topfield' - no release name