diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2014-01-04 14:14:56 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2014-01-04 14:14:56 +0000 |
| commit | 32959c84ee99f04b9e4abe706babe1cc4bc91199 (patch) | |
| tree | d9e1a146c0b8adf8be3620a2a24e375f105377cb /usr.sbin/pkg_add | |
| parent | aae0254de0b10daf3dd930eb032adba3afc46a9d (diff) | |
recognize @option firmware
Diffstat (limited to 'usr.sbin/pkg_add')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackingElement.pm | 8 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackingList.pm | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm index f9dd2045c9d..717ca72e7c0 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackingElement.pm,v 1.219 2014/01/04 01:42:46 espie Exp $ +# $OpenBSD: PackingElement.pm,v 1.220 2014/01/04 14:14:55 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # @@ -851,6 +851,8 @@ sub new return OpenBSD::PackingElement::NoDefaultConflict->new; } elsif ($args eq 'manual-installation') { return OpenBSD::PackingElement::ManualInstallation->new; + } elsif ($args eq 'firmware') { + return OpenBSD::PackingElement::Firmware->new; } elsif ($args eq 'system-package') { return OpenBSD::PackingElement::SystemPackage->new; } elsif ($args eq 'always-update') { @@ -892,6 +894,10 @@ sub write_no_sig() { } +package OpenBSD::PackingElement::Firmware; +our @ISA=qw(OpenBSD::PackingElement::ManualInstallation); +sub category() { 'firmware' } + package OpenBSD::PackingElement::SystemPackage; our @ISA=qw(OpenBSD::PackingElement::UniqueOption); diff --git a/usr.sbin/pkg_add/OpenBSD/PackingList.pm b/usr.sbin/pkg_add/OpenBSD/PackingList.pm index ab5d5de81f1..a0d8abb5162 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackingList.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackingList.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackingList.pm,v 1.125 2014/01/04 00:14:08 espie Exp $ +# $OpenBSD: PackingList.pm,v 1.126 2014/01/04 14:14:55 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # @@ -438,7 +438,7 @@ sub match_pkgpath } our @unique_categories = - (qw(name url signer digital-signature no-default-conflict manual-installation always-update explicit-update extrainfo localbase arch)); + (qw(name url signer digital-signature no-default-conflict manual-installation firmware always-update explicit-update extrainfo localbase arch)); our @list_categories = (qw(conflict pkgpath incompatibility ask-update updateset depend |