maple/prplos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prplOS: target: remove ppp and ppp-mod-pppoe from default packages

Browse Source 
We’ve got bug reports, that the new mod-ppp-daemon-v0.5.4 fails to build:

 x86_64-openwrt-linux-musl-gcc -Os <snip>
 In file included from ppp.c:70:
   prplos/staging_dir/target-x86_64_musl/usr/include/pppd/pppd.h:60:10: fatal error: net/ppp_defs.h: No such file or directory
     60 | #include <net/ppp_defs.h>
        |          ^~~~~~~~~~~~~~~~

The problem is that we now have two ppp packages with
different/conflicting staging dir content, `ppp` and `ppp-prpl`, both are
being compiled now, but just `ppp-prpl` ends in the final image.

This can result likely in the following build race:

 Working case:

    ppp               (installs incompatible pppd.h header)
    |
    `ppp-prpl         (installs compatible pppd.h header)
     |
     `mod-ppp-daemon  (builds fine)

 Broken case:

    ppp-prpl          (installs compatible header)
    |
    `ppp              (installs incompatible header)
     |
     `mod-ppp-daemon  (build fails)

So workaround it for now by removing `ppp` and `ppp-mod-pppoe` from
default packages, as we clearly can't have two packages for `ppp` in the
system.

Fixes: PCF-979
Signed-off-by: Petr Štetiar <ynezz@true.cz>
(cherry picked from commit 251911e39aa471b3047c3c2db67b0044c370e772)
This commit is contained in:
Petr Štetiar 2023-10-03 18:37:11 +00:00 committed by Petr Štetiar
parent 3e81b415ce
commit a916e98685
No known key found for this signature in database
GPG Key ID: 58EE120F30CC02D3
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/target.mk
View File

@ -55,9 +55,7 @@ DEFAULT_PACKAGES.router:=\
nftables \
kmod-nft-offload \
odhcp6c \
odhcpd-ipv6only \
ppp \
ppp-mod-pppoe
odhcpd-ipv6only
ifneq ($(DUMP),)
all: dumpinfo