Mon Dec 5 23:04:39 2011 UTC ()
do_sys_sync() is part of vfs, hence rumpvfs. Used by pmf(9) during
device suspend, so explicitly link against rumpvfs to resolve that
symbol when linking rumpdev.

Unbreaks "rumptest" target.


(jym)
diff -r1.251 -r1.252 src/build.sh
cvs diff -r1.251 -r1.252 src/build.sh (expand / switch to unified diff)

--- src/build.sh 2011/10/17 16:22:12 1.251
+++ src/build.sh 2011/12/05 23:04:39 1.252
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1#! /usr/bin/env sh 1#! /usr/bin/env sh
2# $NetBSD: build.sh,v 1.251 2011/10/17 16:22:12 mbalmer Exp $ 2# $NetBSD: build.sh,v 1.252 2011/12/05 23:04:39 jym Exp $
3# 3#
4# Copyright (c) 2001-2011 The NetBSD Foundation, Inc. 4# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
5# All rights reserved. 5# All rights reserved.
6# 6#
7# This code is derived from software contributed to The NetBSD Foundation 7# This code is derived from software contributed to The NetBSD Foundation
8# by Todd Vierling and Luke Mewburn. 8# by Todd Vierling and Luke Mewburn.
9# 9#
10# Redistribution and use in source and binary forms, with or without 10# Redistribution and use in source and binary forms, with or without
11# modification, are permitted provided that the following conditions 11# modification, are permitted provided that the following conditions
12# are met: 12# are met:
13# 1. Redistributions of source code must retain the above copyright 13# 1. Redistributions of source code must retain the above copyright
14# notice, this list of conditions and the following disclaimer. 14# notice, this list of conditions and the following disclaimer.
15# 2. Redistributions in binary form must reproduce the above copyright 15# 2. Redistributions in binary form must reproduce the above copyright
@@ -1622,27 +1622,27 @@ createmakewrapper() @@ -1622,27 +1622,27 @@ createmakewrapper()
1622 else 1622 else
1623 makewrapout=">>\${makewrapper}" 1623 makewrapout=">>\${makewrapper}"
1624 fi 1624 fi
1625 1625
1626 case "${KSH_VERSION:-${SH_VERSION}}" in 1626 case "${KSH_VERSION:-${SH_VERSION}}" in
1627 *PD\ KSH*|*MIRBSD\ KSH*) 1627 *PD\ KSH*|*MIRBSD\ KSH*)
1628 set +o braceexpand 1628 set +o braceexpand
1629 ;; 1629 ;;
1630 esac 1630 esac
1631 1631
1632 eval cat <<EOF ${makewrapout} 1632 eval cat <<EOF ${makewrapout}
1633#! ${HOST_SH} 1633#! ${HOST_SH}
1634# Set proper variables to allow easy "make" building of a NetBSD subtree. 1634# Set proper variables to allow easy "make" building of a NetBSD subtree.
1635# Generated from: \$NetBSD: build.sh,v 1.251 2011/10/17 16:22:12 mbalmer Exp $ 1635# Generated from: \$NetBSD: build.sh,v 1.252 2011/12/05 23:04:39 jym Exp $
1636# with these arguments: ${_args} 1636# with these arguments: ${_args}
1637# 1637#
1638 1638
1639EOF 1639EOF
1640 { 1640 {
1641 for f in ${makeenv}; do 1641 for f in ${makeenv}; do
1642 if eval "[ -z \"\${$f}\" -a \"\${${f}-X}\" = \"X\" ]"; then 1642 if eval "[ -z \"\${$f}\" -a \"\${${f}-X}\" = \"X\" ]"; then
1643 eval echo "unset ${f}" 1643 eval echo "unset ${f}"
1644 else 1644 else
1645 eval echo "${f}=\'\$$(echo ${f})\'\;\ export\ ${f}" 1645 eval echo "${f}=\'\$$(echo ${f})\'\;\ export\ ${f}"
1646 fi 1646 fi
1647 done 1647 done
1648 1648
@@ -1820,27 +1820,27 @@ installworld() @@ -1820,27 +1820,27 @@ installworld()
1820# linking was successful. 1820# linking was successful.
1821# 1821#
1822# We test that rump links with a number of component configurations. 1822# We test that rump links with a number of component configurations.
1823# These attempt to mimic what is encountered in the full build. 1823# These attempt to mimic what is encountered in the full build.
1824# See list below. The list should probably be either autogenerated 1824# See list below. The list should probably be either autogenerated
1825# or managed elsewhere; keep it here until a better idea arises. 1825# or managed elsewhere; keep it here until a better idea arises.
1826# 1826#
1827# Above all, note that THIS IS NOT A SUBSTITUTE FOR A FULL BUILD. 1827# Above all, note that THIS IS NOT A SUBSTITUTE FOR A FULL BUILD.
1828# 1828#
1829 1829
1830RUMP_LIBSETS=' 1830RUMP_LIBSETS='
1831 -lrump, 1831 -lrump,
1832 -lrumpvfs -lrump, 1832 -lrumpvfs -lrump,
1833 -lrumpdev -lrump, 1833 -lrumpvfs -lrumpdev -lrump,
1834 -lrumpnet -lrump, 1834 -lrumpnet -lrump,
1835 -lrumpkern_tty -lrumpvfs -lrump, 1835 -lrumpkern_tty -lrumpvfs -lrump,
1836 -lrumpfs_tmpfs -lrumpvfs -lrump, 1836 -lrumpfs_tmpfs -lrumpvfs -lrump,
1837 -lrumpfs_ffs -lrumpfs_msdos -lrumpvfs -lrumpdev_disk -lrumpdev -lrump, 1837 -lrumpfs_ffs -lrumpfs_msdos -lrumpvfs -lrumpdev_disk -lrumpdev -lrump,
1838 -lrumpnet_virtif -lrumpnet_netinet -lrumpnet_net -lrumpnet -lrump, 1838 -lrumpnet_virtif -lrumpnet_netinet -lrumpnet_net -lrumpnet -lrump,
1839 -lrumpnet_sockin -lrumpfs_smbfs -lrumpdev_netsmb 1839 -lrumpnet_sockin -lrumpfs_smbfs -lrumpdev_netsmb
1840 -lrumpkern_crypto -lrumpdev -lrumpnet -lrumpvfs -lrump, 1840 -lrumpkern_crypto -lrumpdev -lrumpnet -lrumpvfs -lrump,
1841 -lrumpnet_sockin -lrumpfs_nfs -lrumpnet -lrumpvfs -lrump, 1841 -lrumpnet_sockin -lrumpfs_nfs -lrumpnet -lrumpvfs -lrump,
1842 -lrumpdev_cgd -lrumpdev_raidframe -lrumpdev_disk -lrumpdev_rnd 1842 -lrumpdev_cgd -lrumpdev_raidframe -lrumpdev_disk -lrumpdev_rnd
1843 -lrumpdev_dm -lrumpdev -lrumpvfs -lrumpkern_crypto -lrump' 1843 -lrumpdev_dm -lrumpdev -lrumpvfs -lrumpkern_crypto -lrump'
1844dorump() 1844dorump()
1845{ 1845{
1846 local doclean="" 1846 local doclean=""