Charlie Li wrote:
Kristof Provost wrote:
The branch main has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=e51be99e8ad021923e74c9a9e1b87c2c2309b561

commit e51be99e8ad021923e74c9a9e1b87c2c2309b561
Author:     Kristof Provost <[email protected]>
AuthorDate: 2021-12-16 08:55:11 +0000
Commit:     Kristof Provost <[email protected]>
CommitDate: 2021-12-17 11:38:36 +0000

     test-includes: update badfiles.inc
     Rebuild badfiles.inc after recent fixes.
     Sponsored by:   Rubicon Communications, LLC ("Netgate")
     Differential Revision:  https://reviews.freebsd.org/D33506
---
  tools/build/test-includes/badfiles.inc | 15 ---------------
  1 file changed, 15 deletions(-)

diff --git a/tools/build/test-includes/badfiles.inc b/tools/build/test-includes/badfiles.inc
index afc0c1c5394d..70061ae0b2b2 100644
--- a/tools/build/test-includes/badfiles.inc
+++ b/tools/build/test-includes/badfiles.inc
@@ -168,10 +158,6 @@ BADHDRS= \
      net/if_llc.h \
      net/if_media.h \
      net/if_mib.h \
-    net/if_pflog.h \
-    net/if_pfsync.h \
-    net/if_sppp.h \
-    net/if_stf.h \
      net/if_tap.h \
      net/if_tun.h \
      net/if_var.h \

This breaks building poudriere jails at least:

--- net/if_sppp.o --- [17058/25345]
In file included from net/if_sppp.c:1:
/usr/obj/usr/local/poudriere/jails/current/usr/src/amd64.amd64/tmp/usr/include/net/if_sppp.h:29:2: error: unknown type name 'u_long'
; did you mean 'long'?
         u_long  opts;           /* LCP options to send (bitfield) */
         ^
/usr/obj/usr/local/poudriere/jails/current/usr/src/amd64.amd64/tmp/usr/include/net/if_sppp.h:30:2: error: unknown type name 'u_long'
; did you mean 'long'?
         u_long  magic;          /* local magic number */
         ^
/usr/obj/usr/local/poudriere/jails/current/usr/src/amd64.amd64/tmp/usr/include/net/if_sppp.h:31:2: error: unknown type name 'u_long'
; did you mean 'long'?
         u_long  mru;            /* our max receive unit */
         ^
/usr/obj/usr/local/poudriere/jails/current/usr/src/amd64.amd64/tmp/usr/include/net/if_sppp.h:32:2: error: unknown type name 'u_long'
; did you mean 'long'?
         u_long  their_mru;      /* their max receive unit */
         ^
/usr/obj/usr/local/poudriere/jails/current/usr/src/amd64.amd64/tmp/usr/include/net/if_sppp.h:33:2: error: unknown type name 'u_long'
; did you mean 'long'?
         u_long  protos;         /* bitmask of protos that are started */
         ^
/usr/obj/usr/local/poudriere/jails/current/usr/src/amd64.amd64/tmp/usr/include/net/if_sppp.h:34:2: error: unknown type name 'u_char'
; did you mean 'char'?
         u_char  echoid;         /* id of last keepalive echo request */
         ^
/usr/obj/usr/local/poudriere/jails/current/usr/src/amd64.amd64/tmp/usr/include/net/if_sppp.h:46:2: error: unknown type name 'u_long'
; did you mean 'long'?
         u_long  opts;           /* IPCP options to send (bitfield) */
         ^
/usr/obj/usr/local/poudriere/jails/current/usr/src/amd64.amd64/tmp/usr/include/net/if_sppp.h:47:2: error: unknown type name 'u_int'
         u_int   flags;
         ^
/usr/obj/usr/local/poudriere/jails/current/usr/src/amd64.amd64/tmp/usr/include/net/if_sppp.h:64:2: error: unknown type name 'u_short
'; did you mean 'short'?
        u_short proto;                  /* authentication protocol to use */
         ^
/usr/obj/usr/local/poudriere/jails/current/usr/src/amd64.amd64/tmp/usr/include/net/if_sppp.h:65:2: error: unknown type name 'u_short
'; did you mean 'short'?
         u_short flags;
         ^
/usr/obj/usr/local/poudriere/jails/current/usr/src/amd64.amd64/tmp/usr/include/net/if_sppp.h:69:2: error: unknown type name 'u_char'
; did you mean 'char'?
         u_char  name[AUTHNAMELEN];      /* system identification name */
         ^
/usr/obj/usr/local/poudriere/jails/current/usr/src/amd64.amd64/tmp/usr/include/net/if_sppp.h:70:2: error: unknown type name 'u_char'
; did you mean 'char'?
         u_char  secret[AUTHKEYLEN];     /* secret password */
         ^
/usr/obj/usr/local/poudriere/jails/current/usr/src/amd64.amd64/tmp/usr/include/net/if_sppp.h:71:2: error: unknown type name 'u_char'
; did you mean 'char'?
         u_char  challenge[AUTHKEYLEN];  /* random challenge */
         ^
13 errors generated.
Building /usr/obj/usr/local/poudriere/jails/current/usr/src/amd64.amd64/tools/build/test-includes/net80211/ieee80211_wps.o
*** [net/if_sppp.o] Error code 1

make[3]: stopped in /usr/local/poudriere/jails/current/usr/src/tools/build/test-includes

net/if_sppp.h isn't even in the tree anymore afaict. Further, this happens even with a clean objdir.

Looks like this is an error on poudriere-jail(8)'s part when copying from an existing src tree (that does not contain net/if_sppp.h). Removing the jail's tree then letting poudriere-jail(8) copy it again allows the build to continue. Apologies for the noise.

--
Charlie Li
…nope, still don't have an exit line.

Attachment: OpenPGP_signature
Description: OpenPGP digital signature

Reply via email to