04cb1e0fd2 was implemented to avoid failures with kernels before
4.14.9.  At this point OpenWRT no longer supports earlier kernels,
so make the copy fail if compiler_types.h doesn't exist.

Updates: 04cb1e0fd2 ("ppp: fix build with kernel 4.14.9+")
Signed-off-by: Elliott Mitchell <ehem+open...@m5p.com>
---
 package/network/services/ppp/Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/network/services/ppp/Makefile 
b/package/network/services/ppp/Makefile
index 40ec5c5cf1..5f4b8ac02f 100644
--- a/package/network/services/ppp/Makefile
+++ b/package/network/services/ppp/Makefile
@@ -184,13 +184,9 @@ $(call Build/Configure/Default,, \
        mkdir -p $(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux
        $(CP) \
                $(LINUX_DIR)/include/linux/compiler.h \
+               $(LINUX_DIR)/include/linux/compiler_types.h \
                $(LINUX_DIR)/include/$(LINUX_UAPI_DIR)linux/atm*.h \
                $(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux/
-
-       # Kernel 4.14.9+ only, ignore the exit status of cp in case the file
-       # doesn't exits
-       -$(CP) $(LINUX_DIR)/include/linux/compiler_types.h \
-               $(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux/
 endef
 
 MAKE_FLAGS += COPTS="$(TARGET_CFLAGS)" \
-- 
(\___(\___(\______          --=> 8-) EHM <=--          ______/)___/)___/)
 \BS (    |       ehem+open...@m5p.com     PGP 87145445       |    )   /
  \_CS\   |  _____  -O #include <stddisclaimer.h> O-   _____  |   /  _/
8A19\___\_|_/58D2 7E3D DDF4 7BA6 <-PGP-> 41D1 B375 37D0 8714\_|_/___/5445




_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to