From nobody Sat Feb 17 11:31:09 2024 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 4TcRSs2qjRz5B8dy; Sat, 17 Feb 2024 11:31:09 +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 4TcRSs1dYsz47j2; Sat, 17 Feb 2024 11:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708169469; 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=Fdy1oNi2AHDI6mffZ49R3iM3wMG9I1na8T9fwbv3JWg=; b=JsMr46rSoc1YKCEBTeqycq6I9rrecJFeKYHLz8HHhz+h3kWpd84ejaAnXqX7B57AHjCTla Rh5L6taD/Idt5F/1nKtWZsmnIJlzDoXLbSqF+7IZlYDsj2x02277nibXsj+DK1ASK/HNUf eRQbnphRaRJO2l2fnpSUDXMacu2wn2OpbNc/yuHI14LpNWX50PhUzgkteiSeymcZJDQJxB ytws8yb+ysmZDP3bO4ZD0TdYKyqZnw8HBocmMFZ2wtd6DL11F3y80RUMqeMAnFdjfRvNOj X7tknaffwHaAknA/HLNlP6WBR7QP+NX5PePZh1kYFDqfpTfpFyeAdUv1RwIeOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708169469; 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=Fdy1oNi2AHDI6mffZ49R3iM3wMG9I1na8T9fwbv3JWg=; b=AWaC9JcxaFBNATCZUJ0YV+EeNEJu0FyMpz7sDS51bKmTrZZwWcXmnYuxKEAjT9hyCA3jSa Ju/jfD/14ueDXTZQPpU+eywdJSgBt/8n+WFnLlxlzePBuhQHHNN6Z74PZn9nIN+pGDGI+F 5CyCx+yD9tUCijXmk1bUD1BbwCLY+EeYpQPLpEVB+kD5nhfUYinmE0VAMcdayHMWNe8hi7 bCKtIPH92QWBxvYTopLS2yMOr+ZSM0pFYd+jZMWU3mdpqjqoK2cgdl0qb+56K15LeRGby2 s11gT89vyRa0PvF81PGzT6NbGoYywmS6fzNeCW+VIMU2sLllYp3v8VADpTPo4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708169469; a=rsa-sha256; cv=none; b=Ex73UZc8TgklsK62o+XdTEnZWHLUTmStItBJkic1GSFX3siBBewVOjZN6cAxCFnmx4NCiy juHBx5+FYMCKQ3q4nocWAn+Chp4flUkSP6iqB4dM+KBYq0y32vPfxvUXuNN8rKv/C8Q7Nf 5na3CK7Ze9iwlUanuSwkxcY0V+mVme7A6WTKEI+h+IyHp3nt700tw10Kaf5Xdqf3VdM3KK rBh9KvjL2420W1/KZoJisDbX4ogRU6158mIakB0MfUvkUcCV612MM3M+SoLK8EsIIrL5ZY pjsPv4xMRbuu8TCbX/mId+FVeIi1+VYFDGjeU5XHbilRtXIXa3kf9J+5w9BGUw== 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 4TcRSs0hw3z15pH; Sat, 17 Feb 2024 11:31:09 +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 41HBV9gh005575; Sat, 17 Feb 2024 11:31:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HBV9wg005572; Sat, 17 Feb 2024 11:31:09 GMT (envelope-from git) Date: Sat, 17 Feb 2024 11:31:09 GMT Message-Id: <202402171131.41HBV9wg005572@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: e368e9b75677 - main - Proactively remove /usr/lib/kgdb file that became a directory 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e368e9b756772264acdbc11f3cc1d223bcd48dee Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e368e9b756772264acdbc11f3cc1d223bcd48dee commit e368e9b756772264acdbc11f3cc1d223bcd48dee Author: Dimitry Andric AuthorDate: 2024-02-17 11:27:33 +0000 Commit: Dimitry Andric CommitDate: 2024-02-17 11:27:33 +0000 Proactively remove /usr/lib/kgdb file that became a directory This was already handled in ObsoleteFiles.inc (see the 20201215 entry), but some people never run "make delete-old", or want to upgrade directly from a revision that still had the file to the most recent revision. They would then encounter a failure during installworld, similar to: install: /usr/libexec/kgdb exists but is not a directory Therefore, clean it up in the distrib-cleanup phase, similar to the earlier instances of libc++ header files that became a directory. MFC after: 3 days --- etc/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/Makefile b/etc/Makefile index 745ca91c60bf..229d9380901d 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -126,6 +126,7 @@ MTREES+= ../${mtree} / # scenario. DISTRIB_CLEANUP_FILES+= ${INCLUDEDIR}/c++/v1/__string DISTRIB_CLEANUP_FILES+= ${INCLUDEDIR}/c++/v1/__tuple +DISTRIB_CLEANUP_FILES+= ${LIBEXECDIR}/kgdb distrib-cleanup: .PHONY for file in ${DISTRIB_CLEANUP_FILES}; do \ if [ -f ${DESTDIR}/$${file} ]; then \