diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-05-31 17:52:33 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-04 13:27:30 +0100 |
| commit | 79400a1042e24d38752ffdc1288aefe3415c6c11 (patch) | |
| tree | 610d44ed42d2a0fb6fc717fdf60db05ec3c11884 /meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch | |
| parent | 83ba71a3057dba1d8ac2f9c15663c9ba9ad833f4 (diff) | |
| download | poky-79400a1042e24d38752ffdc1288aefe3415c6c11.tar.gz | |
ppp: update 2.4.7 -> 2.4.8
Drop patches:
0001-ppp-Fix-compilation-errors-in-Makefile.patch - issue fixed upstream
0001-pppoe-include-netinet-in.h-before-linux-in.h.patch - backport
cifdefroute.patch - superseded by new default route metric option
ppp-2.4.7-DES-openssl.patch - openssl support added upstream
(From OE-Core rev: 406895464980f62744193841651c436c6e463a37)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch')
| -rw-r--r-- | meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch b/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch index 8a69396cc7..614a474c37 100644 --- a/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch +++ b/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | From 505705d0e1b55ce3fdc10d0e5eab5488f869adb6 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Andreas Oberritter <obi@opendreambox.org> | ||
| 3 | Date: Thu, 1 Jul 2010 14:34:12 +0800 | ||
| 4 | Subject: [PATCH] ppp: Upgraded to version 2.4.5 | ||
| 5 | |||
| 1 | The patch comes from OpenEmbedded. | 6 | The patch comes from OpenEmbedded. |
| 2 | Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com> | 7 | Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com> |
| 3 | 8 | ||
| @@ -6,24 +11,15 @@ Signed-off-by: Andreas Oberritter <obi@opendreambox.org> | |||
| 6 | 11 | ||
| 7 | Upstream-Status: Inappropriate [configuration] | 12 | Upstream-Status: Inappropriate [configuration] |
| 8 | 13 | ||
| 9 | Index: ppp-2.4.7/pppd/Makefile.linux | 14 | --- |
| 10 | =================================================================== | 15 | pppd/Makefile.linux | 4 ++-- |
| 11 | --- ppp-2.4.7.orig/pppd/Makefile.linux | 16 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 12 | +++ ppp-2.4.7/pppd/Makefile.linux | 17 | |
| 13 | @@ -120,10 +120,10 @@ CFLAGS += -DHAS_SHADOW | 18 | diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux |
| 14 | #LIBS += -lshadow $(LIBS) | 19 | index 4e485a1..44c4193 100644 |
| 15 | endif | 20 | --- a/pppd/Makefile.linux |
| 16 | 21 | +++ b/pppd/Makefile.linux | |
| 17 | -ifneq ($(wildcard /usr/include/crypt.h),) | 22 | @@ -188,10 +188,10 @@ LIBS += -ldl |
| 18 | +#ifneq ($(wildcard /usr/include/crypt.h),) | ||
| 19 | CFLAGS += -DHAVE_CRYPT_H=1 | ||
| 20 | LIBS += -lcrypt | ||
| 21 | -endif | ||
| 22 | +#endif | ||
| 23 | |||
| 24 | ifdef USE_LIBUTIL | ||
| 25 | CFLAGS += -DHAVE_LOGWTMP=1 | ||
| 26 | @@ -177,10 +177,10 @@ LIBS += -ldl | ||
| 27 | endif | 23 | endif |
| 28 | 24 | ||
| 29 | ifdef FILTER | 25 | ifdef FILTER |