dev | 23 Apr 12:27 2014

[freenas/ports] 7e5eed4: Man, I really need to learn how to merge between repos. This was the painful method!

branch: freenas/9-stable
Repository: freenas/ports
Pushed by: git
Pushed to: branch freenas/9-stable
commit 7e5eed4d66f1e76de9af2ce8092af4de1fff9e05
Author: Jordan Hubbard <jkh@...>
Date:   Wed Apr 23 03:27:14 2014 -0700

    Man, I really need to learn how to merge between repos.  This was the painful method!
---
 .../files/patch-Config.kmk                         |  58 ---------
 ...VBox-Additions-common-VBoxGuestLib-Makefile.kmk |  18 ---
 ...src-VBox-Additions-common-crOpenGL-Makefile.kmk |  40 -------
 ...rc-VBox-Additions-common-crOpenGL-fakedri_drv.c | 120 -------------------
 ...-VBox-Additions-x11-Installer-98vboxadd-xclient |  27 -----
 ...VBox-Additions-x11-Installer-vboxclient.desktop |  10 --
 ...h-src-VBox-Additions-x11-vboxvideo-Makefile.kmk |  20 ----
 ...Box-Runtime-r0drv-freebsd-alloc-r0drv-freebsd.c |  16 ---
 ...ox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c |  56 ---------
 ...0drv-freebsd-memobj-r0drv-freebsd_VM_MAP_FIND.c |  48 --------
 ...freebsd-memobj-r0drv-freebsd_VM_OBJECT_RENAME.c | 132 ---------------------
 ...VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h |  20 ----
 .../files/extrapatch-Config.kmk                    |  11 --
 ...h-src-VBox-HostDrivers-Support-freebsd-Makefile |  11 --
 .../virtualbox-ose-kmod/files/patch-Config.kmk     |  56 ---------
 ...ch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk |  25 ----
 ...Drivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c |  72 -----------
 ...Box-Runtime-r0drv-freebsd-alloc-r0drv-freebsd.c |  16 ---
 ...ox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c |  56 ---------
 ...0drv-freebsd-memobj-r0drv-freebsd_VM_MAP_FIND.c |  48 --------
(Continue reading)

dev | 23 Apr 11:34 2014

[freenas/freenas] cfdae1a: Enable the virtualbox networking.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit cfdae1aa98aeedf0df2d5d3ffa53592b1e3e69ae
Author: Jordan K. Hubbard <jkh@...>
Date:   Wed Apr 23 02:34:35 2014 -0700

    Enable the virtualbox networking.
---
 nanobsd/Files/etc/rc.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nanobsd/Files/etc/rc.conf b/nanobsd/Files/etc/rc.conf
index d022b04..fe3a32d 100644
--- a/nanobsd/Files/etc/rc.conf
+++ b/nanobsd/Files/etc/rc.conf
 <at>  <at>  -67,6 +67,9  <at>  <at>  watchdogd_enable="YES"
 # Turbo boost
 performance_cpu_freq="HIGH"

+# Allow virtualbox template to work
+vboxnet_enable="YES"
+
 # Add our rc.d scripts to load path
 local_startup="/etc/ix.rc.d /usr/local/etc/rc.d"
dev | 23 Apr 11:05 2014

[freenas/ports] 33f70e7: Add tar.mk

branch: freenas/9-stable
Repository: freenas/ports
Pushed by: git
Pushed to: branch freenas/9-stable
commit 33f70e74a2a9370e371b7f90d373226968115ea4
Author: Jordan Hubbard <jkh@...>
Date:   Wed Apr 23 02:04:52 2014 -0700

    Add tar.mk
---
 Mk/Uses/tar.mk | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/Mk/Uses/tar.mk b/Mk/Uses/tar.mk
new file mode 100644
index 0000000..92eb0f7
--- /dev/null
+++ b/Mk/Uses/tar.mk
 <at>  <at>  -0,0 +1,32  <at>  <at> 
