aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurilo Opsfelder Araujo <muriloo@linux.vnet.ibm.com>2017-06-23 09:23:25 -0300
committerAlexey Kardashevskiy <aik@ozlabs.ru>2017-06-28 13:13:38 +1000
commitdb35f1b8a2d3e44f4a12ca926359cc2575e98064 (patch)
tree98e08ceff7e904534be258c785abbbdc8a27ff63
parent895dbdd0dbd74887c9734b0b1dcc7f2f33a5a669 (diff)
downloadSLOF-db35f1b8a2d3e44f4a12ca926359cc2575e98064.zip
SLOF-db35f1b8a2d3e44f4a12ca926359cc2575e98064.tar.gz
SLOF-db35f1b8a2d3e44f4a12ca926359cc2575e98064.tar.bz2
lib/Makefile: Pass FLAG to make in SUBDIRS target
Some applications, e.g. https://maas.io/, trust on the dhcp code 93 option to reply the correct pxelinux.0 file according to client architecture. Today, dhcp.c is compiled without DHCPARCH, which causes it not to send client architecture in the dhcp request, i.e. dhcpd server can reply a pxelinux.0 binary that is not intended for client architecture. This patch makes sure client architecture is sent in the dhcp request. Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.vnet.ibm.com> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
-rw-r--r--lib/Makefile2
-rw-r--r--lib/libnet/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Makefile b/lib/Makefile
index a4d4bb2..1e8bb62 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -21,7 +21,7 @@ all: subdirs
subdirs: $(SUBDIRS)
$(SUBDIRS):
- $(MAKE) -C $@ $(MAKEARG)
+ $(MAKE) -C $@ FLAG=$(FLAG) $(MAKEARG)
# Rules for making clean:
clean:
diff --git a/lib/libnet/Makefile b/lib/libnet/Makefile
index 83ac1e5..dfefea9 100644
--- a/lib/libnet/Makefile
+++ b/lib/libnet/Makefile
@@ -16,7 +16,7 @@ ifndef TOP
endif
include $(TOP)/make.rules
-CFLAGS += -I. -I.. -I../libc/include -I$(TOP)/include
+CFLAGS += -I. -I.. -I../libc/include -I$(TOP)/include $(FLAG)
SRCS = ethernet.c ipv4.c udp.c tcp.c dns.c bootp.c dhcp.c tftp.c \
ipv6.c dhcpv6.c icmpv6.c ndp.c netload.c ping.c args.c