From nobody Thu Dec 7 02:35:50 2023 X-Original-To: dev-commits-src-all@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 4Slz0R06v0z53QdV; Thu, 7 Dec 2023 02:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slz0Q6Y9Zz4dG4; Thu, 7 Dec 2023 02:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701916550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PG2cv+bxcAgn3xF8EK96gsEPeIOuiKiDuSl7AqTXTeU=; b=CiQKzzuIwx5e3FdB77QFJBPYdyUzWEtinQWnvz2LELpYkZ+JzwAUsHSRyCGPY6VyNUwQQ6 GYCY4zddWdfo22VRrSr0SXxgnaiZaHsewzFhCzZCkWCjU3KIM+nl8fc7zt7fyl/9b0koJ8 S1GRWX7541k1Xwb9JVJL0xLJhIgzrMhS7Z83gHHNDQtuq0kB8pCpVkbr8K14tQabMIh/95 Rd6SmS7yNWbM666E15gTw/izu2yxY/6VD9hxBNh3pzCeNB6sMZBhONIeix1SvYdX7WL7er OFpBtBaiP8t3rF9Vdoq5gFKXC33AAphDfa2cPPswix8LnqUX/R3zyUlvkZXPtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701916550; a=rsa-sha256; cv=none; b=G7naGCPZZj5NjtqG6/cC8tX2Ybfrbd6Bx4SPQOcrZXvcXPDqBELAKrLZFvaefv1T6u7o9E g7GVSobcNdaEkMiSpvf5cTz3npJxo0Tez91t4IR0Q9C/7TOxilVN/KKRICd0as5C49CZfe dcNGQbRluI7Mvu/MpR09HlxPhnkl9qo+PQhqPCoJuwRJEbnu2Xva/e2bJlm6x+PTI4RpRc yvPrW4rhICcAjLJPx7MfZeCHNvIeLWuoLRrKwK6GhD8bU2E8CYxMw81aSSulerbzaKvjVK 3Z0RVLF9uNSHhnDHTjSj5Kl8p/zOoBJJKIJqxSp5xcFiHixCqjiX+4IJTtr3Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701916550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PG2cv+bxcAgn3xF8EK96gsEPeIOuiKiDuSl7AqTXTeU=; b=Q9XaS9xQQdNpZJeubPCZ7hd408RODJCTNipKOjK5IbsAjkRzm/DZlYbxmH+8ngvrzhHy8B inVCAdL1FjvsDFau8XZTS/VfcTzEJ36bgPGMU9p1oxRAsA4dJEU22VelMNwqAxPO/6iWON u8s+B72UoL60EHdMH0aJN86Or4hb60wRBWkASkFfe0fL8JvRbuJNCDfTIW5ib15srDJDRl 9/THiT9+vze8lfLw0lQ3wOgzNJudRqSJso1A4iqqd6GehGzCCWYVDoRIuA0EtQb7Ursc+6 Sp7bD6H6Q5KA2indFKc6OmiaUgMQb4nNS8D0HxoMz25ZAIBrG/1QQajBUmFLIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Slz0Q5bN4z45N; Thu, 7 Dec 2023 02:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B72Zojv043064; Thu, 7 Dec 2023 02:35:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B72ZoZp043061; Thu, 7 Dec 2023 02:35:50 GMT (envelope-from git) Date: Thu, 7 Dec 2023 02:35:50 GMT Message-Id: <202312070235.3B72ZoZp043061@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 83d0b8c089d8 - main - bsdinstall generate opt_osname.h in include List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83d0b8c089d807d6d4c50cba40ae2d0fedb3bf1b Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=83d0b8c089d807d6d4c50cba40ae2d0fedb3bf1b commit 83d0b8c089d807d6d4c50cba40ae2d0fedb3bf1b Author: Simon J. Gerraty AuthorDate: 2023-12-07 02:34:52 +0000 Commit: Simon J. Gerraty CommitDate: 2023-12-07 02:34:52 +0000 bsdinstall generate opt_osname.h in include This allows the subdirs that do more work to run in parallel Reviewed by: jrtc27 Differential Revision: https://reviews.freebsd.org/D42947 --- usr.sbin/bsdinstall/Makefile | 7 ++++--- usr.sbin/bsdinstall/Makefile.depend | 12 +++++++----- usr.sbin/bsdinstall/Makefile.inc | 3 +++ usr.sbin/bsdinstall/distextract/Makefile | 9 --------- usr.sbin/bsdinstall/distextract/Makefile.depend | 1 + usr.sbin/bsdinstall/distfetch/Makefile | 1 - usr.sbin/bsdinstall/distfetch/Makefile.depend | 2 +- usr.sbin/bsdinstall/include/Makefile | 13 +++++++++++++ usr.sbin/bsdinstall/include/Makefile.depend | 10 ++++++++++ usr.sbin/bsdinstall/partedit/Makefile | 1 - usr.sbin/bsdinstall/partedit/Makefile.depend | 2 +- 11 files changed, 40 insertions(+), 21 deletions(-) diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile index bbf8071a91c3..422bdcaaa77a 100644 --- a/usr.sbin/bsdinstall/Makefile +++ b/usr.sbin/bsdinstall/Makefile @@ -1,9 +1,9 @@ -OSNAME?= FreeBSD SUBDIR= distextract distfetch partedit runconsoles scripts SUBDIR_PARALLEL= -SUBDIR_DEPEND_distfetch = distextract -SUBDIR_DEPEND_partedit = distextract +SUBDIR_DEPEND_distextract = include +SUBDIR_DEPEND_distfetch = include +SUBDIR_DEPEND_partedit = include SCRIPTS= bsdinstall MAN= bsdinstall.8 PACKAGE= bsdinstall @@ -11,5 +11,6 @@ PACKAGE= bsdinstall SCRIPTS+= startbsdinstall SCRIPTSDIR_startbsdinstall= ${LIBEXECDIR}/bsdinstall +UPDATE_DEPENDFILE= no .include diff --git a/usr.sbin/bsdinstall/Makefile.depend b/usr.sbin/bsdinstall/Makefile.depend index 11aba52f82cf..6ce3965b1642 100644 --- a/usr.sbin/bsdinstall/Makefile.depend +++ b/usr.sbin/bsdinstall/Makefile.depend @@ -1,10 +1,12 @@ -# Autogenerated - do NOT edit! +# Not autogenerated - take care DIRDEPS = \ + usr.sbin/bsdinstall/distextract \ + usr.sbin/bsdinstall/distfetch \ + usr.sbin/bsdinstall/include \ + usr.sbin/bsdinstall/partedit \ + usr.sbin/bsdinstall/runconsoles \ + usr.sbin/bsdinstall/scripts \ .include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/usr.sbin/bsdinstall/Makefile.inc b/usr.sbin/bsdinstall/Makefile.inc index dc4e35b73799..c0907ffac469 100644 --- a/usr.sbin/bsdinstall/Makefile.inc +++ b/usr.sbin/bsdinstall/Makefile.inc @@ -1 +1,4 @@ PACKAGE=bsdinstall + +CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/../include + diff --git a/usr.sbin/bsdinstall/distextract/Makefile b/usr.sbin/bsdinstall/distextract/Makefile index 368e1b1378ab..6813c9a79391 100644 --- a/usr.sbin/bsdinstall/distextract/Makefile +++ b/usr.sbin/bsdinstall/distextract/Makefile @@ -1,18 +1,9 @@ BINDIR= ${LIBEXECDIR}/bsdinstall PROG= distextract -CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib -I. LIBADD= archive bsddialog m SRCS= distextract.c MAN= -GENHDRS= opt_osname.h -SRCS+= ${GENHDRS} -CLEANFILES+= ${GENHDRS} - -opt_osname.h: .PHONY - if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET}; then \ - echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \ - fi .include diff --git a/usr.sbin/bsdinstall/distextract/Makefile.depend b/usr.sbin/bsdinstall/distextract/Makefile.depend index 10731d6ccb01..dd87c979eb80 100644 --- a/usr.sbin/bsdinstall/distextract/Makefile.depend +++ b/usr.sbin/bsdinstall/distextract/Makefile.depend @@ -9,6 +9,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/msun \ + usr.sbin/bsdinstall/include \ .include diff --git a/usr.sbin/bsdinstall/distfetch/Makefile b/usr.sbin/bsdinstall/distfetch/Makefile index 325f5c55cfd5..8a9011734592 100644 --- a/usr.sbin/bsdinstall/distfetch/Makefile +++ b/usr.sbin/bsdinstall/distfetch/Makefile @@ -1,7 +1,6 @@ BINDIR= ${LIBEXECDIR}/bsdinstall PROG= distfetch -CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/../distextract LIBADD= fetch bsddialog MAN= diff --git a/usr.sbin/bsdinstall/distfetch/Makefile.depend b/usr.sbin/bsdinstall/distfetch/Makefile.depend index 16e54d9b2a6e..9e9ac6d1bae8 100644 --- a/usr.sbin/bsdinstall/distfetch/Makefile.depend +++ b/usr.sbin/bsdinstall/distfetch/Makefile.depend @@ -8,7 +8,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libfetch \ - usr.sbin/bsdinstall/distextract \ + usr.sbin/bsdinstall/include \ .include diff --git a/usr.sbin/bsdinstall/include/Makefile b/usr.sbin/bsdinstall/include/Makefile new file mode 100644 index 000000000000..15f947defa9b --- /dev/null +++ b/usr.sbin/bsdinstall/include/Makefile @@ -0,0 +1,13 @@ +OSNAME?= FreeBSD +GENHDRS= opt_osname.h +SRCS+= ${GENHDRS} +CLEANFILES+= ${GENHDRS} + +opt_osname.h: ${META_NOPHONY} + @if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET} 2> /dev/null; then \ + echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \ + fi + +MK_STAGING= no + +.include diff --git a/usr.sbin/bsdinstall/include/Makefile.depend b/usr.sbin/bsdinstall/include/Makefile.depend new file mode 100644 index 000000000000..11aba52f82cf --- /dev/null +++ b/usr.sbin/bsdinstall/include/Makefile.depend @@ -0,0 +1,10 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/usr.sbin/bsdinstall/partedit/Makefile b/usr.sbin/bsdinstall/partedit/Makefile index 8d7156fd16d2..397e404a126f 100644 --- a/usr.sbin/bsdinstall/partedit/Makefile +++ b/usr.sbin/bsdinstall/partedit/Makefile @@ -4,7 +4,6 @@ PROG= partedit LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \ ${BINDIR}/partedit ${BINDIR}/scriptedpart SYMLINKS= ../libexec/bsdinstall/partedit /usr/sbin/sade -CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/../distextract LIBADD+= geom util bsddialog PARTEDIT_ARCH= ${MACHINE} diff --git a/usr.sbin/bsdinstall/partedit/Makefile.depend b/usr.sbin/bsdinstall/partedit/Makefile.depend index 4d5ca3e13299..68a44a4d87a7 100644 --- a/usr.sbin/bsdinstall/partedit/Makefile.depend +++ b/usr.sbin/bsdinstall/partedit/Makefile.depend @@ -9,7 +9,7 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libgeom \ lib/libutil \ - usr.sbin/bsdinstall/distextract \ + usr.sbin/bsdinstall/include \ .include