From 10002c22780b05286c90cf31c52bb3e16b170c8f Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 2 Mar 2015 12:42:43 +0100 Subject: [PATCH] pkg: auto-mounting the repo taints pkg(8) setups Move the config files out of the way, but still install them properly. --- Makefile | 6 ++++++ {src/etc/pkg/repos => pkg}/OPNsense.conf | 0 {src/etc => pkg}/pkg.conf | 0 3 files changed, 6 insertions(+) rename {src/etc/pkg/repos => pkg}/OPNsense.conf (100%) rename {src/etc => pkg}/pkg.conf (100%) diff --git a/Makefile b/Makefile index 22cffa0c2..32a3003db 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,12 @@ install: # move all sources to their destination and... @mkdir -p ${DESTDIR}/usr/local @cp -r ${.CURDIR}/src/* ${DESTDIR}/usr/local + # bootstrap pkg(8) files that are not in sources + @mkdir -p ${DESTDIR}/usr/local/etc/pkg/repos + @cp ${.CURDIR}/pkg/OPNsense.conf ${DESTDIR}/usr/local/etc/pkg/repos + @echo /usr/local/etc/pkg/repos/OPNsense.conf + @cp ${.CURDIR}/pkg/pkg.conf ${DESTDIR}/usr/local/etc + @echo /usr/local/etc/pkg.conf # ... pretty-print a list of files present @(cd ${.CURDIR}/src; find * -type f) | \ xargs -n1 printf "/usr/local/%s\n" diff --git a/src/etc/pkg/repos/OPNsense.conf b/pkg/OPNsense.conf similarity index 100% rename from src/etc/pkg/repos/OPNsense.conf rename to pkg/OPNsense.conf diff --git a/src/etc/pkg.conf b/pkg/pkg.conf similarity index 100% rename from src/etc/pkg.conf rename to pkg/pkg.conf