main/dhcp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

The following changes were made:

Browse Source 
* DEPENDS moved from Makefile to Makefile.dhclient and Makefile.dhcpd
  * Modified 01_client-script.patch to use /bin/sh in dhclient-script
This commit is contained in:
Jay Larson
2018-03-29 19:09:40 -05:00
parent 3028162f5f
commit 11c51cf947
4 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -11,11 +11,10 @@
SHELL = /bin/bash SHELL = /bin/bash
export SRCPKG = dhcp export SRCPKG = dhcp
export DEPENDS = glibc
export ARCH = x86_64 export ARCH = x86_64
export URL = https://www.isc.org/ export URL = https://www.isc.org/
BRIEF = Source package for dhcpd and dhclient BRIEF = Source package for dhcpd and dhclient
SNAPVER = 5 SNAPVER = 6
PWD := $(shell pwd) PWD := $(shell pwd)
ROOT := $(PWD)/ROOT ROOT := $(PWD)/ROOT

1
Makefile.dhclient
View File

@@ -8,6 +8,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
DEPENDS = dash,glibc
REPO = core REPO = core
BRIEF = DHCP Client BRIEF = DHCP Client
DESC = The Internet Systems Consortium DHCP Client, dhclient, \ DESC = The Internet Systems Consortium DHCP Client, dhclient, \

1
Makefile.dhcpd
View File

@@ -8,6 +8,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
DEPENDS = glibc
REPO = server REPO = server
BRIEF = DHCP server BRIEF = DHCP server
DESC = The Internet Systems Consortium DHCP Server, dhcpd, implements the \ DESC = The Internet Systems Consortium DHCP Server, dhcpd, implements the \

17
SRC/patches/01_client-script.patch
View File

@@ -1,16 +1,9 @@
Submitted By: Armin K. <krejzi at email dot com> diff -Naur a/client/scripts/linux b/client/scripts/linux
Date: 2012-08-14 --- a/client/scripts/linux 2016-09-27 14:16:50.000000000 -0500
Initial Package Version: 4.2.4-P1 +++ b/client/scripts/linux 2018-03-29 18:30:41.975046889 -0500
Upstream Status: Rejected by upstream.
Origin: Based on Debian's dhclient-script, but modified for BLFS
Description: This patch replaces original linux script for dhcp client with
better one which is based on Debian's dhclient-script, but modified
to be used on LFS/BLFS. It also removes net-tools dependency.
--- a/client/scripts/linux 2014-07-09 20:26:40.000000000 +0200
+++ b/client/scripts/linux 2014-08-12 01:21:02.858998828 +0200
@@ -1,316 +1,346 @@ @@ -1,316 +1,346 @@
#!/bin/bash -#!/bin/bash
+#!/bin/sh
+ +
# dhclient-script for Linux. Dan Halbert, March, 1997. # dhclient-script for Linux. Dan Halbert, March, 1997.
# Updated for Linux 2.[12] by Brian J. Murrell, January 1999. # Updated for Linux 2.[12] by Brian J. Murrell, January 1999.