From nobody Thu Oct 17 17:28:47 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XTvvg4Hw2z5ZGH6; Thu, 17 Oct 2024 17:29:03 +0000 (UTC) (envelope-from wschnr@googlemail.com) Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XTvvf5Zj4z4DfR; Thu, 17 Oct 2024 17:29:02 +0000 (UTC) (envelope-from wschnr@googlemail.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of wschnr@googlemail.com designates 209.85.218.44 as permitted sender) smtp.mailfrom=wschnr@googlemail.com; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none) Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-a9a1b71d7ffso177302866b.1; Thu, 17 Oct 2024 10:29:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729186140; x=1729790940; 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=QLMMp++J49n7QlKAgFSRdAE5m/c+bgM7I4VQdDc065U=; b=UgOW8IJIMD7apM4jddOUwa5posKUPUSheIYo9EDsu0IXMIJDGYhKr0MP/M+8YzRuiq xljCvA7x/hw8/bKIA/tVavtIoKES2G9GC0yfoy4uQMCVJRRhPs5HY2rGfSBrwGSSA0bG Ru29LKJ6GG5fkPF278kqQp+0A7H3wX4JI0Vjfgy3wAmnoXfbRzdVpTf8nt80NmfTPr+d hIrkf/SyPV8mjt7KY/95zktUAOuwkaY2BxQHZZUsHdK8TKEcFGS618hReuDeQs1S5iNo 1XCob4f6MskBUPpAXh71W0WQaY6NwqQDPij+lwzQwsI1sG4227nqL/aa7Hwf6S+bjJyh +wFA== X-Forwarded-Encrypted: i=1; AJvYcCWq0BuTJNf3c1Sij0hFpci6drST0ykFDjHOngSx37o4X8mcR1f7V+l/sl+CksQPg4SRghxrCMQgF/uzFCaBt2ahrYsLby8=@freebsd.org, AJvYcCXDP+cAjy4nafdFxQ3zdcHMQq396xFxYhqwkYaQ5oF7a6f+3WiFzMbhPfnplAT3HZIpd86jGVrROPM61wahqrkSYRZR@freebsd.org X-Gm-Message-State: AOJu0YybkglD6bCjWx6ssBjgP0F0LdTPXBYIY+1rIyGw7mpbDrgbt/u2 TBptQNFHIarDEd7xMlVI3X/aeiSXg4SNyYgDTiYQfpwlLmcoeVr60TJakVAiEfy8G1EjpiiZooI errTVYTe0pRZgDGsKKeaTn6gJeGVsDlMzaX8= X-Google-Smtp-Source: AGHT+IHJzsRpQzhCoNepWyV473b2WngnjRnX7eppFsUIjEh2sDHD3yJxMHOFZ4tKY/gjInjSZdBHt4hMBPpPSdhtv5k= X-Received: by 2002:a17:906:c10a:b0:a9a:3dc0:8911 with SMTP id a640c23a62f3a-a9a3dc089f9mr539708866b.16.1729186139878; Thu, 17 Oct 2024 10:28:59 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202410122058.49CKwkrP038188@gitrepo.freebsd.org> In-Reply-To: <202410122058.49CKwkrP038188@gitrepo.freebsd.org> From: Wolfram Schneider Date: Thu, 17 Oct 2024 19:28:47 +0200 Message-ID: Subject: Re: git: 1a37caeb076b - main - modules: Add missing opt_*.h files for stand-alone compile To: Warner Losh Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Result: default: False [-1.88 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-0.96)[-0.958]; FORGED_SENDER(0.30)[wosch@freebsd.org,wschnr@googlemail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; NEURAL_HAM_SHORT(-0.02)[-0.021]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; RCVD_COUNT_ONE(0.00)[1]; TO_DN_SOME(0.00)[]; FREEMAIL_ENVFROM(0.00)[googlemail.com]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; MISSING_XM_UA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[wosch@freebsd.org,wschnr@googlemail.com]; FROM_HAS_DN(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.218.44:from]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RCVD_TLS_LAST(0.00)[]; R_DKIM_NA(0.00)[]; RCPT_COUNT_THREE(0.00)[4] X-Rspamd-Queue-Id: 4XTvvf5Zj4z4DfR X-Spamd-Bar: - On Sat, 12 Oct 2024 at 22:58, Warner Losh wrote: > > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=1a37caeb076b9d31e13c54691d7f1eeb589798bb > > commit 1a37caeb076b9d31e13c54691d7f1eeb589798bb > Author: Warner Losh > AuthorDate: 2024-10-12 20:40:41 +0000 > Commit: Warner Losh > CommitDate: 2024-10-12 20:40:41 +0000 > > modules: Add missing opt_*.h files for stand-alone compile > > Standalone compile that we at least create these opt_*.h files. > > Sponsored by: Netflix > --- > sys/modules/linux/Makefile | 2 ++ > sys/modules/linux64/Makefile | 5 ++++- > 2 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile > index eb4e17ec706b..36dfbbe2192f 100644 > --- a/sys/modules/linux/Makefile > +++ b/sys/modules/linux/Makefile > @@ -33,6 +33,7 @@ SRCS= linux${SFX}_dummy_machdep.c \ > linux_uid16.c \ > linux_vdso.c \ > linux_xattr.c \ > + opt_compat.h \ > opt_inet.h \ > opt_inet6.h \ > opt_ktrace.h \ > @@ -41,6 +42,7 @@ SRCS= linux${SFX}_dummy_machdep.c \ > bus_if.h \ > device_if.h \ > vnode_if.h > + > .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" > SRCS+= linux_dummy_x86.c > VDSODEPS=linux_vdso_gettc_x86.inc > diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile > index b23891a65a4f..119d90126ab3 100644 > --- a/sys/modules/linux64/Makefile > +++ b/sys/modules/linux64/Makefile > @@ -28,14 +28,17 @@ SRCS= linux_dummy_machdep.c \ > linux_vdso.c \ > linux_timer.c \ > linux_xattr.c \ > - opt_ktrace.h \ > + opt_compat.h \ > opt_inet6.h \ > + opt_ktrace.h \ > opt_posix.h \ > + opt_usb.h \ > bus_if.h \ > device_if.h \ > vnode_if.h \ > linux_support.S \ > linux_vdso_inc.S > + > .if ${MACHINE_CPUARCH} == "amd64" > SRCS+= linux_dummy_x86.c > .endif After this commit I get stale symlinks in /usr/obj make -j$(nproc) buildworld > log.buildworld 2>&1; make -j$(nproc) buildkernel >& log.buildkernel; ./tools/build/stale-symlink-buildworld.sh amd64: stale symlink detected: lrwxrwxr-x 1 wosch wheel 95 Oct 17 17:00 /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/amd64.amd64/sys/GENERIC/modules/home/wosch/projects/freebsd-src/sys/modules/linux/opt_compat.h -> /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/amd64.amd64/sys/GENERIC/opt_compat.h stale symlink detected: lrwxrwxr-x 1 wosch wheel 95 Oct 17 17:00 /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/amd64.amd64/sys/GENERIC/modules/home/wosch/projects/freebsd-src/sys/modules/linux64/opt_compat.h -> /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/amd64.amd64/sys/GENERIC/opt_compat.h arm64: stale symlink detected: lrwxr-xr-x 1 root wheel 73 Oct 17 17:18 /usr/obj/home/projects/freebsd-src/arm64.aarch64/sys/GENERIC/modules/home/projects/freebsd-src/sys/modules/linux64/opt_compat.h -> /usr/obj/home/projects/freebsd-src/arm64.aarch64/sys/GENERIC/opt_compat.h see also PR: 276235 -Wolfram -- Wolfram Schneider https://wolfram.schneider.org