Project

General

Profile

« Previous | Next » 

Revision 1b40e1a6

Added by Renato Botelho about 7 years ago

Do not depend of pfSense-builder meta package, track dependencies using pkg

View differences:

build.sh
345 345
	git_last_commit
346 346

  
347 347
	# Ensure binaries are present that builder system requires
348
	builder_setup
348
	depend_check
349 349

  
350 350
	# Build world, kernel and install
351 351
	make_world
tools/builder_common.sh
1064 1064
	fi
1065 1065
}
1066 1066

  
1067
depend_check() {
1068
	for _pkg in BUILDER_PKG_DEPENDENCIES; do
1069
		if ! pkg info -e ${_pkg}; then
1070
			echo "Missing dependency (${_pkg})."
1071
			print_error_pfS
1072
		fi
1073
	done
1074
}
1075

  
1067 1076
# This routine ensures any ports / binaries that the builder
1068 1077
# system needs are on disk and ready for execution.
1069 1078
builder_setup() {
tools/builder_defaults.sh
255 255
		exit 1
256 256
esac
257 257

  
258
export BUILDER_PKG_DEPENDENCIES="devel/git ftp/curl net/rsync sysutils/screen" \
259
    "sysutils/vmdktool sysutils/py-salt security/sudo www/nginx" \
260
    "emulators/qemu-user-static security/sssd security/pam_ldap" \
261
    "security/pam_mkhomedir archivers/gtar textproc/xmlstarlet"
262

  
258 263
# Host to rsync pkg repos from poudriere
259 264
export PKG_RSYNC_HOSTNAME=${PKG_RSYNC_HOSTNAME:-${STAGING_HOSTNAME}}
260 265
export PKG_RSYNC_USERNAME=${PKG_RSYNC_USERNAME:-"wwwsync"}

Also available in: Unified diff