config: extend ignore to check against product target
This is a little easier as it clusters arm together, if anyone wants to build !armv6 and runs in to general trouble there.
This commit is contained in:
parent
f80e6e9af5
commit
9bd279f32c
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Copyright (c) 2015-2016 Franco Fichtner <franco@opnsense.org>
|
||||
# Copyright (c) 2015-2017 Franco Fichtner <franco@opnsense.org>
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
|
@ -38,10 +38,9 @@ cat ${CONFIGDIR}/plugins.conf | while read PLUGIN_ORIGIN PLUGIN_IGNORE; do
|
|||
fi
|
||||
if [ -n "${PLUGIN_IGNORE}" ]; then
|
||||
for PLUGIN_QUIRK in $(echo ${PLUGIN_IGNORE} | tr ',' ' '); do
|
||||
if [ ${PLUGIN_QUIRK} = ${PRODUCT_ARCH} ]; then
|
||||
continue 2
|
||||
fi
|
||||
if [ ${PLUGIN_QUIRK} = ${PRODUCT_FLAVOUR} ]; then
|
||||
if [ ${PLUGIN_QUIRK} = ${PRODUCT_TARGET} -o \
|
||||
${PLUGIN_QUIRK} = ${PRODUCT_ARCH} -o \
|
||||
${PLUGIN_QUIRK} = ${PRODUCT_FLAVOUR} ]; then
|
||||
continue 2
|
||||
fi
|
||||
done
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Copyright (c) 2014-2016 Franco Fichtner <franco@opnsense.org>
|
||||
# Copyright (c) 2014-2017 Franco Fichtner <franco@opnsense.org>
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
|
@ -38,10 +38,9 @@ cat ${CONFIGDIR}/ports.conf | while read PORT_ORIGIN PORT_IGNORE; do
|
|||
fi
|
||||
if [ -n "${PORT_IGNORE}" ]; then
|
||||
for PORT_QUIRK in $(echo ${PORT_IGNORE} | tr ',' ' '); do
|
||||
if [ ${PORT_QUIRK} = ${PRODUCT_ARCH} ]; then
|
||||
continue 2
|
||||
fi
|
||||
if [ ${PORT_QUIRK} = ${PRODUCT_FLAVOUR} ]; then
|
||||
if [ ${PLUGIN_QUIRK} = ${PRODUCT_TARGET} -o \
|
||||
${PLUGIN_QUIRK} = ${PRODUCT_ARCH} -o \
|
||||
${PLUGIN_QUIRK} = ${PRODUCT_FLAVOUR} ]; then
|
||||
continue 2
|
||||
fi
|
||||
done
|
||||
|
|
|
@ -1,21 +1,21 @@
|
|||
#ORIGIN IGNORE
|
||||
devel/debug armv6
|
||||
devel/debug arm
|
||||
devel/helloworld
|
||||
net-mgmt/snmp
|
||||
net/ftp-proxy
|
||||
net/haproxy armv6
|
||||
net/haproxy arm
|
||||
net/igmp-proxy
|
||||
net/intel-em armv6
|
||||
net/intel-em arm
|
||||
net/l2tp
|
||||
net/pppoe
|
||||
net/pptp
|
||||
net/relayd armv6
|
||||
net/relayd arm
|
||||
net/upnp
|
||||
net/wol
|
||||
security/intrusion-detection-content-pt-open
|
||||
security/tinc armv6
|
||||
security/tinc arm
|
||||
sysutils/boot-delay
|
||||
sysutils/smart armv6
|
||||
sysutils/vmware armv6
|
||||
sysutils/xen armv6
|
||||
www/web-proxy-sso armv6
|
||||
sysutils/smart arm
|
||||
sysutils/vmware arm
|
||||
sysutils/xen arm
|
||||
www/web-proxy-sso arm
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
#ORIGIN IGNORE
|
||||
opnsense/acme-tiny armv6
|
||||
opnsense/acme-tiny arm
|
||||
opnsense/apinger
|
||||
opnsense/beep armv6
|
||||
opnsense/bsdinstaller armv6
|
||||
opnsense/beep arm
|
||||
opnsense/bsdinstaller arm
|
||||
opnsense/cpustats
|
||||
opnsense/dhcpleases
|
||||
opnsense/filterdns
|
||||
opnsense/filterlog
|
||||
opnsense/ifinfo
|
||||
opnsense/ngattach
|
||||
opnsense/openldap-sasl-server armv6
|
||||
opnsense/openldap-sasl-server arm
|
||||
opnsense/opnsense-lang
|
||||
opnsense/opnsense-update
|
||||
opnsense/pam_opnsense
|
||||
|
@ -18,23 +18,23 @@ opnsense/py27-fail2ban
|
|||
opnsense/py27-netaddr
|
||||
opnsense/py27-requests
|
||||
opnsense/py27-sqlite3
|
||||
opnsense/py27-telepot armv6,LibreSSL
|
||||
opnsense/py27-telepot arm,LibreSSL
|
||||
opnsense/py27-ujson
|
||||
opnsense/py35-Jinja2 armv6,i386
|
||||
opnsense/py35-netaddr armv6,i386
|
||||
opnsense/py35-requests armv6,i386
|
||||
opnsense/py35-sqlite3 armv6,i386
|
||||
opnsense/py35-ujson armv6,i386
|
||||
opnsense/ruby armv6
|
||||
opnsense/py35-Jinja2 arm,i386
|
||||
opnsense/py35-netaddr arm,i386
|
||||
opnsense/py35-requests arm,i386
|
||||
opnsense/py35-sqlite3 arm,i386
|
||||
opnsense/py35-ujson arm,i386
|
||||
opnsense/ruby arm
|
||||
opnsense/sshlockout_pf
|
||||
opnsense/syslogd
|
||||
archivers/php56-zlib
|
||||
archivers/zip
|
||||
benchmarks/iperf3 armv6
|
||||
comms/gnokii armv6
|
||||
comms/kermit armv6
|
||||
databases/php56-mysql armv6
|
||||
databases/php56-mysqli armv6
|
||||
benchmarks/iperf3 arm
|
||||
comms/gnokii arm
|
||||
comms/kermit arm
|
||||
databases/php56-mysql arm
|
||||
databases/php56-mysqli arm
|
||||
databases/php56-sqlite3
|
||||
databases/rrdtool12
|
||||
devel/automake
|
||||
|
@ -52,119 +52,119 @@ devel/php56-json
|
|||
devel/phpunit
|
||||
devel/pkgconf
|
||||
dns/bind910
|
||||
dns/ddclient armv6
|
||||
dns/dnscrypt-proxy armv6
|
||||
dns/ddclient arm
|
||||
dns/dnscrypt-proxy arm
|
||||
dns/dnsmasq
|
||||
dns/maradns armv6
|
||||
dns/maradns arm
|
||||
dns/unbound
|
||||
editors/joe
|
||||
editors/nano
|
||||
editors/vim-lite
|
||||
emulators/open-vm-tools-nox11 armv6
|
||||
emulators/open-vm-tools-nox11 arm
|
||||
ftp/php56-curl
|
||||
ftp/uftp armv6
|
||||
ftp/wget armv6
|
||||
mail/opensmtpd armv6
|
||||
mail/smtp-cli armv6
|
||||
misc/gnu-watch armv6
|
||||
ftp/uftp arm
|
||||
ftp/wget arm
|
||||
mail/opensmtpd arm
|
||||
mail/smtp-cli arm
|
||||
misc/gnu-watch arm
|
||||
misc/help2man
|
||||
misc/mc-light armv6
|
||||
net-mgmt/bandwidthd armv6
|
||||
misc/mc-light arm
|
||||
net-mgmt/bandwidthd arm
|
||||
net-mgmt/bsnmp-regex
|
||||
net-mgmt/bsnmp-ucd
|
||||
net-mgmt/bwm-ng armv6
|
||||
net-mgmt/bwm-ng arm
|
||||
net-mgmt/choparp
|
||||
net-mgmt/collectd5 armv6
|
||||
net-mgmt/darkstat armv6
|
||||
net-mgmt/collectd5 arm
|
||||
net-mgmt/darkstat arm
|
||||
net-mgmt/flowd
|
||||
net-mgmt/iftop
|
||||
net-mgmt/lldpd armv6,i386
|
||||
net-mgmt/mk-livestatus armv6
|
||||
net-mgmt/nrpe armv6
|
||||
net-mgmt/lldpd arm,i386
|
||||
net-mgmt/mk-livestatus arm
|
||||
net-mgmt/nrpe arm
|
||||
net-mgmt/rate
|
||||
net-mgmt/yaf armv6
|
||||
net-mgmt/zabbix24-agent armv6
|
||||
net/asterisk13 armv6,i386
|
||||
net-mgmt/yaf arm
|
||||
net-mgmt/zabbix24-agent arm
|
||||
net/asterisk13 arm,i386
|
||||
net/dhcp6
|
||||
net/freeradius3 armv6
|
||||
net/haproxy armv6
|
||||
net/freeradius3 arm
|
||||
net/haproxy arm
|
||||
net/igmpproxy
|
||||
net/intel-em-kmod armv6
|
||||
net/intel-em-kmod arm
|
||||
net/isc-dhcp43-client
|
||||
net/isc-dhcp43-relay
|
||||
net/isc-dhcp43-server
|
||||
net/mdns-repeater armv6
|
||||
net/mdns-repeater arm
|
||||
net/miniupnpd
|
||||
net/mpd5
|
||||
net/mtr armv6
|
||||
net/mtr arm
|
||||
net/ntp
|
||||
net/pecl-radius
|
||||
net/php56-ldap
|
||||
net/php56-soap armv6
|
||||
net/php56-soap arm
|
||||
net/php56-sockets
|
||||
net/quagga armv6
|
||||
net/quagga arm
|
||||
net/radvd
|
||||
net/relayd armv6
|
||||
net/rsync armv6
|
||||
net/relayd arm
|
||||
net/rsync arm
|
||||
net/samplicator
|
||||
net/siproxd armv6
|
||||
net/sixxs-aiccu armv6
|
||||
net/vnstat armv6
|
||||
net/siproxd arm
|
||||
net/sixxs-aiccu arm
|
||||
net/vnstat arm
|
||||
net/wol
|
||||
print/texinfo
|
||||
security/acme-client armv6
|
||||
security/autossh armv6
|
||||
security/acme-client arm
|
||||
security/autossh arm
|
||||
security/ca_root_nss
|
||||
security/expiretable
|
||||
security/honeybadger armv6
|
||||
security/nmap armv6
|
||||
security/openconnect armv6
|
||||
security/honeybadger arm
|
||||
security/nmap arm
|
||||
security/openconnect arm
|
||||
security/openssh-portable
|
||||
security/openvpn23
|
||||
security/pam_ldap armv6
|
||||
security/pam_ldap arm
|
||||
security/php-suhosin
|
||||
security/php56-filter
|
||||
security/php56-hash
|
||||
security/php56-mcrypt
|
||||
security/php56-openssl
|
||||
security/softether armv6
|
||||
security/softether arm
|
||||
security/strongswan
|
||||
security/sudo
|
||||
security/suricata
|
||||
security/tinc armv6
|
||||
security/tor armv6
|
||||
sysutils/apcupsd armv6
|
||||
sysutils/beadm armv6
|
||||
sysutils/dmidecode armv6
|
||||
sysutils/flashrom armv6
|
||||
security/tinc arm
|
||||
security/tor arm
|
||||
sysutils/apcupsd arm
|
||||
sysutils/beadm arm
|
||||
sysutils/dmidecode arm
|
||||
sysutils/flashrom arm
|
||||
sysutils/flock
|
||||
sysutils/iocage armv6
|
||||
sysutils/iohyve armv6
|
||||
sysutils/ipmitool armv6
|
||||
sysutils/msktutil armv6
|
||||
sysutils/monit armv6
|
||||
sysutils/nut armv6,i386
|
||||
sysutils/iocage arm
|
||||
sysutils/iohyve arm
|
||||
sysutils/ipmitool arm
|
||||
sysutils/msktutil arm
|
||||
sysutils/monit arm
|
||||
sysutils/nut arm,i386
|
||||
sysutils/pftop
|
||||
sysutils/screen
|
||||
sysutils/smartmontools armv6
|
||||
sysutils/smartmontools arm
|
||||
sysutils/sysinfo
|
||||
sysutils/tarsnap
|
||||
sysutils/tmux
|
||||
sysutils/usb_modeswitch
|
||||
sysutils/xe-guest-utilities armv6
|
||||
sysutils/xe-guest-utilities arm
|
||||
textproc/php56-ctype
|
||||
textproc/php56-dom
|
||||
textproc/php56-simplexml
|
||||
textproc/php56-xml
|
||||
www/lightsquid armv6
|
||||
www/lightsquid arm
|
||||
www/lighttpd
|
||||
www/nginx armv6
|
||||
www/nginx arm
|
||||
www/phalcon
|
||||
www/php56-session
|
||||
www/polipo armv6
|
||||
www/privoxy armv6
|
||||
www/sarg armv6
|
||||
www/polipo arm
|
||||
www/privoxy arm
|
||||
www/sarg arm
|
||||
www/squid
|
||||
www/tinyproxy armv6
|
||||
www/webgrind armv6,i386
|
||||
x11-fonts/urwfonts armv6
|
||||
www/tinyproxy arm
|
||||
www/webgrind arm,i386
|
||||
x11-fonts/urwfonts arm
|
||||
|
|
|
@ -1,21 +1,21 @@
|
|||
#ORIGIN IGNORE
|
||||
devel/debug armv6
|
||||
devel/debug arm
|
||||
devel/helloworld
|
||||
net-mgmt/snmp
|
||||
net/ftp-proxy
|
||||
net/haproxy armv6
|
||||
net/haproxy arm
|
||||
net/igmp-proxy
|
||||
net/intel-em armv6
|
||||
net/intel-em arm
|
||||
net/l2tp
|
||||
net/pppoe
|
||||
net/pptp
|
||||
net/relayd armv6
|
||||
net/relayd arm
|
||||
net/upnp
|
||||
net/wol
|
||||
security/intrusion-detection-content-pt-open
|
||||
security/tinc armv6
|
||||
security/tinc arm
|
||||
sysutils/boot-delay
|
||||
sysutils/smart armv6
|
||||
sysutils/vmware armv6
|
||||
sysutils/xen armv6
|
||||
www/web-proxy-sso armv6
|
||||
sysutils/smart arm
|
||||
sysutils/vmware arm
|
||||
sysutils/xen arm
|
||||
www/web-proxy-sso arm
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
#ORIGIN IGNORE
|
||||
opnsense/acme-tiny armv6
|
||||
opnsense/acme-tiny arm
|
||||
opnsense/apinger
|
||||
opnsense/beep armv6
|
||||
opnsense/bsdinstaller armv6
|
||||
opnsense/beep arm
|
||||
opnsense/bsdinstaller arm
|
||||
opnsense/cpustats
|
||||
opnsense/dhcpleases
|
||||
opnsense/filterdns
|
||||
opnsense/filterlog
|
||||
opnsense/ifinfo
|
||||
opnsense/openldap-sasl-server armv6
|
||||
opnsense/openldap-sasl-server arm
|
||||
opnsense/opnsense-lang
|
||||
opnsense/opnsense-update
|
||||
opnsense/pam_opnsense
|
||||
|
@ -17,23 +17,23 @@ opnsense/py27-fail2ban
|
|||
opnsense/py27-netaddr
|
||||
opnsense/py27-requests
|
||||
opnsense/py27-sqlite3
|
||||
opnsense/py27-telepot armv6,LibreSSL
|
||||
opnsense/py27-telepot arm,LibreSSL
|
||||
opnsense/py27-ujson
|
||||
#opnsense/py35-Jinja2 armv6,i386
|
||||
#opnsense/py35-netaddr armv6,i386
|
||||
#opnsense/py35-requests armv6,i386
|
||||
#opnsense/py35-sqlite3 armv6,i386
|
||||
#opnsense/py35-ujson armv6,i386
|
||||
opnsense/ruby armv6
|
||||
#opnsense/py35-Jinja2 arm,i386
|
||||
#opnsense/py35-netaddr arm,i386
|
||||
#opnsense/py35-requests arm,i386
|
||||
#opnsense/py35-sqlite3 arm,i386
|
||||
#opnsense/py35-ujson arm,i386
|
||||
opnsense/ruby arm
|
||||
opnsense/sshlockout_pf
|
||||
opnsense/syslogd
|
||||
archivers/php70-zlib
|
||||
archivers/zip
|
||||
benchmarks/iperf3 armv6
|
||||
comms/gnokii armv6
|
||||
comms/kermit armv6
|
||||
converters/php70-mbstring armv6
|
||||
databases/php70-mysqli armv6
|
||||
benchmarks/iperf3 arm
|
||||
comms/gnokii arm
|
||||
comms/kermit arm
|
||||
converters/php70-mbstring arm
|
||||
databases/php70-mysqli arm
|
||||
databases/php70-sqlite3
|
||||
databases/rrdtool12
|
||||
devel/automake
|
||||
|
@ -51,119 +51,119 @@ devel/php70-json
|
|||
devel/phpunit
|
||||
devel/pkgconf
|
||||
dns/bind911
|
||||
dns/ddclient armv6
|
||||
dns/dnscrypt-proxy armv6
|
||||
dns/ddclient arm
|
||||
dns/dnscrypt-proxy arm
|
||||
dns/dnsmasq
|
||||
dns/maradns armv6
|
||||
dns/maradns arm
|
||||
dns/unbound
|
||||
editors/joe
|
||||
editors/nano
|
||||
editors/vim-lite
|
||||
emulators/open-vm-tools-nox11 armv6
|
||||
emulators/open-vm-tools-nox11 arm
|
||||
ftp/php70-curl
|
||||
ftp/uftp armv6
|
||||
ftp/wget armv6
|
||||
mail/opensmtpd armv6
|
||||
mail/smtp-cli armv6
|
||||
math/php70-bcmath armv6
|
||||
misc/gnu-watch armv6
|
||||
ftp/uftp arm
|
||||
ftp/wget arm
|
||||
mail/opensmtpd arm
|
||||
mail/smtp-cli arm
|
||||
math/php70-bcmath arm
|
||||
misc/gnu-watch arm
|
||||
misc/help2man
|
||||
misc/mc-light armv6
|
||||
net-mgmt/bandwidthd armv6
|
||||
misc/mc-light arm
|
||||
net-mgmt/bandwidthd arm
|
||||
net-mgmt/bsnmp-regex
|
||||
net-mgmt/bsnmp-ucd
|
||||
net-mgmt/bwm-ng armv6
|
||||
net-mgmt/bwm-ng arm
|
||||
net-mgmt/choparp
|
||||
net-mgmt/collectd5 armv6
|
||||
net-mgmt/darkstat armv6
|
||||
net-mgmt/collectd5 arm
|
||||
net-mgmt/darkstat arm
|
||||
net-mgmt/flowd
|
||||
net-mgmt/iftop
|
||||
net-mgmt/lldpd armv6,i386
|
||||
net-mgmt/mk-livestatus armv6
|
||||
net-mgmt/nrpe armv6
|
||||
net-mgmt/lldpd arm,i386
|
||||
net-mgmt/mk-livestatus arm
|
||||
net-mgmt/nrpe arm
|
||||
net-mgmt/rate
|
||||
net-mgmt/yaf armv6
|
||||
net-mgmt/zabbix24-agent armv6
|
||||
net/asterisk13 armv6,i386
|
||||
net-mgmt/yaf arm
|
||||
net-mgmt/zabbix24-agent arm
|
||||
net/asterisk13 arm,i386
|
||||
net/dhcp6
|
||||
net/freeradius3 armv6
|
||||
net/haproxy armv6
|
||||
net/freeradius3 arm
|
||||
net/haproxy arm
|
||||
net/igmpproxy
|
||||
net/intel-em-kmod armv6
|
||||
net/intel-em-kmod arm
|
||||
net/isc-dhcp43-client
|
||||
net/isc-dhcp43-relay
|
||||
net/isc-dhcp43-server
|
||||
net/mdns-repeater armv6
|
||||
net/mdns-repeater arm
|
||||
net/miniupnpd
|
||||
net/mpd5
|
||||
net/mtr armv6
|
||||
net/mtr arm
|
||||
net/ntp
|
||||
net/pecl-radius
|
||||
net/php70-ldap
|
||||
net/php70-soap armv6
|
||||
net/php70-soap arm
|
||||
net/php70-sockets
|
||||
net/quagga armv6
|
||||
net/quagga arm
|
||||
net/radvd
|
||||
net/relayd armv6
|
||||
net/rsync armv6
|
||||
net/relayd arm
|
||||
net/rsync arm
|
||||
net/samplicator
|
||||
net/siproxd armv6
|
||||
net/sixxs-aiccu armv6
|
||||
net/vnstat armv6
|
||||
net/siproxd arm
|
||||
net/sixxs-aiccu arm
|
||||
net/vnstat arm
|
||||
net/wol
|
||||
print/texinfo
|
||||
security/acme-client armv6
|
||||
security/autossh armv6
|
||||
security/acme-client arm
|
||||
security/autossh arm
|
||||
security/ca_root_nss
|
||||
security/expiretable
|
||||
security/honeybadger armv6
|
||||
security/nmap armv6
|
||||
security/openconnect armv6
|
||||
security/honeybadger arm
|
||||
security/nmap arm
|
||||
security/openconnect arm
|
||||
security/openssh-portable
|
||||
security/openvpn23
|
||||
security/pam_ldap armv6
|
||||
security/pam_ldap arm
|
||||
security/php70-filter
|
||||
security/php70-hash
|
||||
security/php70-mcrypt
|
||||
security/php70-openssl
|
||||
security/softether armv6
|
||||
security/softether arm
|
||||
security/strongswan
|
||||
security/sudo
|
||||
security/suricata
|
||||
security/tinc armv6
|
||||
security/tor armv6
|
||||
sysutils/apcupsd armv6
|
||||
sysutils/beadm armv6
|
||||
sysutils/dmidecode armv6
|
||||
sysutils/flashrom armv6
|
||||
security/tinc arm
|
||||
security/tor arm
|
||||
sysutils/apcupsd arm
|
||||
sysutils/beadm arm
|
||||
sysutils/dmidecode arm
|
||||
sysutils/flashrom arm
|
||||
sysutils/flock
|
||||
sysutils/iocage armv6
|
||||
sysutils/iohyve armv6
|
||||
sysutils/ipmitool armv6
|
||||
sysutils/msktutil armv6
|
||||
sysutils/monit armv6
|
||||
sysutils/nut armv6,i386
|
||||
sysutils/iocage arm
|
||||
sysutils/iohyve arm
|
||||
sysutils/ipmitool arm
|
||||
sysutils/msktutil arm
|
||||
sysutils/monit arm
|
||||
sysutils/nut arm,i386
|
||||
sysutils/pftop
|
||||
sysutils/screen
|
||||
sysutils/smartmontools armv6
|
||||
sysutils/smartmontools arm
|
||||
sysutils/sysinfo
|
||||
sysutils/tarsnap
|
||||
sysutils/tmux
|
||||
sysutils/usb_modeswitch
|
||||
sysutils/xe-guest-utilities armv6
|
||||
sysutils/xe-guest-utilities arm
|
||||
textproc/php70-ctype
|
||||
textproc/php70-dom
|
||||
textproc/php70-simplexml
|
||||
textproc/php70-xml
|
||||
www/lightsquid armv6
|
||||
www/lightsquid arm
|
||||
www/lighttpd
|
||||
www/nginx armv6
|
||||
www/nginx arm
|
||||
www/phalcon
|
||||
www/php70-session
|
||||
www/polipo armv6
|
||||
www/privoxy armv6
|
||||
www/sarg armv6
|
||||
www/polipo arm
|
||||
www/privoxy arm
|
||||
www/sarg arm
|
||||
www/squid
|
||||
www/tinyproxy armv6
|
||||
www/webgrind armv6,i386
|
||||
x11-fonts/urwfonts armv6
|
||||
www/tinyproxy arm
|
||||
www/webgrind arm,i386
|
||||
x11-fonts/urwfonts arm
|
||||
|
|
Loading…
Reference in New Issue