]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blob - src/patches/net-tools-1.60-no-hostname.patch
Merge remote-tracking branch 'origin/master' into core78
[people/pmueller/ipfire-2.x.git] / src / patches / net-tools-1.60-no-hostname.patch
1 --- a/Makefile.bak 2014-06-03 19:01:39.758845492 +0000
2 +++ b/Makefile 2014-06-03 19:02:34.119171419 +0000
3 @@ -76,7 +76,7 @@
4 NET_LIB_PATH = lib
5 NET_LIB_NAME = net-tools
6
7 -PROGS := ifconfig hostname arp netstat route rarp slattach plipconfig nameif
8 +PROGS := ifconfig arp netstat route rarp slattach plipconfig nameif
9
10 -include config.make
11 ifeq ($(HAVE_IP_TOOLS),1)
12 @@ -190,9 +190,6 @@
13 nameif: nameif.o
14 $(CC) $(LDFLAGS) -o nameif nameif.o
15
16 -hostname: hostname.o
17 - $(CC) $(LDFLAGS) -o hostname hostname.o $(DNLIB)
18 -
19 route: $(NET_LIB) route.o
20 $(CC) $(LDFLAGS) -o route route.o $(NLIB) $(RESLIB)
21
22 @@ -224,7 +221,6 @@
23 install -m 0755 -d ${BASEDIR}/sbin
24 install -m 0755 -d ${BASEDIR}/bin
25 install -m 0755 arp ${BASEDIR}/sbin
26 - install -m 0755 hostname ${BASEDIR}/bin
27 install -m 0755 ifconfig ${BASEDIR}/sbin
28 install -m 0755 nameif ${BASEDIR}/sbin
29 install -m 0755 netstat ${BASEDIR}/bin
30 @@ -239,21 +235,11 @@
31 ifeq ($(HAVE_MII),1)
32 install -m 0755 mii-tool $(BASEDIR)/sbin
33 endif
34 - ln -fs hostname $(BASEDIR)/bin/dnsdomainname
35 - ln -fs hostname $(BASEDIR)/bin/ypdomainname
36 - ln -fs hostname $(BASEDIR)/bin/nisdomainname
37 - ln -fs hostname $(BASEDIR)/bin/domainname
38 -ifeq ($(HAVE_AFDECnet),1)
39 - ln -fs hostname $(BASEDIR)/bin/nodename
40 -endif
41
42 savebin:
43 @for i in ${BASEDIR}/sbin/arp ${BASEDIR}/sbin/ifconfig \
44 ${BASEDIR}/bin/netstat \
45 - ${BASEDIR}/sbin/rarp ${BASEDIR}/sbin/route \
46 - ${BASEDIR}/bin/hostname ${BASEDIR}/bin/ypdomainname \
47 - ${BASEDIR}/bin/dnsdomainname ${BASEDIR}/bin/nisdomainname \
48 - ${BASEDIR}/bin/domainname ; do \
49 + ${BASEDIR}/sbin/rarp ${BASEDIR}/sbin/route; do \
50 [ -f $$i ] && cp -f $$i $$i.old ; done ; echo Saved.
51
52 installdata: