From 58dfa07ade1fb5ec166d7bd1952f59e5f943c6e0 Mon Sep 17 00:00:00 2001 From: Remko Lodder Date: Wed, 22 Aug 2007 18:45:00 +0000 Subject: [PATCH] Bring in two fixes for TinyBSD: - Add the bind mtree to the TinyBSD build so that files can be installed there (else the build fails) - Change GEOM_GPT to GEOM_PART_GPT since that had been renamed in current. The kernel configuration provided by TinyBSD will not build without these changes. PR: misc/115484 PR: misc/115405 Submitted by: Richard Arends Approved by: re (bmah) Approved by: imp (mentor) --- tools/tools/tinybsd/conf/bridge/TINYBSD | 2 +- tools/tools/tinybsd/conf/default/TINYBSD | 2 +- tools/tools/tinybsd/conf/firewall/TINYBSD | 2 +- tools/tools/tinybsd/conf/minimal/TINYBSD | 2 +- tools/tools/tinybsd/conf/vpn/TINYBSD | 2 +- tools/tools/tinybsd/conf/wireless/TINYBSD | 2 +- tools/tools/tinybsd/conf/wrap/TINYBSD | 2 +- tools/tools/tinybsd/tinybsd | 1 + 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/tools/tinybsd/conf/bridge/TINYBSD b/tools/tools/tinybsd/conf/bridge/TINYBSD index 63f7ca29a68..6faf082dd92 100644 --- a/tools/tools/tinybsd/conf/bridge/TINYBSD +++ b/tools/tools/tinybsd/conf/bridge/TINYBSD @@ -17,7 +17,7 @@ options UFS_DIRHASH # Improve performance on big directories options MD_ROOT # MD is a potential root device options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework -options GEOM_GPT # GUID Partition Tables. +options GEOM_PART_GPT # GUID Partition Tables. options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options SYSVSHM # SYSV-style shared memory diff --git a/tools/tools/tinybsd/conf/default/TINYBSD b/tools/tools/tinybsd/conf/default/TINYBSD index 9d1b6a921fe..d3af637c988 100644 --- a/tools/tools/tinybsd/conf/default/TINYBSD +++ b/tools/tools/tinybsd/conf/default/TINYBSD @@ -23,7 +23,7 @@ options MSDOSFS # MSDOS Filesystem options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework -options GEOM_GPT # GUID Partition Tables. +options GEOM_PART_GPT # GUID Partition Tables. options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options SYSVSHM # SYSV-style shared memory diff --git a/tools/tools/tinybsd/conf/firewall/TINYBSD b/tools/tools/tinybsd/conf/firewall/TINYBSD index 4c15a6cb33a..f4c5d3ce546 100644 --- a/tools/tools/tinybsd/conf/firewall/TINYBSD +++ b/tools/tools/tinybsd/conf/firewall/TINYBSD @@ -16,7 +16,7 @@ options UFS_DIRHASH # Improve performance on big directories options MD_ROOT # MD is a potential root device options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework -options GEOM_GPT # GUID Partition Tables. +options GEOM_PART_GPT # GUID Partition Tables. options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options SYSVSHM # SYSV-style shared memory diff --git a/tools/tools/tinybsd/conf/minimal/TINYBSD b/tools/tools/tinybsd/conf/minimal/TINYBSD index 0ef5706b679..2cd1f9af9ae 100644 --- a/tools/tools/tinybsd/conf/minimal/TINYBSD +++ b/tools/tools/tinybsd/conf/minimal/TINYBSD @@ -16,7 +16,7 @@ options UFS_DIRHASH # Improve performance on big directories options MD_ROOT # MD is a potential root device options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework -options GEOM_GPT # GUID Partition Tables. +options GEOM_PART_GPT # GUID Partition Tables. options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options SYSVSHM # SYSV-style shared memory diff --git a/tools/tools/tinybsd/conf/vpn/TINYBSD b/tools/tools/tinybsd/conf/vpn/TINYBSD index 57bc1984c47..76a6fa2bf7a 100644 --- a/tools/tools/tinybsd/conf/vpn/TINYBSD +++ b/tools/tools/tinybsd/conf/vpn/TINYBSD @@ -16,7 +16,7 @@ options UFS_DIRHASH # Improve performance on big directories options MD_ROOT # MD is a potential root device options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework -options GEOM_GPT # GUID Partition Tables. +options GEOM_PART_GPT # GUID Partition Tables. options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options SYSVSHM # SYSV-style shared memory diff --git a/tools/tools/tinybsd/conf/wireless/TINYBSD b/tools/tools/tinybsd/conf/wireless/TINYBSD index 4966b826613..8b3f843941e 100644 --- a/tools/tools/tinybsd/conf/wireless/TINYBSD +++ b/tools/tools/tinybsd/conf/wireless/TINYBSD @@ -16,7 +16,7 @@ options UFS_DIRHASH # Improve performance on big directories options MD_ROOT # MD is a potential root device options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework -options GEOM_GPT # GUID Partition Tables. +options GEOM_PART_GPT # GUID Partition Tables. options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options SYSVSHM # SYSV-style shared memory diff --git a/tools/tools/tinybsd/conf/wrap/TINYBSD b/tools/tools/tinybsd/conf/wrap/TINYBSD index 238a4b61828..aff67ea95ef 100644 --- a/tools/tools/tinybsd/conf/wrap/TINYBSD +++ b/tools/tools/tinybsd/conf/wrap/TINYBSD @@ -19,7 +19,7 @@ options NFSSERVER # Network Filesystem Server options NFS_ROOT # NFS usable as /, requires NFSCLIENT options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework -options GEOM_GPT # GUID Partition Tables. +options GEOM_PART_GPT # GUID Partition Tables. options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options SYSVSHM # SYSV-style shared memory diff --git a/tools/tools/tinybsd/tinybsd b/tools/tools/tinybsd/tinybsd index da953c9d23f..f8de882cda3 100755 --- a/tools/tools/tinybsd/tinybsd +++ b/tools/tools/tinybsd/tinybsd @@ -267,6 +267,7 @@ prework() { create_tree() { echo "${TS} Creating directory hierarchy... " mtree -deU -f /etc/mtree/BSD.root.dist -p ${WORKDIR} + mtree -deU -f /etc/mtree/BIND.chroot.dist -p ${WORKDIR} mtree -deU -f /etc/mtree/BSD.usr.dist -p ${WORKDIR}/usr mtree -deU -f /etc/mtree/BSD.local.dist -p ${WORKDIR}/usr/local mtree -deU -f /etc/mtree/BSD.var.dist -p ${WORKDIR}/var