From owner-svn-src-projects@FreeBSD.ORG Thu Sep 3 18:23:24 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5ACE6106566B; Thu, 3 Sep 2009 18:23:24 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 48E578FC08; Thu, 3 Sep 2009 18:23:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n83INN96041311; Thu, 3 Sep 2009 18:23:23 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n83INNZE041309; Thu, 3 Sep 2009 18:23:23 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200909031823.n83INNZE041309@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Thu, 3 Sep 2009 18:23:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196794 - projects/mips/sys/mips/atheros X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2009 18:23:24 -0000 Author: gonzo Date: Thu Sep 3 18:23:23 2009 New Revision: 196794 URL: http://svn.freebsd.org/changeset/base/196794 Log: - Fix phy address calculation Modified: projects/mips/sys/mips/atheros/if_arge.c Modified: projects/mips/sys/mips/atheros/if_arge.c ============================================================================== --- projects/mips/sys/mips/atheros/if_arge.c Thu Sep 3 18:16:03 2009 (r196793) +++ projects/mips/sys/mips/atheros/if_arge.c Thu Sep 3 18:23:23 2009 (r196794) @@ -477,7 +477,7 @@ arge_miibus_readreg(device_t dev, int ph { struct arge_softc * sc = device_get_softc(dev); int i, result; - uint32_t addr = 0x1000 | (phy << MAC_MII_PHY_ADDR_SHIFT) + uint32_t addr = (phy << MAC_MII_PHY_ADDR_SHIFT) | (reg & MAC_MII_REG_MASK); if (phy != sc->arge_phy_num) @@ -511,8 +511,8 @@ arge_miibus_writereg(device_t dev, int p { struct arge_softc * sc = device_get_softc(dev); int i; - uint32_t addr = 0x1000 - | (phy << MAC_MII_PHY_ADDR_SHIFT) | (reg & MAC_MII_REG_MASK); + uint32_t addr = + (phy << MAC_MII_PHY_ADDR_SHIFT) | (reg & MAC_MII_REG_MASK); dprintf("%s: phy=%d, reg=%02x, value=%04x\n", __func__, phy, reg, data); From owner-svn-src-projects@FreeBSD.ORG Thu Sep 3 18:27:55 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 706C2106566B; Thu, 3 Sep 2009 18:27:55 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5EC4E8FC14; Thu, 3 Sep 2009 18:27:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n83IRtI7041435; Thu, 3 Sep 2009 18:27:55 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n83IRtu8041433; Thu, 3 Sep 2009 18:27:55 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200909031827.n83IRtu8041433@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Thu, 3 Sep 2009 18:27:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196795 - projects/mips/sys/mips/atheros X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2009 18:27:55 -0000 Author: gonzo Date: Thu Sep 3 18:27:55 2009 New Revision: 196795 URL: http://svn.freebsd.org/changeset/base/196795 Log: - Remove flags accidently brought by dumb cut'n'paste coding Modified: projects/mips/sys/mips/atheros/ar71xx_ehci.c Modified: projects/mips/sys/mips/atheros/ar71xx_ehci.c ============================================================================== --- projects/mips/sys/mips/atheros/ar71xx_ehci.c Thu Sep 3 18:23:23 2009 (r196794) +++ projects/mips/sys/mips/atheros/ar71xx_ehci.c Thu Sep 3 18:27:55 2009 (r196795) @@ -190,12 +190,7 @@ ar71xx_ehci_attach(device_t self) * which means port speed must be read from the Port Status * register following a port enable. */ - sc->sc_flags |= EHCI_SCFLG_TT - | EHCI_SCFLG_SETMODE - | EHCI_SCFLG_BIGEDESC - | EHCI_SCFLG_BIGEMMIO - | EHCI_SCFLG_NORESTERM - ; + sc->sc_flags = EHCI_SCFLG_SETMODE; (void) ehci_reset(sc); err = ehci_init(sc); From owner-svn-src-projects@FreeBSD.ORG Thu Sep 3 22:42:48 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5D918106566B; Thu, 3 Sep 2009 22:42:48 +0000 (UTC) (envelope-from jb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4C58E8FC14; Thu, 3 Sep 2009 22:42:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n83MgmOK046733; Thu, 3 Sep 2009 22:42:48 GMT (envelope-from jb@svn.freebsd.org) Received: (from jb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n83MgmBh046728; Thu, 3 Sep 2009 22:42:48 GMT (envelope-from jb@svn.freebsd.org) Message-Id: <200909032242.n83MgmBh046728@svn.freebsd.org> From: John Birrell Date: Thu, 3 Sep 2009 22:42:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196802 - in projects/jbuild/usr.bin: jbuild make X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2009 22:42:48 -0000 Author: jb Date: Thu Sep 3 22:42:47 2009 New Revision: 196802 URL: http://svn.freebsd.org/changeset/base/196802 Log: - Force the PATH to avoid developer creativity. - Ignore /etc when meta files are parsed - Add code to clean up orphaned files that were generated by targets that have since been deleted. Modified: projects/jbuild/usr.bin/jbuild/jbuild_version projects/jbuild/usr.bin/make/job.c projects/jbuild/usr.bin/make/main.c projects/jbuild/usr.bin/make/make.c Modified: projects/jbuild/usr.bin/jbuild/jbuild_version ============================================================================== --- projects/jbuild/usr.bin/jbuild/jbuild_version Thu Sep 3 22:32:32 2009 (r196801) +++ projects/jbuild/usr.bin/jbuild/jbuild_version Thu Sep 3 22:42:47 2009 (r196802) @@ -1,5 +1,5 @@ # $FreeBSD$ -JBUILD_VERSION = 14 +JBUILD_VERSION = 15 CFLAGS += -DJBUILD_VERSION=\"${JBUILD_VERSION}\" Modified: projects/jbuild/usr.bin/make/job.c ============================================================================== --- projects/jbuild/usr.bin/make/job.c Thu Sep 3 22:32:32 2009 (r196801) +++ projects/jbuild/usr.bin/make/job.c Thu Sep 3 22:42:47 2009 (r196802) @@ -112,6 +112,9 @@ __FBSDID("$FreeBSD$"); #endif #include #include +#ifdef MAKE_IS_BUILD +#include +#endif #include #include #include @@ -416,6 +419,121 @@ static GNode *ENDNode; #ifdef MAKE_IS_BUILD static int n_meta_created = 0; /* Number of meta data files created. */ +static void +meta_orphan_files(const char *objroot, size_t objrootlen, const char *mname) +{ + FILE *fp; + char *bufr; + char *p; + int f = 0; + int tgt = 0; + size_t s_bufr = 128 * 1024; + + if ((fp = fopen(mname, "r")) == NULL) + return; + + if ((bufr = malloc(s_bufr)) == NULL) + err(1, "Cannot allocate memory for a read buffer"); + + while (fgets(bufr, s_bufr, fp) != NULL) { + /* Whack the trailing newline. */ + bufr[strlen(bufr) - 1] = '\0'; + + /* Find the start of the build monitor section. */ + if (strncmp(bufr, "-- buildmon", 11) == 0) { + if (tgt == 0) + break; + + f = 1; + continue; + } + + /* Check if parsing the build monitor section. */ + if (f) { + if (strncmp(bufr, "W ", 2) != 0) + continue; + + /* Delimit the record type. */ + p = bufr; + strsep(&p, " "); + + /* Skip the pid. */ + if (strsep(&p, " ") == NULL) + break; + + if (*p == '/' && strncmp(p, objroot, objrootlen) != 0) + break; + + fprintf(stderr,"Deleting generated file: %s\n", p); + unlink(p); + + /* Check if this is the target record. */ + } else if (strncmp(bufr, "TGT ", 4) == 0) { + /* Lookup the target by name to see if it is still defined. */ + if (Targ_FindNode(bufr + 4, TARG_NOCREATE) != NULL) + break; + + /* + * The target wasn't found, so we need to try to clean up files + * that were created when it last existed. + */ + tgt = 1; + + fprintf(stderr,"Target %s no longer exists. Trying to clean up...\n", bufr + 4); + } + } + + free(bufr); + + fclose(fp); + + /* + * If the target has been deleted, try to delete the meta data file, + * but don't get too stressed out if there is an error deleting it. + */ + if (tgt) + unlink(mname); +} + +static void +meta_orphans(void) +{ + DIR *d; + char *paths[2]; + char thisdir[2] = { '.', '\0' }; + const char *objroot; + size_t len; + size_t objrootlen; + struct dirent *de; + + /* XXX Need a better way to do this. */ + if (strcmp(getenv("__MKLVL__"), "2") != 0) + return; + + if ((objroot = Var_Value(".OBJROOT", VAR_GLOBAL)) == NULL) + return; + + objrootlen = strlen(objroot); + + paths[0] = thisdir; + paths[1] = NULL; + + if ((d = opendir(".")) == NULL) + err(1, NULL); + + while ((de = readdir(d)) != NULL) { + if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0) + continue; + + len = strlen(de->d_name); + + if (len > 5 && strcmp(de->d_name + len - 5, ".meta") == 0) + meta_orphan_files(objroot, objrootlen, de->d_name); + } + + closedir(d); +} + void meta_exit(void) { @@ -467,8 +585,8 @@ meta_exit(void) srctop = Var_Value(".SRCTOP", VAR_GLOBAL); curdir = Var_Value(".CURDIR", VAR_GLOBAL); srcrel = Var_Value(".SRCREL", VAR_GLOBAL); - objroot = Var_Value(".OBJROOT", VAR_GLOBAL); objdir = Var_Value(".OBJDIR", VAR_GLOBAL); + objroot = Var_Value(".OBJROOT", VAR_GLOBAL); filedep_name = Var_Value(".FILEDEP_NAME", VAR_GLOBAL); meta_created = Var_Value(".META_CREATED", VAR_GLOBAL); @@ -680,6 +798,7 @@ meta_create(GNode *gn, char *p_mname, si fprintf(fp, "CMD %s\n", Buf_Peel(Var_Subst(Lst_Datum(ln), gn, FALSE))); fprintf(fp, "CWD %s\n", getcwd(bufr, sizeof(bufr))); + fprintf(fp, "TGT %s\n", tname); for (ptr = environ; *ptr != NULL; ptr++) fprintf(fp, "ENV %s\n", *ptr); @@ -2839,6 +2958,11 @@ Job_Init(int maxproc) } #endif +#ifdef MAKE_IS_BUILD + /* Clean up any orphaned files we can find. */ + meta_orphans(); +#endif + begin = Targ_FindNode(".BEGIN", TARG_NOCREATE); if (begin != NULL) { @@ -3866,6 +3990,12 @@ Compat_Run(Lst *targs) Compat_InstallSignalHandlers(); ENDNode = Targ_FindNode(".END", TARG_CREATE); + +#ifdef MAKE_IS_BUILD + /* Clean up any orphaned files we can find. */ + meta_orphans(); +#endif + /* * If the user has defined a .BEGIN target, execute the commands * attached to it. Modified: projects/jbuild/usr.bin/make/main.c ============================================================================== --- projects/jbuild/usr.bin/make/main.c Thu Sep 3 22:32:32 2009 (r196801) +++ projects/jbuild/usr.bin/make/main.c Thu Sep 3 22:42:47 2009 (r196802) @@ -116,7 +116,6 @@ static char **save_argv; /* saved argv * static char *save_makeflags;/* saved MAKEFLAGS */ #ifdef MAKE_IS_BUILD static char *save_mklvl; /* saved __MKLVL__ */ -static char *save_path; /* saved PATH */ static char *clean_environ[2]; static char *default_machine = NULL; #endif @@ -978,7 +977,6 @@ main(int argc, char **argv) #ifdef MAKE_IS_BUILD save_mklvl = getenv(MKLVL_ENVVAR); - save_path = getenv("PATH"); #endif /* @@ -1088,7 +1086,7 @@ main(int argc, char **argv) environ = clean_environ; /* Put the user's PATH into the new environent. */ - setenv("PATH", save_path, 1); + setenv("PATH", "/bin:/sbin:/usr/bin:/usr/sbin", 1); #endif check_make_level(); Modified: projects/jbuild/usr.bin/make/make.c ============================================================================== --- projects/jbuild/usr.bin/make/make.c Thu Sep 3 22:32:32 2009 (r196801) +++ projects/jbuild/usr.bin/make/make.c Thu Sep 3 22:42:47 2009 (r196802) @@ -336,6 +336,13 @@ Make_OODate(GNode *gn) break; /* + * Ignore etc files because they tend to change when + * dist'ed from a central server. + */ + if (strncmp(p, "/etc/", 5) == 0) + break; + + /* * The rest of the record is the * file name. * Check if it's not an absolute From owner-svn-src-projects@FreeBSD.ORG Thu Sep 3 23:04:33 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BD6E3106566B; Thu, 3 Sep 2009 23:04:33 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 791948FC0C; Thu, 3 Sep 2009 23:04:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n83N4X7A047188; Thu, 3 Sep 2009 23:04:33 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n83N4Xe1047186; Thu, 3 Sep 2009 23:04:33 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200909032304.n83N4Xe1047186@svn.freebsd.org> From: Sam Leffler Date: Thu, 3 Sep 2009 23:04:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196803 - projects/mips/sys/mips/conf X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2009 23:04:33 -0000 Author: sam Date: Thu Sep 3 23:04:33 2009 New Revision: 196803 URL: http://svn.freebsd.org/changeset/base/196803 Log: o enable mesh support o add bridge support o no need for explicit ar5212 support; ath_hal drags it in Modified: projects/mips/sys/mips/conf/AR71XX Modified: projects/mips/sys/mips/conf/AR71XX ============================================================================== --- projects/mips/sys/mips/conf/AR71XX Thu Sep 3 22:42:47 2009 (r196802) +++ projects/mips/sys/mips/conf/AR71XX Thu Sep 3 23:04:33 2009 (r196803) @@ -48,6 +48,7 @@ device pci # Wireless NIC cards options IEEE80211_DEBUG +options IEEE80211_SUPPORT_MESH options IEEE80211_SUPPORT_TDMA device wlan # 802.11 support device wlan_wep # 802.11 WEP support @@ -56,9 +57,8 @@ device wlan_tkip # 802.11 TKIP su device ath # Atheros pci/cardbus NIC's options ATH_DEBUG -option AH_SUPPORT_AR5416 device ath_hal -device ath_ar5212 # Atheros HAL (Hardware Access Layer) +option AH_SUPPORT_AR5416 device ath_rate_sample device mii @@ -83,3 +83,4 @@ device ether device md device bpf device random +device if_bridge From owner-svn-src-projects@FreeBSD.ORG Fri Sep 4 01:44:31 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8551B106568B; Fri, 4 Sep 2009 01:44:31 +0000 (UTC) (envelope-from rodrigc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 752AF8FC12; Fri, 4 Sep 2009 01:44:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n841iV9n050356; Fri, 4 Sep 2009 01:44:31 GMT (envelope-from rodrigc@svn.freebsd.org) Received: (from rodrigc@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n841iVWd050354; Fri, 4 Sep 2009 01:44:31 GMT (envelope-from rodrigc@svn.freebsd.org) Message-Id: <200909040144.n841iVWd050354@svn.freebsd.org> From: Craig Rodrigues Date: Fri, 4 Sep 2009 01:44:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196806 - projects/jbuild/usr.bin/jbuild X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2009 01:44:31 -0000 Author: rodrigc Date: Fri Sep 4 01:44:31 2009 New Revision: 196806 URL: http://svn.freebsd.org/changeset/base/196806 Log: Delete descriptions for MAKEOBJDIRPREFIX, MAKEOBJDIR variables. Re-write description for .OBJDIR variable. Add descriptions for .SRCTOP, .SRCREL, .OBJROOT variables. Modified: projects/jbuild/usr.bin/jbuild/jbuild.1 Modified: projects/jbuild/usr.bin/jbuild/jbuild.1 ============================================================================== --- projects/jbuild/usr.bin/jbuild/jbuild.1 Fri Sep 4 01:24:27 2009 (r196805) +++ projects/jbuild/usr.bin/jbuild/jbuild.1 Fri Sep 4 01:44:31 2009 (r196806) @@ -574,50 +574,12 @@ to the canonical path given by .Xr getcwd 3 . .It Va .OBJDIR A path to the directory where the targets are built. -At startup, -.Nm -searches for an alternate directory to place target files. -It will attempt to change into this special directory -and will search this directory for makefiles -not found in the current directory. -The following directories are tried in order: -.Pp -.Bl -enum -compact -.It -${MAKEOBJDIRPREFIX}/`pwd` -.It -${MAKEOBJDIR} -.It -obj.${MACHINE} -.It -obj -.It -/usr/obj/`pwd` -.El -.Pp -The first directory that -.Nm -successfully changes into is used. -If either -.Ev MAKEOBJDIRPREFIX -or -.Ev MAKEOBJDIR -is set in the environment but -.Nm -is unable to change into the corresponding directory, -then the current directory is used -without checking the remainder of the list. -If they are undefined and -.Nm -is unable to change into any of the remaining three directories, -then the current directory is used. -Note, that -.Ev MAKEOBJDIRPREFIX -and -.Ev MAKEOBJDIR -must be environment variables and should not be set on -.Nm Ns 's -command line. +This path is set to +.Va ${.SRCTOP}/../obj/${MACHINE}/${.SRCREL} . +Each machine-specific object directory uses the name set by +the +.Va MACHINE +variable. .Pp The .Nm @@ -625,6 +587,29 @@ utility sets .Va .OBJDIR to the canonical path given by .Xr getcwd 3 . +.It Va .OBJROOT +A path set to the value of +.Va ${.SRCTOP}/../obj . +.It Va .SRCTOP +When +.Nm +is invoked, the current directory is determined by +.Xr getcwd 3 . +From the current directory, +.Nm +walks up the directory hierarchy. When +.Pa bld/sys.mk +is found, +.Nm +sets +.Va .SRCTOP +to the value of the current directory and stops. +.It Va .SRCREL +A path set to the value of +.Va .CURDIR +with +.Va .SRCTOP +stripped off. .It Va .MAKEFILE_LIST As .Nm @@ -1651,10 +1636,18 @@ The utility uses the following environment variables, if they exist: .Ev MACHINE , .Ev MAKE , -.Ev MAKEFLAGS , -.Ev MAKEOBJDIR , and -.Ev MAKEOBJDIRPREFIX . +.Ev MAKEFLAGS . +.Pp +When +.Nm +is invoked, the +.Ev PATH +in the environment is ignored, and +is instead set to "/bin:/sbin:/usr/bin:/usr/sbin". This +.Ev PATH +is then used by all processes spawned by +.Nm . .Sh FILES .Bl -tag -width /usr/share/doc/psd/12.make -compact .It Pa .depend @@ -1667,14 +1660,10 @@ list of dependencies object directory .It Pa sys.mk system makefile -.It Pa /usr/share/mk +.It Pa ${.SRCTOP}/bld default system makefile directory .It Pa /usr/share/doc/psd/12.make PMake tutorial -.It Pa /usr/obj -default -.Ev MAKEOBJDIRPREFIX -directory. .It Pa /etc/make.conf default path to .Xr make.conf 5 @@ -1721,10 +1710,6 @@ in .Fx 7.1 . . .Sh BUGS -The determination of -.Va .OBJDIR -is contorted to the point of absurdity. -.Pp In the presence of several .Ic .MAIN special targets, From owner-svn-src-projects@FreeBSD.ORG Fri Sep 4 19:02:11 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8FE0B106568B; Fri, 4 Sep 2009 19:02:11 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7F51A8FC16; Fri, 4 Sep 2009 19:02:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n84J2Bvm000372; Fri, 4 Sep 2009 19:02:11 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n84J2B0Z000369; Fri, 4 Sep 2009 19:02:11 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200909041902.n84J2B0Z000369@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Fri, 4 Sep 2009 19:02:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196836 - projects/mips/sys/mips/malta X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2009 19:02:11 -0000 Author: gonzo Date: Fri Sep 4 19:02:11 2009 New Revision: 196836 URL: http://svn.freebsd.org/changeset/base/196836 Log: - Clean out some XXXMIPS comments that's not relevant now Modified: projects/mips/sys/mips/malta/uart_bus_maltausart.c projects/mips/sys/mips/malta/uart_cpu_maltausart.c Modified: projects/mips/sys/mips/malta/uart_bus_maltausart.c ============================================================================== --- projects/mips/sys/mips/malta/uart_bus_maltausart.c Fri Sep 4 19:00:48 2009 (r196835) +++ projects/mips/sys/mips/malta/uart_bus_maltausart.c Fri Sep 4 19:02:11 2009 (r196836) @@ -28,10 +28,6 @@ * code written by Olivier Houchard. */ -/* - * XXXMIPS: This file is hacked from arm/... . XXXMIPS here means this file is - * experimental and was written for MIPS32 port. - */ #include "opt_uart.h" #include @@ -53,9 +49,6 @@ __FBSDID("$FreeBSD$"); #include #include -/* - * XXXMIPS: - */ #include #include "uart_if.h" Modified: projects/mips/sys/mips/malta/uart_cpu_maltausart.c ============================================================================== --- projects/mips/sys/mips/malta/uart_cpu_maltausart.c Fri Sep 4 19:00:48 2009 (r196835) +++ projects/mips/sys/mips/malta/uart_cpu_maltausart.c Fri Sep 4 19:02:11 2009 (r196836) @@ -29,10 +29,6 @@ * Skeleton of this file was based on respective code for ARM * code written by Olivier Houchard. */ -/* - * XXXMIPS: This file is hacked from arm/... . XXXMIPS here means this file is - * experimental and was written for MIPS32 port. - */ #include "opt_uart.h" #include From owner-svn-src-projects@FreeBSD.ORG Sat Sep 5 05:12:32 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C9BAE1065670; Sat, 5 Sep 2009 05:12:32 +0000 (UTC) (envelope-from jb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B89848FC08; Sat, 5 Sep 2009 05:12:32 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n855CWtE037789; Sat, 5 Sep 2009 05:12:32 GMT (envelope-from jb@svn.freebsd.org) Received: (from jb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n855CWqS037787; Sat, 5 Sep 2009 05:12:32 GMT (envelope-from jb@svn.freebsd.org) Message-Id: <200909050512.n855CWqS037787@svn.freebsd.org> From: John Birrell Date: Sat, 5 Sep 2009 05:12:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196850 - projects/jbuild/usr.bin/jdirdep X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2009 05:12:32 -0000 Author: jb Date: Sat Sep 5 05:12:32 2009 New Revision: 196850 URL: http://svn.freebsd.org/changeset/base/196850 Log: Need to use the JBUILD environment variable in preference to expecting to use jbuild in the PATH. Modified: projects/jbuild/usr.bin/jdirdep/jdirdep.c Modified: projects/jbuild/usr.bin/jdirdep/jdirdep.c ============================================================================== --- projects/jbuild/usr.bin/jdirdep/jdirdep.c Sat Sep 5 01:55:46 2009 (r196849) +++ projects/jbuild/usr.bin/jdirdep/jdirdep.c Sat Sep 5 05:12:32 2009 (r196850) @@ -1025,7 +1025,10 @@ do_dirdep(const char *srctop, const char err(1, "Could not delete '%s/%s", curdir, MAKEFILED); #ifdef JDIRDEP - snprintf(cmd, sizeof(cmd), "jbuild gendirdep"); + const char *p_jbuild; + if ((p_jbuild = getenv("JBUILD")) == NULL) + p_jbuild = "jbuild"; + snprintf(cmd, sizeof(cmd), "%s gendirdep", p_jbuild); #else snprintf(cmd, sizeof(cmd), "build gendirdep"); #endif From owner-svn-src-projects@FreeBSD.ORG Sat Sep 5 05:13:41 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DBA1A106566B; Sat, 5 Sep 2009 05:13:41 +0000 (UTC) (envelope-from jb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B0E2E8FC17; Sat, 5 Sep 2009 05:13:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n855Dfei037853; Sat, 5 Sep 2009 05:13:41 GMT (envelope-from jb@svn.freebsd.org) Received: (from jb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n855Dfu0037851; Sat, 5 Sep 2009 05:13:41 GMT (envelope-from jb@svn.freebsd.org) Message-Id: <200909050513.n855Dfu0037851@svn.freebsd.org> From: John Birrell Date: Sat, 5 Sep 2009 05:13:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196851 - projects/jbuild/usr.bin/jbuild X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2009 05:13:41 -0000 Author: jb Date: Sat Sep 5 05:13:41 2009 New Revision: 196851 URL: http://svn.freebsd.org/changeset/base/196851 Log: Update the jbuild version number Modified: projects/jbuild/usr.bin/jbuild/jbuild_version Modified: projects/jbuild/usr.bin/jbuild/jbuild_version ============================================================================== --- projects/jbuild/usr.bin/jbuild/jbuild_version Sat Sep 5 05:12:32 2009 (r196850) +++ projects/jbuild/usr.bin/jbuild/jbuild_version Sat Sep 5 05:13:41 2009 (r196851) @@ -1,5 +1,5 @@ # $FreeBSD$ -JBUILD_VERSION = 15 +JBUILD_VERSION = 16 CFLAGS += -DJBUILD_VERSION=\"${JBUILD_VERSION}\"