mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
rp-pppoe: upgrade 3.14 -> 3.15
dont-swallow-errors.patch configure.in-Error-fix.patch removed since they're not available in 3.14. configure_in_cross.patch refreshed for 3.14. Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Wang Mingyu
Khem Raj
@@ -1,57 +0,0 @@
|
||||
From bdd20b7a584a20504dfabb409a41ee2b9ae41657 Mon Sep 17 00:00:00 2001
|
||||
From: Lei Maohui <leimaohui@cn.fujitsu.com>
|
||||
Date: Wed, 19 Aug 2015 13:52:57 +0900
|
||||
Subject: [PATCH] configure.in: Error fix.
|
||||
|
||||
the error is: conftest.c:9:28: fatal error: ac_nonexistent.h:
|
||||
No such file or directory #include <ac_nonexistent.h>
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
|
||||
|
||||
---
|
||||
src/configure.in | 30 ------------------------------
|
||||
1 file changed, 30 deletions(-)
|
||||
|
||||
diff --git a/src/configure.in b/src/configure.in
|
||||
index 1714e69..cae0976 100644
|
||||
--- a/src/configure.in
|
||||
+++ b/src/configure.in
|
||||
@@ -195,36 +195,6 @@ if test "$GCC" = yes; then
|
||||
CFLAGS="$CFLAGS -fno-strict-aliasing -Wall -Wstrict-prototypes"
|
||||
fi
|
||||
|
||||
-dnl Figure out packing order of structures
|
||||
-AC_CACHE_CHECK([packing order of bit fields],rpppoe_cv_pack_bitfields,[
|
||||
-if test "${rpppoe_cv_pack_bitfields+set}" != set ; then
|
||||
-AC_TRY_RUN([
|
||||
-union foo {
|
||||
- struct bar {
|
||||
- unsigned int ver:4;
|
||||
- unsigned int type:4;
|
||||
- } bb;
|
||||
- unsigned char baz;
|
||||
-};
|
||||
-
|
||||
-int
|
||||
-main(void)
|
||||
-{
|
||||
- union foo x;
|
||||
- x.bb.ver = 1;
|
||||
- x.bb.type = 2;
|
||||
- if (x.baz == 0x21) {
|
||||
- return 1;
|
||||
- } else if (x.baz == 0x12) {
|
||||
- return 0;
|
||||
- } else {
|
||||
- return 2;
|
||||
- }
|
||||
-}], rpppoe_cv_pack_bitfields=normal, rpppoe_cv_pack_bitfields=rev,
|
||||
-$ECHO "no defaults for cross-compiling"; exit 1)
|
||||
-fi
|
||||
-])
|
||||
-
|
||||
if test "$rpppoe_cv_pack_bitfields" = "rev" ; then
|
||||
AC_MSG_RESULT(reversed)
|
||||
AC_DEFINE([PACK_BITFIELDS_REVERSED], [], [Reversed bitfields])
|
||||
@@ -8,13 +8,12 @@ a few target paths, reworks a few tests to be more friendly for cross
|
||||
and drops other tests.
|
||||
|
||||
Upstream-Status: Inappropriate [build system specific changes]
|
||||
|
||||
---
|
||||
src/configure.in | 66 ++++++++++++++------------------------------------------
|
||||
1 file changed, 16 insertions(+), 50 deletions(-)
|
||||
src/configure.in | 62 ++++++++++--------------------------------------
|
||||
1 file changed, 12 insertions(+), 50 deletions(-)
|
||||
|
||||
diff --git a/src/configure.in b/src/configure.in
|
||||
index 90a07df..1d30243 100644
|
||||
index 4add50c..9dff457 100644
|
||||
--- a/src/configure.in
|
||||
+++ b/src/configure.in
|
||||
@@ -5,6 +5,13 @@ AC_INIT(pppoe.c)
|
||||
@@ -67,13 +66,15 @@ index 90a07df..1d30243 100644
|
||||
fi
|
||||
|
||||
AC_SUBST(LINUX_KERNELMODE_PLUGIN)
|
||||
@@ -142,15 +149,8 @@ AC_CHECK_SIZEOF(unsigned short)
|
||||
@@ -142,17 +149,8 @@ AC_CHECK_SIZEOF(unsigned short)
|
||||
AC_CHECK_SIZEOF(unsigned int)
|
||||
AC_CHECK_SIZEOF(unsigned long)
|
||||
|
||||
-dnl Check for location of ip
|
||||
-AC_PATH_PROG(IP, ip, NOTFOUND, $PATH:/bin:/sbin:/usr/bin:/usr/sbin)
|
||||
-
|
||||
-dnl Check for location of pppd
|
||||
-AC_PATH_PROG(PPPD, pppd, NOTFOUND, $PATH:/sbin:/usr/sbin:/usr/local/sbin)
|
||||
-AC_PATH_PROG(ECHO, echo, echo)
|
||||
-
|
||||
-dnl Check for setsid (probably Linux-specific)
|
||||
-AC_PATH_PROG(SETSID, setsid, "", $PATH:/sbin:/usr/sbin:/usr/local/sbin)
|
||||
@@ -84,7 +85,7 @@ index 90a07df..1d30243 100644
|
||||
|
||||
dnl Check for Linux-specific kernel support for PPPoE
|
||||
AC_MSG_CHECKING(for Linux 2.4.X kernel-mode PPPoE support)
|
||||
@@ -195,44 +195,8 @@ if test "$GCC" = yes; then
|
||||
@@ -195,42 +193,6 @@ if test "$GCC" = yes; then
|
||||
CFLAGS="$CFLAGS -fno-strict-aliasing -Wall -Wstrict-prototypes"
|
||||
fi
|
||||
|
||||
@@ -124,30 +125,9 @@ index 90a07df..1d30243 100644
|
||||
- ;;
|
||||
-esac
|
||||
-
|
||||
dnl Figure out packing order of structures
|
||||
-AC_MSG_CHECKING([packing order of bit fields])
|
||||
+AC_CACHE_CHECK([packing order of bit fields],rpppoe_cv_pack_bitfields,[
|
||||
if test "${rpppoe_cv_pack_bitfields+set}" != set ; then
|
||||
AC_TRY_RUN([
|
||||
union foo {
|
||||
@@ -259,10 +223,11 @@ main(void)
|
||||
}], rpppoe_cv_pack_bitfields=normal, rpppoe_cv_pack_bitfields=rev,
|
||||
$ECHO "no defaults for cross-compiling"; exit 0)
|
||||
fi
|
||||
+])
|
||||
|
||||
if test "$rpppoe_cv_pack_bitfields" = "rev" ; then
|
||||
AC_MSG_RESULT(reversed)
|
||||
- AC_DEFINE(PACK_BITFIELDS_REVERSED)
|
||||
+ AC_DEFINE([PACK_BITFIELDS_REVERSED], [], [Reversed bitfields])
|
||||
else
|
||||
AC_MSG_RESULT(normal)
|
||||
fi
|
||||
@@ -326,6 +291,7 @@ AC_SUBST(PPPOE_SERVER_DEPS)
|
||||
AC_SUBST(RDYNAMIC)
|
||||
AC_SUBST(LIBEVENT)
|
||||
AC_SUBST(ECHO)
|
||||
+AC_SUBST(HAVE_STRUCT_SOCKADDR_LL)
|
||||
AC_SUBST(LDFLAGS)
|
||||
|
||||
datadir_evaluated=`eval echo $datadir`
|
||||
# Sigh... got to fix this up for tcl
|
||||
test "x$prefix" = xNONE && prefix=$ac_default_prefix
|
||||
# Let make expand exec_prefix.
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
From a9a7322273c51882af58c35ba288a0fae00ba841 Mon Sep 17 00:00:00 2001
|
||||
From: Lei Maohui <leimaohui@cn.fujitsu.com>
|
||||
Date: Wed, 19 Aug 2015 12:33:41 +0900
|
||||
Subject: [PATCH] don't swallow errors
|
||||
|
||||
Further fixup to the configure scripts to not swallow errors
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
---
|
||||
src/configure.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/configure.in b/src/configure.in
|
||||
index 1d30243..1714e69 100644
|
||||
--- a/src/configure.in
|
||||
+++ b/src/configure.in
|
||||
@@ -221,7 +221,7 @@ main(void)
|
||||
return 2;
|
||||
}
|
||||
}], rpppoe_cv_pack_bitfields=normal, rpppoe_cv_pack_bitfields=rev,
|
||||
-$ECHO "no defaults for cross-compiling"; exit 0)
|
||||
+$ECHO "no defaults for cross-compiling"; exit 1)
|
||||
fi
|
||||
])
|
||||
|
||||
+2
-5
@@ -4,25 +4,22 @@ SECTION = "net"
|
||||
LICENSE = "GPL-2.0-only"
|
||||
LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=a194eaefae2be54ee3221339b10d0581"
|
||||
|
||||
PR = "r10"
|
||||
PR = "r11"
|
||||
|
||||
SRC_URI = "https://dianne.skoll.ca/projects/rp-pppoe/download/rp-pppoe-${PV}.tar.gz \
|
||||
file://top-autoconf.patch \
|
||||
file://configure_in_cross.patch \
|
||||
file://update-config.patch \
|
||||
file://dont-swallow-errors.patch \
|
||||
file://discard-use-of-dnl-in-Makefile.am.patch \
|
||||
file://configure.patch \
|
||||
file://pppoe-server.default \
|
||||
file://pppoe-server.init \
|
||||
file://configure.in-Error-fix.patch \
|
||||
file://pppoe-server.service \
|
||||
file://0001-ppoe-Dont-include-linux-if_ether.h.patch \
|
||||
file://0002-Enable-support-for-the-kernel-module.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "ec9dccd9a367a1f71f2dc81069796dd8"
|
||||
SRC_URI[sha256sum] = "8cd6bc71ba46bd5f6eb4daf60220ccdcd991a8525111dee466501b1b9717e676"
|
||||
SRC_URI[sha256sum] = "b1f318bc7e4e5b0fd8a8e23e8803f5e6e43165245a5a10a7162a92a6cf17829a"
|
||||
|
||||
inherit autotools-brokensep update-rc.d systemd
|
||||
|
||||
Reference in New Issue
Block a user