diff --git a/Makefile b/Makefile index 4dd0df191..717adfcbc 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ all: .include "Mk/defaults.mk" -CORE_ABI?= 22.1 +CORE_ABI?= 22.7 CORE_MESSAGE?= Carry on my wayward son CORE_NAME?= opnsense-devel CORE_NICKNAME?= Not Yet @@ -129,9 +129,6 @@ CORE_COPYRIGHT_YEARS?= 2014-2022 CORE_DEPENDS_amd64?= beep \ suricata-devel -# XXX transition helpers for PHP 8 migration -CORE_DEPENDS_PHP74= php74-json php74-openssl - CORE_DEPENDS?= ca_root_nss \ choparp \ cpustats \ @@ -175,7 +172,6 @@ CORE_DEPENDS?= ca_root_nss \ php${CORE_PHP}-sqlite3 \ php${CORE_PHP}-xml \ php${CORE_PHP}-zlib \ - ${CORE_DEPENDS_PHP${CORE_PHP}} \ pkg \ py${CORE_PYTHON}-Jinja2 \ py${CORE_PYTHON}-dnspython \ diff --git a/src/etc/opnsense-update.conf.in b/src/etc/opnsense-update.conf.in index 94914a11a..0a312142d 100644 --- a/src/etc/opnsense-update.conf.in +++ b/src/etc/opnsense-update.conf.in @@ -1,3 +1 @@ # configuration for opnsense-update(8), do not edit - -UPGRADE_RELEASE="22.7"