From nobody Sat Feb 03 08:49:23 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 4TRmXh3T3Kz58wXD; Sat, 3 Feb 2024 08:49:24 +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 4TRmXh1NP7z4Qjc; Sat, 3 Feb 2024 08:49:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706950164; 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=Czw2WVb5147922BsvPICFFNrhy4Ecf8Kf+zIvOyDQdw=; b=EQnDXgyGN2E1KSEL7ipeNztxXIsPmrXCSQrAYkvpvFvzB/M/VcZYM6B2LLKqmQjuU0FpLm FxEJDFp0OnHALX/ATkdfw0Hhmvov4UXoEpjnj5yLnC3ovC7WCo/Ww5Yg2orEB/AZ68Dpbr l2TqQlLqBWgBWjFHW8fHSYx5ndA/DAPhAIb6Q/62Zv1v0/0rhLlQbxScvKcEoxvdG0Td/x p3vFl1aQ99wUcM/B21zTEfdEfLw2RFmBttjN8ga6xGq129QK8F9H49dPuIGcd9MsP5YKRn MIMv3uqo1Lb5ow+3ajE5PrgWEDKFvwBhnHwV5N+l49dSFueka7TNkAz4Dsc9nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706950164; 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=Czw2WVb5147922BsvPICFFNrhy4Ecf8Kf+zIvOyDQdw=; b=qEHmjvaaSVh3gyUci+KC1q9VCbMkUycSutYX7qsDRE9jqzHMTDw64+FpQC2qpOnGx+PSRV Ma3kgneDWOFjwWfboe9LuBD+Ep+10oj0tqtVJLcG6S8GU1S/lT0CghLZowvL9btEVZxFXj VojomxiMIQJNMTBOb0EIURAMvofVH2yh0iWSow7iGGVyauViOASR1vNWwhT+tpo2hYhgfO FJ9Cv7PF2HB50Lhtknialihec4dYZ77qERkKuHHFW6/eCi5g2E3kE1XFmDqTMEG7Ulu5Yx +5MFY70geK+sbQXtHNJ4fQFk1/o9fHt/6EumKW7xroWh1yTlKgqGak2MGWuzuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706950164; a=rsa-sha256; cv=none; b=L638i06RaulCZxJnlFUkmiDjaRGl1DBQsTEOuhCwmMjyWwjS7tXOnq6zJj7kJcJW2l4E0l By+zMbsiqZrU1R2d4ytEEpRVYB6q639nRvEuS4Xl8xJIaPNhoKDPYNo6zILwuqk5KC5YT5 oznivy78icn8KNMrpPU4PDnJJAlk7bVlo1eabL3NsKlYU8WqCZdoqqwVIOsolFvt59/3YL eBxIBmOJtamGCj7BA9Q6ShyGRNNTINnN3ZyelT9FHH3jBMOL49RWOEjamDI1O5GE7RA1DR Vmb6oXwYUAyhfAc21TUUP0bd3HnhrO4WAw7IdmnxMM8NHMHhLDU0Of1qLI3ehQ== 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 4TRmXg6zBnz16Hn; Sat, 3 Feb 2024 08:49:23 +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 4138nN7H036860; Sat, 3 Feb 2024 08:49:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4138nN69036857; Sat, 3 Feb 2024 08:49:23 GMT (envelope-from git) Date: Sat, 3 Feb 2024 08:49:23 GMT Message-Id: <202402030849.4138nN69036857@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: b6e9a7a2e251 - main - Reapply "pkgbase: Create a FreeBSD-dtb package" 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6e9a7a2e2517fb9cb560fbd9b1d6171645df24a Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=b6e9a7a2e2517fb9cb560fbd9b1d6171645df24a commit b6e9a7a2e2517fb9cb560fbd9b1d6171645df24a Author: Emmanuel Vadot AuthorDate: 2024-02-02 18:25:55 +0000 Commit: Emmanuel Vadot CommitDate: 2024-02-03 08:49:12 +0000 Reapply "pkgbase: Create a FreeBSD-dtb package" This reverts commit 9bbe06b004e2cadb55a3792c77991ee640bf0f52. Before that dtbs where included in each kernel packages which prevents us to install multiple kernels. Fix mtree-to-plist.awk to only generate a dtb.plist when we create the kernel one (because dtb are installed during make installkernel). Sponsored by: Beckhoff Automation GmbH & Co. KG --- Makefile.inc1 | 28 +++++++++++++++++++++++++++- release/packages/dtb.ucl | 16 ++++++++++++++++ release/scripts/mtree-to-plist.awk | 20 ++++++++++++++------ 3 files changed, 57 insertions(+), 7 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 1e86cda657dd..7a9917fd8a74 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2178,9 +2178,35 @@ _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-kernel-packages: create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},} create-dtb-package 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 new file mode 100644 index 000000000000..e4717b9054a2 --- /dev/null +++ b/release/packages/dtb.ucl @@ -0,0 +1,16 @@ +# +# + +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 = <