>>> Executing build step update on 26.1 ABI_FILE=/usr/lib/crt1.o BLOCKSIZE=K CONFIGDIR=/usr/tools/config/26.1 CONFIG_XML=/usr/local/etc/config.xml COREBRANCH=stable/26.1 COREDIR=/usr/core COREENV=CORE_PHP=83 CORE_ABI=26.1 CORE_PYTHON=313 CPUS=8 DEVICEDIR=/usr/tools/device ENV_FILTER=env -i USER=root LOGNAME=root HOME=/root SHELL=/bin/sh BLOCKSIZE=K MAIL= PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin TERM= HOSTTYPE= VENDOR= OSTYPE= MACHTYPE= PWD=/usr/tools/build GROUP= HOST= EDITOR= PAGER= ABI_FILE=/usr/lib/crt1.o EXTRABRANCH= HOME=/root IMAGESDIR=/usr/local/opnsense/build/26.1/amd64/images LANG=C.UTF-8 LOGNAME=root LOGSDIR=/usr/local/opnsense/build/26.1/amd64/logs MAKEFLAGS= MAKELEVEL=2 META_MODE=normal MM_CHARSET=UTF-8 OLDPWD=/usr/tools PACKAGESDIR=/.pkg PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin PLUGINSBRANCH=stable/26.1 PLUGINSDIR=/usr/plugins PLUGINSENV=PLUGIN_PHP=83 PLUGIN_ABI=26.1 PLUGIN_PYTHON=313 PORTSBRANCH=master PORTSDIR=/usr/ports PORTSENV= PORTSREFBRANCH=main PORTSREFDIR=/usr/freebsd-ports PORTSREFURL=https://git.FreeBSD.org/ports.git PRINT_ENV_SKIP=1 PRODUCT_ABI=26.1 PRODUCT_ADDITIONS= PRODUCT_APACHE=24 PRODUCT_ARCH=amd64 PRODUCT_COMSPEED=115200 PRODUCT_CORE=opnsense PRODUCT_CORES=opnsense opnsense-devel opnsense-business PRODUCT_DEBUG= PRODUCT_DEVEL= PRODUCT_DEVICE_REAL=A10 PRODUCT_GITBASE=https://github.com/opnsense PRODUCT_HOST=amd64 PRODUCT_KERNEL=SMP PRODUCT_LUA=5.4 PRODUCT_MIRROR=https://pkg.opnsense.org PRODUCT_NAME=OPNsense PRODUCT_PERL=5.42 PRODUCT_PHP=83 PRODUCT_PLUGIN=os-* PRODUCT_PLUGINS=os-* PRODUCT_PRIVKEY=/usr/tools/config/26.1/repo.key PRODUCT_PUBKEY=/usr/tools/config/26.1/repo.pub PRODUCT_PYTHON=313 PRODUCT_RELEASE=OPNsense-202605061320 PRODUCT_RUBY=33 PRODUCT_SETTINGS=26.1 PRODUCT_SIGNCHK=/usr/tools/scripts/pkg_fingerprint.sh /usr/tools/config/26.1/repo.pub PRODUCT_SIGNCMD=/usr/tools/scripts/pkg_sign.sh /usr/tools/config/26.1/repo.pub /usr/tools/config/26.1/repo.key PRODUCT_SSL=openssl PRODUCT_SUFFIX= PRODUCT_TARGET=amd64 PRODUCT_TYPE=opnsense PRODUCT_UEFI=arm dvd serial vga vm PRODUCT_VERSION=202605061320 PRODUCT_ZFS_ALLOWED= PRODUCT_ZFS_REQUESTED= PWD=/usr/tools/build REMOTEDIR=incoming SERVER=nightly@pkg.opnsense.org SETSDIR=/usr/local/opnsense/build/26.1/amd64/sets SHELL=/bin/sh SRCABI=FreeBSD:14:amd64 SRCBRANCH=stable/26.1 SRCDIR=/usr/src SRCREVISION=14.3 STAGEDIR=/usr/obj/usr/tools/config/26.1/amd64 STAGEDIRPREFIX=/usr/obj TARGETDIR=/usr/local/opnsense/build/26.1/amd64 TARGETDIRPREFIX=/usr/local/opnsense/build TOOLSBRANCH=master TOOLSDIR=/usr/tools USER=root >>> Running build step: update >>> Passing arguments: (none) >>> Fetching /usr/core: From https://github.com/opnsense/core + 983ece5d3...8881f014f apply_unify -> origin/apply_unify (forced update) + 299d73b95...eeee81277 gwgroups_mvc -> origin/gwgroups_mvc (forced update) a0863680e..8942e1c3c master -> origin/master + 2e89bb5e0...28c36daf3 service-redo -> origin/service-redo (forced update) >>> Updating branch stable/26.1 of /usr/core: Already on 'stable/26.1' Your branch and 'origin/stable/26.1' have diverged, and have 2 and 54 different commits each, respectively. (use "git pull" if you want to integrate the remote branch with yours) hint: You have divergent branches and need to specify how to reconcile them. hint: You can do so by running one of the following commands sometime before hint: your next pull: hint: hint: git config pull.rebase false # merge hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. fatal: Need to specify how to reconcile divergent branches. >>> Fetching /usr/plugins: >>> Updating branch stable/26.1 of /usr/plugins: Already on 'stable/26.1' Your branch is up to date with 'origin/stable/26.1'. Already up to date. >>> Fetching /usr/ports: >>> Updating branch master of /usr/ports: Already on 'master' Your branch is up to date with 'origin/master'. Already up to date. >>> Fetching /usr/src: >>> Updating branch stable/26.1 of /usr/src: Already on 'stable/26.1' Your branch is up to date with 'origin/stable/26.1'. Already up to date. >>> Fetching /usr/tools: >>> Updating branch master of /usr/tools: Already on 'master' Your branch is up to date with 'origin/master'. Already up to date. 5.35 real 0.81 user 1.91 sys