From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 17 Nov 2023 10:46:04 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1r3vQJ-00EtMR-33 for lore@lore.pengutronix.de; Fri, 17 Nov 2023 10:46:04 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1r3vQK-00064t-9P; Fri, 17 Nov 2023 10:46:04 +0100 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1r3vQ3-00064A-TX; Fri, 17 Nov 2023 10:45:48 +0100 Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-53dd752685fso2582624a12.3; Fri, 17 Nov 2023 01:45:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700214347; x=1700819147; darn=pengutronix.de; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=4N8m4S1WjUG8wSeFoW15OGb8R/6ssFBDpfOjpMAsGtM=; b=d3VeVgTSMif7zC6xWXpQVbeZmjxO+MuAQPHflrYjQ+iL8cB69ChrxqdqwUs1Gy5fmw MVKfF4gw5xHEpCm2nW2LDLvj1V1Uaa+VE0QMyZnbWLi+B4g73lYsJDnp8RSCVi3h+TYw Qloxtev/ER5jcHJh5ToQH+8jYIRPnJN8rKRCTzuyglRWaDm1CcHZYUGOagr7JUrgrDg6 /yopI3Yq0sShsQ1XRplsiGaJT31l6N/qagAelsH29bh8zySQYoFaEHa8wwlpXwv24zGr lOqpA5Yq5itLw2VGs3+RgNjcsluFs4LPEowzH1RPqwlkqtl9saVYBXV7UfmYXnD+OhHW Qvig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700214347; x=1700819147; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4N8m4S1WjUG8wSeFoW15OGb8R/6ssFBDpfOjpMAsGtM=; b=f9LhxNoM4jj60JwKju2vWVBG0nEbvkul6kgxux+1G17fZgbcIpcjl0cQzD0KXM40hv EXm0DyHVjEf/9kC6UB+egXDDqyKgF6FxvcnvHPdrI8057iBZjNzE1cACuxRcaSJORMv9 iyJM4SBPC3RaQqgWzzCMzp5jTeHtmuf2I8fW78sBX8HJPk5sRkQ1xuLg7aoHWDRaKoOq e9dtYjNGcc8IeSYhTO1e0TQ8wfjuZ4gkDd508S1x8ZQjYOejfWURboZxuZZnMNoOdBwB oaGT2TMW1JOtc86PszHu0ye+HR6O/SQZBewS4xx2LJGhdd7JB0VERW33K/Vy3LJt/jXc SI+w== X-Gm-Message-State: AOJu0YxtVJGk/96AZ9ygHZCcNdKWu1EmGyAzXG5DIFHcuRFfEG8Dqp9H HJOD0DVF8rUSDW6cuGPHqDhyyl5xeDLCZERzX5SUmm9M X-Google-Smtp-Source: AGHT+IHbk9ziUs2YJgo5af5mqUoMPOyDWwKJzwNbgyFvpbGkm+8zbktBj+ihsc9n3kJMZjD9xDaSKggyyVLNZ+I2gjo= X-Received: by 2002:aa7:d555:0:b0:546:d0b7:f4e4 with SMTP id u21-20020aa7d555000000b00546d0b7f4e4mr15123598edr.8.1700214346767; Fri, 17 Nov 2023 01:45:46 -0800 (PST) MIME-Version: 1.0 References: <20231107140210.2780010-1-lapeddk@gmail.com> In-Reply-To: From: Lars Pedersen Date: Fri, 17 Nov 2023 10:45:35 +0100 Message-ID: To: m.olbrich@pengutronix.de Content-Type: text/plain; charset="UTF-8" X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=4.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Subject: Re: [ptxdist] [PATCH 1/2] ppp: patch: Makefile add chap_ms.h into headers X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Hi. On Fri, 17 Nov 2023 at 08:26, Michael Olbrich 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 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 > > > > --- > > > > ...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 > > > > +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 |