From owner-dev-commits-src-main@freebsd.org Tue Apr 20 21:51:35 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0169C5EA94E; Tue, 20 Apr 2021 21:51:35 +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 4FPy7V6gYTz3n7y; Tue, 20 Apr 2021 21:51:34 +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 D7F451A66C; Tue, 20 Apr 2021 21:51:34 +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 13KLpYGH019796; Tue, 20 Apr 2021 21:51:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13KLpY5g019795; Tue, 20 Apr 2021 21:51:34 GMT (envelope-from git) Date: Tue, 20 Apr 2021 21:51:34 GMT Message-Id: <202104202151.13KLpY5g019795@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ccefbe98d86e - main - bsdinstall: remove compat hacks for FreeBSD 9 and earlier 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/main X-Git-Reftype: branch X-Git-Commit: ccefbe98d86e437097a64e00cfde0578b84f1d3e Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 21:51:35 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ccefbe98d86e437097a64e00cfde0578b84f1d3e commit ccefbe98d86e437097a64e00cfde0578b84f1d3e Author: Warner Losh AuthorDate: 2021-04-20 21:41:39 +0000 Commit: Warner Losh CommitDate: 2021-04-20 21:51:31 +0000 bsdinstall: remove compat hacks for FreeBSD 9 and earlier Sponsored by: Netflix --- usr.sbin/bsdinstall/distextract/distextract.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/usr.sbin/bsdinstall/distextract/distextract.c b/usr.sbin/bsdinstall/distextract/distextract.c index 81d83f982e30..8ad6c7b2c64b 100644 --- a/usr.sbin/bsdinstall/distextract/distextract.c +++ b/usr.sbin/bsdinstall/distextract/distextract.c @@ -53,11 +53,6 @@ static void sig_int(int sig); static int count_files(const char *file); static int extract_files(struct dpv_file_node *file, int out); -#if __FreeBSD_version <= 1000008 /* r232154: bump for libarchive update */ -#define archive_read_support_filter_all(x) \ - archive_read_support_compression_all(x) -#endif - #define _errx(...) (end_dialog(), errx(__VA_ARGS__)) int