From nobody Fri Oct 22 20:30:48 2021 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 E0CE617F0717; Fri, 22 Oct 2021 20:30:48 +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 4HbbZw62Rjz4pZd; Fri, 22 Oct 2021 20:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 AEFAB154BB; Fri, 22 Oct 2021 20:30:48 +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 19MKUmQN073914; Fri, 22 Oct 2021 20:30:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19MKUmSR073913; Fri, 22 Oct 2021 20:30:48 GMT (envelope-from git) Date: Fri, 22 Oct 2021 20:30:48 GMT Message-Id: <202110222030.19MKUmSR073913@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: c2426723394b - main - Fix sconfig(8) build. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2426723394ba9ab8ffa0d69bd132af1aaa2ea12 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=c2426723394ba9ab8ffa0d69bd132af1aaa2ea12 commit c2426723394ba9ab8ffa0d69bd132af1aaa2ea12 Author: Gleb Smirnoff AuthorDate: 2021-10-22 20:28:44 +0000 Commit: Gleb Smirnoff CommitDate: 2021-10-22 20:28:44 +0000 Fix sconfig(8) build. Missed that since sconfig(8) was built on i386 only. Since I enabled cp(4) on amd64, enable sconfig(8) as well. Fixes: 6aae3517ed25 --- sbin/Makefile | 4 ---- sbin/Makefile.amd64 | 1 + sbin/sconfig/Makefile | 2 +- sbin/sconfig/sconfig.c | 5 +---- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/sbin/Makefile b/sbin/Makefile index ade73fc8b0ee..b4da58680458 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -93,10 +93,6 @@ SUBDIR.${MK_TESTS}+= tests SUBDIR_PARALLEL= -# Add architecture-specific manpages -# to be included anyway -MAN= sconfig/sconfig.8 - .include .include diff --git a/sbin/Makefile.amd64 b/sbin/Makefile.amd64 index 2d231b0cb2b0..4135c44082c9 100644 --- a/sbin/Makefile.amd64 +++ b/sbin/Makefile.amd64 @@ -2,3 +2,4 @@ SUBDIR += bsdlabel SUBDIR += fdisk +SUBDIR += sconfig diff --git a/sbin/sconfig/Makefile b/sbin/sconfig/Makefile index bce914f40868..96fb46434d7a 100644 --- a/sbin/sconfig/Makefile +++ b/sbin/sconfig/Makefile @@ -4,7 +4,7 @@ PACKAGE=runtime PROG= sconfig MAN= sconfig.8 -MANSUBDIR= /i386 WARNS?= 2 +CFLAGS+= -I${SRCTOP}/sys/dev/cp .include diff --git a/sbin/sconfig/sconfig.c b/sbin/sconfig/sconfig.c index eebf6013e167..48363036e412 100644 --- a/sbin/sconfig/sconfig.c +++ b/sbin/sconfig/sconfig.c @@ -29,10 +29,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include -#include -#include +#include "cserial.h" #define MAXCHAN 128