Get rid of useless bash dependency in the linux client script.

diff --git a/recipes/dhcp/dhcp_3.0.1.bb b/recipes/dhcp/dhcp_3.0.1.bb
index 7d55dc3a033fdd57cade2075ca26856f90c654ef..2deee26a0c8441609abb8dc9c3f83eeffca58d3c 100644 (file)
--- a/recipes/dhcp/dhcp_3.0.1.bb
+++ b/recipes/dhcp/dhcp_3.0.1.bb
@@ -2,10 +2,11 @@ SECTION = "console/network"
 DESCRIPTION = "Internet Software Consortium DHCP package"
 HOMEPAGE = "http://www.isc.org/"
 LICENSE = "BSD"
-PR = "r3"
+PR = "r4"
 SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \
           file://noattrmode.patch;patch=1 \
           file://fixincludes.patch;patch=1 \
+          file://useless-use-of-bash.patch;patch=1 \
           file://init-relay file://default-relay \
           file://init-server file://default-server \
           file://dhclient.conf file://dhcpd.conf"

diff --git a/recipes/dhcp/dhcp_3.0.2.bb b/recipes/dhcp/dhcp_3.0.2.bb
index 993459028b91625f61b17d50c0dbf617838062f5..3c3c742b33275b8852efaae839f09af656f94b7f 100644 (file)
--- a/recipes/dhcp/dhcp_3.0.2.bb
+++ b/recipes/dhcp/dhcp_3.0.2.bb
@@ -3,10 +3,11 @@ require dhcp3.inc
 SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \
           file://noattrmode.patch;patch=1 \
           file://fixincludes.patch;patch=1 \
+          file://useless-use-of-bash.patch;patch=1 \
           file://dhclient-script-exit-status.dpatch;patch=1 \
           file://dhcp-3.0.3-dhclient-dbus.patch;patch=1;pnum=0 \
           file://init-relay file://default-relay \
           file://init-server file://default-server \
           file://dhclient.conf file://dhcpd.conf"
 
-PR = "${INC_PR}"
+PR = "${INC_PR}.0"

diff --git a/recipes/dhcp/dhcp_3.1.2p1.bb b/recipes/dhcp/dhcp_3.1.2p1.bb
index e57fb016a9ff81d2a216dad1ec2a7799ad7b6277..4900a4978902826f7c4a8570ea0928e7c7e2ea49 100644 (file)
--- a/recipes/dhcp/dhcp_3.1.2p1.bb
+++ b/recipes/dhcp/dhcp_3.1.2p1.bb
@@ -2,10 +2,11 @@ require dhcp3.inc
 
 SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.1-history/dhcp-${PV}.tar.gz \
           file://fixincludes.patch;patch=1 \
+          file://useless-use-of-bash.patch;patch=1 \
           file://dhclient-script-exit-status.dpatch;patch=1 \
           file://dhcp-3.0.3-dhclient-dbus.patch;patch=1;pnum=0 \
           file://init-relay file://default-relay \
           file://init-server file://default-server \
           file://dhclient.conf file://dhcpd.conf"
 
-PR = "${INC_PR}"
+PR = "${INC_PR}.0"

diff --git a/recipes/dhcp/files/useless-use-of-bash.patch b/recipes/dhcp/files/useless-use-of-bash.patch
new file mode 100644 (file)
index 0000000..6628fe7
--- /dev/null
+++ b/recipes/dhcp/files/useless-use-of-bash.patch
@@ -0,0 +1,8 @@
+--- dhcp-3.0.2p1/client/scripts/linux  2006-07-22 04:24:16.000000000 +0200
++++ dhcp-3.0.2p1/client/scripts/linux  2009-11-03 17:51:55.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ # dhclient-script for Linux. Dan Halbert, March, 1997.
+ # Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
+ # No guarantees about this. I'm a novice at the details of Linux