date:20150629

svn commit: r284935 - stable/10/sys/dev/hptnr

2015-06-29 Thread Xin LI

Author: delphij
Date: Mon Jun 29 18:34:30 2015
New Revision: 284935
URL: https://svnweb.freebsd.org/changeset/base/284935

Log:
  MFC r284792:
  
  Merge changes from vendor driver 1.1.4:
  
v1.1.4 2015-06-09
 * Fix a bug that FailLED was not initialized properly.
v1.1.3 2015-05-19
 * Support Report Luns command.
v1.1.2 2015-05-05
 * Fix a bug that report wrong physical sector size for 512e HDD.
  
  Many thanks to HighPoint for continued support of FreeBSD!
  
  This driver update is intended for 10.2-RELEASE.
  
  Submitted by: Steve Chang

Modified:
  stable/10/sys/dev/hptnr/README
  stable/10/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu
  stable/10/sys/dev/hptnr/him.h
  stable/10/sys/dev/hptnr/hptnr_config.c
  stable/10/sys/dev/hptnr/hptnr_osm_bsd.c
  stable/10/sys/dev/hptnr/i386-elf.hptnr_lib.o.uu
  stable/10/sys/dev/hptnr/ldm.h
  stable/10/sys/dev/hptnr/osm.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/hptnr/README
==
--- stable/10/sys/dev/hptnr/README  Mon Jun 29 18:11:10 2015
(r284934)
+++ stable/10/sys/dev/hptnr/README  Mon Jun 29 18:34:30 2015
(r284935)
@@ -3,6 +3,16 @@ Copyright (C) 2015 HighPoint Technologie
 
 #
 Revision History:
+
+   v1.1.4 2015-06-09
+ * Fix a bug that FailLED was not initialized properly.
+
+   v1.1.3 2015-05-19
+ * Support Report Luns command.
+
+   v1.1.2 2015-05-05
+ * Fix a bug that report wrong physical sector size for 512e HDD.
+
v1.1.1 2015-03-26
  * Support 4Kn drive.
  * Change the SCSI target ID of the disk to be the index of physical 
connetion to the HBA.
@@ -57,7 +67,7 @@ Revision History:
   2) Extract the driver files under the kernel source tree:
 
  # cd /usr/src/sys/
- # tar xvzf /your/path/to/hptnr-freebsd-src-v1.0-130701.tgz
+ # tar xvzf /your/path/to/HPTNR_FreeBSD_Src_1.x.x_xx_xx_xx.tgz
 
   3) Update the kernel configuration file to include the HighPoint source.
  Assume the configure file is GENERIC, and new kernel configure file is 
@@ -79,8 +89,8 @@ Revision History:
   compile-with"uudecode < 
$S/dev/hptnr/i386-elf.hptnr_lib.o.uu" \
   no-implicit-rule
 
-  dev/hptnr/os_bsd.c  optionalhptnr
-  dev/hptnr/osm_bsd.c optionalhptnr
+  dev/hptnr/hptnr_os_bsd.c  optionalhptnr
+  dev/hptnr/hptnr_osm_bsd.c optionalhptnr
   dev/hptnr/hptnr_config.c  optionalhptnr
 
  For amd64 system, edit /usr/src/sys/conf/files.amd64 and append the lines
@@ -91,13 +101,13 @@ Revision History:
   compile-with"uudecode < 
$S/dev/hptnr/amd64-elf.hptnr_lib.o.uu" \
   no-implicit-rule
 
-  dev/hptnr/os_bsd.c  optionalhptnr
-  dev/hptnr/osm_bsd.c optionalhptnr
+  dev/hptnr/hptnr_os_bsd.c  optionalhptnr
+  dev/hptnr/hptnr_osm_bsd.c optionalhptnr
   dev/hptnr/hptnr_config.c  optionalhptnr
 
   6) Rebuild and install the kernel:
 
- a) for FreeBSD 5.x-i386/6.x-i386/7.x-i386/8.x-i386/9.x-i386:
+ a) for FreeBSD 5.x-i386/6.x-i386/7.x-i386/8.x-i386/9.x-i386/10.x-i386:
  
 # cd /usr/src/sys/i386/conf/
 # /usr/sbin/config MYKERNEL
