diff options
| author | brooks <brooks@FreeBSD.org> | 2005-06-07 03:59:26 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2005-06-07 03:59:26 +0000 |
| commit | 889029339427479400173e85589ca167386d5d1d (patch) | |
| tree | 6dc9d78a4705861164596cb5e9d3918abec49fc6 | |
| parent | d1e4c87cf9e12097e8ffd9ce9307c9ac54d10d12 (diff) | |
| download | FreeBSD-src-889029339427479400173e85589ca167386d5d1d.zip FreeBSD-src-889029339427479400173e85589ca167386d5d1d.tar.gz | |
Temporarily disconnect dhclient from the build while I import the
OpenBSD version.
| -rw-r--r-- | rescue/rescue/Makefile | 14 | ||||
| -rw-r--r-- | sbin/Makefile | 1 |
2 files changed, 7 insertions, 8 deletions
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 572f108..8467362 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -11,11 +11,11 @@ nextboot_FIXED: ../../sbin/reboot/nextboot.sh sed '1s/\/bin\//\/rescue\//' ${.ALLSRC} > ${.TARGET} CLEANFILES+= nextboot_FIXED -SCRIPTS+= dhclient_FIXED -SCRIPTSNAME_dhclient_FIXED= dhclient-script -dhclient_FIXED: ../../contrib/isc-dhcp/client/scripts/freebsd - sed '1s/\/bin\//\/rescue\//' ${.ALLSRC} > ${.TARGET} -CLEANFILES+= dhclient_FIXED +#SCRIPTS+= dhclient_FIXED +#SCRIPTSNAME_dhclient_FIXED= dhclient-script +#dhclient_FIXED: ../../contrib/isc-dhcp/client/scripts/freebsd +# sed '1s/\/bin\//\/rescue\//' ${.ALLSRC} > ${.TARGET} +#CLEANFILES+= dhclient_FIXED ################################################################# # @@ -174,8 +174,8 @@ CRUNCH_ALIAS_fsck_ffs= fsck_4.2bsd fsck_ufs CRUNCH_ALIAS_mount_std= mount_devfs mount_fdescfs mount_linprocfs mount_procfs # dhclient has historically been troublesome... -CRUNCH_PROGS_sbin+= dhclient -CRUNCH_BUILDOPTS_dhclient= -DRELEASE_CRUNCH -Dlint +#CRUNCH_PROGS_sbin+= dhclient +#CRUNCH_BUILDOPTS_dhclient= -DRELEASE_CRUNCH -Dlint ################################################################## # Programs from stock /usr/bin diff --git a/sbin/Makefile b/sbin/Makefile index 732895b..c4c97f2 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -15,7 +15,6 @@ SUBDIR= adjkerntz \ conscontrol \ ${_devd} \ devfs \ - dhclient \ dmesg \ dump \ dumpfs \ |
