]> git.ipfire.org Git - people/stevee/ipfire-2.x.git/blob - src/patches/net-tools-2.10-no-hostname.patch
Merge branch 'master' into next
[people/stevee/ipfire-2.x.git] / src / patches / net-tools-2.10-no-hostname.patch
1 --- net-tools-2.10/Makefile.orig 2021-01-07 00:22:35.000000000 +0100
2 +++ net-tools-2.10/Makefile 2021-02-06 19:30:07.104393812 +0100
3 @@ -39,9 +39,6 @@
4 ifeq ($(HAVE_ARP_TOOLS),1)
5 PROGS += arp rarp
6 endif
7 -ifeq ($(HAVE_HOSTNAME_TOOLS),1)
8 -PROGS += hostname
9 -endif
10 ifeq ($(HAVE_IP_TOOLS),1)
11 PROGS += iptunnel ipmaddr
12 endif
13 @@ -173,9 +170,6 @@
14 nameif: $(NET_LIB) nameif.o
15 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ nameif.o $(NLIB) $(LDLIBS)
16
17 -hostname: hostname.o
18 - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ hostname.o $(DNLIB) $(LDLIBS)
19 -
20 route: $(NET_LIB) route.o
21 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ route.o $(NLIB) $(LDLIBS)
22
23 @@ -219,18 +213,6 @@
24 install -m 0755 arp ${BASEDIR}${SBINDIR}
25 install -m 0755 rarp ${BASEDIR}${SBINDIR}
26 endif
27 -ifeq ($(HAVE_HOSTNAME_TOOLS),1)
28 - install -m 0755 hostname ${BASEDIR}${BINDIR}
29 - ln -fs hostname $(BASEDIR)${BINDIR}/dnsdomainname
30 -ifeq ($(HAVE_HOSTNAME_SYMLINKS),1)
31 - ln -fs hostname $(BASEDIR)${BINDIR}/ypdomainname
32 - ln -fs hostname $(BASEDIR)${BINDIR}/nisdomainname
33 - ln -fs hostname $(BASEDIR)${BINDIR}/domainname
34 -endif
35 -ifeq ($(HAVE_AFDECnet),1)
36 - ln -fs hostname $(BASEDIR)${BINDIR}/nodename
37 -endif
38 -endif
39 ifeq ($(HAVE_IP_TOOLS),1)
40 install -m 0755 ipmaddr $(BASEDIR)${SBINDIR}
41 install -m 0755 iptunnel $(BASEDIR)${SBINDIR}