@@ -106,7 +116,7 @@ Revision History:
 # make 
 # make install
 
- b) for FreeBSD 5.x-amd64/6.x-amd64/7.x-amd64/8.x-amd64/9.x-amd64:
+ b) for FreeBSD 
5.x-amd64/6.x-amd64/7.x-amd64/8.x-amd64/9.x-amd64/10.x-amd64:
 
 # cd /usr/src/sys/amd64/conf/
 # /usr/sbin/config MYKERNEL
@@ -139,7 +149,7 @@ Revision History:
   2) Extract the driver files under the kernel source tree:
 
  # cd /usr/src/sys/
- # tar xvzf /your/path/to/hptnr-freebsd-src-v1.0-111213.tgz
+ # tar xvzf /your/path/to/HPTNR_FreeBSD_Src_1.x.x_xx_xx_xx.tgz
 
 
   4) Build the driver module:
@@ -153,7 +163,7 @@ Revision History:
  
  # cp hptnr.ko /modules/
 
- For FreeBSD 5.x/6.x/7.x/8.x/9.x:
+ For FreeBSD 5.x/6.x/7.x/8.x/9.x/10.x:
 
  # cp hptnr.ko /boot/kernel/
 
@@ -179,7 +189,7 @@ Revision History:
 /modules/hptnr.ko text=0xf571 data=0x2c8+0x254
 ok boot
 
- For FreeBSD 5.x/6.x/7.x/8.x/9.x, you can select 6 on the boot menu to get 
a loader
+ For FreeBSD 5.x/6.x/7.x/8.x/9.x/10.x, you can select 6 on the boot menu 
to get a loader
  prompt.
   
   7) You can add a below line into /boot/defaults/loader.conf to load the

Modified: stable/10/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu
==
--- stable/10/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uuMon Jun 29 18:11:10 
2015(r284934)
+++ stable/10/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uuMon Jun 29 18:34:30 
2015

svn commit: r284936 - stable/10/usr.sbin/freebsd-update

2015-06-29 Thread Xin LI

Author: delphij
Date: Mon Jun 29 18:44:15 2015
New Revision: 284936
URL: https://svnweb.freebsd.org/changeset/base/284936

Log:
  MFC r284425:
  
  Skip src component if /usr/src is empty.
  
  Submitted by: kczekirda
  Reviewed by:  cperciva, delphij, nwhitehorn, allanjude

Modified:
  stable/10/usr.sbin/freebsd-update/freebsd-update.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/freebsd-update/freebsd-update.sh
