Submitted By: Archaic (archaic -aT- linuxfromscratch -DoT- org) Date: 2006-03-22 Initial Package Version: 5.94 Origin: Archaic Upstream Status: Not submitted (LFS specific) Description: This patch supresses the building of the hostname binary and man page and should only be used if you have installed Net-Tools (which has its own hostname program) and then need to re-install Coreutils. This patch must be applied after the suppress_uptime_kill_su patch. diff -Naur coreutils-5.94.orig/AUTHORS coreutils-5.94/AUTHORS --- coreutils-5.94.orig/AUTHORS 2006-03-22 17:21:12.000000000 +0000 +++ coreutils-5.94/AUTHORS 2006-03-22 17:21:27.000000000 +0000 @@ -31,7 +31,6 @@ groups: David MacKenzie head: David MacKenzie, Jim Meyering hostid: Jim Meyering -hostname: Jim Meyering id: Arnold Robbins, David MacKenzie join: Mike Haertel link: Michael Stone diff -Naur coreutils-5.94.orig/README coreutils-5.94/README --- coreutils-5.94.orig/README 2006-03-22 17:21:12.000000000 +0000 +++ coreutils-5.94/README 2006-03-22 17:21:27.000000000 +0000 @@ -9,7 +9,7 @@ [ basename cat chgrp chmod chown chroot cksum comm cp csplit cut date dd df dir dircolors dirname du echo env expand expr factor false fmt fold - ginstall groups head hostid hostname id join link ln logname ls + ginstall groups head hostid id join link ln logname ls md5sum mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr printenv printf ptx pwd readlink rm rmdir seq sha1sum shred sleep sort split stat stty su sum sync tac tail tee test touch tr true tsort tty diff -Naur coreutils-5.94.orig/man/Makefile.in coreutils-5.94/man/Makefile.in --- coreutils-5.94.orig/man/Makefile.in 2006-03-22 17:21:12.000000000 +0000 +++ coreutils-5.94/man/Makefile.in 2006-03-22 17:22:36.000000000 +0000 @@ -303,7 +303,7 @@ basename.1 cat.1 chgrp.1 chmod.1 chown.1 chroot.1 cksum.1 comm.1 \ cp.1 csplit.1 cut.1 date.1 dd.1 df.1 dir.1 dircolors.1 dirname.1 du.1 \ echo.1 env.1 expand.1 expr.1 factor.1 false.1 fmt.1 fold.1 groups.1 \ - head.1 hostid.1 hostname.1 id.1 install.1 join.1 \ + head.1 hostid.1 id.1 install.1 join.1 \ link.1 ln.1 logname.1 \ ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nice.1 nl.1 nohup.1 od.1 \ paste.1 pathchk.1 pinky.1 pr.1 printenv.1 printf.1 ptx.1 pwd.1 readlink.1 \ @@ -571,7 +571,6 @@ groups.1: $(common_dep) $(srcdir)/groups.x ../src/groups.sh head.1: $(common_dep) $(srcdir)/head.x ../src/head.c hostid.1: $(common_dep) $(srcdir)/hostid.x ../src/hostid.c -hostname.1: $(common_dep) $(srcdir)/hostname.x ../src/hostname.c id.1: $(common_dep) $(srcdir)/id.x ../src/id.c install.1: $(common_dep) $(srcdir)/install.x ../src/install.c join.1: $(common_dep) $(srcdir)/join.x ../src/join.c @@ -653,7 +652,7 @@ check-x-vs-1: PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \ t=ls-files.$$$$; \ - (cd $(srcdir) && ls -1 *.x) | grep -v -e 'kill.x' -e 'su.x' -e 'uptime.x' | sed 's/\.x$$//' | $(ASSORT) > $$t;\ + (cd $(srcdir) && ls -1 *.x) | grep -v -e 'hostname.x' -e 'kill.x' -e 'su.x' -e 'uptime.x' | sed 's/\.x$$//' | $(ASSORT) > $$t;\ echo $(dist_man_MANS) | tr -s ' ' '\n' | sed 's/\.1$$//' \ | $(ASSORT) | diff - $$t || { rm $$t; exit 1; }; \ rm $$t diff -Naur coreutils-5.94.orig/src/Makefile.in coreutils-5.94/src/Makefile.in --- coreutils-5.94.orig/src/Makefile.in 2006-03-22 17:21:12.000000000 +0000 +++ coreutils-5.94/src/Makefile.in 2006-03-22 17:21:27.000000000 +0000 @@ -55,7 +55,7 @@ tail$(EXEEXT) tr$(EXEEXT) tsort$(EXEEXT) unexpand$(EXEEXT) \ uniq$(EXEEXT) wc$(EXEEXT) basename$(EXEEXT) date$(EXEEXT) \ dirname$(EXEEXT) echo$(EXEEXT) env$(EXEEXT) expr$(EXEEXT) \ - factor$(EXEEXT) false$(EXEEXT) hostname$(EXEEXT) id$(EXEEXT) \ + factor$(EXEEXT) false$(EXEEXT) id$(EXEEXT) \ logname$(EXEEXT) pathchk$(EXEEXT) \ printenv$(EXEEXT) printf$(EXEEXT) pwd$(EXEEXT) seq$(EXEEXT) \ sleep$(EXEEXT) tee$(EXEEXT) test$(EXEEXT) true$(EXEEXT) \ @@ -335,11 +335,6 @@ hostid_LDADD = $(LDADD) hostid_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \ ../lib/libcoreutils.a -hostname_SOURCES = hostname.c -hostname_OBJECTS = hostname.$(OBJEXT) -hostname_LDADD = $(LDADD) -hostname_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \ - ../lib/libcoreutils.a id_SOURCES = id.c id_OBJECTS = id.$(OBJEXT) id_LDADD = $(LDADD) @@ -613,7 +608,7 @@ $(chown_SOURCES) chroot.c cksum.c comm.c $(cp_SOURCES) \ csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \ dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \ - fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \ + fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c \ id.c join.c link.c ln.c logname.c $(ls_SOURCES) \ $(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) \ nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \ @@ -627,7 +622,7 @@ $(chown_SOURCES) chroot.c cksum.c comm.c $(cp_SOURCES) \ csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \ dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \ - fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \ + fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c \ id.c join.c link.c ln.c logname.c $(ls_SOURCES) \ $(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) \ nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \ @@ -1058,9 +1053,6 @@ hostid$(EXEEXT): $(hostid_OBJECTS) $(hostid_DEPENDENCIES) @rm -f hostid$(EXEEXT) $(LINK) $(hostid_LDFLAGS) $(hostid_OBJECTS) $(hostid_LDADD) $(LIBS) -hostname$(EXEEXT): $(hostname_OBJECTS) $(hostname_DEPENDENCIES) - @rm -f hostname$(EXEEXT) - $(LINK) $(hostname_LDFLAGS) $(hostname_OBJECTS) $(hostname_LDADD) $(LIBS) id$(EXEEXT): $(id_OBJECTS) $(id_DEPENDENCIES) @rm -f id$(EXEEXT) $(LINK) $(id_LDFLAGS) $(id_OBJECTS) $(id_LDADD) $(LIBS) @@ -1303,7 +1295,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fold.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/head.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hostid.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hostname.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/install.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/join.Po@am__quote@