From: Lars Pedersen <lapeddk@gmail.com>
To: m.olbrich@pengutronix.de
Cc: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH 1/2] ppp: patch: Makefile add chap_ms.h into headers
Date: Fri, 17 Nov 2023 10:45:35 +0100 [thread overview]
Message-ID: <CAKd8=GtXy8aQUzQN_9UPQi_y3qV0_-OzyRZ2udgsYQVQ+thFuw@mail.gmail.com> (raw)
In-Reply-To: <ZVcVs1GYjaJXQo3t@pengutronix.de>
Hi.
On Fri, 17 Nov 2023 at 08:26, Michael Olbrich <m.olbrich@pengutronix.de> wrote:
>
> On Mon, Nov 13, 2023 at 11:30:27AM +0100, Lars Pedersen wrote:
> > Hi. Thanks for the review.
> >
> > On Sat, 11 Nov 2023 at 07:09, Michael Olbrich <m.olbrich@pengutronix.de> wrote:
> > >
> > > On Tue, Nov 07, 2023 at 03:02:09PM +0100, Lars Pedersen wrote:
> > > > Patch to fix compile error in NetworkManager pppd part:
> > > >
> > > > nm-pppd-compat.c:50:10: fatal error: pppd/chap_ms.h: No such file or
> > > > directory
> > >
> > > No. This file is installed with PTXCONF_PPP_MS_CHAP=y. NetworkManager needs
> > > to select that.
> > >
> > > Michael
> > I have tried to select PTXCONF_PPP_MS_CHAP in NetworkManager, but it
> > still fails to build with the same error.
> >
> > In pppd/Makefile.linux I can see that the header file should be added,
> > but it doesn't seems to be the case when the header files is installed
> > (make install-devel).
> >
> > ifdef CHAPMS
> > CFLAGS += -DCHAPMS=1
> > NEEDDES=y
> > PPPDOBJS += chap_ms.o
> > HEADERS += chap_ms.h
> > ifdef MSLANMAN
> > CFLAGS += -DMSLANMAN=1
> > endif
> > ifdef MPPE
> > CFLAGS += -DMPPE=1
> > HEADERS += mppe.h
> > endif
> > endif
> >
> > ...
> > /ptxdist/platform-tqma7/build-target/ppp-2.4.9/pppd/plugins/radius'
> > arm-v7a-linux-gnueabihf-gcc -O2 -g -pipe -I. -I../..
> > -I../../../include -fPIC -DRC_LOG_FACILITY=LOG_DAEMON -DCHAPMS=1
> > -DMPPE=1 -DMAXOCTETS=1 -c -o radius.o radius.c
> > ...
> > cd pppd; make -w -j1 install-devel
> > make[1]: Entering directory 'ptxdist/platform-tqma7/build-target/ppp-2.4.9/pppd'
> > mkdir -p ptxdist/platform-tqma7/packages/ppp-2.4.9/usr/include/pppd
> > install -c -m 644 ccp.h session.h chap-new.h ecp.h fsm.h ipcp.h
> > ipxcp.h lcp.h magic.h patchlevel.h pathnames.h pppd.h upap.h eap.h
> > eap-tls.h ipv6cp.h eui64.h
> > /ptxdist/platform-tqma7/packages/ppp-2.4.9/usr/include/pppd
> >
> > So maybe I should just spend my time on updating ppp to 2.5.0, which
> > got a major update on the buildsystem.
>
> So I'm not sure what exactly happens, but I tried to apply your patch and
> install failed in by test BSP where all PPP_* sub-options are enabled
> because the file was specified twice.
> So some combination of options causes ppp to actually install chap_ms.h.
> Maybe some other options needs to be selected as well?
> Or rather PPP_MS_CHAP needs to select something. Because it looks to me
> that chap_ms.c is only compiled when chap_ms.h is installed. At least
> that's what the Makefile section you posted above suggests.
>
> Michael
I decided to try update the ppp to 2.5.0 instead. The current
NetworkManager version doesn't work with ppp 2.5.0 so it will be a new
patch series that updates both.
//Lars Pedersen
>
> > > > Signed-off-by: Lars Pedersen <lapeddk@gmail.com>
> > > > ---
> > > > ...02-makefile-add-chap_ms-into-headers.patch | 25 +++++++++++++++++++
> > > > patches/ppp-2.4.9/series | 1 +
> > > > 2 files changed, 26 insertions(+)
> > > > create mode 100644 patches/ppp-2.4.9/0202-makefile-add-chap_ms-into-headers.patch
> > > >
> > > > diff --git a/patches/ppp-2.4.9/0202-makefile-add-chap_ms-into-headers.patch b/patches/ppp-2.4.9/0202-makefile-add-chap_ms-into-headers.patch
> > > > new file mode 100644
> > > > index 000000000..bd05aafff
> > > > --- /dev/null
> > > > +++ b/patches/ppp-2.4.9/0202-makefile-add-chap_ms-into-headers.patch
> > > > @@ -0,0 +1,25 @@
> > > > +From 2ea8d8a07be3af9693eed1f1bf867f499c61a762 Mon Sep 17 00:00:00 2001
> > > > +From: Lars Pedersen <lapeddk@gmail.com>
> > > > +Date: Sat, 4 Nov 2023 13:49:08 +0000
> > > > +Subject: [PATCH 1/1] Add chap_ms.h header
> > > > +
> > > > +---
> > > > + pppd/Makefile.linux | 2 +-
> > > > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > > > +
> > > > +diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
> > > > +index 9b0119463c1f..ae2a1d80192d 100644
> > > > +--- a/pppd/Makefile.linux
> > > > ++++ b/pppd/Makefile.linux
> > > > +@@ -21,7 +21,7 @@ PPPDSRCS = main.c magic.c fsm.c lcp.c ipcp.c upap.c chap-new.c ccp.c \
> > > > +
> > > > + HEADERS = ccp.h session.h chap-new.h ecp.h fsm.h ipcp.h \
> > > > + ipxcp.h lcp.h magic.h patchlevel.h pathnames.h pppd.h \
> > > > +- upap.h eap.h
> > > > ++ upap.h eap.h chap_ms.h
> > > > +
> > > > + MANPAGES = pppd.8
> > > > + PPPDOBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap-new.o ccp.o \
> > > > +--
> > > > +2.41.0
> > > > +
> > > > diff --git a/patches/ppp-2.4.9/series b/patches/ppp-2.4.9/series
> > > > index 4028f0892..7655fc9f7 100644
> > > > --- a/patches/ppp-2.4.9/series
> > > > +++ b/patches/ppp-2.4.9/series
> > > > @@ -14,4 +14,5 @@
> > > > #tag:ptx --start-number 200
> > > > 0200-pppd-make-makefile-sysroot-aware.patch
> > > > 0201-pppd-make-the-self-made-configure-cross-aware.patch
> > > > +0202-makefile-add-chap_ms-into-headers.patch
> > > > # 9c9016a8956cf8c0dc84ee8dbe803cf3 - git-ptx-patches magic
> > > > --
> > > > 2.41.0
> > > >
> > > >
> > > >
> > >
> > > --
> > > Pengutronix e.K. | |
> > > Steuerwalder Str. 21 | http://www.pengutronix.de/ |
> > > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> > > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
> >
> >
>
> --
> Pengutronix e.K. | |
> Steuerwalder Str. 21 | http://www.pengutronix.de/ |
> 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
prev parent reply other threads:[~2023-11-17 9:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-07 14:02 Lars Pedersen
2023-11-07 14:02 ` [ptxdist] [PATCH 2/2] networkmanager: Version bump 1.30.4 to 1.44.2 Lars Pedersen
2023-11-11 6:09 ` [ptxdist] [PATCH 1/2] ppp: patch: Makefile add chap_ms.h into headers Michael Olbrich
2023-11-13 10:30 ` Lars Pedersen
2023-11-17 7:26 ` Michael Olbrich
2023-11-17 9:45 ` Lars Pedersen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAKd8=GtXy8aQUzQN_9UPQi_y3qV0_-OzyRZ2udgsYQVQ+thFuw@mail.gmail.com' \
--to=lapeddk@gmail.com \
--cc=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox