svn commit: r219772 - head/sys/dev/ath/ath_hal
Author: adrian
Date: Sat Mar 19 14:37:13 2011
New Revision: 219772
URL: http://svn.freebsd.org/changeset/base/219772
Log:
Reserve a new diagnostic code for the channel survey code I'll add soon.
Modified:
head/sys/dev/ath/ath_hal/ah_diagcodes.h
Modified: head/sys/dev/ath/ath_hal/ah_diagcodes.h
==
--- head/sys/dev/ath/ath_hal/ah_diagcodes.h Sat Mar 19 03:15:28 2011
(r219771)
+++ head/sys/dev/ath/ath_hal/ah_diagcodes.h Sat Mar 19 14:37:13 2011
(r219772)
@@ -62,6 +62,7 @@ enum {
HAL_DIAG_ANI_PARAMS = 31, /* ANI noise immunity parameters */
HAL_DIAG_CHECK_HANGS= 32, /* check h/w hangs */
HAL_DIAG_SETREGS= 33, /* write registers */
+ HAL_DIAG_CHANSURVEY = 34, /* channel survey */
};
#endif /* _ATH_AH_DIAGCODES_H_ */
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r219773 - head/sys/dev/ath/ath_hal
Author: adrian
Date: Sat Mar 19 14:38:28 2011
New Revision: 219773
URL: http://svn.freebsd.org/changeset/base/219773
Log:
Add in the channel survey data structures. These will be filled out
by the HAL at some point in the future.
Modified:
head/sys/dev/ath/ath_hal/ah.h
Modified: head/sys/dev/ath/ath_hal/ah.h
==
--- head/sys/dev/ath/ath_hal/ah.h Sat Mar 19 14:37:13 2011
(r219772)
+++ head/sys/dev/ath/ath_hal/ah.h Sat Mar 19 14:38:28 2011
(r219773)
@@ -596,6 +596,33 @@ struct ath_rx_status;
struct ieee80211_channel;
/*
+ * This is a channel survey sample entry.
+ *
+ * The AR5212 ANI routines fill these samples. The ANI code then uses it
+ * when calculating listen time; it is also exported via a diagnostic
+ * API.
+ */
+typedef struct {
+ uint32_tseq_num;
+ uint32_ttx_busy;
+ uint32_trx_busy;
+ uint32_tchan_busy;
+ uint32_tcycle_count;
+} HAL_SURVEY_SAMPLE;
+
+/*
+ * This provides 3.2 seconds of sample space given an
+ * ANI time of 1/10th of a second. This may not be enough!
+ */
+#defineCHANNEL_SURVEY_SAMPLE_COUNT 32
+
+typedef struct {
+ HAL_SURVEY_SAMPLE samples[CHANNEL_SURVEY_SAMPLE_COUNT];
+ uint32_t cur_sample;/* current sample in sequence */
+ uint32_t cur_seq; /* current sequence number */
+} HAL_CHANNEL_SURVEY;
+
+/*
* Hardware Access Layer (HAL) API.
*
* Clients of the HAL call ath_hal_attach to obtain a reference to an
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r219775 - in head/sys: amd64/conf i386/conf ia64/conf mips/conf
Author: bz Date: Sat Mar 19 15:50:34 2011 New Revision: 219775 URL: http://svn.freebsd.org/changeset/base/219775 Log: For now remove options FLOWTABLE from the remaining GENERIC kernel configurations and make it opt-in for those who want it. LINT will still build it. While it may be a perfect win in some scenarios, it still troubles users (see PRs) in general cases. In addition we are still allocating resources even if disabled by sysctl and still leak arp/nd6 entries in case of interface destruction. Discussed with: qingli (2010-11-24, just never executed) Discussed with: juli (OCTEON1) PR: kern/148018, kern/155604, kern/144917, kern/146792 MFC after:2 weeks Modified: head/sys/amd64/conf/GENERIC head/sys/i386/conf/GENERIC head/sys/ia64/conf/GENERIC head/sys/mips/conf/OCTEON1 Modified: head/sys/amd64/conf/GENERIC == --- head/sys/amd64/conf/GENERIC Sat Mar 19 14:44:24 2011(r219774) +++ head/sys/amd64/conf/GENERIC Sat Mar 19 15:50:34 2011(r219775) @@ -61,7 +61,6 @@ options KBD_INSTALL_CDEV# install a CD optionsHWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) optionsAUDIT # Security event auditing optionsMAC # TrustedBSD MAC Framework -optionsFLOWTABLE # per-cpu routing cache #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks optionsINCLUDE_CONFIG_FILE # Include this file in kernel Modified: head/sys/i386/conf/GENERIC == --- head/sys/i386/conf/GENERIC Sat Mar 19 14:44:24 2011(r219774) +++ head/sys/i386/conf/GENERIC Sat Mar 19 15:50:34 2011(r219775) @@ -62,7 +62,6 @@ options KBD_INSTALL_CDEV# install a CD optionsHWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) optionsAUDIT # Security event auditing optionsMAC # TrustedBSD MAC Framework -optionsFLOWTABLE # per-cpu routing cache #options KDTRACE_HOOKS # Kernel DTrace hooks optionsINCLUDE_CONFIG_FILE # Include this file in kernel Modified: head/sys/ia64/conf/GENERIC == --- head/sys/ia64/conf/GENERIC Sat Mar 19 14:44:24 2011(r219774) +++ head/sys/ia64/conf/GENERIC Sat Mar 19 15:50:34 2011(r219775) @@ -31,8 +31,6 @@ options COMPAT_FREEBSD7 # Compatible wi optionsDDB # Support DDB optionsDEADLKRES # Enable the deadlock resolver optionsFFS # Berkeley Fast Filesystem -#options FLOWTABLE # per-cpu routing cache (removed due to - # misaligned access -- see kern/148018) optionsGDB # Support remote GDB optionsGEOM_LABEL # Provides labelization optionsINCLUDE_CONFIG_FILE # Include this file in kernel Modified: head/sys/mips/conf/OCTEON1 == --- head/sys/mips/conf/OCTEON1 Sat Mar 19 14:44:24 2011(r219774) +++ head/sys/mips/conf/OCTEON1 Sat Mar 19 15:50:34 2011(r219775) @@ -73,7 +73,6 @@ options PRINTF_BUFR_SIZE=128# Prevent optionsHWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) optionsAUDIT # Security event auditing optionsMAC # TrustedBSD MAC Framework -optionsFLOWTABLE # per-cpu routing cache #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks optionsINCLUDE_CONFIG_FILE # Include this file in kernel ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r219776 - head/sys/net
Author: dchagin
Date: Sat Mar 19 16:52:06 2011
New Revision: 219776
URL: http://svn.freebsd.org/changeset/base/219776
Log:
Remove a now unused variable.
MFC after:1 Week
Modified:
head/sys/net/route.c
Modified: head/sys/net/route.c
==
--- head/sys/net/route.cSat Mar 19 15:50:34 2011(r219775)
+++ head/sys/net/route.cSat Mar 19 16:52:06 2011(r219776)
@@ -338,7 +338,6 @@ rtalloc1_fib(struct sockaddr *dst, int r
u_int fibnum)
{
struct radix_node_head *rnh;
- struct rtentry *rt;
struct radix_node *rn;
struct rtentry *newrt;
struct rt_addrinfo info;
@@ -366,7 +365,7 @@ rtalloc1_fib(struct sockaddr *dst, int r
#endif
rn = rnh-rnh_matchaddr(dst, rnh);
if (rn ((rn-rn_flags RNF_ROOT) == 0)) {
- newrt = rt = RNTORT(rn);
+ newrt = RNTORT(rn);
RT_LOCK(newrt);
RT_ADDREF(newrt);
if (needlock)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r219779 - head/sys/netinet
Author: bz
Date: Sat Mar 19 19:08:54 2011
New Revision: 219779
URL: http://svn.freebsd.org/changeset/base/219779
Log:
Properly check for an IPv4 socket after r219579.
In some cases as udp6_connect() without an earlier bind(2) to an
address, v4-mapped scokets allowed and a non mapped destination
address, we can end up here with both v4 and v6 indicated:
inp_vflag = (INP_IPV4|INP_IPV6|INP_IPV6PROTO)
In that case however laddrp is NULL as the IPv6 path does not
pass in a copy currently.
Reported by: Pawel Worach (pawel.worach gmail.com)
Tested by:Pawel Worach (pawel.worach gmail.com)
MFC after:6 days
X-MFC with: r219579
Modified:
head/sys/netinet/in_pcb.c
Modified: head/sys/netinet/in_pcb.c
==
--- head/sys/netinet/in_pcb.c Sat Mar 19 18:26:54 2011(r219778)
+++ head/sys/netinet/in_pcb.c Sat Mar 19 19:08:54 2011(r219779)
@@ -387,7 +387,7 @@ in_pcb_lport(struct inpcb *inp, struct i
#ifdef INET
/* Make the compiler happy. */
laddr.s_addr = 0;
- if ((inp-inp_vflag INP_IPV4) != 0) {
+ if ((inp-inp_vflag (INP_IPV4|INP_IPV6)) == INP_IPV4) {
KASSERT(laddrp != NULL, (%s: laddrp NULL for v4 inp %p,
__func__, inp));
laddr = *laddrp;
@@ -423,7 +423,7 @@ in_pcb_lport(struct inpcb *inp, struct i
} while (tmpinp != NULL);
#ifdef INET
- if ((inp-inp_vflag INP_IPV4) != 0)
+ if ((inp-inp_vflag (INP_IPV4|INP_IPV6)) == INP_IPV4)
laddrp-s_addr = laddr.s_addr;
#endif
*lportp = lport;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r219780 - head/sys/sparc64/pci
Author: marius
Date: Sat Mar 19 19:30:49 2011
New Revision: 219780
URL: http://svn.freebsd.org/changeset/base/219780
Log:
In case reading PCIR_MINGNT fails don't use it for calculating the
latency. This is more or less a theoretical problem though as it
typically indicates way bigger problems.
Modified:
head/sys/sparc64/pci/ofw_pcibus.c
Modified: head/sys/sparc64/pci/ofw_pcibus.c
==
--- head/sys/sparc64/pci/ofw_pcibus.c Sat Mar 19 19:08:54 2011
(r219779)
+++ head/sys/sparc64/pci/ofw_pcibus.c Sat Mar 19 19:30:49 2011
(r219780)
@@ -165,7 +165,7 @@ ofw_pcibus_setup_device(device_t bridge,
CS_WRITE(PCIR_SECLAT_1, reg, 1);
} else {
reg = CS_READ(PCIR_MINGNT, 1);
- if (reg != 0) {
+ if ((int)reg 0) {
switch (clock) {
case 3300:
reg *= 8;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r219781 - head/sys/netgraph
Author: glebius
Date: Sat Mar 19 19:37:53 2011
New Revision: 219781
URL: http://svn.freebsd.org/changeset/base/219781
Log:
Remove spl(9) remnants.
Modified:
head/sys/netgraph/ng_iface.c
Modified: head/sys/netgraph/ng_iface.c
==
--- head/sys/netgraph/ng_iface.cSat Mar 19 19:30:49 2011
(r219780)
+++ head/sys/netgraph/ng_iface.cSat Mar 19 19:37:53 2011
(r219781)
@@ -286,12 +286,11 @@ static int
ng_iface_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
{
struct ifreq *const ifr = (struct ifreq *) data;
- int s, error = 0;
+ int error = 0;
#ifdef DEBUG
ng_iface_print_ioctl(ifp, command, data);
#endif
- s = splimp();
switch (command) {
/* These two are mostly handled at a higher layer */
@@ -343,7 +342,6 @@ ng_iface_ioctl(struct ifnet *ifp, u_long
error = EINVAL;
break;
}
- (void) splx(s);
return (error);
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r219782 - head/sys/sparc64/sparc64
Author: marius
Date: Sat Mar 19 19:39:05 2011
New Revision: 219782
URL: http://svn.freebsd.org/changeset/base/219782
Log:
On Serengeti-class machines the OFW root isn't the parent of the CPU
nodes.
Modified:
head/sys/sparc64/sparc64/tick.c
Modified: head/sys/sparc64/sparc64/tick.c
==
--- head/sys/sparc64/sparc64/tick.c Sat Mar 19 19:37:53 2011
(r219781)
+++ head/sys/sparc64/sparc64/tick.c Sat Mar 19 19:39:05 2011
(r219782)
@@ -158,8 +158,8 @@ cpu_initclocks(void)
sclock = 0;
if (PCPU_GET(impl) == CPU_IMPL_SPARC64V ||
PCPU_GET(impl) = CPU_IMPL_ULTRASPARCIII) {
- if (OF_getprop(OF_parent(PCPU_GET(node)), stick-frequency,
- sclock, sizeof(sclock)) == -1) {
+ if (OF_getprop(OF_peer(0), stick-frequency, sclock,
+ sizeof(sclock)) == -1) {
panic(%s: could not determine STICK frequency,
__func__);
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r219783 - head/sys/net
Author: dchagin
Date: Sat Mar 19 19:50:36 2011
New Revision: 219783
URL: http://svn.freebsd.org/changeset/base/219783
Log:
A bit rearranged rtalloc1_fib() code.
Initialize a variable when it is really needed.
To avoid code duplication move the miss label to line up and jump on it.
MFC after:1 Week
Modified:
head/sys/net/route.c
Modified: head/sys/net/route.c
==
--- head/sys/net/route.cSat Mar 19 19:39:05 2011(r219782)
+++ head/sys/net/route.cSat Mar 19 19:50:36 2011(r219783)
@@ -348,14 +348,13 @@ rtalloc1_fib(struct sockaddr *dst, int r
if (dst-sa_family != AF_INET) /* Only INET supports 1 fib now */
fibnum = 0;
rnh = rt_tables_get_rnh(fibnum, dst-sa_family);
- newrt = NULL;
+ if (rnh == NULL)
+ goto miss;
+
/*
* Look up the address in the table for that Address Family
*/
- if (rnh == NULL) {
- V_rtstat.rts_unreach++;
- goto miss;
- }
+ newrt = NULL;
needlock = !(ignflags RTF_RNH_LOCKED);
if (needlock)
RADIX_NODE_HEAD_RLOCK(rnh);
@@ -380,8 +379,9 @@ rtalloc1_fib(struct sockaddr *dst, int r
* Which basically means
* caint get there frm here
*/
- V_rtstat.rts_unreach++;
miss:
+ V_rtstat.rts_unreach++;
+
if (report) {
/*
* If required, report the failure to the supervising
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r219785 - head/sys/sparc64/pci
Author: marius
Date: Sat Mar 19 20:36:05 2011
New Revision: 219785
URL: http://svn.freebsd.org/changeset/base/219785
Log:
- Make a panic message better reflect the actual problem.
- A closer inspection of the OpenSolaris code indicates the block store
workaround is only necessary in case of BUS_DMASYNC_POSTREAD.
- Mark some unused parameters as such.
Modified:
head/sys/sparc64/pci/fire.c
Modified: head/sys/sparc64/pci/fire.c
==
--- head/sys/sparc64/pci/fire.c Sat Mar 19 19:58:09 2011(r219784)
+++ head/sys/sparc64/pci/fire.c Sat Mar 19 20:36:05 2011(r219785)
@@ -337,7 +337,7 @@ fire_attach(device_t dev)
if (OF_getprop(node, portid, sc-sc_ign, sizeof(sc-sc_ign)) == -1)
panic(%s: could not determine IGN, __func__);
if (OF_getprop(node, module-revision#, prop, sizeof(prop)) == -1)
- panic(%s: could not determine revision, __func__);
+ panic(%s: could not determine module-revision, __func__);
device_printf(dev, %s, module-revision %d, IGN %#x\n,
desc-fd_name, prop, sc-sc_ign);
@@ -1510,18 +1510,20 @@ fire_dmamap_sync(bus_dma_tag_t dt __unus
static u_char buf[VIS_BLOCKSIZE] __aligned(VIS_BLOCKSIZE);
register_t reg, s;
- if ((map-dm_flags DMF_LOADED) == 0 ||
- (op ~BUS_DMASYNC_POSTWRITE) == 0)
+ if ((map-dm_flags DMF_LOADED) == 0)
return;
- s = intr_disable();
- reg = rd(fprs);
- wr(fprs, reg | FPRS_FEF, 0);
- __asm __volatile(stda %%f0, [%0] %1
- : : r (buf), n (ASI_BLK_COMMIT_S));
- membar(Sync);
- wr(fprs, reg, 0);
- intr_restore(s);
+ if ((op BUS_DMASYNC_POSTREAD) != 0) {
+ s = intr_disable();
+ reg = rd(fprs);
+ wr(fprs, reg | FPRS_FEF, 0);
+ __asm __volatile(stda %%f0, [%0] %1
+ : : r (buf), n (ASI_BLK_COMMIT_S));
+ membar(Sync);
+ wr(fprs, reg, 0);
+ intr_restore(s);
+ } else if ((op BUS_DMASYNC_PREWRITE) != 0)
+ membar(Sync);
}
static void
@@ -2128,7 +2130,7 @@ fire_release_resource(device_t bus, devi
}
static bus_dma_tag_t
-fire_get_dma_tag(device_t bus, device_t child)
+fire_get_dma_tag(device_t bus, device_t child __unused)
{
struct fire_softc *sc;
@@ -2137,7 +2139,7 @@ fire_get_dma_tag(device_t bus, device_t
}
static phandle_t
-fire_get_node(device_t bus, device_t dev)
+fire_get_node(device_t bus, device_t child __unused)
{
struct fire_softc *sc;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r219786 - head/sys/net
Author: dchagin Date: Sat Mar 19 21:10:57 2011 New Revision: 219786 URL: http://svn.freebsd.org/changeset/base/219786 Log: ouch, newrt is used on the return path, my fault. Partialy revert the previous change. MFC after:1 Week. Modified: head/sys/net/route.c Modified: head/sys/net/route.c == --- head/sys/net/route.cSat Mar 19 20:36:05 2011(r219785) +++ head/sys/net/route.cSat Mar 19 21:10:57 2011(r219786) @@ -348,13 +348,13 @@ rtalloc1_fib(struct sockaddr *dst, int r if (dst-sa_family != AF_INET) /* Only INET supports 1 fib now */ fibnum = 0; rnh = rt_tables_get_rnh(fibnum, dst-sa_family); + newrt = NULL; if (rnh == NULL) goto miss; /* * Look up the address in the table for that Address Family */ - newrt = NULL; needlock = !(ignflags RTF_RNH_LOCKED); if (needlock) RADIX_NODE_HEAD_RLOCK(rnh); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r219787 - head/sys/dev/vte
Author: yongari
Date: Sat Mar 19 22:36:59 2011
New Revision: 219787
URL: http://svn.freebsd.org/changeset/base/219787
Log:
Correct broadcast frame handling. Setting bit6 of MCR0 register
enables broadcast filtering. Make sure to clear the bit to receive
broadcast frames. While I'm here rename the bit definition to
reflect reality.
Reported by: brad@OpenBSD
MFC after:1 week
Modified:
head/sys/dev/vte/if_vte.c
head/sys/dev/vte/if_vtereg.h
Modified: head/sys/dev/vte/if_vte.c
==
--- head/sys/dev/vte/if_vte.c Sat Mar 19 21:10:57 2011(r219786)
+++ head/sys/dev/vte/if_vte.c Sat Mar 19 22:36:59 2011(r219787)
@@ -1963,9 +1963,10 @@ vte_rxfilter(struct vte_softc *sc)
}
mcr = CSR_READ_2(sc, VTE_MCR0);
- mcr = ~(MCR0_PROMISC | MCR0_BROADCAST | MCR0_MULTICAST);
+ mcr = ~(MCR0_PROMISC | MCR0_MULTICAST);
+ mcr |= MCR0_BROADCAST_DIS;
if ((ifp-if_flags IFF_BROADCAST) != 0)
- mcr |= MCR0_BROADCAST;
+ mcr = ~MCR0_BROADCAST_DIS;
if ((ifp-if_flags (IFF_PROMISC | IFF_ALLMULTI)) != 0) {
if ((ifp-if_flags IFF_PROMISC) != 0)
mcr |= MCR0_PROMISC;
Modified: head/sys/dev/vte/if_vtereg.h
==
--- head/sys/dev/vte/if_vtereg.hSat Mar 19 21:10:57 2011
(r219786)
+++ head/sys/dev/vte/if_vtereg.hSat Mar 19 22:36:59 2011
(r219787)
@@ -48,7 +48,7 @@
#defineMCR0_ACCPT_LONG_PKT 0x0008
#defineMCR0_ACCPT_DRIBBLE 0x0010
#defineMCR0_PROMISC0x0020
-#defineMCR0_BROADCAST 0x0040
+#defineMCR0_BROADCAST_DIS 0x0040
#defineMCR0_RX_EARLY_INTR 0x0080
#defineMCR0_MULTICAST 0x0100
#defineMCR0_FC_ENB 0x0200
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r219788 - head/release
Author: nwhitehorn
Date: Sat Mar 19 23:06:17 2011
New Revision: 219788
URL: http://svn.freebsd.org/changeset/base/219788
Log:
Add support for checking out ports and doc trees from a CVS repository,
in addition to CVSUP, and add support for alternate SVN roots for src.
Requested by: jhb
Modified:
head/release/generate-release.sh
Modified: head/release/generate-release.sh
==
--- head/release/generate-release.shSat Mar 19 22:36:59 2011
(r219787)
+++ head/release/generate-release.shSat Mar 19 23:06:17 2011
(r219788)
@@ -7,8 +7,12 @@
#
# Environment variables:
# CVSUP_HOST: Host of a cvsup server to obtain the ports and documentation
-# trees. Must be set to include ports and documentation.
-# CVSUP_TAG: CVS tag for ports and documentation (HEAD by default)
+# trees. This or CVSROOT must be set to include ports and documentation.
+# CVSROOT:CVS root to obtain the ports and documentation trees. This or
+# CVSUP_HOST must be set to include ports and documentation.
+# CVS_TAG:CVS tag for ports and documentation (HEAD by default)
+# SVNROOT:SVN URL to FreeBSD source repository (by default,
+# svn://svn.freebsd.org/base)
# MAKE_FLAGS: optional flags to pass to make (e.g. -j)
#
# Note: Since this requires a chroot, release cross-builds will not work!
@@ -17,20 +21,22 @@
#
mkdir -p $2/usr/src
-svn co svn://svn.freebsd.org/base/$1 $2/usr/src || exit 1
+svn co ${SVNROOT:-svn://svn.freebsd.org/base}/$1 $2/usr/src || exit 1
if [ ! -z $CVSUP_HOST ]; then
cat $2/docports-supfile EOF
*default host=$CVSUP_HOST
*default base=/var/db
*default prefix=/usr
- *default release=cvs tag=${CVSUP_TAG:-.}
+ *default release=cvs tag=${CVS_TAG:-.}
*default delete use-rel-suffix
*default compress
ports-all
doc-all
EOF
-else
- RELEASE_FLAGS=-DNOPORTS -DNODOC
+elif [ ! -z $CVSROOT ]; then
+ cd $2/usr
+ cvs -R ${CVSARGS} -d ${CVSROOT} co -P -r ${CVS_TAG:-HEAD} ports || exit
1
+ cvs -R ${CVSARGS} -d ${CVSROOT} co -P -r ${CVS_TAG:-HEAD} doc || exit 1
fi
cd $2/usr/src
@@ -43,6 +49,10 @@ if [ ! -z $CVSUP_HOST ]; then
# Checkout ports and doc trees
chroot $2 /usr/bin/csup /docports-supfile || exit 1
+fi
+
+if [ -d $2/usr/doc ]; then
+ cp /etc/resolv.conf $2/etc/resolv.conf
# Build ports to build the docs, then build the docs
chroot $2 /bin/sh -c 'pkg_add -r docproj || (cd
/usr/ports/textproc/docproj make install clean BATCH=yes WITHOUT_X11=yes
JADETEX=no WITHOUT_PYTHON=yes)' || exit 1
@@ -50,7 +60,7 @@ if [ ! -z $CVSUP_HOST ]; then
fi
chroot $2 /bin/sh -c cd /usr/src make $MAKE_FLAGS buildworld buildkernel
|| exit 1
-chroot $2 /bin/sh -c cd /usr/src/release make obj release $RELEASE_FLAGS
|| exit 1
+chroot $2 /bin/sh -c cd /usr/src/release make obj release || exit 1
mkdir $2/R
cp -pRP $2/usr/obj/usr/src/release/release.iso
$2/usr/obj/usr/src/release/memstick $2/usr/obj/usr/src/release/ftp $2/R
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r219788 - head/release
On Sat, Mar 19, 2011 at 4:06 PM, Nathan Whitehorn nwhiteh...@freebsd.org wrote: Author: nwhitehorn Date: Sat Mar 19 23:06:17 2011 New Revision: 219788 URL: http://svn.freebsd.org/changeset/base/219788 Log: Add support for checking out ports and doc trees from a CVS repository, in addition to CVSUP, and add support for alternate SVN roots for src. Requested by: jhb Although this seems good and all, wouldn't it make sense to split off the pulling infrastructure into separate scripts so that someone could have hooks to do: - pre-pull (create paths, whatever) - pull - post-pull (patch?) That way someone could choose any arbitrary SCM (git, hg, etc), specify necessary configuration files, and apply local patches as necessary. Thanks, -Garrett ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r219788 - head/release
On 03/19/11 18:10, Garrett Cooper wrote: On Sat, Mar 19, 2011 at 4:06 PM, Nathan Whitehorn nwhiteh...@freebsd.org wrote: Author: nwhitehorn Date: Sat Mar 19 23:06:17 2011 New Revision: 219788 URL: http://svn.freebsd.org/changeset/base/219788 Log: Add support for checking out ports and doc trees from a CVS repository, in addition to CVSUP, and add support for alternate SVN roots for src. Requested by: jhb Although this seems good and all, wouldn't it make sense to split off the pulling infrastructure into separate scripts so that someone could have hooks to do: - pre-pull (create paths, whatever) - pull - post-pull (patch?) That way someone could choose any arbitrary SCM (git, hg, etc), specify necessary configuration files, and apply local patches as necessary. Thanks, -Garrett That's pretty much the point of having generate-release.sh be a different thing from 'make release'. You'll note that the script is very short (36 lines of code, a good chunk of which are an inline supfile), and could easily be adapted to suit any SCM. All it does is: 1. Check out source code 2. Build and install world into a chroot 3. Optionally check out doc/ports and install docproj ports 4. Run make release in the chroot The regular make release stuff only cares that src(/doc/ports) have shown up somehow on the host system and is well suited to the local patches or nonstandard SCM case. -Nathan ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r219667 - head/usr.sbin/bsdinstall/partedit
Date: Fri, 18 Mar 2011 20:50:08 -0500 From: Nathan Whitehorn nwhiteh...@freebsd.org Subject: Re: svn commit: r219667 - head/usr.sbin/bsdinstall/partedit To: Gavin Atkinson ga...@freebsd.org Cc: src-committ...@freebsd.org, svn-src-...@freebsd.org, svn-src-head@FreeBSD.org On 03/15/11 12:50, Gavin Atkinson wrote: On Tue, 2011-03-15 at 12:26 -0500, Nathan Whitehorn wrote: Hrm, I hadn't realised this was the case. If this change is intentional and planned to remain, I guess the various bits of documentation that say several partitions good, one bad should be updated... It is intended. I think it makes things somewhat easier for the virtualization case, and I know a lot of people have been running their systems with one-big-/ for years. If it is harmful for some reason, however, it's easy to change. I wonder if it is time to start enabling SU+J on non-root filesystems now? That's certainly something to think about, although I'll defer whether that is wise to others. It's a little bit of a pain on the implementation side, since you can't turn it on from newfs, but that isn't a serious obstacle. As of r218726, you can now set this from newfs. (-j) Ah, wonderful. The decision of whether that is a good idea still rests with others, however :) -nathan I believe that we should enable SU+J by default. We should do it now so that we can get wider experience with it before 9.0 is released (thus letting us revert to SU if uncorrectable problems arise). The requirement that the root run without SU derived from the fact that you could get out of space errors if you tried to replace files too quickly (e.g., during installworld). That problem was fixed about 2004. So there is no reason that root cannot have SU enabled. In particular, if you are going to default to a single filesystem, then root should definitely have SU (or SU+J per above) enabled. Kirk McKusick ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
