Merge

2004/11/26 18:52:27+01:00 uni-frankfurt.de!mickeyl
update oz-3.5.2.conf

2004/11/25 16:55:33+01:00 uni-frankfurt.de!mickeyl
this patch adds an exclusion parameter to mkfs.jffs2. use -i <path> to exclude a subtree from being included into the image. this is necessary for the forthcoming clone functionality of opie-backup. the patch will be posted to the mtd list

2004/11/25 15:40:03+01:00 uni-frankfurt.de!mickeyl
add user mode linux as found in kernel 2.6.10-rc2-mm3

BKrev: 41a76de1US2tkAYWHnb0zgCpVNciXA

diff --git a/conf/distro/openzaurus-3.5.2.conf b/conf/distro/openzaurus-3.5.2.conf
index 5fe5c4b..ce50f76 100644 (file)
--- a/conf/distro/openzaurus-3.5.2.conf
+++ b/conf/distro/openzaurus-3.5.2.conf
@@ -7,7 +7,7 @@ FEED_URIS += " \
        libs##http://openzaurus.org/official/unstable/3.5.2/feed/libs/          \
        console##http://openzaurus.org/official/unstable/3.5.2/feed/console"
 
-CVSDATE = 20041120
+CVSDATE = 20041127
 ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
 PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
@@ -23,6 +23,7 @@ TARGET_FPU = "soft"
 #DEBUG_OPTIMIZATION = "-O -g3"
 #DEBUG_BUILD = "1"
 #INHIBIT_PACKAGE_STRIP = "1"
+#ENABLE_SYSREQ = "yes"
 
 PREFERRED_VERSION_binutils-cross = "2.15.91.0.2"
 PREFERRED_VERSION_libtool-native = "1.5.6"

diff --git a/linux-uml/linux-uml-2.6.10-rc2-mm3/compile-fix.patch b/linux-uml/linux-uml-2.6.10-rc2-mm3/compile-fix.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/linux-uml/linux-uml-2.6.10-rc2-mm3/defconfig b/linux-uml/linux-uml-2.6.10-rc2-mm3/defconfig
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/linux-uml/linux-uml_2.6.10-rc2-mm3.oe b/linux-uml/linux-uml_2.6.10-rc2-mm3.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/mtd/mtd/add-exclusion-to-mkfs-jffs2.patch b/mtd/mtd/add-exclusion-to-mkfs-jffs2.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/mtd/mtd_20041113.oe b/mtd/mtd_20041113.oe
index 3cd2f8e..b7e33fd 100644 (file)
--- a/mtd/mtd_20041113.oe
+++ b/mtd/mtd_20041113.oe
@@ -1,12 +1,14 @@
+DESCRIPTION = "Tools for managing memory technology devices."
 SECTION = "base"
 DEPENDS = "zlib"
-DESCRIPTION = "Tools for managing memory technology devices."
 HOMEPAGE = "http://www.linux-mtd.infradead.org/"
 LICENSE = "GPLv2"
+PR = "r1"
 
+SRC_URI = "ftp://ftp.uk.linux.org/pub/people/dwmw2/mtd/cvs/mtd-snapshot-${PV}.tar.bz2 \
+           file://add-exclusion-to-mkfs-jffs2.patch;patch"
 S = "${WORKDIR}/mtd/"
-#SRC_URI = "cvs://anoncvs@cvs.infradead.org/home/cvs;module=mtd;method=ext"
-SRC_URI = "ftp://ftp.uk.linux.org/pub/people/dwmw2/mtd/cvs/mtd-snapshot-${PV}.tar.bz2"
+
 
 CFLAGS_prepend = "-I${S}/include "