From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 13 Nov 2023 11:30:59 +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 1r2UDa-009rC5-11 for lore@lore.pengutronix.de; Mon, 13 Nov 2023 11:30:59 +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 1r2UDa-0006XS-Nq; Mon, 13 Nov 2023 11:30:58 +0100 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1r2UDH-0006XJ-K6 for ptxdist@pengutronix.de; Mon, 13 Nov 2023 11:30:40 +0100 Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-545ed16b137so5912355a12.1 for ; Mon, 13 Nov 2023 02:30:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699871439; x=1700476239; darn=pengutronix.de; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=B7JhNXdmUqKYa6+YRxLoNXCtk9Ypusua9m4b1yr8iVo=; b=AbePA3bkqe3u/l8lJ2Ka90ATczMgSq1vSC6qrbhA5hME5z5sBRm116DXZ3fXbEiJ1j UHbL35ZKNAkjT8tFehqyHOuJAX3dhtoxdt7uUP30QTfDNjY4FVC39TCGnvEhCBd/HTRB M8XpTqy1Kyj3L93zFOswnXsMTmz5V42zhttpNTNIKs9WDUtKCysxedZ4EpsqZhHEGd52 4l0OxMWUeLMovFxWQBUhtG5EKTG+P7dqheFH6nbyaVLbMG5v/2nrdJOBzWvINVTaiuhp X4JVSs4GE2u4DeQjfz11A8f3DfToIVEv1qZEd6ioEJ1i6EYc/quedmhEuwpWp8efgTpq 0l8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699871439; x=1700476239; h=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=B7JhNXdmUqKYa6+YRxLoNXCtk9Ypusua9m4b1yr8iVo=; b=nvTqhkBvsMw9A2oI0lGNzsO0rfwgHrM+3pyDB5zljIQ2qqDPJM14gcmWDq5D92QsKt qjJWgS9Gs6DVLB3k/plXoB49eIsHXTkO6w/4+0lLqalaHbw9o+6DZlTSqH5zl2Dwkwqf bneAGtK+Eh0yNFRiWhktaZU7JL90Kdvyk81r9OjoTLokHyQ5JGM9qpqfQoGFj15BlANu jXHwId9L3btIVlQOISbz0R2ZPeKzAFJmPbVbnnyCbLfQOIpMsU6WIZG9ZYYl66fH0YkV Eb7/csf0ot5AP/F44V+wpP6twKi7n0ds2SHrvggulTM1Pq2mJ3eOaub1wedzGJJABkme Sb9A== X-Gm-Message-State: AOJu0Yyqe8PRNDCm18u+5R6w9kgGodTC1CB6pphjpQFbvhyGehZ3DT8T BoIYaOu+thJpCy+/OEn+B0raL5vtnTY1uKGC55z0TegynGg= X-Google-Smtp-Source: AGHT+IFpIMwh/XkmZJRKbSwrasvw/9tMgirVMLMLLm2f2UBTW6lDPjT0kntNXlM8ESaOCX3b6xk2FdIIoc0ysLdnkI0= X-Received: by 2002:a05:6402:b09:b0:543:cc91:ebe2 with SMTP id bm9-20020a0564020b0900b00543cc91ebe2mr4013156edb.39.1699871438781; Mon, 13 Nov 2023 02:30:38 -0800 (PST) MIME-Version: 1.0 References: <20231107140210.2780010-1-lapeddk@gmail.com> In-Reply-To: From: Lars Pedersen Date: Mon, 13 Nov 2023 11:30:27 +0100 Message-ID: To: Lars Pedersen , ptxdist@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 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. 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. /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 |