From nobody Tue Jan 24 22:12:22 2023 X-Original-To: dev-commits-src-branches@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 4P1h6G5DZhz3bfs2; Tue, 24 Jan 2023 22:12:22 +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 4P1h6G48z7z3CZL; Tue, 24 Jan 2023 22:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598342; 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=m14WBGgx87kqYvIoA8n9+aNs0D1Znlleguqv+qHxCwA=; b=Tejq4MshWpBzW+Y8Fcy9T3wTVK3cqN47oYSDjzU5CGVe5A0ZuK+2HepoAfypJVi5Wvn2vL UF/ZeYC/X9AgA8doFrSptIQqi8DIPkCbYZUa/h1DXEqNW60tuUHUy8Rl6e6CcZ4vOxSDvB vDAyEBLq79h4+KwCJjrYlrekcsYnDRACC5Acoe/iP3WR50FbfaZy+oNRLxPSSw3kRnCopQ AO++HogTYdxKxDMlyn+V3Tr9NSkeodHbzbwNy768kGqPLxSWUme6satFV2FXcUf5DWBLEs FAIz1ZjsrUYgVmHeu/lKlcZVBOj4JhQvgoFQNgabuVwfrrIXz43js+whQMD4Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598342; 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=m14WBGgx87kqYvIoA8n9+aNs0D1Znlleguqv+qHxCwA=; b=TDyzINjVobWeu7+Kjq5FBg/wuj94BKTpe+twF88/PCtwI9nqL4P2clvSyWvwKVnb0vzyUp T2LZQ8SjXCQAgC2kvfaIXL5d+6y+Z9Kp3EMoJ4LK3EgbvJxb2LPrdGypXw/z11Bvnd9iPY 6U1g6nyd+JpwK/dvEa/bjJ/E4sxb2C/TkWgUP4f+MckBejXyZ6TPvp62q2diYdPE35Z6iD TG56ntiRlx8Pn6avRYAqHaWYUHKjxbo/dZ51MyriDC3M0UUJerNWgaJh3bN7anriPvqCak Go/XZeROG/bVumpTAh6J+FPHb70U/Ts0JGKudLLj4JvidSsM1smmKEoJeQ8QBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598342; a=rsa-sha256; cv=none; b=HBUouM2KV8hxVVg2jeUQSiXmrtrZetFQYQKbuIbl6CfkmoseH9rGBtf6aOGuPNkfrhJIHr i1lCOO0F5rNLNlB0r36Y+BAEFM41aRsKChbmhftKNJlblPDetnWuuc41doeSRpi9wUEE9j Scy8EaBNxf04PSGZaxx0ovGW6lA8gnQIbVDfoCWdSIGjhjyTtGGelj049NOtVDE2N6oIgt JZWY48STr+BlVqhJAJkpmkf7pZKddJ/tYfkgWzEn3txE15yTUrdwv501jtAmtaVtp/1dcR KFG1RYotmEBBzFkTO8t0qdlpd9YDVCTFguQSU4WwqKtLMR0+PcISNb9bVD6mKg== 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 4P1h6G3FZpzQm5; Tue, 24 Jan 2023 22:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMCMEk086934; Tue, 24 Jan 2023 22:12:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMCMG0086933; Tue, 24 Jan 2023 22:12:22 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:12:22 GMT Message-Id: <202301242212.30OMCMG0086933@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 63284e7d6ac7 - stable/13 - kboot: List sources one per line to make merges easier List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 63284e7d6ac7719230190f26982111ad22ccfd6a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=63284e7d6ac7719230190f26982111ad22ccfd6a commit 63284e7d6ac7719230190f26982111ad22ccfd6a Author: Warner Losh AuthorDate: 2022-09-01 17:07:34 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:33 +0000 kboot: List sources one per line to make merges easier Make SRC an alphabetical list of files, one per line. Sponsored by: Netflix (cherry picked from commit 69818bcf38e0bb1716a8d29f61ed392d447cea83) --- stand/kboot/Makefile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/stand/kboot/Makefile b/stand/kboot/Makefile index b8e71fd70dc7..c204af8b17e7 100644 --- a/stand/kboot/Makefile +++ b/stand/kboot/Makefile @@ -18,9 +18,18 @@ NEWVERSWHAT= "kboot loader" ${MACHINE_ARCH} INSTALLFLAGS= -b # Architecture-specific loader code -SRCS= crt1.c conf.c vers.c main.c host_syscalls.c hostcons.c hostdisk.c kbootfdt.c gfx_fb_stub.c -SRCS+= init.c -SRCS+= termios.c +SRCS= \ + conf.c \ + crt1.c \ + gfx_fb_stub.c \ + host_syscalls.c \ + hostcons.c \ + hostdisk.c \ + init.c \ + kbootfdt.c \ + main.c \ + termios.c \ + vers.c \ CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken