From owner-svn-src-head@freebsd.org Thu Jan 30 03:01:03 2020 Return-Path: Delivered-To: svn-src-head@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 943CE229874; Thu, 30 Jan 2020 03:01:03 +0000 (UTC) (envelope-from kevans@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 487Q8v2v7Yz4Y42; Thu, 30 Jan 2020 03:01:03 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5D5481E630; Thu, 30 Jan 2020 03:01:03 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00U313Aq099105; Thu, 30 Jan 2020 03:01:03 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00U310Z8099092; Thu, 30 Jan 2020 03:01:00 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202001300301.00U310Z8099092@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 30 Jan 2020 03:01:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r357283 - head/release/packages X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/release/packages X-SVN-Commit-Revision: 357283 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jan 2020 03:01:03 -0000 Author: kevans Date: Thu Jan 30 03:01:00 2020 New Revision: 357283 URL: https://svnweb.freebsd.org/changeset/base/357283 Log: pkgbase: generate dependencies in generate-ucl.sh This cuts out a large chunk of duplicated *.ucl files that just needed dependencies tacked on, and gives generate-ucl.sh some leeway in case a future pkg may need more than one dependency. Run-through to determine which ones could simply be removed done with for i in *.ucl; do diff -U3 template.ucl ${i}; done | less and inspecting for any differences beyond just adding deps at the end. The remaining ucl files are basically all differently-licensed, require scripts, or are marked vital. I've opted to remove %PKGDEPS% entirely without regard for third-party ucl, as pkgbase is not yet considered production. However, I do not hold a strong position on this and there is approximately 0 chance it will return. clibs should have been added previously in generate-ucl.sh as one that doesn't have any dependencies, but do so now that we would otherwise be tacking on the runtime dependency. Reviewed by: manu, bapt (earlier version) Differential Revision: https://reviews.freebsd.org/D23415 Deleted: head/release/packages/acct.ucl head/release/packages/acpi.ucl head/release/packages/amd.ucl head/release/packages/apm.ucl head/release/packages/at.ucl head/release/packages/autofs.ucl head/release/packages/bhyve.ucl head/release/packages/bluetooth.ucl head/release/packages/bsdinstall.ucl head/release/packages/bsnmp.ucl head/release/packages/dma.ucl head/release/packages/ee.ucl head/release/packages/hostapd.ucl head/release/packages/jail-debug.ucl head/release/packages/jail-development.ucl head/release/packages/jail-lib32-debug.ucl head/release/packages/jail-lib32-development.ucl head/release/packages/jail-lib32-profile.ucl head/release/packages/jail-lib32.ucl head/release/packages/jail-profile.ucl head/release/packages/rcmds.ucl head/release/packages/runtime-debug.ucl head/release/packages/runtime-development.ucl head/release/packages/runtime-lib32.ucl head/release/packages/runtime-manuals.ucl head/release/packages/runtime-profile.ucl head/release/packages/syscons.ucl head/release/packages/tests.ucl head/release/packages/vi.ucl head/release/packages/wpa.ucl Modified: head/release/packages/binutils.ucl head/release/packages/caroot.ucl head/release/packages/clang.ucl head/release/packages/gdb.ucl head/release/packages/generate-ucl.sh head/release/packages/groff.ucl head/release/packages/jail.ucl head/release/packages/lld.ucl head/release/packages/lldb.ucl head/release/packages/runtime.ucl head/release/packages/ssh.ucl head/release/packages/svn.ucl head/release/packages/unbound.ucl Modified: head/release/packages/binutils.ucl ============================================================================== --- head/release/packages/binutils.ucl Thu Jan 30 02:16:17 2020 (r357282) +++ head/release/packages/binutils.ucl Thu Jan 30 03:01:00 2020 (r357283) @@ -15,10 +15,4 @@ licenses = [ GPLv2 ] desc = <> ${uclfile} +deps: { + FreeBSD-${pkgdeps}: { + origin: "base", + version: "${PKG_VERSION}" + } +} +EOF + fi cap_arg="$( make -f ${srctree}/share/mk/bsd.endian.mk -VCAP_MKDB_ENDIAN )" sed -i '' -e "s/%VERSION%/${PKG_VERSION}/" \ -e "s/%PKGNAME%/${origname}/" \ -e "s/%COMMENT%/${comment}/" \ -e "s/%DESC%/${desc}/" \ -e "s/%CAP_MKDB_ENDIAN%/${cap_arg}/g" \ - -e "s/%PKGDEPS%/${pkgdeps}/" \ ${uclfile} return 0 } Modified: head/release/packages/groff.ucl ============================================================================== --- head/release/packages/groff.ucl Thu Jan 30 02:16:17 2020 (r357282) +++ head/release/packages/groff.ucl Thu Jan 30 03:01:00 2020 (r357283) @@ -15,10 +15,4 @@ licenses = [ GPLv2 ] desc = <