+# $FreeBSD$
+#
+# handle tar archives
+#
+# Feature:	tar
+# Usage:	USES=tar[:[xz|lzma|Z|bzip2|tgz|tbz]]
+#
+# MAINTAINER: portmgr@...
+
+.if !defined(_INCLUDE_USES_TAR_MK)
+_INCLUDE_USES_TAR_MK=	yes
(Continue reading)

dev | 23 Apr 10:35 2014

[freenas/freenas] 75121c8: Add a knob, USE_POUDRIERE, to test building the FreeNAS ports with poudriere.

branch: poudriere
Repository: freenas/freenas
Pushed by: git
Pushed to: branch poudriere
commit 75121c8a9876264b36ef0527c8c4cfe1d2f24e4c
Author: Craig Rodrigues <rodrigc@...>
Date:   Wed Apr 23 01:34:08 2014 -0700

    Add a knob, USE_POUDRIERE, to test building the FreeNAS ports
    with poudriere.
---
 Makefile                    | 10 ++++++++++
 build/build_jail.sh         |  7 ++++++-
 build/do_build.sh           |  4 ++++
 build/ports/build-ports.sh  |  4 ++--
 build/ports/prepare-jail.sh |  4 ++--
 nanobsd/common              | 30 ++++++++++++++++++++++++++++++
 nanobsd/os-base             | 13 ++++++++++++-
 7 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index d82e9d2..de91769 100644
--- a/Makefile
+++ b/Makefile
 <at>  <at>  -19,12 +19,22  <at>  <at>  GIT_LOCATION!=cat ${GIT_REPO_SETTING}
 .endif
 ENV_SETUP=env NANO_LABEL=${NANO_LABEL} VERSION=${VERSION} GIT_LOCATION=${GIT_LOCATION} BUILD_TIMESTAMP=${BUILD_TIMESTAMP}

+USE_POUDRIERE=yes
+.if defined(USE_POUDRIERE)
(Continue reading)

dev | 23 Apr 10:35 2014

[freenas/freenas] a666e20: Add scripts which parse the INDEX file generated by poudriere which has the list of ports that poudriere built. Use this information to figure out what ports to install in the final package.

branch: poudriere
Repository: freenas/freenas
Pushed by: git
Pushed to: branch poudriere
commit a666e200fbdb1b1de2a1971c11bf7a7bc373fb0c
Author: Craig Rodrigues <rodrigc@...>
Date:   Wed Apr 23 01:31:59 2014 -0700

    Add scripts which parse the INDEX file generated by poudriere which
    has the list of ports that poudriere built. Use this information to figure
    out what ports to install in the final package.
---
 build/ports/install-ports-from-list.py | 67 ++++++++++++++++++++++++++++++++++
 build/ports/install-ports.sh           | 28 ++++++++++++++
 2 files changed, 95 insertions(+)

diff --git a/build/ports/install-ports-from-list.py b/build/ports/install-ports-from-list.py
new file mode 100755
index 0000000..f0944d5
--- /dev/null
+++ b/build/ports/install-ports-from-list.py
 <at>  <at>  -0,0 +1,67  <at>  <at> 
+#!/usr/bin/env python
+
+import argparse
+import os
+import re
+import sys
+
+from subprocess import Popen, PIPE
(Continue reading)

dev | 23 Apr 10:34 2014

[freenas/freenas] eb6e6f5: Remove unused code.

branch: poudriere
Repository: freenas/freenas
Pushed by: git
Pushed to: branch poudriere
commit eb6e6f519bb94d8e492bcf3259d5db73c9f0f3ea
Author: Craig Rodrigues <rodrigc@...>
Date:   Wed Apr 23 01:29:01 2014 -0700

    Remove unused code.
---
 build/do_build.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/build/do_build.sh b/build/do_build.sh
index 1460d1b..d23619e 100755
--- a/build/do_build.sh
+++ b/build/do_build.sh
 <at>  <at>  -155,10 +155,6  <at>  <at>  build_target()

 	local _required_logs="_.ik _.iw"

