Date: Wed, 18 Mar 2015 09:39:32 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r280209 - in projects/release-pkg: . release/packages release/packages/acpi release/packages/at release/packages/bhyve release/packages/development release/packages/docs release/package... Message-ID: <201503180939.t2I9dWhh063830@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Wed Mar 18 09:39:31 2015 New Revision: 280209 URL: https://svnweb.freebsd.org/changeset/base/280209 Log: Now that pkg create can directly accept both a file and a plist in command line, directly use it Added: projects/release-pkg/release/packages/acpi.ucl - copied unchanged from r280181, projects/release-pkg/release/packages/acpi/+MANIFEST projects/release-pkg/release/packages/at.ucl - copied unchanged from r280181, projects/release-pkg/release/packages/at/+MANIFEST projects/release-pkg/release/packages/bhyve.ucl - copied unchanged from r280181, projects/release-pkg/release/packages/bhyve/+MANIFEST projects/release-pkg/release/packages/development.ucl - copied unchanged from r280181, projects/release-pkg/release/packages/development/+MANIFEST projects/release-pkg/release/packages/docs.ucl - copied unchanged from r280181, projects/release-pkg/release/packages/docs/+MANIFEST projects/release-pkg/release/packages/kernel.ucl - copied, changed from r280181, projects/release-pkg/release/packages/kernel/+MANIFEST projects/release-pkg/release/packages/profile.ucl - copied unchanged from r280181, projects/release-pkg/release/packages/profile/+MANIFEST projects/release-pkg/release/packages/runtime.ucl - copied unchanged from r280181, projects/release-pkg/release/packages/runtime/+MANIFEST projects/release-pkg/release/packages/ssh.ucl projects/release-pkg/release/packages/svn.ucl - copied unchanged from r280181, projects/release-pkg/release/packages/svn/+MANIFEST projects/release-pkg/release/packages/syscons.ucl - copied unchanged from r280181, projects/release-pkg/release/packages/syscons/+MANIFEST projects/release-pkg/release/packages/unbound.ucl - copied unchanged from r280181, projects/release-pkg/release/packages/unbound/+MANIFEST Deleted: projects/release-pkg/release/packages/acpi/ projects/release-pkg/release/packages/at/ projects/release-pkg/release/packages/bhyve/ projects/release-pkg/release/packages/development/ projects/release-pkg/release/packages/docs/ projects/release-pkg/release/packages/kernel/+MANIFEST projects/release-pkg/release/packages/profile/ projects/release-pkg/release/packages/runtime/ projects/release-pkg/release/packages/svn/ projects/release-pkg/release/packages/syscons/ projects/release-pkg/release/packages/unbound/ Modified: projects/release-pkg/Makefile.inc1 Modified: projects/release-pkg/Makefile.inc1 ============================================================================== --- projects/release-pkg/Makefile.inc1 Wed Mar 18 08:46:08 2015 (r280208) +++ projects/release-pkg/Makefile.inc1 Wed Mar 18 09:39:31 2015 (r280209) @@ -1214,24 +1214,22 @@ create-world-packages: ${DESTDIR}/METALOG @for plist in ${DESTDIR}/*.plist; do \ plist=$${plist##*/} ; \ - test -d ${SRCDIR}/release/packages/$${plist%.plist} || \ + test -f ${SRCDIR}/release/packages/$${plist%.plist}.ucl || \ ( echo "Unkown package FreeBSD-$${plist%.plist}" ; false ) ; \ done @for plist in ${DESTDIR}/*.plist; do \ plist=$${plist##*/} ; \ pkgname=$${plist%.plist} ; \ - rm -rf ${DESTDIR}/$${pkgname}-manifestdir ; \ - cp -r ${SRCDIR}/release/packages/$${pkgname} \ - ${DESTDIR}/$${pkgname}-manifestdir ; \ - sed -i '' -e "s/%VERSION%/${PKG_VERSION}/" \ + sed -e "s/%VERSION%/${PKG_VERSION}/" \ -e "s/%PKGNAME%/$${pkgname}/" \ -e "s/%COMMENT%/Generic comment for $${pkgname}/" \ -e "s/%DESC%/Generic description for $${pkgname}/" \ - ${DESTDIR}/$${pkgname}-manifestdir/+MANIFEST ; \ + ${SRCDIR}/release/packages/$${pkgname}.ucl \ + > ${DESTDIR}/$${pkgname}.ucl ; \ awk -F\" '/name/ { printf("===> Creating %s-", $$2) } /version/ {print $$2 }' \ ${DESTDIR}/$${pkgname}-manifestdir/+MANIFEST ; \ pkg -o ABI_FILE=${DESTDIR}/bin/sh \ - create -m ${DESTDIR}/$${pkgname}-manifestdir \ + create -M ${DESTDIR}/$${pkgname}.ucl \ -p ${DESTDIR}/$${pkgname}.plist \ -r ${DESTDIR} -o ${DESTDIR} ; \ done Copied: projects/release-pkg/release/packages/acpi.ucl (from r280181, projects/release-pkg/release/packages/acpi/+MANIFEST) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/release/packages/acpi.ucl Wed Mar 18 09:39:31 2015 (r280209, copy of r280181, projects/release-pkg/release/packages/acpi/+MANIFEST) @@ -0,0 +1,13 @@ +name = "FreeBSD-acpi" +origin = "base" +version = "%VERSION%" +comment = "ACPI tools" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "http://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = <<EOD +TODO +EOD Copied: projects/release-pkg/release/packages/at.ucl (from r280181, projects/release-pkg/release/packages/at/+MANIFEST) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/release/packages/at.ucl Wed Mar 18 09:39:31 2015 (r280209, copy of r280181, projects/release-pkg/release/packages/at/+MANIFEST) @@ -0,0 +1,13 @@ +name = "FreeBSD-at" +origin = "base" +version = "%VERSION%" +comment = "at(1) and related utilities" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "http://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = <<EOD +TODO +EOD Copied: projects/release-pkg/release/packages/bhyve.ucl (from r280181, projects/release-pkg/release/packages/bhyve/+MANIFEST) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/release/packages/bhyve.ucl Wed Mar 18 09:39:31 2015 (r280209, copy of r280181, projects/release-pkg/release/packages/bhyve/+MANIFEST) @@ -0,0 +1,15 @@ +name = "FreeBSD-bhyve" +origin = "base" +version = "%VERSION%" +comment = "The BSD Hypervisor" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "http://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = <<EOD +bhyve, the "BSD hypervisor" is a hypervisor/virtual machine manager developed on +FreeBSD and relies on modern CPU features such as Extended Page Tables (EPT) and +VirtIO network and storage drivers +EOD Copied: projects/release-pkg/release/packages/development.ucl (from r280181, projects/release-pkg/release/packages/development/+MANIFEST) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/release/packages/development.ucl Wed Mar 18 09:39:31 2015 (r280209, copy of r280181, projects/release-pkg/release/packages/development/+MANIFEST) @@ -0,0 +1,13 @@ +name = "FreeBSD-%PKGNAME%" +origin = "base" +version = "%VERSION%" +comment = "%COMMENT%" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "http://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = <<EOD +%DESC% +EOD Copied: projects/release-pkg/release/packages/docs.ucl (from r280181, projects/release-pkg/release/packages/docs/+MANIFEST) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/release/packages/docs.ucl Wed Mar 18 09:39:31 2015 (r280209, copy of r280181, projects/release-pkg/release/packages/docs/+MANIFEST) @@ -0,0 +1,13 @@ +name = "FreeBSD-%PKGNAME%" +origin = "base" +version = "%VERSION%" +comment = "%COMMENT%" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "http://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = <<EOD +%DESC% +EOD Copied and modified: projects/release-pkg/release/packages/kernel.ucl (from r280181, projects/release-pkg/release/packages/kernel/+MANIFEST) ============================================================================== --- projects/release-pkg/release/packages/kernel/+MANIFEST Tue Mar 17 15:48:19 2015 (r280181, copy source) +++ projects/release-pkg/release/packages/kernel.ucl Wed Mar 18 09:39:31 2015 (r280209) @@ -11,3 +11,6 @@ licenses = [ BSD2CLAUSE ] desc = <<EOD %DESC% EOD +post-install = <<EOD +/usr/sbin/kldxref /boot/kernel +EOD Copied: projects/release-pkg/release/packages/profile.ucl (from r280181, projects/release-pkg/release/packages/profile/+MANIFEST) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/release/packages/profile.ucl Wed Mar 18 09:39:31 2015 (r280209, copy of r280181, projects/release-pkg/release/packages/profile/+MANIFEST) @@ -0,0 +1,13 @@ +name = "FreeBSD-%PKGNAME%" +origin = "base" +version = "%VERSION%" +comment = "%COMMENT%" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "http://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = <<EOD +%DESC% +EOD Copied: projects/release-pkg/release/packages/runtime.ucl (from r280181, projects/release-pkg/release/packages/runtime/+MANIFEST) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/release/packages/runtime.ucl Wed Mar 18 09:39:31 2015 (r280209, copy of r280181, projects/release-pkg/release/packages/runtime/+MANIFEST) @@ -0,0 +1,13 @@ +name = "FreeBSD-%PKGNAME%" +origin = "base" +version = "%VERSION%" +comment = "%COMMENT%" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "http://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = <<EOD +%DESC% +EOD Added: projects/release-pkg/release/packages/ssh.ucl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/release/packages/ssh.ucl Wed Mar 18 09:39:31 2015 (r280209) @@ -0,0 +1,13 @@ +name = "FreeBSD-ssh" +origin = "base" +version = "%VERSION%" +comment = "Secure SHell" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "http://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ ISCL ] +desc = <<EOD +TODO +EOD Copied: projects/release-pkg/release/packages/svn.ucl (from r280181, projects/release-pkg/release/packages/svn/+MANIFEST) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/release/packages/svn.ucl Wed Mar 18 09:39:31 2015 (r280209, copy of r280181, projects/release-pkg/release/packages/svn/+MANIFEST) @@ -0,0 +1,13 @@ +name = "FreeBSD-svn" +origin = "base" +version = "%VERSION%" +comment = "Version control system" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "http://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ APACHE20 ] +desc = <<EOD +Lite version of the Subversion version control system +EOD Copied: projects/release-pkg/release/packages/syscons.ucl (from r280181, projects/release-pkg/release/packages/syscons/+MANIFEST) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/release/packages/syscons.ucl Wed Mar 18 09:39:31 2015 (r280209, copy of r280181, projects/release-pkg/release/packages/syscons/+MANIFEST) @@ -0,0 +1,13 @@ +name = "FreeBSD-syscons" +origin = "base" +version = "%VERSION%" +comment = "syscons(4) support files" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "http://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = <<EOD +syscons(4) support files such as keyboard maps, fonts and screen output maps. +EOD Copied: projects/release-pkg/release/packages/unbound.ucl (from r280181, projects/release-pkg/release/packages/unbound/+MANIFEST) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/release/packages/unbound.ucl Wed Mar 18 09:39:31 2015 (r280209, copy of r280181, projects/release-pkg/release/packages/unbound/+MANIFEST) @@ -0,0 +1,14 @@ +name = "FreeBSD-unbound" +origin = "base" +version = "%VERSION%" +comment = "Validating, recursive, and caching DNS resolver" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "http://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD4CLAUSE ] +desc = <<EOD +Unbound is a recursive-only caching DNS server which can perform DNSSEC +validation of results +EOD
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503180939.t2I9dWhh063830>