diff options
Diffstat (limited to 'busybox/networking')
| -rw-r--r-- | busybox/networking/Makefile.in | 2 | ||||
| -rw-r--r-- | busybox/networking/libiproute/Makefile.in | 2 | ||||
| -rw-r--r-- | busybox/networking/udhcp/Makefile.in | 2 | ||||
| -rw-r--r-- | busybox/networking/udhcp/clientpacket.c | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/busybox/networking/Makefile.in b/busybox/networking/Makefile.in index 9bfe901..f0157ad 100644 --- a/busybox/networking/Makefile.in +++ b/busybox/networking/Makefile.in @@ -61,7 +61,7 @@ ifeq ($(needcrypt-y),y) endif $(NETWORKING_DIR)$(NETWORKING_AR): $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y)) - $(AR) -ro $@ $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y)) + $(AR) $(ARFLAGS) $@ $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y)) $(NETWORKING_DIR)%.o: $(srcdir)/%.c $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< diff --git a/busybox/networking/libiproute/Makefile.in b/busybox/networking/libiproute/Makefile.in index fcc7f48..a28af46 100644 --- a/busybox/networking/libiproute/Makefile.in +++ b/busybox/networking/libiproute/Makefile.in @@ -77,7 +77,7 @@ LIBIPROUTE-$(CONFIG_IPTUNNEL) += \ libraries-y+=$(LIBIPROUTE_DIR)$(LIBIPROUTE_AR) $(LIBIPROUTE_DIR)$(LIBIPROUTE_AR): $(patsubst %,$(LIBIPROUTE_DIR)%, $(LIBIPROUTE-y)) - $(AR) -ro $@ $(patsubst %,$(LIBIPROUTE_DIR)%, $(LIBIPROUTE-y)) + $(AR) $(ARFLAGS) $@ $(patsubst %,$(LIBIPROUTE_DIR)%, $(LIBIPROUTE-y)) $(LIBIPROUTE_DIR)%.o: $(srcdir)/%.c $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< diff --git a/busybox/networking/udhcp/Makefile.in b/busybox/networking/udhcp/Makefile.in index 94750f6..ac9be5c 100644 --- a/busybox/networking/udhcp/Makefile.in +++ b/busybox/networking/udhcp/Makefile.in @@ -47,7 +47,7 @@ UDHCP_OBJS=$(patsubst %.c,$(UDHCP_DIR)%.o, $(UDHCP-y)) libraries-y+=$(UDHCP_DIR)$(UDHCP_AR) $(UDHCP_DIR)$(UDHCP_AR): $(UDHCP_OBJS) - $(AR) -ro $@ $(UDHCP_OBJS) + $(AR) $(ARFLAGS) $@ $(UDHCP_OBJS) $(UDHCP_OBJS): $(UDHCP_DIR)%.o : $(srcdir)/%.c $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -DIN_BUSYBOX -c $< -o $@ diff --git a/busybox/networking/udhcp/clientpacket.c b/busybox/networking/udhcp/clientpacket.c index ec96601..a0e8ccf 100644 --- a/busybox/networking/udhcp/clientpacket.c +++ b/busybox/networking/udhcp/clientpacket.c @@ -76,7 +76,8 @@ static void init_packet(struct dhcpMessage *packet, char type) init_header(packet, type); memcpy(packet->chaddr, client_config.arp, 6); - add_option_string(packet->options, client_config.clientid); + if (client_config.clientid) + add_option_string(packet->options, client_config.clientid); if (client_config.hostname) add_option_string(packet->options, client_config.hostname); add_option_string(packet->options, (uint8_t *) &vendor_id); } |