Date: Mon, 26 Jan 2015 10:25:27 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r277744 - in projects/building-blocks: etc/pam.d etc/rc.d share/examples share/man/man5 sys/amd64/amd64 tools/build/mk Message-ID: <201501261025.t0QAPRTE062656@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Mon Jan 26 10:25:26 2015 New Revision: 277744 URL: https://svnweb.freebsd.org/changeset/base/277744 Log: MFhead @ r277742 Diff reduce where possible Modified: projects/building-blocks/etc/pam.d/Makefile projects/building-blocks/etc/rc.d/Makefile projects/building-blocks/share/examples/Makefile projects/building-blocks/share/man/man5/src.conf.5 projects/building-blocks/sys/amd64/amd64/machdep.c projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: projects/building-blocks/ (props changed) projects/building-blocks/etc/ (props changed) projects/building-blocks/sbin/ (props changed) projects/building-blocks/share/ (props changed) projects/building-blocks/share/man/man4/ (props changed) projects/building-blocks/sys/ (props changed) projects/building-blocks/sys/conf/ (props changed) Modified: projects/building-blocks/etc/pam.d/Makefile ============================================================================== --- projects/building-blocks/etc/pam.d/Makefile Mon Jan 26 10:11:55 2015 (r277743) +++ projects/building-blocks/etc/pam.d/Makefile Mon Jan 26 10:25:26 2015 (r277744) @@ -1,9 +1,9 @@ # $FreeBSD$ -NO_OBJ= - .include <src.opts.mk> +NO_OBJ= + FILES= README \ cron \ login \ Modified: projects/building-blocks/etc/rc.d/Makefile ============================================================================== --- projects/building-blocks/etc/rc.d/Makefile Mon Jan 26 10:11:55 2015 (r277743) +++ projects/building-blocks/etc/rc.d/Makefile Mon Jan 26 10:25:26 2015 (r277744) @@ -12,7 +12,6 @@ FILES= DAEMON \ abi \ addswap \ adjkerntz \ - amd \ archdep \ bgfsck \ ${_bluetooth} \ @@ -115,7 +114,7 @@ FILES+= powerd .endif .if ${MK_AMD} != "no" -FILES+= amd +FILES+= amd .endif .if ${MK_APM} != "no" @@ -135,9 +134,9 @@ FILES+= auditdistd .endif .if ${MK_AUTOFS} != "no" -FILES+= automount -FILES+= automountd -FILES+= autounmountd +FILES+= automount +FILES+= automountd +FILES+= autounmountd .endif .if ${MK_BLUETOOTH} != "no" Modified: projects/building-blocks/share/examples/Makefile ============================================================================== --- projects/building-blocks/share/examples/Makefile Mon Jan 26 10:11:55 2015 (r277743) +++ projects/building-blocks/share/examples/Makefile Mon Jan 26 10:25:26 2015 (r277744) @@ -179,6 +179,22 @@ BINDIR= ${SHAREDIR}/examples NO_OBJ= +.if ${MK_HAST} != "no" +LDIRS+= hast +XFILES+= hast/ucarp.sh \ + hast/ucarp_down.sh \ + hast/ucarp_up.sh \ + hast/vip-down.sh \ + hast/vip-up.sh +.endif + +.if ${MACHINE_CPUARCH} == "amd64" +.if ${MK_BHYVE} != "no" +LDIRS+= bhyve +XFILES+= bhyve/vmrun.sh +.endif +.endif + # Define SHARED to indicate whether you want symbolic links to the system # source (``symlinks''), or a separate copy (``copies''); (latter useful # in environments where it's not possible to keep /sys publicly readable) Modified: projects/building-blocks/share/man/man5/src.conf.5 ============================================================================== --- projects/building-blocks/share/man/man5/src.conf.5 Mon Jan 26 10:11:55 2015 (r277743) +++ projects/building-blocks/share/man/man5/src.conf.5 Mon Jan 26 10:25:26 2015 (r277744) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des .\" $FreeBSD$ -.Dd January 24, 2015 +.Dd January 25, 2015 .Dt SRC.CONF 5 .Os .Sh NAME @@ -121,6 +121,18 @@ Set to not build audit support into syst .\" from FreeBSD: head/tools/build/options/WITHOUT_AUTHPF 156932 2006-03-21 07:50:50Z ru Set to not build .Xr authpf 8 . +.It Va WITHOUT_AUTOFS +.\" from FreeBSD: head/tools/build/options/WITHOUT_AUTOFS 277728 2015-01-26 07:15:49Z ngie +Set to not build +.Xr autofs 4 +related programs, libraries, and kernel modules. +.It Va WITHOUT_BHYVE +.\" from FreeBSD: head/tools/build/options/WITHOUT_BHYVE 277727 2015-01-26 06:44:48Z ngie +Set to not build or install +.Xr bhyve 8 , +associated utilities, and examples. +.Pp +This option only affects amd64/amd64. .It Va WITHOUT_BINUTILS .\" from FreeBSD: head/tools/build/options/WITHOUT_BINUTILS 266158 2014-05-15 16:51:45Z brooks Set to not build or install binutils (as, c++-filt, gconv, @@ -543,6 +555,11 @@ You should consider installing the textp .It Va WITHOUT_GSSAPI .\" from FreeBSD: head/tools/build/options/WITHOUT_GSSAPI 174548 2007-12-12 16:39:32Z ru Set to not build libgssapi. +.It Va WITHOUT_HAST +.\" from FreeBSD: head/tools/build/options/WITHOUT_HAST 277725 2015-01-26 06:27:07Z ngie +Set to not build +.Xr hastd 8 +and related utilities. .It Va WITH_HESIOD .\" from FreeBSD: head/tools/build/options/WITH_HESIOD 156932 2006-03-21 07:50:50Z ru Set to build Hesiod support. Modified: projects/building-blocks/sys/amd64/amd64/machdep.c ============================================================================== --- projects/building-blocks/sys/amd64/amd64/machdep.c Mon Jan 26 10:11:55 2015 (r277743) +++ projects/building-blocks/sys/amd64/amd64/machdep.c Mon Jan 26 10:25:26 2015 (r277744) @@ -1355,8 +1355,10 @@ add_physmap_entry(uint64_t base, uint64_ /* * Find insertion point while checking for overlap. Start off by * assuming the new entry will be added to the end. + * + * NB: physmap_idx points to the next free slot. */ - insert_idx = physmap_idx + 2; + insert_idx = physmap_idx; for (i = 0; i <= physmap_idx; i += 2) { if (base < physmap[i + 1]) { if (base + length <= physmap[i]) { @@ -1394,7 +1396,7 @@ add_physmap_entry(uint64_t base, uint64_ * Move the last 'N' entries down to make room for the new * entry if needed. */ - for (i = physmap_idx; i > insert_idx; i -= 2) { + for (i = (physmap_idx - 2); i > insert_idx; i -= 2) { physmap[i] = physmap[i - 2]; physmap[i + 1] = physmap[i - 1]; } @@ -1580,23 +1582,27 @@ getmemsize(caddr_t kmdp, u_int64_t first int page_counter; bzero(physmap, sizeof(physmap)); - basemem = 0; physmap_idx = 0; init_ops.parse_memmap(kmdp, physmap, &physmap_idx); + physmap_idx -= 2; /* * Find the 'base memory' segment for SMP */ basemem = 0; for (i = 0; i <= physmap_idx; i += 2) { - if (physmap[i] == 0x00000000) { + if (physmap[i] <= 0xA0000) { basemem = physmap[i + 1] / 1024; break; } } - if (basemem == 0) - panic("BIOS smap did not include a basemem segment!"); + if (basemem == 0 || basemem > 640) { + if (bootverbose) + printf( + "Memory map doesn't contain a basemem segment, faking it"); + basemem = 640; + } /* * Make hole for "AP -> long mode" bootstrap code. The @@ -1604,8 +1610,12 @@ getmemsize(caddr_t kmdp, u_int64_t first * is configured to support APs and APs for the system start * in 32bit mode (e.g. SMP bare metal). */ - if (init_ops.mp_bootaddress) + if (init_ops.mp_bootaddress) { + if (physmap[1] >= 0x100000000) + panic( + "Basemem segment is not suitable for AP bootstrap code!"); physmap[1] = init_ops.mp_bootaddress(physmap[1] / 1024); + } /* * Maxmem isn't the "maximum memory", it's one larger than the @@ -1657,12 +1667,14 @@ getmemsize(caddr_t kmdp, u_int64_t first */ physmem_start = (vm_guest > VM_GUEST_NO ? 1 : 16) << PAGE_SHIFT; TUNABLE_ULONG_FETCH("hw.physmem.start", &physmem_start); - if (physmem_start < PAGE_SIZE) - physmap[0] = PAGE_SIZE; - else if (physmem_start >= physmap[1]) - physmap[0] = round_page(physmap[1] - PAGE_SIZE); - else - physmap[0] = round_page(physmem_start); + if (physmap[0] < physmem_start) { + if (physmem_start < PAGE_SIZE) + physmap[0] = PAGE_SIZE; + else if (physmem_start >= physmap[1]) + physmap[0] = round_page(physmap[1] - PAGE_SIZE); + else + physmap[0] = round_page(physmem_start); + } pa_indx = 0; da_indx = 1; phys_avail[pa_indx++] = physmap[0]; Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 10:11:55 2015 (r277743) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 10:25:26 2015 (r277744) @@ -289,6 +289,7 @@ OLD_FILES+=usr/share/man/man8/authpf-noi .if ${MK_AUTOFS} == no OLD_FILES+=etc/autofs/include_ldap OLD_FILES+=etc/autofs/special_hosts +OLD_FILES+=etc/autofs/special_media OLD_FILES+=etc/autofs/special_null OLD_FILES+=etc/auto_master OLD_FILES+=usr/sbin/automount @@ -6535,6 +6536,8 @@ OLD_DIRS+=usr/share/vi .if ${MK_WIRELESS} == no OLD_FILES+=etc/regdomain.xml +OLD_FILES+=etc/rc.d/hostapd +OLD_FILES+=etc/rc.d/wpa_supplicant OLD_FILES+=usr/sbin/ancontrol OLD_FILES+=usr/sbin/hostapd OLD_FILES+=usr/sbin/hostapd_cli
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501261025.t0QAPRTE062656>