Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/09/06 20:25:26+02:00 uni-frankfurt.de!mickey
apply the 'remove-montavista-init-stupidity' (sic) patch

BKrev: 413caba03jxaiqX7bev5LkOzvfYLcQ

diff --git a/linux/montavista-sa-2.4.17-mvl21/remove-montavista-init-stupidity.patch b/linux/montavista-sa-2.4.17-mvl21/remove-montavista-init-stupidity.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/linux/montavista-sa_2.4.17-mvl21.oe b/linux/montavista-sa_2.4.17-mvl21.oe
index 21f344f..43f93ba 100644 (file)
--- a/linux/montavista-sa_2.4.17-mvl21.oe
+++ b/linux/montavista-sa_2.4.17-mvl21.oe
@@ -3,7 +3,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 KV = "${@oe.data.getVar('PV',d,True).split('-')[0]}"
 MVLV = "${@oe.data.getVar('PV',d,True).split('-')[1]}"
-PR = "r4"
+PR = "r5"
 DEPENDS = "cetools-native"
 
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/montavista-sa-${PV}"
@@ -14,6 +14,7 @@ SRC_URI = "http://www.vanille.de/mirror/linux-${KV}_${MVLV}.tar.gz \
            file://iw240_we15-6.diff;patch=1 \
           \
           file://flash-for-beagle-iii.patch;patch=1 \
+          file://remove-montavista-init-stupidity.patch;patch=1 \
           \
            file://mkdep.patch;patch=1 \
            file://defconfig-${MACHINE}"
@@ -22,7 +23,7 @@ S = "${WORKDIR}/linux-${KV}_${MVLV}"
 
 inherit kernel
 
-CMDLINE="noinitrd root=/dev/mtdblock/1 mem=27M console=ttySA0"
+CMDLINE = "root=/dev/mtdblock/1 mem=27M console=ttySA0 noinitrd"
 
 KERNEL_CCSUFFIX = "-2.95"
 KERNEL_LDSUFFIX = "-2.11.2"