-	_c=$(echo ${AVATAR_COMPONENT} | tr '-' '_')
-		
-	export "${_c}_FORCE=1"
-
 	local _cmd="${_nanobsd} -c ${_target} ${_args} -j ${MAKE_JOBS}"
 	echo ${_cmd}
dev | 23 Apr 10:34 2014

[freenas/freenas] 8ae4a0a: Print out NANO_CUSTOMIZE and NANO_CUSTOMIZE_LATE just before we execute the functions listed in those variables. It makes it a bit easier to figure out the order in which functions are being executed during the build.

branch: poudriere
Repository: freenas/freenas
Pushed by: git
Pushed to: branch poudriere
commit 8ae4a0a63546262f9233c9fad772955c0bc2a3c7
Author: Jordan Hubbard <jkh@...>
Date:   Wed Apr 23 01:21:40 2014 -0700

    Print out NANO_CUSTOMIZE and NANO_CUSTOMIZE_LATE just
    before we execute the functions listed in those variables.
    It makes it a bit easier to figure out the order in which
    functions are being executed during the build.
---
 build/nanobsd/nanobsd_funcs.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build/nanobsd/nanobsd_funcs.sh b/build/nanobsd/nanobsd_funcs.sh
index 28562bb..198ab41 100644
--- a/build/nanobsd/nanobsd_funcs.sh
+++ b/build/nanobsd/nanobsd_funcs.sh
 <at>  <at>  -307,6 +307,7  <at>  <at>  install_kernel ( ) (
 run_customize() (

 	pprint 2 "run customize scripts"
+	pprint 2 "NANO_CUSTOMIZE: $NANO_CUSTOMIZE"
 	set -- $NANO_CUSTOMIZE
 	i=1
 	num_steps=$#
 <at>  <at>  -325,6 +326,7  <at>  <at>  run_customize() (
 run_late_customize() (
(Continue reading)

dev | 23 Apr 10:29 2014

[freenas/freenas] a3944d2: I'm *sure* I can make virtualbox work as a jail template. Try try again!

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit a3944d24bec9656637afae0a6b0b384040de4f86
Author: Jordan K. Hubbard <jkh@...>
Date:   Wed Apr 23 01:28:53 2014 -0700

    I'm *sure* I can make virtualbox work as a jail template.  Try try again!
---
 nanobsd/os-ports | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nanobsd/os-ports b/nanobsd/os-ports
index 01c862f..7e8f150 100644
--- a/nanobsd/os-ports
+++ b/nanobsd/os-ports
 <at>  <at>  -59,6 +59,7  <at>  <at>  add_port net-mgmt/sipcalc
 add_port net/istgt
 if ! is_truenas ; then
 	add_port net/vblade
+	add_port emulators/virtualbox-ose-kmod
 fi
 add_port security/libgpg-error
 add_port security/libgcrypt
dev | 23 Apr 10:25 2014

[freenas/ports] c98f431: Merge branch 'freenas/9-stable' of gitserver.ixsystems.com:/git/repos/freenas-build/ports into freenas/9-stable

branch: freenas/9-stable
Repository: freenas/ports
Pushed by: git
Pushed to: branch freenas/9-stable
commit c98f431891c1b006ed2c973a51e49af5320cee63
Merge: abe148b 4099896
Author: Jordan Hubbard <jkh@...>
Date:   Wed Apr 23 01:25:35 2014 -0700

    Merge branch 'freenas/9-stable' of gitserver.ixsystems.com:/git/repos/freenas-build/ports into freenas/9-stable

 Mk/Uses/fam.mk       | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 net/samba41/Makefile | 15 ++++++-------
 2 files changed, 70 insertions(+), 8 deletions(-)
dev | 23 Apr 10:25 2014

[freenas/ports] abe148b: Whoops, git commit -a doesn't do what I thought it did. Add files missing from last commit.

branch: freenas/9-stable
Repository: freenas/ports
Pushed by: git
Pushed to: branch freenas/9-stable
commit abe148be7918fc2b28c09d0638dfcf909f20de00
Author: Jordan Hubbard <jkh@...>
Date:   Wed Apr 23 01:24:41 2014 -0700

    Whoops, git commit -a doesn't do what I thought it did.  Add files missing from last commit.
---
 .../virtualbox-ose/files/extrapatch-Config.kmk     |  27 +++
 ...-src-VBox-Additions-x11-VBoxClient-Makefile.kmk |  11 +
 ...h-src-VBox-Additions-x11-vboxvideo-Makefile.kmk |  12 +
 ...xtrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk |  11 +
 ...h-src-VBox-HostDrivers-Support-freebsd-Makefile |  11 +
 ...-VBox-Main-src-server-generic-NetIf-generic.cpp |  10 +
 .../files/extrapatch-src-recompiler-Makefile.kmk   |  10 +
 .../virtualbox-ose/files/patch-include-iprt-x86.h  |  18 ++
 ...-Additions-common-VBoxGuest-VBoxGuest-freebsd.c | 255 +++++++++++++++++++++
 ...itions-common-VBoxGuest-freebsd-files_vboxguest |  10 +
 ...VBox-Additions-common-VBoxGuestLib-Makefile.kmk |  18 ++
 ...-VBox-Additions-x11-Installer-98vboxadd-xclient |  30 +++
 ...VBox-Additions-x11-Installer-vboxclient.desktop |  10 +
 ...h-src-VBox-Additions-x11-vboxvideo-Makefile.kmk | 138 +++++++++++
 .../patch-src-VBox-Devices-Graphics-DevVGA.cpp     |  86 +++++++
 ...patch-src-VBox-Devices-Graphics-DevVGA_VBVA.cpp |  34 +++
 ...h-src-VBox-Devices-Graphics-HGSMI-HGSMIHost.cpp |  38 +++
 ...VBox-Devices-Network-slirp-resolv_conf_parser.c |  11 +
 .../files/patch-src-VBox-Devices-PC-DrvACPI.cpp    |  29 +++
 .../patch-src-VBox-Devices-Storage-DevAHCI.cpp     |  11 +
(Continue reading)

dev | 23 Apr 10:25 2014

[freenas/ports] 10e3e9b: Try again with the virtualbox science experiment using the current version.

branch: freenas/9-stable
Repository: freenas/ports
Pushed by: git
Pushed to: branch freenas/9-stable
commit 10e3e9b65570aee1c5ebf4cc1dfc43bbfbcc4127
Author: Jordan Hubbard <jkh@...>
Date:   Wed Apr 23 01:22:16 2014 -0700

    Try again with the virtualbox science experiment using the current version.
---
 emulators/virtualbox-ose-additions/Makefile        | 114 ++++++-------
 emulators/virtualbox-ose-additions/distinfo        |   4 +-
 emulators/virtualbox-ose-additions/pkg-plist       |  11 +-
 emulators/virtualbox-ose-kmod/Makefile             |  49 +++---
 emulators/virtualbox-ose-kmod/distinfo             |   4 +-
 emulators/virtualbox-ose-kmod/files/vboxnet.in     |   3 +-
 emulators/virtualbox-ose-kmod/pkg-plist            |   7 +-
 emulators/virtualbox-ose/Makefile                  | 180 +++++++++++----------
 emulators/virtualbox-ose/distinfo                  |   8 +-
 ...Main-src-server-freebsd-HostHardwareFreeBSD.cpp |  15 +-
 .../files/patch-src-VBox-Runtime-Makefile.kmk      |  18 ++-
 ...ox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c |  95 ++++++++---
 emulators/virtualbox-ose/files/vboxheadless.in     |   2 +-
 emulators/virtualbox-ose/pkg-plist                 | 149 ++++++++++-------
 14 files changed, 388 insertions(+), 271 deletions(-)

diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index 2cc62da..b18ce99 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
(Continue reading)


Gmane