==
--- stable/10/usr.sbin/freebsd-update/freebsd-update.sh Mon Jun 29 18:34:30 
2015(r284935)
+++ stable/10/usr.sbin/freebsd-update/freebsd-update.sh Mon Jun 29 18:44:15 
2015(r284936)
@@ -216,7 +216,15 @@ config_KeepModifiedMetadata () {
 # Add to the list of components which should be kept updated.
 config_Components () {
for C in $@; do
-   COMPONENTS="${COMPONENTS} ${C}"
+   if [ "$C" = "src" ]; then
+   if [ -e /usr/src/COPYRIGHT ]; then
+   COMPONENTS="${COMPONENTS} ${C}"
+   else
+   echo "src component not installed, skipped"
+   fi
+   else
+   COMPONENTS="${COMPONENTS} ${C}"
+   fi
done
 }
 
@@ -2634,10 +2642,10 @@ install_unschg () {
while read F; do
if ! [ -e ${BASEDIR}/${F} ]; then
continue
+   else
+   echo ${BASEDIR}/${F}
fi
-
-   chflags noschg ${BASEDIR}/${F} || return 1
-   done < filelist
+   done < filelist | xargs chflags noschg || return 1
 
# Clean up
rm filelist
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r284937 - stable/10/usr.sbin/freebsd-update

2015-06-29 Thread Xin LI

Author: delphij
Date: Mon Jun 29 18:51:08 2015
New Revision: 284937
URL: https://svnweb.freebsd.org/changeset/base/284937

Log:
  MFC r276095 (des)
  
  Use "RCS tag" instead of "$FreeBSD$ tag", since svn will obediently
  expand the latter.

Modified:
  stable/10/usr.sbin/freebsd-update/freebsd-update.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/freebsd-update/freebsd-update.sh
==
--- stable/10/usr.sbin/freebsd-update/freebsd-update.sh Mon Jun 29 18:44:15 
2015(r284936)
+++ stable/10/usr.sbin/freebsd-update/freebsd-update.sh Mon Jun 29 18:51:08 
2015(r284937)
@@ -2287,7 +2287,7 @@ upgrade_oldall_to_oldnew () {
 }
 
 # Helper for upgrade_merge: Return zero true iff the two files differ only
-# in the contents of their $FreeBSD$ tags.
+# in the contents of their RCS tags.
 samef () {
X=`sed -E 's/\\$FreeBSD.*\\$/\$FreeBSD\$/' < $1 | ${SHA256}`
Y=`sed -E 's/\\$FreeBSD.*\\$/\$FreeBSD\$/' < $2 | ${SHA256}`
@@ -2383,7 +2383,7 @@ upgrade_merge () {
# Ask the user to handle any files which didn't merge.
while read F; do
# If the installed file differs from the version in
-   # the old release only due to $FreeBSD$ tag expansion
+   # the old release only due to RCS tag expansion
# then just use the version in the new release.
if samef merge/old/${F} merge/${OLDRELNUM}/${F}; then
cp merge/${RELNUM}/${F} merge/new/${F}
@@ -2405,14 +2405,14 @@ manually...
# of merging files.
while read F; do
# Skip files which haven't changed except possibly
-   # in their $FreeBSD$ tags.
+   # in their RCS tags.
if [ -f merge/old/${F} ] && [ -f merge/new/${F} ] &&
samef merge/old/${F} merge/new/${F}; then
continue
fi
 
# Skip files where the installed file differs from
-   # the old file only due to $FreeBSD$ tags.
+   # the old file only due to RCS tags.
if [ -f merge/old/${F} ] &&
[ -f merge/${OLDRELNUM}/${F} ] &&
samef merge/old/${F} merge/${OLDRELNUM}/${F}; then
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r284938 - stable/10/usr.sbin/freebsd-update

2015-06-29 Thread Xin LI

Author: delphij
Date: Mon Jun 29 18:56:53 2015
New Revision: 284938
URL: https://svnweb.freebsd.org/changeset/base/284938

Log:
  MFC r274630,r274653 (feld):
  
  Add logic for detecting non-persistent filesystems being utilized by
  workdir which would break the upgrade process upon reboot.
  
  Currently we check for tmpfs and md.

Modified:
  stable/10/usr.sbin/freebsd-update/freebsd-update.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/freebsd-update/freebsd-update.sh
==
--- stable/10/usr.sbin/freebsd-update/freebsd-update.sh Mon Jun 29 18:51:08 
2015(r284937)
+++ stable/10/usr.sbin/freebsd-update/freebsd-update.sh Mon Jun 29 18:56:53 
2015(r284938)
@@ -603,6 +603,7 @@ fetchupgrade_check_params () {
_KEYPRINT_z="Key must be given via -k option or configuration file."
_KEYPRINT_bad="Invalid key fingerprint: "
_WORKDIR_bad="Directory does not exist or is not writable: "
+   _WORKDIR_bad2="Directory is not on a persistent filesystem: "
 
if [ -z "${SERVERNAME}" ]; then
echo -n "`basename $0`: "
@@ -626,6 +627,13 @@ fetchupgrade_check_params () {
echo ${WORKDIR}
exit 1
fi
+   case `df -T ${WORKDIR}` in */dev/md[0-9]* | *tmpfs*)
+   echo -n "`basename $0`: "
+   echo -n "${_WORKDIR_bad2}"
+   echo ${WORKDIR}
+   exit 1
+   ;;
+   esac
chmod 700 ${WORKDIR}
cd ${WORKDIR} || exit 1
 
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r284939 - stable/10/usr.sbin/freebsd-update

2015-06-29 Thread Xin LI

Author: delphij
Date: Mon Jun 29 19:02:30 2015
New Revision: 284939
URL: https://svnweb.freebsd.org/changeset/base/284939

Log:
  MFC r256594 (cperciva):
  
  Speed up `freebsd-update IDS` by using IFS to split fields instead of
  forking lots of processes to run echo|cut.  In one test this reduced
  the CPU time from 980s to 134s and the wallclock time from 806s to
  132s.
  
  Submitted by: Oleg Ginzburg

Modified:
  stable/10/usr.sbin/freebsd-update/freebsd-update.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/freebsd-update/freebsd-update.sh
==
--- stable/10/usr.sbin/freebsd-update/freebsd-update.sh Mon Jun 29 18:56:53 
2015(r284938)
+++ stable/10/usr.sbin/freebsd-update/freebsd-update.sh Mon Jun 29 19:02:30 
2015(r284939)
@@ -3099,21 +3099,8 @@ IDS_compare () {
mv INDEX-NOTMATCHING.tmp INDEX-NOTMATCHING
 
# Go through the lines and print warnings.
-   while read LINE; do
-   FPATH=`echo "${LINE}" | cut -f 1 -d '|'`
-   TYPE=`echo "${LINE}" | cut -f 2 -d '|'`
-   OWNER=`echo "${LINE}" | cut -f 3 -d '|'`
-   GROUP=`echo "${LINE}" | cut -f 4 -d '|'`
-   PERM=`echo "${LINE}" | cut -f 5 -d '|'`
-   HASH=`echo "${LINE}" | cut -f 6 -d '|'`
-   LINK=`echo "${LINE}" | cut -f 7 -d '|'`
-   P_TYPE=`echo "${LINE}" | cut -f 8 -d '|'`
-   P_OWNER=`echo "${LINE}" | cut -f 9 -d '|'`
-   P_GROUP=`echo "${LINE}" | cut -f 10 -d '|'`
-   P_PERM=`echo "${LINE}" | cut -f 11 -d '|'`
-   P_HASH=`echo "${LINE}" | cut -f 12 -d '|'`
-   P_LINK=`echo "${LINE}" | cut -f 13 -d '|'`
-
+   local IFS='|'
+   while read FPATH TYPE OWNER GROUP PERM HASH LINK P_TYPE P_OWNER P_GROUP 
P_PERM P_HASH P_LINK; do
# Warn about different object types.
if ! [ "${TYPE}" = "${P_TYPE}" ]; then
echo -n "${FPATH} is a "
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r284940 - stable/10/usr.sbin/freebsd-update

2015-06-29 Thread Xin LI

Author: delphij
Date: Mon Jun 29 19:09:16 2015
New Revision: 284940
URL: https://svnweb.freebsd.org/changeset/base/284940

Log:
  MFC r279901 (kmoore):
  
   - Include commas in valid file-name chars freebsd-update will support

Modified:
  stable/10/usr.sbin/freebsd-update/freebsd-update.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/freebsd-update/freebsd-update.sh
==
--- stable/10/usr.sbin/freebsd-update/freebsd-update.sh Mon Jun 29 19:02:30 
2015(r284939)
+++ stable/10/usr.sbin/freebsd-update/freebsd-update.sh Mon Jun 29 19:09:16 
2015(r284940)
@@ -1239,7 +1239,7 @@ fetch_metadata_sanity () {
# Some aliases to save space later: ${P} is a character which can
# appear in a path; ${M} is the four numeric metadata fields; and
# ${H} is a sha256 hash.
-   P="[-+./:=%@_[~[:alnum:]]"
+   P="[-+./:=,%@_[~[:alnum:]]"
M="[0-9]+\|[0-9]+\|[0-9]+\|[0-9]+"
H="[0-9a-f]{64}"
 
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r284943 - in stable/10/release: . tools

2015-06-29 Thread Glen Barber

Author: gjb
Date: Tue Jun 30 00:51:43 2015
New Revision: 284943
URL: https://svnweb.freebsd.org/changeset/base/284943

Log:
  MFC r284882, r284884:
  
   r284882:
Add initial support for automatically uploading GCE virtual
machine images to the Google Compute Engine platform.
  
Remove gce-package.sh.
  
   r284884:
Fix a vi-invoked typo.
  
  Sponsored by: The FreeBSD Foundation

Added:
  stable/10/release/Makefile.gce
 - copied, changed from r284882, head/release/Makefile.gce
Deleted:
  stable/10/release/tools/gce-package.sh
Modified:
  stable/10/release/Makefile.vm
Directory Properties:
  stable/10/   (props changed)

Copied and modified: stable/10/release/Makefile.gce (from r284882, 
head/release/Makefile.gce)
==
--- head/release/Makefile.gce   Sat Jun 27 01:29:59 2015(r284882, copy 
source)
+++ stable/10/release/Makefile.gce  Tue Jun 30 00:51:43 2015
(r284943)
@@ -36,7 +36,7 @@ gce-check-depends:
 . endif
 .endfor
 .if !exists(/usr/local/bin/gcutil)
-. if !execho ists(${PORTSDIR}/net/google-cloud-api/Makefile)
+. if !exists(${PORTSDIR}/net/google-cloud-api/Makefile)
 .  if !exists(/usr/local/sbin/pkg-static)
env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf
 .  endif

Modified: stable/10/release/Makefile.vm
==
--- stable/10/release/Makefile.vm   Mon Jun 29 21:26:41 2015
(r284942)
+++ stable/10/release/Makefile.vm   Tue Jun 30 00:51:43 2015
(r284943)
@@ -155,3 +155,4 @@ cloudware-install:
 
 .include "${.CURDIR}/Makefile.ec2"
 .include "${.CURDIR}/Makefile.azure"
+.include "${.CURDIR}/Makefile.gce"
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r284944 - stable/10/sys/kern

2015-06-29 Thread Konstantin Belousov

Author: kib
Date: Tue Jun 30 05:53:15 2015
New Revision: 284944
URL: https://svnweb.freebsd.org/changeset/base/284944

Log:
  MFC r284719:
  Only take previous buffer queue lock (olock) when needed for REMFREE
  in binsfree().

Modified:
  stable/10/sys/kern/vfs_bio.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/vfs_bio.c
==
--- stable/10/sys/kern/vfs_bio.cTue Jun 30 00:51:43 2015
(r284943)
+++ stable/10/sys/kern/vfs_bio.cTue Jun 30 05:53:15 2015
(r284944)
@@ -963,21 +963,23 @@ binsfree(struct buf *bp, int qindex)
 
BUF_ASSERT_XLOCKED(bp);
 
-   olock = bqlock(bp->b_qindex);
nlock = bqlock(qindex);
-   mtx_lock(olock);
/* Handle delayed bremfree() processing. */
-   if (bp->b_flags & B_REMFREE)
+   if (bp->b_flags & B_REMFREE) {
+   olock = bqlock(bp->b_qindex);
+   mtx_lock(olock);
bremfreel(bp);
+   if (olock != nlock) {
+   mtx_unlock(olock);
+   mtx_lock(nlock);
+   }
+   } else
+   mtx_lock(nlock);
 
if (bp->b_qindex != QUEUE_NONE)
panic("binsfree: free buffer onto another queue???");
 
bp->b_qindex = qindex;
-   if (olock != nlock) {
-   mtx_unlock(olock);
-   mtx_lock(nlock);
-   }
if (bp->b_flags & B_AGE)
TAILQ_INSERT_HEAD(&bufqueues[bp->b_qindex], bp, b_freelist);
else
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r284935 - stable/10/sys/dev/hptnr

svn commit: r284936 - stable/10/usr.sbin/freebsd-update

svn commit: r284937 - stable/10/usr.sbin/freebsd-update

svn commit: r284938 - stable/10/usr.sbin/freebsd-update

svn commit: r284939 - stable/10/usr.sbin/freebsd-update

svn commit: r284940 - stable/10/usr.sbin/freebsd-update

svn commit: r284943 - in stable/10/release: . tools

svn commit: r284944 - stable/10/sys/kern

8 matches

Site Navigation

Mail list logo

Footer information