summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2013-10-26 03:31:05 +0000
committerbdrewery <bdrewery@FreeBSD.org>2013-10-26 03:31:05 +0000
commit389ffca6d66dc27bd6424dccf90331a485dd7eaa (patch)
tree7465eb11eecd7e13e95edcbbbfe5cf707c488172 /etc
parente8e5ffc1183571be34ec075ebc30419dae5daba3 (diff)
downloadFreeBSD-src-389ffca6d66dc27bd6424dccf90331a485dd7eaa.zip
FreeBSD-src-389ffca6d66dc27bd6424dccf90331a485dd7eaa.tar.gz
Add support for reading configuration files from /etc/pkg.
For now only /etc/pkg/FreeBSD.conf is supported. Its style is: Repo: { URL: "...", MIRROR_TYPE: "...", ... } The configuration will be read from /usr/local/etc/pkg.conf if exists, otherwise /etc/pkg/FreeBSD.conf Approved by: bapt MFC after: 2 days
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile3
-rw-r--r--etc/pkg/FreeBSD.conf6
-rw-r--r--etc/pkg/Makefile10
3 files changed, 19 insertions, 0 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 7e8e23f..d763df6 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -225,6 +225,9 @@ distribution:
${_+_}cd ${.CURDIR}/devd; ${MAKE} install
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
+.if ${MK_PKGBOOTSTRAP} != "no"
+ ${_+_}cd ${.CURDIR}/pkg; ${MAKE} install
+.endif
${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
${_+_}cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall
${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap
diff --git a/etc/pkg/FreeBSD.conf b/etc/pkg/FreeBSD.conf
new file mode 100644
index 0000000..b36d20f
--- /dev/null
+++ b/etc/pkg/FreeBSD.conf
@@ -0,0 +1,6 @@
+# $FreeBSD$
+FreeBSD: {
+ url: "pkg+http://pkg.freebsd.org/${ABI}/latest",
+ mirror_type: "srv",
+ enabled: "yes"
+}
diff --git a/etc/pkg/Makefile b/etc/pkg/Makefile
new file mode 100644
index 0000000..abc8c64
--- /dev/null
+++ b/etc/pkg/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+NO_OBJ=
+
+FILES= FreeBSD.conf
+
+FILESDIR= /etc/pkg
+FILESMODE= 644
+
+.include <bsd.prog.mk>
OpenPOWER on IntegriCloud