Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/28 01:01:33+02:00 dyndns.org!reenoo
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded

2005/05/28 01:01:11+02:00 dyndns.org!reenoo
gtk-webcore: switch to a fixed CVSDATE for now (current CVS is known broken)

2005/05/28 00:53:45+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/05/28 00:21:25+02:00 uni-frankfurt.de!mickeyl
bump oz-3.5.4 CVSDATE

2005/05/28 00:11:53+02:00 uni-frankfurt.de!mickeyl
fix wlan-ng-modules build for tosa

2005/05/28 00:09:35+02:00 uni-frankfurt.de!mickeyl
apply hack to fix wlan-ng-modules compiling against oz-pxa-2.4.18-embedix

BKrev: 4297afd6iT3bz_6TYmdnwEFqrwj3bg

diff --git a/conf/distro/openzaurus-3.5.4.conf b/conf/distro/openzaurus-3.5.4.conf
index b4f1f81..47b9c05 100644 (file)
--- a/conf/distro/openzaurus-3.5.4.conf
+++ b/conf/distro/openzaurus-3.5.4.conf
@@ -13,7 +13,7 @@ FEED_URIS += " \
        console##http://openzaurus.org/official/unstable/3.5.3/feed/console     \
        devel##http://openzaurus.org/official/unstable/3.5.3/feed/devel"
 
-CVSDATE = "20050521"
+CVSDATE = "20050528"
 
 #
 # Zaurus

diff --git a/packages/gtk-webcore/osb-browser_cvs.bb b/packages/gtk-webcore/osb-browser_20050430.bb
similarity index 100%
rename from packages/gtk-webcore/osb-browser_cvs.bb
rename to packages/gtk-webcore/osb-browser_20050430.bb

diff --git a/packages/gtk-webcore/osb-jscore_cvs.bb b/packages/gtk-webcore/osb-jscore_20050430.bb
similarity index 100%
rename from packages/gtk-webcore/osb-jscore_cvs.bb
rename to packages/gtk-webcore/osb-jscore_20050430.bb

diff --git a/packages/gtk-webcore/osb-nrcit_cvs.bb b/packages/gtk-webcore/osb-nrcit_20050430.bb
similarity index 100%
rename from packages/gtk-webcore/osb-nrcit_cvs.bb
rename to packages/gtk-webcore/osb-nrcit_20050430.bb

diff --git a/packages/gtk-webcore/osb-nrcore_cvs.bb b/packages/gtk-webcore/osb-nrcore_20050430.bb
similarity index 100%
rename from packages/gtk-webcore/osb-nrcore_cvs.bb
rename to packages/gtk-webcore/osb-nrcore_20050430.bb

diff --git a/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/dumb-hack-for-wlan-ng.patch b/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/dumb-hack-for-wlan-ng.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
index 83b2161..c4159d2 100644 (file)
--- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
+++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
@@ -7,7 +7,7 @@ KV = "2.4.18"
 RMKV = "7"
 PXAV = "3"
 SHARPV = "20031107"
-PR = "r38"
+PR = "r39"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
@@ -48,6 +48,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
            file://ir241_qos_param-2.diff;patch=1 \
            http://us1.samba.org/samba/ftp/cifs-cvs/cifs-1.20c-2.4.tar.gz \
            file://fix_tosa_apm.patch;patch=1 \
+           file://dumb-hack-for-wlan-ng.patch;patch=1 \
            file://defconfig-${MACHINE} "
 
 SRC_URI_append_poodle += " file://smallfonts.diff;patch=1"

diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb b/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb
index 95d764d..92f3375 100644 (file)
--- a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb
@@ -4,7 +4,7 @@ SECTION = "kernel/modules"
 DEPENDS = "virtual/kernel"
 RRECOMMENDS = "wlan-ng-utils"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
        file://no-compat.patch;patch=1 \
@@ -14,6 +14,8 @@ S = "${WORKDIR}/linux-wlan-ng-${PV}"
 
 inherit module
 
+PARALLEL_MAKE = ""
+
 do_configure() {
        install -m 0655 ${WORKDIR}/config.in ${S}/config.in
        oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config
@@ -39,7 +41,7 @@ do_configure() {
 }
 
 do_compile() {
-       oe_runmake all
+       oe_runmake -C src all
 }
 
 do_install() {