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 = <<EOD
%DESC%
EOD
-deps: {
- FreeBSD-%PKGDEPS%: {
- origin: "base",
- version: "%VERSION%"
- }
-}
Modified: head/release/packages/caroot.ucl
==============================================================================
--- head/release/packages/caroot.ucl Thu Jan 30 02:16:17 2020
(r357282)
+++ head/release/packages/caroot.ucl Thu Jan 30 03:01:00 2020
(r357283)
@@ -15,12 +15,6 @@ licenses = [ BSD2CLAUSE ]
desc = <<EOD
%DESC%
EOD
-deps: {
- FreeBSD-%PKGDEPS%: {
- origin: "base",
- version: "%VERSION%"
- }
-}
scripts: {
# XXX If pkg picks up a mechanism to detect in the post-install script
# files being added or removed, we should use it instead to gate the
Modified: head/release/packages/clang.ucl
==============================================================================
--- head/release/packages/clang.ucl Thu Jan 30 02:16:17 2020
(r357282)
+++ head/release/packages/clang.ucl Thu Jan 30 03:01:00 2020
(r357283)
@@ -15,10 +15,4 @@ licenses = [ NCSA ]
desc = <<EOD
%DESC%
EOD
-deps: {
- FreeBSD-%PKGDEPS%: {
- origin: "base",
- version: "%VERSION%"
- }
-}
Modified: head/release/packages/gdb.ucl
==============================================================================
--- head/release/packages/gdb.ucl Thu Jan 30 02:16:17 2020
(r357282)
+++ head/release/packages/gdb.ucl Thu Jan 30 03:01:00 2020
(r357283)
@@ -15,10 +15,4 @@ licenses = [ GPLv2 ]
desc = <<EOD
%DESC%
EOD
-deps: {
- FreeBSD-%PKGDEPS%: {
- origin: "base",
- version: "%VERSION%"
- }
-}
Modified: head/release/packages/generate-ucl.sh
==============================================================================
--- head/release/packages/generate-ucl.sh Thu Jan 30 02:16:17 2020
(r357282)
+++ head/release/packages/generate-ucl.sh Thu Jan 30 03:01:00 2020
(r357283)
@@ -34,6 +34,10 @@ main() {
outname="$(echo ${outname} | tr '-' '_')"
case "${outname}" in
+ clibs)
+ # clibs should not have any dependencies or anything
+ # else imposed on it.
+ ;;
caroot)
pkgdeps="utilities"
;;
@@ -134,13 +138,22 @@ main() {
[ -z "${desc}" ] && desc="${outname} package"
cp "${uclsource}" "${uclfile}"
+ if [ ! -z "${pkgdeps}" ]; then
+ cat <<EOF >> ${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 = <<EOD
%DESC%
EOD
-deps: {
- FreeBSD-%PKGDEPS%: {
- origin: "base",
- version: "%VERSION%"
- }
-}
Modified: head/release/packages/jail.ucl
==============================================================================
--- head/release/packages/jail.ucl Thu Jan 30 02:16:17 2020
(r357282)
+++ head/release/packages/jail.ucl Thu Jan 30 03:01:00 2020
(r357283)
@@ -16,10 +16,4 @@ licenses = [ BSD2CLAUSE ]
desc = <<EOD
%DESC%
EOD
-deps: {
- FreeBSD-%PKGDEPS%: {
- origin: "base",
- version: "%VERSION%"
- }
-}
Modified: head/release/packages/lld.ucl
==============================================================================
--- head/release/packages/lld.ucl Thu Jan 30 02:16:17 2020
(r357282)
+++ head/release/packages/lld.ucl Thu Jan 30 03:01:00 2020
(r357283)
@@ -15,10 +15,4 @@ licenses = [ NCSA ]
desc = <<EOD
%DESC%
EOD
-deps: {
- FreeBSD-%PKGDEPS%: {
- origin: "base",
- version: "%VERSION%"
- }
-}
Modified: head/release/packages/lldb.ucl
==============================================================================
--- head/release/packages/lldb.ucl Thu Jan 30 02:16:17 2020
(r357282)
+++ head/release/packages/lldb.ucl Thu Jan 30 03:01:00 2020
(r357283)
@@ -15,10 +15,4 @@ licenses = [ NCSA ]
desc = <<EOD
%DESC%
EOD
-deps: {
- FreeBSD-%PKGDEPS%: {
- origin: "base",
- version: "%VERSION%"
- }
-}
Modified: head/release/packages/runtime.ucl
==============================================================================
--- head/release/packages/runtime.ucl Thu Jan 30 02:16:17 2020
(r357282)
+++ head/release/packages/runtime.ucl Thu Jan 30 03:01:00 2020
(r357283)
@@ -23,12 +23,6 @@ scripts: {
chmod 1777 ${PKG_ROOTDIR}/tmp
EOD
}
-deps: {
- "FreeBSD-clibs": {
- origin: "base"
- version: "%VERSION%"
- }
-}
directories {
/dev = "y";
/tmp = "y";
Modified: head/release/packages/ssh.ucl
==============================================================================
--- head/release/packages/ssh.ucl Thu Jan 30 02:16:17 2020
(r357282)
+++ head/release/packages/ssh.ucl Thu Jan 30 03:01:00 2020
(r357283)
@@ -15,10 +15,4 @@ licenses = [ ISCL ]
desc = <<EOD
%DESC%
EOD
-deps: {
- FreeBSD-%PKGDEPS%: {
- origin: "base",
- version: "%VERSION%"
- }
-}
Modified: head/release/packages/svn.ucl
==============================================================================
--- head/release/packages/svn.ucl Thu Jan 30 02:16:17 2020
(r357282)
+++ head/release/packages/svn.ucl Thu Jan 30 03:01:00 2020
(r357283)
@@ -15,10 +15,4 @@ licenses = [ APACHE20 ]
desc = <<EOD
%DESC%
EOD
-deps: {
- FreeBSD-%PKGDEPS%: {
- origin: "base",
- version: "%VERSION%"
- }
-}
Modified: head/release/packages/unbound.ucl
==============================================================================
--- head/release/packages/unbound.ucl Thu Jan 30 02:16:17 2020
(r357282)
+++ head/release/packages/unbound.ucl Thu Jan 30 03:01:00 2020
(r357283)
@@ -15,10 +15,4 @@ licenses = [ BSD4CLAUSE ]
desc = <<EOD
%DESC%
EOD
-deps: {
- FreeBSD-%PKGDEPS%: {
- origin: "base",
- version: "%VERSION%"
- }
-}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
