From nobody Thu Apr 21 22:34:53 2022 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 0D7E81995B18; Thu, 21 Apr 2022 22:34:54 +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 4KksmY6bB4z4Vf0; Thu, 21 Apr 2022 22:34:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650580494; 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=oE45NE/tioKXkdzIziB809SJ/kKMfohlG25TR5pcYfE=; b=rVtqo1zC6patIi2TfC++0VL3Kb774jQMu4nB8JKbfWEJVTVHl1VMSKkAPOdyz2n7GGwfHY 8OUG7Wzy2NOIGzLSvpeZM1Hcdcbuo+bAlAPZVLcQ+rju+SpSchss2DoVCucDQWBSUl3ZV5 ndr9fC8ziZ9/lMj14EAntPvtJa9XdyrZKeNipRa8mfAtbPJtAD6hbh1xpbOJVSTMkkmAs2 OikfKIbS4hmKx/1uqCwxCeYd0QnpmITb1xK8px8JGew6Rr+pDMoRuzE1q+y5P+IVBPySuC BkgbtR1RBrbUIR2stR8qkN49HuMqFsxo3D4XFSc1IoZtPk5FS1tszcQCBXKQUA== 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 B15B111260; Thu, 21 Apr 2022 22:34:53 +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 23LMYrkl019132; Thu, 21 Apr 2022 22:34:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23LMYr6b019131; Thu, 21 Apr 2022 22:34:53 GMT (envelope-from git) Date: Thu, 21 Apr 2022 22:34:53 GMT Message-Id: <202204212234.23LMYr6b019131@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 53fefea53f12 - stable/12 - loader: userboot: provide a getsecs() implementation 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 53fefea53f12f13ef53b639c7d2073ffc84523ab Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650580494; 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=oE45NE/tioKXkdzIziB809SJ/kKMfohlG25TR5pcYfE=; b=me78iZhNoScfXbmgzgVRyQ9OOAJ0+5jkhSXlp+SbfA9JyBNyGrPuZcaethGIpGxgUK7S2r 46fiBGD+57s/pqaq0wgOEp2+RbCoHfrp9aZ13NVraRHa8dh9UZBok+OZKPIsfPjctyIRmZ gVL/hjNoUojmPHZWEUEnxU8RBfdS9Zzvky+G71jCwH2N2xb9kTlnpezb+Zivq13L0ilAKz /ikX6Fd4WUsUpARtlaB94ZMsPZ2GNiszbGhY4K2uRbqkxwhE/Ya7it1CtIrfJW46GIZwcn MRbbESiiRtFaceodl92ZsdSnNI1nHeKEt9QN7h/2DX2sMeExlgxUYkowvEvlEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650580494; a=rsa-sha256; cv=none; b=S863cO6cY7wzrmisLVA8SBVLMz1g1jE5KAgPw8E0dunee8vvxL4V+HN3EHuz2qGLyS/tJS lpiE1qw0M+19sGgiIm6SbXgucWQ1uVH8DE1fDpNhbeD2OUhjsLOjoQk5LxOhElAv9k0P3N +kiyzxrWjOtN4DGEO42sp9eH74YJCyF7kyuGvNPpsow1UVY2U0dctFBvlq8mALCX0I0Gq5 T5me9AdTCH80gT9qkOBlOVtBfwDSB3ryn6AmJjYKigw+zAgG/mybssB2glebSlCA8YsS6d 40hAAiRdi9uP2/JkoBBGCOyniFi6jo6WX4zQarqs3NAMNVTIp2K2WVh6VDyCtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=53fefea53f12f13ef53b639c7d2073ffc84523ab commit 53fefea53f12f13ef53b639c7d2073ffc84523ab Author: Kyle Evans AuthorDate: 2022-04-13 00:29:54 +0000 Commit: Kyle Evans CommitDate: 2022-04-21 22:33:21 +0000 loader: userboot: provide a getsecs() implementation We don't need it for userboot, but it avoids issues with BIND_NOW, so just provide it. time(3) isn't defined but ends up being provided by libc linked into the host process, which is generally fine. PR: 262920 Reviewed by: imp, jhb (cherry picked from commit 660c1892d5c90500d37f98185326c6287b2b61be) --- stand/userboot/userboot/main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/stand/userboot/userboot/main.c b/stand/userboot/userboot/main.c index 148398bd6c91..9af0b3b646a0 100644 --- a/stand/userboot/userboot/main.c +++ b/stand/userboot/userboot/main.c @@ -69,6 +69,18 @@ delay(int usec) CALLBACK(delay, usec); } +time_t +getsecs(void) +{ + + /* + * userboot can't do netboot, so this implementation isn't strictly + * required. Defining it avoids issues with BIND_NOW, and it doesn't + * hurt to do it. + */ + return (time(NULL)); +} + void exit(int v) {