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

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

2005/02/25 14:03:04+01:00 local!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into marcinj.local:/home/hrw/zaurus/bb/openembedded

2005/02/25 14:02:49+01:00 local!hrw
kdepimpi updated to 2.0.12

2005/02/25 13:44:41+01:00 dyndns.org!reenoo
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded

2005/02/25 13:44:16+01:00 dyndns.org!reenoo
openvpn, ppp-dsl, prism54, shorewall, snes232: more kernel-module-* RDEPENDS/RRECOMMENDS fixes.

BKrev: 421f2e7b3lxlXoEXbn-3tJe302dc8g

7 files changed, 14 insertions, 10 deletions

diff --git a/packages/kdepimpi/kdepimpi_2.0.11.bb b/packages/kdepimpi/kdepimpi_2.0.12.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/kdepimpi/kdepimpi_2.0.11.bb
+++ b/packages/kdepimpi/kdepimpi_2.0.12.bb
diff --git a/packages/openvpn/openvpn_1.5.0.bb b/packages/openvpn/openvpn_1.5.0.bb
index 2ae76af84e..49fb233e3a 100644
--- a/packages/openvpn/openvpn_1.5.0.bb
+++ b/packages/openvpn/openvpn_1.5.0.bb
@@ -2,8 +2,8 @@ SECTION = "console/network"
 DESCRIPTION = "A VPN solution via tun device.  Not IPSEC!"
 PRIORITY = "optional"
 DEPENDS = "lzo openssl"
-RDEPENDS = "kernel-module-tun"
-PR = "r1"
+RRECOMMENDS = "kernel-module-tun"
+PR = "r2"
 LICENSE = "GPL"
 SRC_URI = "${SOURCEFORGE_MIRROR}/openvpn/openvpn-${PV}.tar.gz \
 	file://openvpn"
diff --git a/packages/openvpn/openvpn_1.6.0.bb b/packages/openvpn/openvpn_1.6.0.bb
index 4b5c46e859..387c0a9291 100644
--- a/packages/openvpn/openvpn_1.6.0.bb
+++ b/packages/openvpn/openvpn_1.6.0.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://openvpn.sourceforge.net"
 LICENSE = "GPLv2"
 PRIORITY = "optional"
 DEPENDS = "lzo openssl"
-RDEPENDS = "kernel-module-tun"
+RRECOMMENDS = "kernel-module-tun"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openvpn/openvpn-${PV}.tar.gz \
diff --git a/packages/ppp-dsl/ppp-dsl_0.1.bb b/packages/ppp-dsl/ppp-dsl_0.1.bb
index 58861f1f32..0d30031602 100644
--- a/packages/ppp-dsl/ppp-dsl_0.1.bb
+++ b/packages/ppp-dsl/ppp-dsl_0.1.bb
@@ -3,8 +3,9 @@ DESCRIPTION = "Enables PPP dial-in through a DSL connection"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "PD"
 DEPENDS = "ppp rp-pppoe"
-RDEPENDS = "ppp rp-pppoe kernel-module-ppp-async kernel-module-ppp-generic kernel-module-slhc"
-PR = "r1"
+RDEPENDS = "ppp rp-pppoe"
+RRECOMMENDS = "kernel-module-ppp-async kernel-module-ppp-generic kernel-module-slhc"
+PR = "r2"
 
 SRC_URI = "file://dsl-provider \
 	file://ppp_on_boot.dsl"
diff --git a/packages/prism54/prism54-module_1.2.bb b/packages/prism54/prism54-module_1.2.bb
index c55bf27bca..a986fc404d 100644
--- a/packages/prism54/prism54-module_1.2.bb
+++ b/packages/prism54/prism54-module_1.2.bb
@@ -4,8 +4,10 @@ PRIORITY = "optional"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 HOMEPAGE = "http://prism54.org"
 LICENSE = "GPL"
-RDEPENDS = "kernel (${KERNEL_VERSION}) kernel-module-firmware-class prism54-firmware (1.0.3.0) hotplug"
+RDEPENDS = "kernel (${KERNEL_VERSION}) prism54-firmware (1.0.3.0) hotplug"
+RRECOMMENDS = "kernel-module-firmware-class"
 DEPENDS = "virtual/kernel prism54-firmware"
+PR = "r1"
 
 SRC_URI = "http://prism54.org/pub/linux/testing/tars/2004-06/prism54-1.2.tar.bz2"
 
diff --git a/packages/shorewall/shorewall_2.0.9.bb b/packages/shorewall/shorewall_2.0.9.bb
index f92da56808..ec5af89fa1 100644
--- a/packages/shorewall/shorewall_2.0.9.bb
+++ b/packages/shorewall/shorewall_2.0.9.bb
@@ -4,9 +4,10 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
 SECTION = "network"
 PRIORITY = "optional"
-PR = "r2"
+PR = "r3"
 
-RDEPENDS = "iptables kernel-module-ip-tables kernel-module-ip-conntrack kernel-module-ipt-conntrack kernel-module-ipt-multiport kernel-module-ipt-log kernel-module-ipt-mac kernel-module-ipt-mark kernel-module-ipt-masquerade kernel-module-ipt-pkttype kernel-module-ipt-reject kernel-module-ipt-state kernel-module-ipt-tos kernel-module-iptable-filter kernel-module-iptable-mangle kernel-module-iptable-nat"
+RDEPENDS = "iptables"
+RRECOMMENDS = "kernel-module-ip-tables kernel-module-ip-conntrack kernel-module-ipt-conntrack kernel-module-ipt-multiport kernel-module-ipt-log kernel-module-ipt-mac kernel-module-ipt-mark kernel-module-ipt-masquerade kernel-module-ipt-pkttype kernel-module-ipt-reject kernel-module-ipt-state kernel-module-ipt-tos kernel-module-iptable-filter kernel-module-iptable-mangle kernel-module-iptable-nat"
 
 SRC_URI = "http://germany.shorewall.net/pub/shorewall/2.0/shorewall-2.0.9/shorewall-2.0.9.tgz \
 	file://install-no-chown.diff;patch=1;pnum=0"
diff --git a/packages/snes232/snes232_cvs.bb b/packages/snes232/snes232_cvs.bb
index 56091149bc..1424f86dfe 100644
--- a/packages/snes232/snes232_cvs.bb
+++ b/packages/snes232/snes232_cvs.bb
@@ -1,9 +1,9 @@
 SECTION = "unknown"
-PR = "r3"
+PR = "r4"
 LICENSE = "GPL"
 INHIBIT_PACKAGE_STRIP = "1"
 
-RDEPENDS = "kernel-module-serport"
+RRECOMMENDS = "kernel-module-serport"
 
 SRC_URI = "${HANDHELDS_CVS};module=gpe/games/snes232 \
 	file://snes232-2.6.patch;patch=1;pnum=0 \