From dd07efe178b057fe2b4cf74b0fec4f34f6712588 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 17 Jan 2024 08:46:53 +0100 Subject: [PATCH] Framework: load firmware repo scripts on post update (cherry picked from commit c888c851d783025308dbe3e0596147d9938680ad) (cherry picked from commit 1ade0ef804cd44ce37d004739e327cb36eb4dd4f) --- Mk/plugins.mk | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Mk/plugins.mk b/Mk/plugins.mk index 823fd4ea7..cd89650d2 100644 --- a/Mk/plugins.mk +++ b/Mk/plugins.mk @@ -131,8 +131,8 @@ manifest: check done @echo "}" .endif - @if [ -f ${WRKSRC}/usr/local/opnsense/version/${PLUGIN_NAME} ]; then \ - echo "annotations $$(cat ${WRKSRC}/usr/local/opnsense/version/${PLUGIN_NAME})"; \ + @if [ -f ${WRKSRC}${LOCALBASE}/opnsense/version/${PLUGIN_NAME} ]; then \ + echo "annotations $$(cat ${WRKSRC}${LOCALBASE}/opnsense/version/${PLUGIN_NAME})"; \ fi scripts: check scripts-pre scripts-auto scripts-manual scripts-post @@ -185,6 +185,12 @@ scripts-auto: ${DESTDIR}/+POST_INSTALL; \ done; \ fi + @if [ -d ${.CURDIR}/src/opnsense/scripts/firmware/repos ]; then \ + for FILE in $$(cd ${.CURDIR}/src && find -s \ + opnsense/scripts/firmware/repos -type f); do \ + echo "${LOCALBASE}/$${FILE#.}" >> ${DESTDIR}/+POST_INSTALL; \ + done \ + fi scripts-manual: @for SCRIPT in ${PLUGIN_SCRIPTS}; do \ @@ -273,7 +279,7 @@ package: check @${MAKE} DESTDIR=${WRKSRC} install @echo " done" @echo ">>> Generated version info for ${PLUGIN_PKGNAME}-${PLUGIN_PKGVERSION}:" - @cat ${WRKSRC}/usr/local/opnsense/version/${PLUGIN_NAME} + @cat ${WRKSRC}${LOCALBASE}/opnsense/version/${PLUGIN_NAME} @echo -n ">>> Generating metadata for ${PLUGIN_PKGNAME}-${PLUGIN_PKGVERSION}..." @${MAKE} DESTDIR=${WRKSRC} metadata @echo " done" @@ -434,7 +440,7 @@ style-model: test: check @if [ -d ${.CURDIR}/src/opnsense/mvc/tests ]; then \ - cd /usr/local/opnsense/mvc/tests && \ + cd ${LOCALBASE}/opnsense/mvc/tests && \ phpunit --configuration PHPunit.xml \ ${.CURDIR}/src/opnsense/mvc/tests; \ fi