From nobody Fri Feb 02 10:41:12 2024 X-Original-To: dev-commits-src-all@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 4TRC490pFKz58Th3; Fri, 2 Feb 2024 10:41:13 +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 4TRC490FZwz4s8V; Fri, 2 Feb 2024 10:41:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706870473; 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=pq6RLAOElvkXo7fQ3U6OAg/j3k4iL2smK96+cwhKoEs=; b=vrer2PQozpkV8t5vkGlK1HdJvvXExzzW81Eb60OWftOomR+umILVASEXejE0o0zfdROoXN lLRJ58oyzQ/Z0Zo2GmwyNae8QTh5eKUdhHB+WPM8YXgfMuCtgmEpRzAKeNnWL1Ao6MRRzY I838zUxsqL4NFxVE67HDPbisF4FJSGBtm4kWcneasx2OVgib08fErXjdCu33jCKWoOljo9 sSHp+pYyhuR55GgvZ5EhJM6fvXLP9TJpqFiXvlI5ScVqrcbm1xg5BhtiD5xvVZal7wZDxa KBZLMtY6U386BuKqPkKUYyUHamtyqqD9I76iCcSsV2Yu+NrY5GwmEaDVaP5zQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706870473; 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=pq6RLAOElvkXo7fQ3U6OAg/j3k4iL2smK96+cwhKoEs=; b=V/rljJ4zNoQMtpeKStDWm4/aM87dIRcZVmraeU2LXZ8nQ2ORdWPTexJ2Tt7AZUrY6N+ZHs pR6rQClA4uPwkDf0WArqhAsraJwmOR/3Vxzwl7FL0JbFgnupGzDgnEoZs8HOx1QCzbS+sc SWe797Jdqk/QNcqDPkIRxoR/Z0BLdRSOXxNdoCuHljy/wh3xlbIArQpgTzGKEOBsHXGucB MamzUSkNEPs2z7Y8pRhT7YeJJJgJiDpruvjQgNJgRCd0kviVJN185ofvW/Jji1havJ/dc7 ul2sYTHA3EMlcNQuF4C8//wSr0sWeXHOnMP4Kef+Vkza+O2WiI8e4N5d4k0sbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706870473; a=rsa-sha256; cv=none; b=S1VnhFv8Pa+Y+3I9WhpgTHphKuZwq2KKnF1wV5/s0vfeS+JjYQ8j2BOqdIXkzGu1EkdWQG Qv1eX5TxetLWcbMra/rPbuhMW922Uo6q44S7DMulH1YWoL8GRGlI6gIpLLNFltmrPi2u7Y Ewmpt4wrBmdZrPq5+jp12pPBG1yPwOhciBYHM/bE6RKQCQ7ImkZuYe3uaQK6rvfqzOz5DA D9ZT/l7MgVyG8OC7aIwOnAicCUSoWzZpW5rtGfZi/FyE2K383v/kWcZYjjfdBN+b/ouD72 xERkn4Qgeox1QhBKCNNQbfpN6VMQprRm6XIZiNS21oPR1upOMat6CYuXJrkWVQ== 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 4TRC486QSSzRcK; Fri, 2 Feb 2024 10:41:12 +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 412AfCFe007177; Fri, 2 Feb 2024 10:41:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412AfCLk007174; Fri, 2 Feb 2024 10:41:12 GMT (envelope-from git) Date: Fri, 2 Feb 2024 10:41:12 GMT Message-Id: <202402021041.412AfCLk007174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 9bbe06b004e2 - main - Revert "pkgbase: Create a FreeBSD-dtb package" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9bbe06b004e2cadb55a3792c77991ee640bf0f52 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=9bbe06b004e2cadb55a3792c77991ee640bf0f52 commit 9bbe06b004e2cadb55a3792c77991ee640bf0f52 Author: Emmanuel Vadot AuthorDate: 2024-02-02 10:39:51 +0000 Commit: Emmanuel Vadot CommitDate: 2024-02-02 10:39:51 +0000 Revert "pkgbase: Create a FreeBSD-dtb package" Somehow this doesn't work iwth make packages due to some kind of a race. The package is first created correctly but later in the process it is overwritten by a badly created empty package. Revert in the mean time so we can have working pkgbase on arm/arm64 This reverts commit a5afd7920d50ff23f91bdbabb1f0fd7ba028ba9e. --- Makefile.inc1 | 28 +--------------------------- release/packages/dtb.ucl | 16 ---------------- release/scripts/mtree-to-plist.awk | 20 ++++++-------------- 3 files changed, 7 insertions(+), 57 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 7a9917fd8a74..1e86cda657dd 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2178,35 +2178,9 @@ _default_flavor= -default . if ${MK_DEBUG_FILES} != "no" _debug=-dbg . endif - -create-dtb-package: - @if [ -f ${KSTAGEDIR}/${DISTDIR}/dtb.plist ]; then \ - sed -e "s/%VERSION%/${PKG_VERSION}/" \ - -e "s/%PKGNAME%/dtb/" \ - -e "s/%COMMENT%/FreeBSD Devicetree Blobs/" \ - -e "s/%DESC%/FreeBSD Devicetree Blobs/" \ - -e "s/ %VCS_REVISION%/${VCS_REVISION}/" \ - -e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \ - -e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \ - -e "s|%PKG_WWW%|${PKG_WWW}|" \ - ${SRCDIR}/release/packages/dtb.ucl \ - > ${KSTAGEDIR}/${DISTDIR}/dtb.ucl ; \ - awk -F\" ' \ - /name/ { printf("===> Creating %s-", $$2); next } \ - /version/ {print $$2; next } ' \ - ${KSTAGEDIR}/${DISTDIR}/dtb.ucl ; \ - ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ - -o OSVERSION="${SRCRELDATE}" \ - create -f ${PKG_FORMAT} \ - -M ${KSTAGEDIR}/${DISTDIR}/dtb.ucl \ - -p ${KSTAGEDIR}/${DISTDIR}/dtb.plist \ - -r ${KSTAGEDIR}/${DISTDIR} \ - -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} ; \ - fi - create-kernel-packages: .PHONY . for flavor in "" ${_debug} -create-kernel-packages: create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},} create-dtb-package +create-kernel-packages: create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},} create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap .PHONY @cd ${KSTAGEDIR}/${DISTDIR} ; \ ${METALOG_SORT_CMD} ${KSTAGEDIR}/kernel.meta | \ diff --git a/release/packages/dtb.ucl b/release/packages/dtb.ucl deleted file mode 100644 index e4717b9054a2..000000000000 --- a/release/packages/dtb.ucl +++ /dev/null @@ -1,16 +0,0 @@ -# -# - -name = "%PKG_NAME_PREFIX%-%PKGNAME%" -origin = "base" -version = "%VERSION%" -comment = "%COMMENT%" -categories = [ base ] -maintainer = "%PKG_MAINTAINER%" -www = "%PKG_WWW%" -prefix = "/" -licenselogic = "single" -licenses = [ BSD2CLAUSE ] -desc = <