firmware: stop providing ABI/name version files manually

Add them to the plist with proper replacement for now, even though
they are going away eventually.
This commit is contained in:
Franco Fichtner 2018-09-22 10:38:15 +02:00
parent 8a2d2be72c
commit 6ebded2717
6 changed files with 10 additions and 4 deletions

View File

@ -31,10 +31,6 @@ EOF
cat /etc/rc.shutdown.bak >> /etc/rc.shutdown
rm -f /etc/rc.shutdown.bak
# XXX 18.7 compat for now (remove scripts SED_REPLACE from Makefile, too)
echo "%%CORE_NAME%%" > /usr/local/opnsense/version/opnsense.name
echo "%%CORE_ABI%%" > /usr/local/opnsense/version/opnsense.abi
/usr/local/etc/rc.d/configd start
/usr/local/etc/rc.configure_firmware

View File

@ -155,6 +155,10 @@ mount:
echo -n "Enabling core.git live mount..."; \
sed ${SED_REPLACE} ${.CURDIR}/src/opnsense/version/opnsense.in > \
${.CURDIR}/src/opnsense/version/opnsense; \
sed ${SED_REPLACE} ${.CURDIR}/src/opnsense/version/opnsense.abi.in > \
${.CURDIR}/src/opnsense/version/opnsense.abi; \
sed ${SED_REPLACE} ${.CURDIR}/src/opnsense/version/opnsense.name.in > \
${.CURDIR}/src/opnsense/version/opnsense.name; \
mount_unionfs ${.CURDIR}/src ${LOCALBASE}; \
touch ${WRKDIR}/.mount_done; \
echo "done"; \

2
plist
View File

@ -839,6 +839,8 @@
/usr/local/opnsense/site-python/watchers/__init__.py
/usr/local/opnsense/site-python/watchers/dhcpd.py
/usr/local/opnsense/version/opnsense
/usr/local/opnsense/version/opnsense.abi
/usr/local/opnsense/version/opnsense.name
/usr/local/opnsense/www/api.php
/usr/local/opnsense/www/css/bootstrap-datepicker3.min.css
/usr/local/opnsense/www/css/flags/1x1/ad.svg

View File

@ -1,2 +1,4 @@
*
!/opnsense.abi.in
!/opnsense.in
!/opnsense.name.in

View File

@ -0,0 +1 @@
%%CORE_ABI%%

View File

@ -0,0 +1 @@
%%CORE_NAME%%