Project

General

Profile

« Previous | Next » 

Revision 0436dfad

Added by Ronald Schellberg over 5 years ago

Improve building of non pfSense builds

  • Remove redirection on jail delete so user receives delete prompt
  • Fix editing ports that don't contain a pkg-descr file by testing for file's existence first
  • Fix renaming of pfSense.c file in php module
  • Renaming of php_pfSense.h references in pfSense.c and dummynet.c
  • Allow for renaming of pfSense files to include both files and directories

A pull request for sysutils/pfSense-repo/makefile is also suggested in FreeBSD-ports.

View differences:

tools/builder_common.sh
1541 1541
		local _pdir=$(dirname ${d})
1542 1542
		local _pname=$(echo $(basename ${d}) | sed "s,pfSense,${PRODUCT_NAME},")
1543 1543
		local _plist=""
1544
		local _pdescr=""
1544 1545

  
1545 1546
		if [ -e ${_pdir}/${_pname} ]; then
1546 1547
			rm -rf ${_pdir}/${_pname}
......
1552 1553
			_plist=${_pdir}/${_pname}/pkg-plist
1553 1554
		fi
1554 1555

  
1556
		if [ -f ${_pdir}/${_pname}/pkg-descr ]; then
1557
			_pdescr=${_pdir}/${_pname}/pkg-descr
1558
		fi
1559

  
1555 1560
		sed -i '' -e "s,pfSense,${PRODUCT_NAME},g" \
1556 1561
			  -e "s,https://www.pfsense.org,${PRODUCT_URL},g" \
1557 1562
			  -e "/^MAINTAINER=/ s,^.*$,MAINTAINER=	${PRODUCT_EMAIL}," \
1558
			${_pdir}/${_pname}/Makefile \
1559
			${_pdir}/${_pname}/pkg-descr ${_plist}
1563
			${_pdir}/${_pname}/Makefile ${_pdescr} ${_plist}
1560 1564

  
1561 1565
		# PHP module is special
1562 1566
		if echo "${_pname}" | grep -q "^php[0-9]*-${PRODUCT_NAME}-module"; then
......
1564 1568
			sed -i '' -e "s,PHP_PFSENSE,PHP_${_product_capital},g" \
1565 1569
				  -e "s,PFSENSE_SHARED_LIBADD,${_product_capital}_SHARED_LIBADD,g" \
1566 1570
				  -e "s,pfSense,${PRODUCT_NAME},g" \
1567
				  -e "s,${PRODUCT_NAME}\.c,pfSense.c,g" \
1571
				  -e "s,pfSense.c,${PRODUCT_NAME}\.c,g" \
1568 1572
				${_pdir}/${_pname}/files/config.m4
1569 1573

  
1570 1574
			sed -i '' -e "s,COMPILE_DL_PFSENSE,COMPILE_DL_${_product_capital}," \
1571 1575
				  -e "s,pfSense_module_entry,${PRODUCT_NAME}_module_entry,g" \
1576
				  -e "s,php_pfSense.h,php_${PRODUCT_NAME}\.h,g" \
1572 1577
				  -e "/ZEND_GET_MODULE/ s,pfSense,${PRODUCT_NAME}," \
1573 1578
				  -e "/PHP_PFSENSE_WORLD_EXTNAME/ s,pfSense,${PRODUCT_NAME}," \
1574 1579
				${_pdir}/${_pname}/files/pfSense.c \
1580
				${_pdir}/${_pname}/files/dummynet.c \
1575 1581
				${_pdir}/${_pname}/files/php_pfSense.h
1576 1582
		fi
1577 1583

  
1578 1584
		if [ -d ${_pdir}/${_pname}/files ]; then
1579
			for fd in $(find ${_pdir}/${_pname}/files -type d -name '*pfSense*'); do
1585
			for fd in $(find ${_pdir}/${_pname}/files d -name '*pfSense*'); do
1580 1586
				local _fddir=$(dirname ${fd})
1581 1587
				local _fdname=$(echo $(basename ${fd}) | sed "s,pfSense,${PRODUCT_NAME},")
1582 1588

  
......
1714 1720

  
1715 1721
		if poudriere jail -i -j "${jail_name}" >/dev/null 2>&1; then
1716 1722
			echo ">>> Poudriere jail ${jail_name} already exists, deleting it..." | tee -a ${LOGFILE}
1717
			poudriere jail -d -j "${jail_name}" >/dev/null 2>&1
1723
			poudriere jail -d -j "${jail_name}"
1718 1724
		fi
1719 1725
	done
1720 1726

  

Also available in: Unified diff