zaurus-2.6.inc/linux-rp: Change to machines marking themselves as not wanting kernels included in images

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2598 311d38ba-8fff-0310-9ca6-ca027cbcb966

8 files changed, 9 insertions, 13 deletions

diff --git a/meta/conf/machine/include/zaurus-2.6.inc b/meta/conf/machine/include/zaurus-2.6.inc
index cf0a238a70..84221b54b0 100644
--- a/meta/conf/machine/include/zaurus-2.6.inc
+++ b/meta/conf/machine/include/zaurus-2.6.inc
@@ -43,3 +43,5 @@ zaurus_make_installkit () {
     md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
     rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/     
 }
+
+RDEPENDS_kernel-base = ""
\ No newline at end of file
diff --git a/meta/packages/linux/linux-nokia800_2.6.18-osso40.bb b/meta/packages/linux/linux-nokia800_2.6.18-osso40.bb
index 76e599ffc4..1189ea7c2c 100644
--- a/meta/packages/linux/linux-nokia800_2.6.18-osso40.bb
+++ b/meta/packages/linux/linux-nokia800_2.6.18-osso40.bb
@@ -1,6 +1,6 @@
 require linux-nokia800.inc
 
-PR = "r4"
+PR = "r5"
 SRC_URI = "http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18.orig.tar.gz \
            http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18-osso40.diff.gz;patch=1 \
            ${RPSRC}/lzo_kernel-r0.patch;patch=1 \
diff --git a/meta/packages/linux/linux-rp.inc b/meta/packages/linux/linux-rp.inc
index 126bb9491d..b89ad7c71c 100644
--- a/meta/packages/linux/linux-rp.inc
+++ b/meta/packages/linux/linux-rp.inc
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 
 inherit kernel
 
-RPROVIDES_kernel-image += "hostap-modules"
+RPROVIDES_kernel-base += "hostap-modules"
 
 DOSRC = "http://www.do13.de/openzaurus/patches"
 RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
@@ -13,12 +13,6 @@ BASRC = "http://www.orca.cx/zaurus/patches"
 CHSRC = "http://oz.drigon.com/patches"
 TKSRC = "http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches"
 
-##############################################################
-# Compensate for sucky bootloader on all Sharp Zaurus models
-#
-FILES_kernel-image = ""
-ALLOW_EMPTY = "1"
-
 EXTRA_OEMAKE = "OPENZAURUS_RELEASE=-${DISTRO_VERSION}"
 COMPATIBLE_HOST = "(arm|i.86).*-linux"
 COMPATIBLE_MACHINE = '(collie|poodle|c7x0|akita|spitz|tosa|hx2000|qemuarm|qemux86|bootcdx86|htcuniversal)'
diff --git a/meta/packages/linux/linux-rp_2.6.17.bb b/meta/packages/linux/linux-rp_2.6.17.bb
index 211c5a43cf..a8821953a1 100644
--- a/meta/packages/linux/linux-rp_2.6.17.bb
+++ b/meta/packages/linux/linux-rp_2.6.17.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r35"
+PR = "r36"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
diff --git a/meta/packages/linux/linux-rp_2.6.20.bb b/meta/packages/linux/linux-rp_2.6.20.bb
index b818b0f3e8..069e6a0f4c 100644
--- a/meta/packages/linux/linux-rp_2.6.20.bb
+++ b/meta/packages/linux/linux-rp_2.6.20.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r19"
+PR = "r20"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
diff --git a/meta/packages/linux/linux-rp_2.6.21.bb b/meta/packages/linux/linux-rp_2.6.21.bb
index 87e8259ec0..682ab308e5 100644
--- a/meta/packages/linux/linux-rp_2.6.21.bb
+++ b/meta/packages/linux/linux-rp_2.6.21.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r6"
+PR = "r7"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
diff --git a/meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb b/meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb
index 922f2c89e8..533b9bb002 100644
--- a/meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb
+++ b/meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_htcuniversal = "1"
diff --git a/meta/packages/linux/linux-rp_2.6.22.bb b/meta/packages/linux/linux-rp_2.6.22.bb
index 0bacce86fa..03eca283b4 100644
--- a/meta/packages/linux/linux-rp_2.6.22.bb
+++ b/meta/packages/linux/linux-rp_2.6.22.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r7"
+PR = "r8"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046