Bump buildroot to version 2017-02
TG-3 #closed
This commit is contained in:
@@ -0,0 +1,22 @@
|
||||
diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h
|
||||
index 9ab2eee..b827620 100644
|
||||
--- a/pppd/plugins/rp-pppoe/pppoe.h
|
||||
+++ b/pppd/plugins/rp-pppoe/pppoe.h
|
||||
@@ -47,6 +47,8 @@
|
||||
#include <sys/socket.h>
|
||||
#endif
|
||||
|
||||
+#include <netinet/in.h>
|
||||
+
|
||||
/* Ugly header files on some Linux boxes... */
|
||||
#if defined(HAVE_LINUX_IF_H)
|
||||
#include <linux/if.h>
|
||||
@@ -84,8 +86,6 @@ typedef unsigned long UINT32_t;
|
||||
#include <linux/if_ether.h>
|
||||
#endif
|
||||
|
||||
-#include <netinet/in.h>
|
||||
-
|
||||
#ifdef HAVE_NETINET_IF_ETHER_H
|
||||
#include <sys/types.h>
|
||||
|
||||
@@ -18,7 +18,7 @@ PPPD_TARGET_BINS = chat pppd pppdump pppstats
|
||||
PPPD_RADIUS_CONF = \
|
||||
dictionary dictionary.ascend dictionary.compat \
|
||||
dictionary.merit dictionary.microsoft \
|
||||
issue port-id-map realms server radiusclient.conf
|
||||
issue port-id-map realms servers radiusclient.conf
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PPPD_FILTER),y)
|
||||
PPPD_DEPENDENCIES += libpcap
|
||||
@@ -46,11 +46,11 @@ PPPD_POST_EXTRACT_HOOKS += PPPD_SET_RESOLV_CONF
|
||||
define PPPD_CONFIGURE_CMDS
|
||||
$(SED) 's/FILTER=y/#FILTER=y/' $(PPPD_DIR)/pppd/Makefile.linux
|
||||
$(SED) 's/ifneq ($$(wildcard \/usr\/include\/pcap-bpf.h),)/ifdef FILTER/' $(PPPD_DIR)/*/Makefile.linux
|
||||
( cd $(@D); ./configure --prefix=/usr )
|
||||
( cd $(@D); $(TARGET_MAKE_ENV) ./configure --prefix=/usr )
|
||||
endef
|
||||
|
||||
define PPPD_BUILD_CMDS
|
||||
$(MAKE) CC="$(TARGET_CC)" COPTS="$(TARGET_CFLAGS)" \
|
||||
$(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" COPTS="$(TARGET_CFLAGS)" \
|
||||
-C $(@D) $(PPPD_MAKE_OPTS)
|
||||
endef
|
||||
|
||||
@@ -104,7 +104,7 @@ define PPPD_INSTALL_TARGET_CMDS
|
||||
endef
|
||||
|
||||
define PPPD_INSTALL_STAGING_CMDS
|
||||
$(MAKE) INSTROOT=$(STAGING_DIR)/ -C $(@D) $(PPPD_MAKE_OPTS) install-devel
|
||||
$(TARGET_MAKE_ENV) $(MAKE) INSTROOT=$(STAGING_DIR)/ -C $(@D) $(PPPD_MAKE_OPTS) install-devel
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
||||
Reference in New Issue
Block a user