Merge pull request #305 from truenas/feature/ports_2023_04_27

Fix build with newer ports

build/config/ports-installer.pyd

@@ -32,7 +32,8 @@ ports += "lang/python3"
 ports += "lang/python"
 ports += "databases/sqlite3"
 ports += "databases/py-sqlite3"
-ports += "databases/py-bsddb3"
+# TODO: Is berkeleydb even used?
+ports += "databases/py-berkeleydb"
 ports += "devel/py-six"
 ports += "devel/py-libzfs"
 ports += "freenas/py-bsd"

build/customize/remove-var-cache-pkg.py

@@ -27,13 +27,15 @@
 #####################################################################
 
 import os
-from utils import chroot,e
+from utils import chroot, e, sh
 
 
 def main():
     if not os.path.exists(e('${WORLD_DESTDIR}/var/cache/pkg')):
         os.makedirs(e('${WORLD_DESTDIR}/var/cache/pkg'))
+    sh('mount -t devfs devfs ${WORLD_DESTDIR}/dev')
     chroot('${WORLD_DESTDIR}', 'pkg clean -a -y')
+    sh('umount -f ${WORLD_DESTDIR}/dev')
 
 
 if __name__ == '__main__':

build/profiles/freenas/ports-system.pyd

@@ -321,8 +321,7 @@ ports += "sysutils/grub2-bhyve"
 ports += "sysutils/beadm"
 ports += "sysutils/throttle"
 ports += "misc/xtail"
-ports += "sysutils/uefi-edk2-bhyve"
-ports += "sysutils/uefi-edk2-bhyve-csm"
+ports += "sysutils/edk2@bhyve"
 ports += "benchmarks/fio"
 ports += "sysutils/cmdwatch"
 ports += "sysutils/devcpu-data"

build/profiles/freenas/repos.pyd

@@ -49,7 +49,7 @@ repos += {
     "name": "ports",
     "path": "ports",
     "url": "https://github.com/freenas/ports.git",
-    "branch": "truenas/13.0-stable"
+    "branch": "truenas/13.1-stable"
 }
 
 repos += {

build/tools/create-iso.py

@@ -279,7 +279,9 @@ def install_ports():
     info('Installing packages')
     sh('mkdir -p ${INSTUFS_DESTDIR}/usr/local/etc/pkg/repos')
     sh('cp ${BUILD_CONFIG}/templates/pkg-repos/local.conf ${INSTUFS_DESTDIR}/usr/local/etc/pkg/repos/')
+    sh('mount -t devfs devfs ${INSTUFS_DESTDIR}/dev')
     chroot('${INSTUFS_DESTDIR}', 'env ASSUME_ALWAYS_YES=yes pkg install -r local -f ${pkgs}')
+    sh('umount -f ${INSTUFS_DESTDIR}/dev')
 
 
 def install_pkgtools():