Add dhcp 3.1.2p1 and fix unneeded bash dependency in 3.0.*
PATCH 1/1 Add dhcp 3.1.2p1 and fix unneeded bash dependency in 3.0.*
Hi,
The latest stable of the isc dhcp 3.x source is 3.1.2p1. I realize that there are already 4.x releases out too, but I have not tested any of them yet.
In any case: the dhclient/scripts/linux is a #!/bin/bash script which does not use any bashisms. As this was (dependency-wise) the only reason for our image to contain bash, I fixed this and while at it moved from 3.0.2 to 3.1.2p1.
Attached is the patch for both changes.
Marc
recipes/dhcp/dhcp_3.0.1.bb +2 -1
@@ -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"
recipes/dhcp/dhcp_3.0.2.bb +2 -2
@@ -2,10 +2,11 @@ SECTION = "console/network" DESCRIPTION = "Internet Software Consortium DHCP package" HOMEPAGE = "http://www.isc.org/" LICENSE = "BSD" -PR = "r10" +PR = "r11" 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 \
@@ -53,7 +54,6 @@ FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server ${sysconf FILES_dhcp-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay" FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf /var/lib/dhcp3" -RDEPENDS_dhcp-client = "bash" FILES_dhcp-omshell = "${bindir}/omshell"
recipes/dhcp/dhcp_3.1.2p1.bb new file +61 -0
61 lines not on this page · raw message
recipes/dhcp/files/useless-use-of-bash.patch new file +8 -0
@@ -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
Hello Marc,
Quoted 10 lines · Marc Olzheim
Hi,
The latest stable of the isc dhcp 3.x source is 3.1.2p1. I realize that there are already 4.x releases out too, but I have not tested any of them yet.
In any case: the dhclient/scripts/linux is a #!/bin/bash script which does not use any bashisms. As this was (dependency-wise) the only reason for our image to contain bash, I fixed this and while at it moved from 3.0.2 to 3.1.2p1.
While you're on it, it would be better to make it in a patchset doing:
- move it all to a .inc and use INC_PR (to avoid useless duplication)
- drop the bash requirement (as you did)
- add the new version
And please, use format-patch to export those patches so we can easily push it.
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Quoted 5 lines · Otavio Salvador
Quoted 4 lines
In any case: the dhclient/scripts/linux is a #!/bin/bash script which does not use any bashisms. As this was (dependency-wise) the only reason for our image to contain bash, I fixed this and while at it moved from 3.0.2 to 3.1.2p1.
Quoted 7 lines
While you're on it, it would be better to make it in a patchset doing:
- move it all to a .inc and use
INC_PR(to avoid useless duplication)
- drop the bash requirement (as you did)
- add the new versionAnd please, use format-patch to export those patches so we can easily push it.
Ok, thanks for the tip, here's the new patch.
Marc
--- conf/checksums.ini | 4 ++ recipes/dhcp/dhcp3.inc | 62 ++++++++++++++++++++++++++ recipes/dhcp/dhcp_3.0.1.bb | 3 +- recipes/dhcp/dhcp_3.0.2.bb | 59 ++---------------------- recipes/dhcp/dhcp_3.1.2p1.bb | 12 +++++ recipes/dhcp/files/useless-use-of-bash.patch | 8 +++ 6 files changed, 93 insertions(+), 55 deletions(-) create mode 100644 recipes/dhcp/dhcp3.inc create mode 100644 recipes/dhcp/dhcp_3.1.2p1.bb create mode 100644 recipes/dhcp/files/useless-use-of-bash.patch
conf/checksums.ini +4 -0
@@ -5178,6 +5178,10 @@ sha256=043dea4144a93b26358ed73cd8fab79be76834a719f13fbb4344a26e8288fc38 md5=04800a111521e7442749b2ce883f962b sha256=21a6e0476fb880e704e0c3cfe7b2bc6a97f6b2b0654db10b38bdd317f511a03a +[ftp://ftp.isc.org/isc/dhcp/dhcp-3.1-history/dhcp-3.1.2p1.tar.gz] +md5=787b2924a1965f0d8558521b36dca73d +sha256=e0cb405e0fef0ecebec7aaed294032a06178ff28be87498596e6069ccda4341e + [http://savannah.nongnu.org/download/dhcp-fwd/dhcp-forwarder-0.6.tar.bz2] md5=cbe60c8c904394a8e38e12ac42c02284 sha256=45b708fb49a9fab10d814eb1e340a0960dac91f92800b3d39ddf0245ac913e30
recipes/dhcp/dhcp3.inc new file +62 -0
62 lines not on this page · raw message
recipes/dhcp/dhcp_3.0.1.bb +2 -1
@@ -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"
recipes/dhcp/dhcp_3.0.2.bb +5 -54
67 lines not on this page · raw message
recipes/dhcp/dhcp_3.1.2p1.bb new file +12 -0
@@ -0,0 +1,12 @@ +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}"
recipes/dhcp/files/useless-use-of-bash.patch new file +8 -0
@@ -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
Signature · 1 line
1.6.3.1
Hello Marc,
Quoted 2 lines · Marc Olzheim
Ok, thanks for the tip, here's the new patch.
Thanks by looking at it again; the only missing things to us to commit it are:
- use a patch for .inc move
- use a patch for the new version
- export both using git format-patch and mail them
Doing the last allow us to give the credit to you and keep tracking who did what in the project; this help a lot and allow us to ping people in case of problems or radical changes that might affect your usage.
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Quoted 10 lines · Otavio Salvador
Thanks by looking at it again; the only missing things to us to commit it are:
- use a patch for .inc move
- use a patch for the new version
- export both using git format-patch and mail themDoing the last allow us to give the credit to you and keep tracking who did what in the project; this help a lot and allow us to ping people in case of problems or radical changes that might affect your usage.
Ok, done, in 3 patches (inc move, add new version, bash-patch).
Marc