Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Massive update to build process including:

 - change to makefile to make people who want "make world" happy
 - separated joyent specific stuff into files that are not required to build
 - new ./configure script to set everything up
 - removed stuff we don't want in proto and renamed proto to 'overlay'
 - script now takes files from system if missing in both proto and overlay
 - ability to build everything into one proto area
 - add bootparams tool to build
  • Loading branch information...
commit 43be32e3db7808f499199e58dc9c88425c95ebe2 1 parent b9442ac
@joshwilsdon joshwilsdon authored
Showing with 281 additions and 1,127 deletions.
  1. +7 −0 .gitignore
  2. +28 −0 Makefile
  3. +163 −0 configure
  4. +1 −12 manifest
  5. 0  {proto → overlay}/etc/bash/bash_completion.example
  6. 0  {proto → overlay}/etc/bash/bashrc.example
  7. 0  {proto → overlay}/etc/bash/inputrc.example
  8. 0  {proto → overlay}/etc/coreadm.conf
  9. 0  {proto → overlay}/etc/default/passwd
  10. 0  {proto → overlay}/etc/dispadmin.conf
  11. 0  {proto → overlay}/etc/driver_aliases
  12. 0  {proto → overlay}/etc/driver_classes
  13. 0  {proto → overlay}/etc/dumpadm.conf
  14. 0  {proto → overlay}/etc/group
  15. 0  {proto → overlay}/etc/inittab
  16. 0  {proto → overlay}/etc/minor_perm
  17. +9 −0 overlay/etc/motd
  18. 0  {proto → overlay}/etc/name_to_major
  19. 0  {proto → overlay}/etc/nodename
  20. 0  {proto → overlay}/etc/passwd
  21. 0  {proto → overlay}/etc/path_to_inst
  22. 0  {proto → overlay}/etc/release
  23. 0  {proto → overlay}/etc/rtc_config
  24. 0  {proto → overlay}/etc/shadow
  25. 0  {proto → overlay}/etc/skel/.bashrc
  26. 0  {proto → overlay}/etc/ssh/sshd_config
  27. 0  {proto → overlay}/etc/svc/profile/generic.xml
  28. 0  {proto → overlay}/etc/svc/profile/platform.xml
  29. 0  {proto → overlay}/etc/system
  30. 0  {proto → overlay}/etc/vfstab
  31. 0  {proto → overlay}/lib/svc/manifest/network/nfs/client.xml
  32. 0  {proto → overlay}/lib/svc/manifest/network/nfs/nlockmgr.xml
  33. 0  {proto → overlay}/lib/svc/manifest/network/nfs/server.xml
  34. 0  {proto → overlay}/lib/svc/method/fs-usr
  35. 0  {proto → overlay}/lib/svc/method/net-physical
  36. 0  {proto → overlay}/lib/svc/method/sysidtool-net
  37. 0  {proto → overlay}/lib/svc/method/sysidtool-system
  38. 0  {proto → overlay}/lib/svc/share/net_include.sh
  39. 0  {proto → overlay}/var/svc/manifest/system/sysidtool.xml
  40. +0 −7 proto/etc/motd
  41. BIN  proto/usr/lib/locale/C/LC_MESSAGES/AMD.mo
  42. BIN  proto/usr/lib/locale/C/LC_MESSAGES/DISK.mo
  43. BIN  proto/usr/lib/locale/C/LC_MESSAGES/FMD.mo
  44. BIN  proto/usr/lib/locale/C/LC_MESSAGES/FMNOTIFY.mo
  45. BIN  proto/usr/lib/locale/C/LC_MESSAGES/GMCA.mo
  46. BIN  proto/usr/lib/locale/C/LC_MESSAGES/INTEL.mo
  47. BIN  proto/usr/lib/locale/C/LC_MESSAGES/NXGE.mo
  48. BIN  proto/usr/lib/locale/C/LC_MESSAGES/PCI.mo
  49. BIN  proto/usr/lib/locale/C/LC_MESSAGES/PCIEX.mo
  50. BIN  proto/usr/lib/locale/C/LC_MESSAGES/SENSOR.mo
  51. BIN  proto/usr/lib/locale/C/LC_MESSAGES/SMF.mo
  52. BIN  proto/usr/lib/locale/C/LC_MESSAGES/STORAGE.mo
  53. BIN  proto/usr/lib/locale/C/LC_MESSAGES/SUNOS.mo
  54. BIN  proto/usr/lib/locale/C/LC_MESSAGES/ZFS.mo
  55. BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/AMD.mo
  56. BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/DISK.mo
  57. BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/FMD.mo
  58. BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/FMNOTIFY.mo
  59. BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/GMCA.mo
  60. BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/INTEL.mo
  61. BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/NXGE.mo
  62. BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/PCI.mo
  63. BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/PCIEX.mo
  64. BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/SENSOR.mo
  65. BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/SMF.mo
  66. BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/STORAGE.mo
  67. BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/SUNOS.mo
  68. BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/ZFS.mo
  69. +0 −751 proto/usr/lib/locale/common/LC_CTYPE/LCL_DEF_unicode
  70. BIN  proto/usr/lib/locale/common/LC_CTYPE/amd64/wdresolve_unicode.so
  71. BIN  proto/usr/lib/locale/common/LC_CTYPE/ldterm_unicode.dat
  72. BIN  proto/usr/lib/locale/common/LC_CTYPE/wdresolve_unicode.so
  73. BIN  proto/usr/lib/locale/common/LO_LTYPE/amd64/umle.layout.so.1
  74. BIN  proto/usr/lib/locale/common/LO_LTYPE/umle.layout.so.1
  75. BIN  proto/usr/lib/locale/common/amd64/methods_unicode.so.3
  76. BIN  proto/usr/lib/locale/common/methods_unicode.so.3
  77. BIN  proto/usr/lib/locale/en_US.ISO8859-1/LC_COLLATE/LCL_DATA
  78. BIN  proto/usr/lib/locale/en_US.ISO8859-1/LC_CTYPE/LCL_DATA
  79. +0 −4 proto/usr/lib/locale/en_US.ISO8859-1/LC_MESSAGES/LCL_DATA
  80. +0 −15 proto/usr/lib/locale/en_US.ISO8859-1/LC_MONETARY/LCL_DATA
  81. +0 −3  proto/usr/lib/locale/en_US.ISO8859-1/LC_NUMERIC/LCL_DATA
  82. +0 −58 proto/usr/lib/locale/en_US.ISO8859-1/LC_TIME/LCL_DATA
  83. BIN  proto/usr/lib/locale/en_US.ISO8859-15/LC_COLLATE/LCL_DATA
  84. BIN  proto/usr/lib/locale/en_US.ISO8859-15/LC_CTYPE/LCL_DATA
  85. +0 −4 proto/usr/lib/locale/en_US.ISO8859-15/LC_MESSAGES/LCL_DATA
  86. +0 −15 proto/usr/lib/locale/en_US.ISO8859-15/LC_MONETARY/LCL_DATA
  87. +0 −3  proto/usr/lib/locale/en_US.ISO8859-15/LC_NUMERIC/LCL_DATA
  88. +0 −58 proto/usr/lib/locale/en_US.ISO8859-15/LC_TIME/LCL_DATA
  89. BIN  proto/usr/lib/locale/en_US.US-ASCII/LC_COLLATE/LCL_DATA
  90. BIN  proto/usr/lib/locale/en_US.US-ASCII/LC_CTYPE/LCL_DATA
  91. +0 −4 proto/usr/lib/locale/en_US.US-ASCII/LC_MESSAGES/LCL_DATA
  92. +0 −15 proto/usr/lib/locale/en_US.US-ASCII/LC_MONETARY/LCL_DATA
  93. +0 −3  proto/usr/lib/locale/en_US.US-ASCII/LC_NUMERIC/LCL_DATA
  94. +0 −58 proto/usr/lib/locale/en_US.US-ASCII/LC_TIME/LCL_DATA
  95. BIN  proto/usr/lib/locale/en_US.UTF-8/LC_COLLATE/LCL_DATA
  96. BIN  proto/usr/lib/locale/en_US.UTF-8/LC_CTYPE/LCL_DATA
  97. +0 −4 proto/usr/lib/locale/en_US.UTF-8/LC_MESSAGES/LCL_DATA
  98. +0 −15 proto/usr/lib/locale/en_US.UTF-8/LC_MONETARY/LCL_DATA
  99. +0 −3  proto/usr/lib/locale/en_US.UTF-8/LC_NUMERIC/LCL_DATA
  100. +0 −58 proto/usr/lib/locale/en_US.UTF-8/LC_TIME/LCL_DATA
  101. +4 −1 src/Makefile
  102. +19 −0 tools/build_illumos
  103. +43 −35 { → tools}/build_live
  104. +7 −1 { → tools}/customize
  105. 0  { → tools}/scanner
  106. 0  { → tools}/sorter
View
7 .gitignore
@@ -0,0 +1,7 @@
+/configure.*
+/output
+/projects
+/proto
+/log
+/src/bootparams
+/0-*-stamp
View
28 Makefile
@@ -0,0 +1,28 @@
+# Copyright (c) 2010 Joyent Inc., All rights reserved.
+
+ROOT:sh=pwd
+PROTO=$(ROOT)/proto
+
+world: 0-illumos-stamp 0-extra-stamp 0-livesrc-stamp
+
+live: world
+ (cd $(ROOT) && ./tools/build_live $(ROOT)/manifest)
+
+0-illumos-stamp:
+ (cd $(ROOT) && ./tools/build_illumos)
+ touch 0-illumos-stamp
+
+0-extra-stamp:
+ (cd $(ROOT)/projects/illumos-extras && make DESTDIR=$(PROTO) && make DESTDIR=$(PROTO) install)
+ touch 0-extra-stamp
+
+0-livesrc-stamp: src/bootparams.c
+ (cd $(ROOT)/src && make DESTDIR=$(PROTO) && make DESTDIR=$(PROTO) install)
+ touch 0-livesrc-stamp
+
+clean:
+ (cd $(ROOT)/src && make clean)
+ (cd $(ROOT)/projects/illumos-extras && make clean)
+ (cd $(ROOT) && rm -rf $(PROTO))
+ (cd $(ROOT) && mkdir -p $(PROTO))
+ rm -f 0-*-stamp
View
163 configure
@@ -0,0 +1,163 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2010 Joyent Inc.
+#
+
+set -e
+
+# Load all site-specific configure files
+source configure.*
+
+echo "==> Installing illumos build dependencies..."
+pfexec pkg install \
+ text/groff \
+ system/zones/internal \
+ library/libxml2 \
+ developer/gnome/gettext \
+ library/python-2/setuptools-26 \
+ library/gnome/gnome-vfs \
+ runtime/perl-510 \
+ runtime/perl-510/extra \
+ developer/build/gnu-make \
+ developer/build/onbld \
+ developer/gcc-3 \
+ developer/astdev \
+ developer/lexer/flex \
+ library/nspr/header-nspr \
+ system/library/mozilla-nss/header-nss \
+ data/docbook \
+ text/gnu-gettext \
+ || /bin/true
+
+
+# TODO: move this to illumos-extras itself
+echo "==> Installing illumos-extras dependencies..."
+pfexec pkg install \
+ compatibility/ucb \
+ developer/build/autoconf \
+ developer/build/automake-19 \
+ developer/build/automake-110 \
+ developer/build/cmake \
+ developer/build/libtool \
+ developer/parser/bison \
+ library/libevent \
+ || /bin/true
+
+
+echo "==> Checking for /opt/SUNWspro/bin/cc..."
+echo " +--> Ensuring SUNWspro (12.1-patched) installed in /opt/SUNWspro/sunstudio12.1..."
+if [ ! -f "/opt/SUNWspro/sunstudio12.1/prod/bin/cc" ]; then
+ if [ ! -z "${SUNW_SPRO12u1_URL}" ]; then
+ (pfexec mkdir -p /opt/SUNWspro \
+ && cd /opt/SUNWspro \
+ && curl -k ${SUNW_SPRO12u1_URL} \
+ | pfexec gtar -zxf -)
+ else
+ echo "FATAL: unable to download sunstudio12u1, no URL is set. Please set SUNW_SPRO12u1_URL in configure.*"
+ exit 1
+ fi
+fi
+echo " +--> Ensuring SUNWspro (12-patched) installed in /opt/SUNWspro..."
+if [ ! -f "/opt/SUNWspro/prod/bin/cc" ]; then
+ if [ ! -z "${SUNW_SPRO12_URL}" ]; then
+ (pfexec mkdir -p /opt/SUNWspro \
+ && cd /opt/SUNWspro \
+ && curl -k "${SUNW_SPRO12_URL}" \
+ | pfexec gtar -jxf -)
+ else
+ echo "FATAL: unable to download sunstudio12, no URL is set. Please set SUNW_SPRO12_URL in configure.*"
+ exit 1
+ fi
+fi
+
+echo "==> Creating the missing symlinks..."
+test -f /usr/bin/aclocal || pfexec ln -s /usr/bin/aclocal-1.10 /usr/bin/aclocal
+test -f /usr/bin/automake || pfexec ln -s /usr/bin/automake-1.10 /usr/bin/automake
+# so builds can use --mode and such
+test -f /usr/bin/install || pfexec ln -s /usr/bin/ginstall /usr/bin/install
+test -f /usr/bin/pod2man || pfexec ln -s /usr/perl5/5.10.0/bin/pod2man /usr/bin/pod2man
+
+echo "==> Populating projects/ directories..."
+[ ! -d "projects" ] || mkdir -p projects
+if [ ! -d "projects" ] ; then
+ echo "FATAL: unable to create projects/ directory."
+ exit 1
+fi
+
+if [ ! -f "projects/illumos/usr/src/tools/env/illumos.sh" ]; then
+ echo " +--> Getting illumos source tree..."
+ if [ -z "${GET_ILLUMOS}" ]; then
+ echo "FATAL: No GET_ILLUMOS defined in configure.*, can't get illumos!"
+ exit 1
+ fi
+ /bin/bash -c "cd projects && ${GET_ILLUMOS} && cd -"
+ if [ ! -f "projects/illumos/usr/src/tools/env/illumos.sh" ]; then
+ echo "FATAL: GET_ILLUMOS command failed to get illumos!"
+ exit 1
+ fi
+fi
+
+if [ ! -f "projects/illumos-extras/Makefile" ]; then
+ echo " +--> Getting illumos-extras source tree..."
+ if [ -z "${GET_ILLUMOS_EXTRAS}" ]; then
+ echo "FATAL: No GET_ILLUMOS_EXTRAS defined in configure.*, can't get illumos-extras!"
+ exit 1
+ fi
+ /bin/bash -c "cd projects && ${GET_ILLUMOS_EXTRAS} && cd -"
+ if [ ! -f "projects/illumos-extras/Makefile" ]; then
+ echo "FATAL: GET_ILLUMOS_EXTRAS command failed to get illumos-extras!"
+ exit 1
+ fi
+fi
+
+if [ ! -f "projects/opensolaris-man/README" ]; then
+ echo " +--> Getting opensolaris-man source tree..."
+ if [ -z "${GET_OPENSOLARIS_MAN}" ]; then
+ echo "FATAL: No GET_OPENSOLARIS_MAN defined in configure.*, can't get opensolaris-man!"
+ exit 1
+ fi
+ /bin/bash -c "cd projects && ${GET_OPENSOLARIS_MAN} && cd -"
+ if [ ! -f "projects/opensolaris-man/README" ]; then
+ echo "FATAL: GET_OPENSOLARIS_MAN command failed to get opensolaris-man!"
+ exit 1
+ fi
+fi
+
+ROOT=`pwd`
+echo "==> Setting up illumos-gate"
+
+cd ${ROOT}/projects/illumos
+
+if [ ! -f on-closed-bins.i386.tar.bz2 ]; then
+ if [ -z "${ON_CLOSED_BINS_URL}" ]; then
+ curl -O http://dlc.sun.com/osol/on/downloads/20100817/on-closed-bins.i386.tar.bz2
+ else
+ curl -k -O "${ON_CLOSED_BINS_URL}"
+ fi
+ tar xvpf on-closed-bins.i386.tar.bz2
+fi
+if [ ! -f on-closed-bins-nd.i386.tar.bz2 ]; then
+ if [ -z "${ON_CLOSED_BINS_ND_URL}" ]; then
+ curl -O http://dlc.sun.com/osol/on/downloads/20100817/on-closed-bins-nd.i386.tar.bz2
+ else
+ curl -k -O "${ON_CLOSED_BINS_ND_URL}"
+ fi
+ tar xvpf on-closed-bins-nd.i386.tar.bz2
+fi
+
+cp usr/src/tools/env/illumos.sh .
+[ ! -z "${RELEASE_VER}" ] && /usr/gnu/bin/sed -i -e "s|^GATE=.*$|GATE=\"${RELEASE_VER}\"; export GATE|" illumos.sh
+[ ! -z "${PUBLISHER}" ] && /usr/gnu/bin/sed -i -e "s|^# PKGPUBLISHER_REDIST=.*$|PKGPUBLISHER_REDIST=\"${PUBLISHER}\"; export PKGPUBLISHER_REDIST|" illumos.sh
+/usr/gnu/bin/sed -i -e "s|^CODEMGR_WS=.*$|CODEMGR_WS=\"${ROOT}/projects/illumos\"; export CODEMGR_WS|" illumos.sh
+/usr/gnu/bin/sed -i -e "s|^NIGHTLY_OPTIONS=.*$|NIGHTLY_OPTIONS=\"-nCmprt\"; export NIGHTLY_OPTIONS|" illumos.sh
+/usr/gnu/bin/sed -i -e "s|^ROOT=.*$|ROOT="${ROOT}/proto"; export ROOT|" illumos.sh
+/usr/gnu/bin/sed -i -e "s|^PARENT_ROOT=.*$|PARENT_ROOT="${ROOT}/proto"; export PARENT_ROOT|" illumos.sh
+
+# For some reason this disappeared before
+touch ${ROOT}/projects/illumos/usr/src/tools/findunref/exception_list.unknown
+
+echo ""
+echo "Configuration complete. You should now be able to build a live image using ./build_live"
+echo ""
+
+exit 0
View
13 manifest
@@ -134,7 +134,6 @@ s dev/sad/admin=../../devices/pseudo/sad@0:admin
s dev/sad/user=../../devices/pseudo/sad@0:user
s dev/sdp=../devices/pseudo/sdp@0:sdp
s dev/smbios=../devices/pseudo/smbios@0:smbios
-s dev/sndstat=../devices/pseudo/audio@0:sound,sndstat0
s dev/spdsock=../devices/pseudo/spdsock@0:spdsock
s dev/sppp=../devices/pseudo/clone@0:sppp
s dev/sppptun=../devices/pseudo/clone@0:sppptun
@@ -300,9 +299,6 @@ f etc/dladm/flowprop.conf 0644 dladm netadm
f etc/dladm/secobj.conf 0660 dladm netadm
f etc/driver_aliases 0644 root sys
f etc/driver_classes 0644 root sys
-d etc/ds 0755 root sys
-f etc/ds/dfstab 0644 root sys
-f etc/ds/fstypes 0644 root root
f etc/dumpadm.conf 0644 root other
f etc/dumpdates 0664 root sys
s etc/ff=../usr/sbin/ff
@@ -552,7 +548,6 @@ d etc/saf/zsmon 0755 root sys
f etc/saf/zsmon/_pid 0644 root root
f etc/saf/zsmon/_pmtab 0644 root sys
d etc/sasl 0755 root sys
-f etc/screenrc 0644 root sys
f etc/sdp.conf 0644 root sys
d etc/security 0755 root sys
d etc/security/audit 0755 root sys
@@ -661,7 +656,6 @@ s etc/wtmpx=../var/adm/wtmpx
d etc/xdg 0755 root sys
d etc/xdg/autostart 0755 root sys
d etc/zfs 0755 root sys
-f etc/zfs/zpool.cache 0644 root root
d etc/zones 0755 root sys
f etc/zones/Joyent.xml 0444 root bin
f etc/zones/SUNWblank.xml 0444 root bin
@@ -2494,6 +2488,7 @@ f usr/bin/bc 0555 root bin
f usr/bin/bdiff 0755 root bin
f usr/bin/bfs 0555 root bin
f usr/bin/bg 0555 root bin
+f usr/bin/bootparams 0555 root bin
f usr/bin/bunzip2 0555 root bin
f usr/bin/busstat 0555 root bin
h usr/bin/bzcat=usr/bin/bunzip2
@@ -13813,12 +13808,6 @@ s usr/sbin/lockfs=../lib/fs/ufs/lockfs
f usr/sbin/lockstat 0555 root bin
f usr/sbin/lofiadm 0555 root bin
f usr/sbin/logadm 0555 root bin
-f usr/sbin/lpfilter 0555 root lp
-f usr/sbin/lpforms 0555 root lp
-f usr/sbin/lpinfo 0555 root bin
-f usr/sbin/lpshut 0555 root lp
-f usr/sbin/lpsystem 0555 root lp
-f usr/sbin/lpusers 0555 root lp
f usr/sbin/lshal 0555 root bin
f usr/sbin/luxadm 0555 root bin
f usr/sbin/makedbm 0555 root bin
View
0  proto/etc/bash/bash_completion.example → overlay/etc/bash/bash_completion.example
File renamed without changes
View
0  proto/etc/bash/bashrc.example → overlay/etc/bash/bashrc.example
File renamed without changes
View
0  proto/etc/bash/inputrc.example → overlay/etc/bash/inputrc.example
File renamed without changes
View
0  proto/etc/coreadm.conf → overlay/etc/coreadm.conf
File renamed without changes
View
0  proto/etc/default/passwd → overlay/etc/default/passwd
File renamed without changes
View
0  proto/etc/dispadmin.conf → overlay/etc/dispadmin.conf
File renamed without changes
View
0  proto/etc/driver_aliases → overlay/etc/driver_aliases
File renamed without changes
View
0  proto/etc/driver_classes → overlay/etc/driver_classes
File renamed without changes
View
0  proto/etc/dumpadm.conf → overlay/etc/dumpadm.conf
File renamed without changes
View
0  proto/etc/group → overlay/etc/group
File renamed without changes
View
0  proto/etc/inittab → overlay/etc/inittab
File renamed without changes
View
0  proto/etc/minor_perm → overlay/etc/minor_perm
File renamed without changes
View
9 overlay/etc/motd
@@ -0,0 +1,9 @@
+ _____
+ ____ ____
+ _____ _____ . .
+ __ __ | .-. . . .-. :--. |-
+ _____ _____ ;| || |(.-' | | |
+ ____ ____ `--' `-' `;-| `-' ' ' `-'
+ _____ / ; Joyent Live Image v0.147+
+ `-' build: 00000000T000000Z
+
View
0  proto/etc/name_to_major → overlay/etc/name_to_major
File renamed without changes
View
0  proto/etc/nodename → overlay/etc/nodename
File renamed without changes
View
0  proto/etc/passwd → overlay/etc/passwd
File renamed without changes
View
0  proto/etc/path_to_inst → overlay/etc/path_to_inst
File renamed without changes
View
0  proto/etc/release → overlay/etc/release
File renamed without changes
View
0  proto/etc/rtc_config → overlay/etc/rtc_config
File renamed without changes
View
0  proto/etc/shadow → overlay/etc/shadow
File renamed without changes
View
0  proto/etc/skel/.bashrc → overlay/etc/skel/.bashrc
File renamed without changes
View
0  proto/etc/ssh/sshd_config → overlay/etc/ssh/sshd_config
File renamed without changes
View
0  proto/etc/svc/profile/generic.xml → overlay/etc/svc/profile/generic.xml
File renamed without changes
View
0  proto/etc/svc/profile/platform.xml → overlay/etc/svc/profile/platform.xml
File renamed without changes
View
0  proto/etc/system → overlay/etc/system
File renamed without changes
View
0  proto/etc/vfstab → overlay/etc/vfstab
File renamed without changes
View
0  proto/lib/svc/manifest/network/nfs/client.xml → overlay/lib/svc/manifest/network/nfs/client.xml
File renamed without changes
View
0  proto/lib/svc/manifest/network/nfs/nlockmgr.xml → overlay/lib/svc/manifest/network/nfs/nlockmgr.xml
File renamed without changes
View
0  proto/lib/svc/manifest/network/nfs/server.xml → overlay/lib/svc/manifest/network/nfs/server.xml
File renamed without changes
View
0  proto/lib/svc/method/fs-usr → overlay/lib/svc/method/fs-usr
File renamed without changes
View
0  proto/lib/svc/method/net-physical → overlay/lib/svc/method/net-physical
File renamed without changes
View
0  proto/lib/svc/method/sysidtool-net → overlay/lib/svc/method/sysidtool-net
File renamed without changes
View
0  proto/lib/svc/method/sysidtool-system → overlay/lib/svc/method/sysidtool-system
File renamed without changes
View
0  proto/lib/svc/share/net_include.sh → overlay/lib/svc/share/net_include.sh
File renamed without changes
View
0  proto/var/svc/manifest/system/sysidtool.xml → overlay/var/svc/manifest/system/sysidtool.xml
File renamed without changes
View
7 proto/etc/motd
@@ -1,7 +0,0 @@
- __ __
- __ / /___ __ _____ ____ / /_
- __/ /___ / / __ \/ / / / _ \/ __ \/ __/
- /_ __/ /_/ / /_/ / /_/ / __/ / / / /_
- /_/ \____/\____/\__, /\___/_/ /_/\__/
- v0.147+ /____/ Joyent Live Image!
-
View
BIN  proto/usr/lib/locale/C/LC_MESSAGES/AMD.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/C/LC_MESSAGES/DISK.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/C/LC_MESSAGES/FMD.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/C/LC_MESSAGES/FMNOTIFY.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/C/LC_MESSAGES/GMCA.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/C/LC_MESSAGES/INTEL.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/C/LC_MESSAGES/NXGE.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/C/LC_MESSAGES/PCI.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/C/LC_MESSAGES/PCIEX.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/C/LC_MESSAGES/SENSOR.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/C/LC_MESSAGES/SMF.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/C/LC_MESSAGES/STORAGE.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/C/LC_MESSAGES/SUNOS.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/C/LC_MESSAGES/ZFS.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/AMD.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/DISK.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/FMD.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/FMNOTIFY.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/GMCA.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/INTEL.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/NXGE.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/PCI.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/PCIEX.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/SENSOR.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/SMF.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/STORAGE.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/SUNOS.mo
Binary file not shown
View
BIN  proto/usr/lib/locale/POSIX/LC_MESSAGES/ZFS.mo
Binary file not shown
View
751 proto/usr/lib/locale/common/LC_CTYPE/LCL_DEF_unicode
@@ -1,751 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-FORM_PART
-obj0{
- type Display
- name DisplayForm
- msg_header_charset UTF-8
- msg_body_charset UTF-8
- plaintext_bodycharset UTF-8
- taggedtext_header_charset UTF-8
- taggedtext_body_charset UTF-8
-}
-obj1{
- type InComingStream
- name InComingStreamForm
- msg_header_charset ASCII;UTF-8;ISO-8859-1;ISO-8859-2;ISO-8859-3;ISO-8859-4;ISO-8859-5;ISO-8859-6;ISO-8859-7;ISO-8859-8;ISO-8859-9;ISO-8859-10;ISO-8859-13;ISO-8859-14;ISO-8859-15;ISO-8859-16;UTF-7;UTF-7-OLD;eucJP;EUC-JP;eucKR;eucKR;ISO-2022-KR;ISO-2022-JP;KOI8-R;KOI8-U;SJIS;ISO-2022-CN;GB2312;Big5;Shift_JIS;TIS-620;UTF-16;UTF-16BE;UTF-16LE;UTF-32;UTF-32BE;UTF-32LE;UNKNOWN;W1250;W1251;W1252;W1253;W1254;W1255;W1256;W1257;W1258
- msg_body_charset ASCII;UTF-8;ISO-8859-1;ISO-8859-2;ISO-8859-3;ISO-8859-4;ISO-8859-5;ISO-8859-6;ISO-8859-7;ISO-8859-8;ISO-8859-9;ISO-8859-10;ISO-8859-13;ISO-8859-14;ISO-8859-15;ISO-8859-16;UTF-7;UTF-7-OLD;eucJP;EUC-JP;eucKR;ISO-2022-KR;ISO-2022-KR;ISO-2022-JP;KOI8-R;KOI8-U;SJIS;ISO-2022-CN;GB2312;Big5;Shift_JIS;TIS-620;UTF-16;UTF-16BE;UTF-16LE;UTF-32;UTF-32BE;UTF-32LE;UNKNOWN;W1250;W1251;W1252;W1253;W1254;W1255;W1256;W1257;W1258
- taggedtext_header_charset ASCII;UTF-8;ISO-8859-1;ISO-8859-2;ISO-8859-3;ISO-8859-4;ISO-8859-5;ISO-8859-6;ISO-8859-7;ISO-8859-8;ISO-8859-9;ISO-8859-10;ISO-8859-13;ISO-8859-14;ISO-8859-15;ISO-8859-16;UTF-7;UTF-7-OLD;eucJP;EUC-JP;eucKR;eucKR;ISO-2022-KR;ISO-2022-JP;KOI8-R;KOI8-U;SJIS;ISO-2022-CN;GB2312;Big5;Shift_JIS;TIS-620;UTF-16;UTF-16BE;UTF-16LE;UTF-32;UTF-32BE;UTF-32LE;UNKNOWN;W1250;W1251;W1252;W1253;W1254;W1255;W1256;W1257;W1258
- taggedtext_body_charset ASCII;UTF-8;ISO-8859-1;ISO-8859-2;ISO-8859-3;ISO-8859-4;ISO-8859-5;ISO-8859-6;ISO-8859-7;ISO-8859-8;ISO-8859-9;ISO-8859-10;ISO-8859-13;ISO-8859-14;ISO-8859-15;ISO-8859-16;UTF-7;UTF-7-OLD;eucJP;EUC-JP;eucKR;ISO-2022-KR;ISO-2022-KR;ISO-2022-JP;KOI8-R;KOI8-U;SJIS;ISO-2022-CN;GB2312;Big5;Shift_JIS;TIS-620;UTF-16;UTF-16BE;UTF-16LE;UTF-32;UTF-32BE;UTF-32LE;UNKNOWN;W1250;W1251;W1252;W1253;W1254;W1255;W1256;W1257;W1258
- msg_header_encoding None
- msg_body_encoding None
- taggedtext_header_encoding None
- taggedtext_body_encoding None
- mail_type Unknown
-}
-obj2{
- type OutGoingStream
- name OutGoingStreamForm
- msg_header_charset ASCII;ISO-8859-1;ISO-8859-2;ISO-8859-3;ISO-8859-4;ISO-8859-5;ISO-8859-6;ISO-8859-7;ISO-8859-8;ISO-8859-9;ISO-8859-10;ISO-8859-13;ISO-8859-14;ISO-8859-15;ISO-8859-16;KOI8-R;KOI8-U;UTF-8;UTF-16;UTF-16BE;UTF-16LE;UTF-32;UTF-32BE;UTF-32LE;UTF-7;W1250;W1251;W1252;W1253;W1254;W1255;W1256;W1257;W1258
- msg_body_charset ASCII;ISO-8859-1;ISO-8859-2;ISO-8859-3;ISO-8859-4;ISO-8859-5;ISO-8859-6;ISO-8859-7;ISO-8859-8;ISO-8859-9;ISO-8859-10;ISO-8859-13;ISO-8859-14;ISO-8859-15;ISO-8859-16;KOI8-R;KOI8-U;UTF-8;UTF-16;UTF-16BE;UTF-16LE;UTF-32;UTF-32BE;UTF-32LE;UTF-7;W1250;W1251;W1252;W1253;W1254;W1255;W1256;W1257;W1258
- taggedtext_header_charset ASCII;ISO-8859-1;ISO-8859-2;ISO-8859-3;ISO-8859-4;ISO-8859-5;ISO-8859-6;ISO-8859-7;ISO-8859-8;ISO-8859-9;ISO-8859-10;ISO-8859-13;ISO-8859-14;ISO-8859-15;ISO-8859-16;KOI8-R;KOI8-U;UTF-8;UTF-16;UTF-16BE;UTF-16LE;UTF-32;UTF-32BE;UTF-32LE;UTF-7;W1250;W1251;W1252;W1253;W1254;W1255;W1256;W1257;W1258
- taggedtext_body_charset ASCII;ISO-8859-1;ISO-8859-2;ISO-8859-3;ISO-8859-4;ISO-8859-5;ISO-8859-6;ISO-8859-7;ISO-8859-8;ISO-8859-9;ISO-8859-10;ISO-8859-13;ISO-8859-14;ISO-8859-15;ISO-8859-16;KOI8-R;KOI8-U;UTF-8;UTF-16;UTF-16BE;UTF-16LE;UTF-32;UTF-32BE;UTF-32LE;UTF-7;W1250;W1251;W1252;W1253;W1254;W1255;W1256;W1257;W1258
- msg_header_encoding Quoted-Printable
- msg_body_encoding Quoted-Printable
- taggedtext_header_encoding Quoted-Printable
- taggedtext_body_encoding Quoted-Printable
- mail_type MIME
-}
-obj3{
- type OutGoingStream
- name OutGoingStreamForm_V3
- msg_header_charset ASCII;UTF-8
- msg_body_charset ASCII;UTF-8
- taggedtext_header_charset ASCII;UTF-8
- taggedtext_body_charset ASCII;UTF-8
- msg_header_encoding None
- msg_body_encoding None
- taggedtext_header_encoding None
- taggedtext_body_encoding None
- mail_type V3
-}
-obj4{
- type OutGoingStream
- name OutGoingStreamForm_V3_Attach
- msg_header_charset ASCII;UTF-8
- msg_body_charset ASCII;UTF-8
- taggedtext_header_charset ASCII;UTF-8
- taggedtext_body_charset ASCII;UTF-8
- msg_header_encoding None
- msg_body_encoding None
- taggedtext_header_encoding None
- taggedtext_body_encoding None
- mail_type V3
-}
-obj5{
- type Display
- name PrintForm
- msg_header_charset UTF-8
- msg_body_charset UTF-8
- plaintext_bodycharset UTF-8
- taggedtext_header_charset UTF-8
- taggedtext_body_charset UTF-8
-}
-END FORM_PART
-ICONV_PART
-conv0{
- encoding eucJP;UTF-8
- conversion eucJP;UTF-8
- direction Both
-}
-conv1{
- encoding SJIS;UTF-8
- conversion SJIS;UTF-8
- direction Both
-}
-conv2{
- encoding ISO-2022-JP;UTF-8
- conversion ISO-2022-JP;UTF-8
- direction Both
-}
-conv3{
- encoding ISO-8859-1;UTF-8
- conversion 8859-1;UTF-8
- direction Both
-}
-conv4{
- encoding ISO-8859-2;UTF-8
- conversion 8859-2;UTF-8
- direction Both
-}
-conv5{
- encoding ISO-8859-3;UTF-8
- conversion 8859-3;UTF-8
- direction Both
-}
-conv6{
- encoding ISO-8859-4;UTF-8
- conversion 8859-4;UTF-8
- direction Both
-}
-conv7{
- encoding ISO-8859-5;UTF-8
- conversion 8859-5;UTF-8
- direction Both
-}
-conv8{
- encoding ISO-8859-6;UTF-8
- conversion 8859-6;UTF-8
- direction Both
-}
-conv9{
- encoding ISO-8859-7;UTF-8
- conversion 8859-7;UTF-8
- direction Both
-}
-conv10{
- encoding ISO-8859-8;UTF-8
- conversion 8859-8;UTF-8
- direction Both
-}
-conv11{
- encoding ISO-8859-9;UTF-8
- conversion 8859-9;UTF-8
- direction Both
-}
-conv12{
- encoding ISO-8859-10;UTF-8
- conversion 8859-10;UTF-8
- direction Both
-}
-conv13{
- encoding KOI8-R;UTF-8
- conversion KOI8-R;UTF-8
- direction Both
-}
-conv14{
- encoding UTF-7;UTF-8
- conversion UTF-7;UTF-8
- direction Both
-}
-conv15{
- encoding ISO-2022-KR;UTF-8
- conversion ko_KR-iso2022-7;ko_KR-UTF-8
- direction Both
-}
-conv16{
- encoding eucKR;UTF-8
- conversion ko_KR-euc;ko_KR-UTF-8
- direction Both
-}
-conv17{
- encoding UTF-7-OLD;UTF-8
- conversion UTF-7;UTF-8
- direction Both
-}
-conv18{
- encoding ISO-8859-15;UTF-8
- conversion 8859-15;UTF-8
- direction Both
-}
-conv19{
- encoding ISO-2022-CN;UTF-8
- conversion zh_CN.iso2022-CN;UTF-8
- direction Both
-}
-conv20{
- encoding ISO-8859-13;UTF-8
- conversion ISO-8859-13;UTF-8
- direction Both
-}
-conv21{
- encoding ISO-8859-14;UTF-8
- conversion ISO-8859-14;UTF-8
- direction Both
-}
-conv22{
- encoding KOI8-U;UTF-8
- conversion KOI8-U;UTF-8
- direction Both
-}
-conv23{
- encoding GB2312;UTF-8
- conversion zh_CN.euc;UTF-8
- direction Both
-}
-conv24{
- encoding Big5;UTF-8
- conversion zh_TW-big5;UTF-8
- direction Both
-}
-conv25{
- encoding Shift_JIS;UTF-8
- conversion PCK;UTF-8
- direction Both
-}
-conv26{
- encoding TIS-620;UTF-8
- conversion eucTH;UTF-8
- direction Both
-}
-conv27{
- encoding UTF-16;UTF-8
- conversion UTF-16;UTF-8
- direction Both
-}
-conv28{
- encoding UTF-16BE;UTF-8
- conversion UTF-16BE;UTF-8
- direction Both
-}
-conv29{
- encoding UTF-16LE;UTF-8
- conversion UTF-16LE;UTF-8
- direction Both
-}
-conv30{
- encoding UNKNOWN;UTF-8
- conversion 8859-1;UTF-8
- direction Both
-}
-conv31{
- encoding W1250;UTF-8
- conversion CP1250;UTF-8
- direction Both
-}
-conv32{
- encoding W1251;UTF-8
- conversion CP1251;UTF-8
- direction Both
-}
-conv33{
- encoding W1252;UTF-8
- conversion CP1252;UTF-8
- direction Both
-}
-conv34{
- encoding W1253;UTF-8
- conversion CP1253;UTF-8
- direction Both
-}
-conv35{
- encoding W1254;UTF-8
- conversion CP1254;UTF-8
- direction Both
-}
-conv36{
- encoding W1255;UTF-8
- conversion CP1255;UTF-8
- direction Both
-}
-conv37{
- encoding W1256;UTF-8
- conversion CP1256;UTF-8
- direction Both
-}
-conv38{
- encoding W1257;UTF-8
- conversion CP1257;UTF-8
- direction Both
-}
-conv39{
- encoding W1258;UTF-8
- conversion CP1258;UTF-8
- direction Both
-}
-conv40{
- encoding UTF-32;UTF-8
- conversion UTF-32;UTF-8
- direction Both
-}
-conv41{
- encoding UTF-32BE;UTF-8
- conversion UTF-32BE;UTF-8
- direction Both
-}
-conv42{
- encoding UTF-32LE;UTF-8
- conversion UTF-32LE;UTF-8
- direction Both
-}
-conv43{
- encoding ISO-8859-16;UTF-8
- conversion 8859-16;UTF-8
- direction Both
-}
-conv44{
- encoding EUC-JP;UTF-8
- conversion eucJP;UTF-8
- direction Both
-}
-END ICONV_PART
-CHARSET_PART
-cs0{
- name ISO-2022-JP
- mime_name ISO-2022-JP
- v3_name ja_JP.iso2022-7
- iconv_name ISO-2022-JP
- format 7BIT
- ascii_superset True
-}
-cs1{
- name ASCII
- mime_name US-ASCII
- v3_name US-ASCII
- iconv_name US-ASCII
- format ASCII
- ascii_superset True
-}
-cs2{
- name eucJP
- mime_name eucJP
- v3_name X-eucJP
- iconv_name eucJP
- format ISO_94_96
- ascii_superset True
-}
-cs3{
- name SJIS
- mime_name SJIS
- v3_name X-SJIS
- iconv_name SJIS
- format ISO_94_Ext
- ascii_superset True
-}
-cs4{
- name UTF-7
- mime_name UTF-7
- v3_name UTF-7
- mail_header_encoding Quoted-Printable
- mail_body_encoding None
- iconv_name UTF-7
-}
-cs5{
- name ASCII
- mime_name US-ASCII
- v3_name US-ASCII
- iconv_name US-ASCII
- mail_header_encoding None
- mail_body_encoding None
- format ASCII
- ascii_superset True
-}
-cs6{
- name ISO-8859-1
- mime_name ISO-8859-1
- v3_name ISO-8859-1
- iconv_name ISO-8859-1
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs7{
- name ISO-8859-2
- mime_name ISO-8859-2
- v3_name ISO-8859-2
- iconv_name ISO-8859-2
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs8{
- name ISO-8859-3
- mime_name ISO-8859-3
- v3_name ISO-8859-3
- iconv_name ISO-8859-3
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs9{
- name ISO-8859-4
- mime_name ISO-8859-4
- v3_name ISO-8859-4
- iconv_name ISO-8859-4
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs10{
- name ISO-8859-5
- mime_name ISO-8859-5
- v3_name ISO-8859-5
- iconv_name ISO-8859-5
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs11{
- name ISO-8859-6
- mime_name ISO-8859-6
- v3_name ISO-8859-6
- iconv_name ISO-8859-6
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs12{
- name ISO-8859-7
- mime_name ISO-8859-7
- v3_name ISO-8859-7
- iconv_name ISO-8859-7
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs13{
- name ISO-8859-8
- mime_name ISO-8859-8
- v3_name ISO-8859-8
- iconv_name ISO-8859-8
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs14{
- name ISO-8859-9
- mime_name ISO-8859-9
- v3_name ISO-8859-9
- iconv_name ISO-8859-9
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs15{
- name ISO-8859-10
- mime_name ISO-8859-10
- v3_name ISO-8859-10
- iconv_name ISO-8859-10
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs16{
- name KOI8-R
- mime_name KOI8-R
- v3_name ru.koi8-r
- iconv_name KOI8-R
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs17{
- name ISO-2022-KR
- mime_name ISO-2022-KR
- v3_name ko_KR.iso2022-7
- iconv_name ko_KR-iso2022-7
- mail_header_encoding Base64
- mail_body_encoding None
- format 7BIT
- ascii_superset True
-}
-cs18{
- name eucKR
- mime_name EUC-KR
- v3_name ko_KR.euc
- iconv_name ko_KR-euc
- mail_header_encoding Base64
- mail_body_encoding Base64
- format ISO_94_96
- ascii_superset True
-}
-cs19{
- name UTF-8
- mime_name UTF-8
- v3_name UTF-8
- iconv_name UTF-8
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- format MB_String
- ascii_superset True
-}
-cs20{
- name UTF-7-OLD
- mime_name UNICODE-1-1-UTF-7
- v3_name UTF-7
- mail_header_encoding Quoted-Printable
- mail_body_encoding None
- iconv_name UTF-7
-}
-cs21{
- name ISO-8859-15
- mime_name ISO-8859-15
- v3_name ISO-8859-15
- iconv_name ISO-8859-15
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs22{
- name ISO-2022-CN
- mime_name ISO-2022-CN
- v3_name zh_CN.iso2022-7
- iconv_name zh_CN.iso2022-CN
- mail_header_encoding Base64
- mail_body_encoding None
- format 7BIT
- ascii_superset True
-}
-cs23{
- name ISO-8859-13
- mime_name ISO-8859-13
- v3_name ISO-8859-13
- iconv_name 8859-13
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs24{
- name ISO-8859-14
- mime_name ISO-8859-14
- v3_name ISO-8859-14
- iconv_name 8859-14
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs25{
- name KOI8-U
- mime_name KOI8-U
- v3_name KOI8-U
- iconv_name KOI8-U
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs26{
- name GB2312
- mime_name GB2312
- v3_name zh_CN.euc
- iconv_name zh_CN.euc
- mail_header_encoding Base64
- mail_body_encoding Base64
- format ISO_94_96
- ascii_superset True
-}
-cs27{
- name Big5
- mime_name Big5
- v3_name Big5
- iconv_name zh_TW-big5
- mail_header_encoding Base64
- mail_body_encoding Base64
- format ISO_94_EXT
- ascii_superset True
-}
-cs28{
- name Shift_JIS
- mime_name Shift_JIS
- v3_name X-SJIS
- iconv_name PCK
- mail_header_encoding Base64
- mail_body_encoding Base64
- format ISO_94_EXT
- ascii_superset True
-}
-cs29{
- name TIS-620
- mime_name TIS-620
- v3_name TIS-620
- iconv_name eucTH
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs30{
- name UTF-16
- mime_name UTF-16
- v3_name UTF-16
- iconv_name UTF-16
- mail_header_encoding Base64
- mail_body_encoding Base64
-}
-cs31{
- name UTF-16BE
- mime_name UTF-16BE
- v3_name UTF-16BE
- iconv_name UTF-16BE
- mail_header_encoding Base64
- mail_body_encoding Base64
-}
-cs32{
- name UTF-16LE
- mime_name UTF-16LE
- v3_name UTF-16LE
- iconv_name UTF-16LE
- mail_header_encoding Base64
- mail_body_encoding Base64
-}
-cs33{
- name UNKNOWN
- mime_name UNKNOWN
- v3_name UNKNOWN
- iconv_name 8859-1
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs34{
- name W1250
- mime_name windows-1250
- v3_name windows-1250
- iconv_name CP1250
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs35{
- name W1251
- mime_name windows-1251
- v3_name windows-1251
- iconv_name CP1251
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs36{
- name W1252
- mime_name windows-1252
- v3_name windows-1252
- iconv_name CP1252
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs37{
- name W1253
- mime_name windows-1253
- v3_name windows-1253
- iconv_name CP1253
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs38{
- name W1254
- mime_name windows-1254
- v3_name windows-1254
- iconv_name CP1254
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs39{
- name W1255
- mime_name windows-1255
- v3_name windows-1255
- iconv_name CP1255
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs40{
- name W1256
- mime_name windows-1256
- v3_name windows-1256
- iconv_name CP1256
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs41{
- name W1257
- mime_name windows-1257
- v3_name windows-1257
- iconv_name CP1257
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs42{
- name W1258
- mime_name windows-1258
- v3_name windows-1258
- iconv_name CP1258
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs43{
- name UTF-32
- mime_name UTF-32
- v3_name UTF-32
- iconv_name UTF-32
- mail_header_encoding Base64
- mail_body_encoding Base64
-}
-cs44{
- name UTF-32BE
- mime_name UTF-32BE
- v3_name UTF-32BE
- iconv_name UTF-32BE
- mail_header_encoding Base64
- mail_body_encoding Base64
-}
-cs45{
- name UTF-32LE
- mime_name UTF-32LE
- v3_name UTF-32LE
- iconv_name UTF-32LE
- mail_header_encoding Base64
- mail_body_encoding Base64
-}
-cs46{
- name ISO-8859-16
- mime_name ISO-8859-16
- v3_name ISO-8859-16
- iconv_name ISO-8859-16
- mail_header_encoding Quoted-Printable
- mail_body_encoding Quoted-Printable
- ascii_superset True
-}
-cs47{
- name EUC-JP
- mime_name EUC-JP
- v3_name X-eucJP
- iconv_name eucJP
- format ISO_94_96
- ascii_superset True
-}
-END CHARSET_PART
View
BIN  proto/usr/lib/locale/common/LC_CTYPE/amd64/wdresolve_unicode.so
Binary file not shown
View
BIN  proto/usr/lib/locale/common/LC_CTYPE/ldterm_unicode.dat
Binary file not shown
View
BIN  proto/usr/lib/locale/common/LC_CTYPE/wdresolve_unicode.so
Binary file not shown
View
BIN  proto/usr/lib/locale/common/LO_LTYPE/amd64/umle.layout.so.1
Binary file not shown
View
BIN  proto/usr/lib/locale/common/LO_LTYPE/umle.layout.so.1
Binary file not shown
View
BIN  proto/usr/lib/locale/common/amd64/methods_unicode.so.3
Binary file not shown
View
BIN  proto/usr/lib/locale/common/methods_unicode.so.3
Binary file not shown
View
BIN  proto/usr/lib/locale/en_US.ISO8859-1/LC_COLLATE/LCL_DATA
Binary file not shown
View
BIN  proto/usr/lib/locale/en_US.ISO8859-1/LC_CTYPE/LCL_DATA
Binary file not shown
View
4 proto/usr/lib/locale/en_US.ISO8859-1/LC_MESSAGES/LCL_DATA
@@ -1,4 +0,0 @@
-^[yY].*
-^[nN].*
-yes
-no
View
15 proto/usr/lib/locale/en_US.ISO8859-1/LC_MONETARY/LCL_DATA
@@ -1,15 +0,0 @@
-USD
-$
-.
-,
-3;3
-
--
-2
-2
-1
-0
-1
-0
-1
-1
View
3  proto/usr/lib/locale/en_US.ISO8859-1/LC_NUMERIC/LCL_DATA
@@ -1,3 +0,0 @@
-.
-,
-3;3
View
58 proto/usr/lib/locale/en_US.ISO8859-1/LC_TIME/LCL_DATA
@@ -1,58 +0,0 @@
-Jan
-Feb
-Mar
-Apr
-May
-Jun
-Jul
-Aug
-Sep
-Oct
-Nov
-Dec
-January
-February
-March
-April
-May
-June
-July
-August
-September
-October
-November
-December
-Sun
-Mon
-Tue
-Wed
-Thu
-Fri
-Sat
-Sunday
-Monday
-Tuesday
-Wednesday
-Thursday
-Friday
-Saturday
-%H:%M:%S
-%m/%d/%Y
-%a %b %e %X %Y
-AM
-PM
-%a %b %e %X %Z %Y
-January
-February
-March
-April
-May
-June
-July
-August
-September
-October
-November
-December
-md
-%I:%M:%S %p
View
BIN  proto/usr/lib/locale/en_US.ISO8859-15/LC_COLLATE/LCL_DATA
Binary file not shown
View
BIN  proto/usr/lib/locale/en_US.ISO8859-15/LC_CTYPE/LCL_DATA
Binary file not shown
View
4 proto/usr/lib/locale/en_US.ISO8859-15/LC_MESSAGES/LCL_DATA
@@ -1,4 +0,0 @@
-^[yY].*
-^[nN].*
-yes
-no
View
15 proto/usr/lib/locale/en_US.ISO8859-15/LC_MONETARY/LCL_DATA
@@ -1,15 +0,0 @@
-USD
-$
-.
-,
-3;3
-
--
-2
-2
-1
-0
-1
-0
-1
-1
View
3  proto/usr/lib/locale/en_US.ISO8859-15/LC_NUMERIC/LCL_DATA
@@ -1,3 +0,0 @@
-.
-,
-3;3
View
58 proto/usr/lib/locale/en_US.ISO8859-15/LC_TIME/LCL_DATA
@@ -1,58 +0,0 @@
-Jan
-Feb
-Mar
-Apr
-May
-Jun
-Jul
-Aug
-Sep
-Oct
-Nov
-Dec
-January
-February
-March
-April
-May
-June
-July
-August
-September
-October
-November
-December
-Sun
-Mon
-Tue
-Wed
-Thu
-Fri
-Sat
-Sunday
-Monday
-Tuesday
-Wednesday
-Thursday
-Friday
-Saturday
-%H:%M:%S
-%m/%d/%Y
-%a %b %e %X %Y
-AM
-PM
-%a %b %e %X %Z %Y
-January
-February
-March
-April
-May
-June
-July
-August
-September
-October
-November
-December
-md
-%I:%M:%S %p
View
BIN  proto/usr/lib/locale/en_US.US-ASCII/LC_COLLATE/LCL_DATA
Binary file not shown
View
BIN  proto/usr/lib/locale/en_US.US-ASCII/LC_CTYPE/LCL_DATA
Binary file not shown
View
4 proto/usr/lib/locale/en_US.US-ASCII/LC_MESSAGES/LCL_DATA
@@ -1,4 +0,0 @@
-^[yY].*
-^[nN].*
-yes
-no
View
15 proto/usr/lib/locale/en_US.US-ASCII/LC_MONETARY/LCL_DATA
@@ -1,15 +0,0 @@
-USD
-$
-.
-,
-3;3
-
--
-2
-2
-1
-0
-1
-0
-1
-1
View
3  proto/usr/lib/locale/en_US.US-ASCII/LC_NUMERIC/LCL_DATA
@@ -1,3 +0,0 @@
-.
-,
-3;3
View
58 proto/usr/lib/locale/en_US.US-ASCII/LC_TIME/LCL_DATA
@@ -1,58 +0,0 @@
-Jan
-Feb
-Mar
-Apr
-May
-Jun
-Jul
-Aug
-Sep
-Oct
-Nov
-Dec
-January
-February
-March
-April
-May
-June
-July
-August
-September
-October
-November
-December
-Sun
-Mon
-Tue
-Wed
-Thu
-Fri
-Sat
-Sunday
-Monday
-Tuesday
-Wednesday
-Thursday
-Friday
-Saturday
-%H:%M:%S
-%m/%d/%Y
-%a %b %e %X %Y
-AM
-PM
-%a %b %e %X %Z %Y
-January
-February
-March
-April
-May
-June
-July
-August
-September
-October
-November
-December
-md
-%I:%M:%S %p
View
BIN  proto/usr/lib/locale/en_US.UTF-8/LC_COLLATE/LCL_DATA
Binary file not shown
View
BIN  proto/usr/lib/locale/en_US.UTF-8/LC_CTYPE/LCL_DATA
Binary file not shown
View
4 proto/usr/lib/locale/en_US.UTF-8/LC_MESSAGES/LCL_DATA
@@ -1,4 +0,0 @@
-^[yY].*
-^[nN].*
-yes
-no
View
15 proto/usr/lib/locale/en_US.UTF-8/LC_MONETARY/LCL_DATA
@@ -1,15 +0,0 @@
-USD
-$
-.
-,
-3;3
-
--
-2
-2
-1
-0
-1
-0
-1
-1
View
3  proto/usr/lib/locale/en_US.UTF-8/LC_NUMERIC/LCL_DATA
@@ -1,3 +0,0 @@
-.
-,
-3;3
View
58 proto/usr/lib/locale/en_US.UTF-8/LC_TIME/LCL_DATA
@@ -1,58 +0,0 @@
-Jan
-Feb
-Mar
-Apr
-May
-Jun
-Jul
-Aug
-Sep
-Oct
-Nov
-Dec
-January
-February
-March
-April
-May
-June
-July
-August
-September
-October
-November
-December
-Sun
-Mon
-Tue
-Wed
-Thu
-Fri
-Sat
-Sunday
-Monday
-Tuesday
-Wednesday
-Thursday
-Friday
-Saturday
-%H:%M:%S
-%m/%d/%Y
-%a %b %e %X %Y
-AM
-PM
-%a %b %e %X %Z %Y
-January
-February
-March
-April
-May
-June
-July
-August
-September
-October
-November
-December
-md
-%I:%M:%S %p
View
5 src/Makefile
@@ -1,10 +1,13 @@
CC=gcc
CFLAGS=-Wall
TARGETS=bootparams
-
+DESTDIR=../proto
all: $(TARGETS)
+install: $(TARGETS)
+ pfexec cp -p $(TARGETS) $(DESTDIR)/usr/bin
+
bootparams: bootparams.c
$(CC) $(CFLAGS) -o $@ $^ -ldevinfo
View
19 tools/build_illumos
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2010 Joyent Inc.
+#
+
+# Setup for building stuff!
+unset CC
+unset CXX
+ROOT=`pwd`
+export PATH=/opt/onbld/bin:/sbin:/usr/sbin:/usr/bin:/bin
+
+echo "==> Building Illumos"
+
+cd ${ROOT}/projects/illumos
+cp usr/src/tools/scripts/nightly ./nightly
+ksh93 ./usr/src/tools/scripts/bldenv.sh -d illumos.sh 'cd $CODEMGR_WS/usr/src && dmake setup && cd tools && dmake install'
+time ./nightly illumos.sh
+
+exit 0
View
78 build_live → tools/build_live
@@ -24,29 +24,37 @@
# Copyright 2010 Joyent, Inc. All rights reserved.
# Use is subject to license terms.
-ROOT=`pwd`/../illumos-joyent/proto/root_i386
-MAN_DIR=`pwd`/../opensolaris-man
-ALT_ROOT=`pwd`/proto
-OUT_DIR=`pwd`/output
-CUSTOMIZE_SCRIPT=`pwd`/customize
-SCANNER=`pwd`/scanner
+ROOT=`pwd`
+PROTO=${ROOT}/proto
+MAN_DIR=${ROOT}/projects/opensolaris-man
+ALT_ROOT=${ROOT}/overlay
+OUT_DIR=${ROOT}/output
+CUSTOMIZE_SCRIPT=${ROOT}/tools/customize
+SCANNER=${ROOT}/tools/scanner
+BUILDSTAMP=`TZ=UTC date "+%Y%m%dT%H%M%SZ"`; export BUILDSTAMP
+LOGFILE="${ROOT}/log/build_live.${BUILDSTAMP}.log"
ERROR=0
PLATFORM=i86pc
ISA=i386
ARCH64=amd64
MANIFEST=
SIZE=700000
-BOOT_ARCHIVE_64=platform/$PLATFORM/$ARCH64/boot_archive
+BOOT_ARCHIVE_64=platform-${BUILDSTAMP}/$PLATFORM/$ARCH64/boot_archive
+OUT_KERNEL_64=platform-${BUILDSTAMP}/$PLATFORM/kernel/$ARCH64/unix
KERNEL_64=platform/$PLATFORM/kernel/$ARCH64/unix
+PREFIX=platform-${BUILDSTAMP}
compress=no
+# Send a copy of stdout and stderr to LOGFILE
+exec > >(tee ${LOGFILE}) 2>&1
+
export PATH=/usr/sbin:/usr/bin:/sbin
export GZIP_CMD=/usr/bin/gzip
usage() {
echo "This tool is for building a live boot_archive amd64."
echo ""
- echo "Usage: ${0##*/}: [-R <root>] [-A <altroot>] [-o <outdir>] <manifest>"
+ echo "Usage: ${0##*/}: [-P <proto>] [-A <altroot>] [-o <outdir>] <manifest>"
exit 1
}
@@ -89,9 +97,9 @@ if [ -z "${MANIFEST}" ] || [ ! -f "${MANIFEST}" ]; then
usage
fi
-# We need the ROOT dir
-if [ -z "${ROOT}" ] || [ ! -d "${ROOT}" ]; then
- echo "FATAL: root ${ROOT} required (Specify with -R <root>)"
+# We need the PROTO dir
+if [ -z "${PROTO}" ] || [ ! -d "${PROTO}" ]; then
+ echo "FATAL: root ${PROTO} required (Specify with -P <proto>)"
usage
fi
@@ -102,7 +110,7 @@ if [ ! -z "${ALT_ROOT}" ]; then
usage
fi
else
- echo "WARNING: no -A <altroot> specified, files will only come from ${ROOT}"
+ echo "WARNING: no -A <altroot> specified, files will only come from ${PROTO}"
fi
if [ ! -d "${OUT_DIR}" ]; then
@@ -114,7 +122,7 @@ if [ ! -d "${OUT_DIR}" ]; then
fi
echo "=== Options/ ==="
-echo "ROOT ...... ${ROOT}"
+echo "PROTO ..... ${PROTO}"
echo "ALT_ROOT .. ${ALT_ROOT}"
echo "OUTPUT .... ${OUT_DIR}"
echo "MANIFEST . ${MANIFEST}"
@@ -140,33 +148,32 @@ function copy_files
[ -d "${rdmnt}/${e_target}" ] || result="*FAILED*"
echo "${result} - DIR: ${e_target}"
;;
- r)
- [ -d "${rdmnt}/${e_target}" ] || pfexec mkdir -p "${rdmnt}/${e_target}"
- if [ -d ${ROOT}/${e_target} ]; then
- (cd ${ROOT}/${e_target} && pfexec tar -cpf - ./) \
- | (cd ${rdmnt}/${e_target}; pfexec tar -xpf -)
- fi
- if [ -d ${ALT_ROOT}/${e_target} ]; then
- (cd ${ALT_ROOT}/${e_target} && pfexec tar -cpf - ./) \
- | (cd ${rdmnt}/${e_target}; pfexec tar -xpf -)
- fi
- #pfexec cp -pPR ${ALT_ROOT}/${e_target}/* ${rdmnt}/${e_target} 2>/dev/null \
- #|| pfexec cp -pPR ${ROOT}/${e_target}/* ${rdmnt}/${e_target}
- echo "${result} - RECURSIVE: ${e_target}"
- ;;
f)
- pfexec cp -p ${ALT_ROOT}/${e_target} ${rdmnt}/${e_target} 2>/dev/null \
- || pfexec cp -p ${ROOT}/${e_target} ${rdmnt}/${e_target} 2>/dev/null
+ where=""
+
+ # First preference is to copy from ALT/overlay dir
+ pfexec cp -p ${ALT_ROOT}/${e_target} ${rdmnt}/${e_target} 2>/dev/null && where="A"
+
+ # If it wasn't copied in from ALT/overlay, copy from proto area
+ if pfexec [ ! -f "${rdmnt}/${e_target}" ]; then
+ pfexec cp -p ${PROTO}/${e_target} ${rdmnt}/${e_target} 2>/dev/null && where="P"
+ fi
- # copy man pages from MAN_DIR if they've not been overriden
- if [ "x$?" != "x0" ] && echo "${e_target}" | grep "^usr\/share\/man\/" >/dev/null 2>&1; then
+ # copy man pages from MAN_DIR if they've not been copied from proto / overlay dir
+ if pfexec [ ! -f "${rdmnt}/${e_target}" ] && echo "${e_target}" | grep "^usr\/share\/man\/" >/dev/null 2>&1; then
man_file=`echo "${e_target}" | sed -e "s/^usr\/share\/man\///"`
- pfexec cp -p ${MAN_DIR}/${man_file} ${rdmnt}/${e_target} 2>/dev/null
+ pfexec cp -p ${MAN_DIR}/${man_file} ${rdmnt}/${e_target} 2>/dev/null && where="M"
+ fi
+
+ # Fallback to build system's version if still doesn't exist.
+ if pfexec [ ! -f "${rdmnt}/${e_target}" ]; then
+ pfexec cp -p /${e_target} ${rdmnt}/${e_target} 2>/dev/null && where="S"
fi
- if [ -f "${rdmnt}/${e_target}" ]; then
+ if pfexec [ -f "${rdmnt}/${e_target}" ]; then
pfexec chmod ${e_mode} ${rdmnt}/${e_target}
pfexec chown ${e_owner}:${e_group} ${rdmnt}/${e_target}
+ result="OK[${where}]"
else
result="*FAILED*"
fi
@@ -304,10 +311,11 @@ pfexec mkfile ${SIZE}k "${rdfile}"
pfexec chown ${USER} ${rdfile}
lofidev32=`pfexec lofiadm -a "${rdfile}"`
create_archive "${OUT_DIR}/${BOOT_ARCHIVE_64}" $lofidev32
-pfexec mkdir -p `dirname ${OUT_DIR}/${KERNEL_64}`
-pfexec cp ${ROOT}/${KERNEL_64} ${OUT_DIR}/${KERNEL_64}
+pfexec mkdir -p `dirname ${OUT_DIR}/${OUT_KERNEL_64}`
+pfexec cp ${PROTO}/${KERNEL_64} ${OUT_DIR}/${OUT_KERNEL_64}
pfexec lofiadm -d "$rdfile32" 2>/dev/null
pfexec chmod 0644 ${OUT_DIR}/${BOOT_ARCHIVE_64}
+(cd ${OUT_DIR} && pfexec gtar -zcf ${PREFIX}.tgz ${PREFIX})
if [ $ERROR = 1 ]; then
cleanup
View
8 customize → tools/customize
@@ -1,5 +1,10 @@
#!/bin/bash
+if [ -z "${BUILDSTAMP}" ]; then
+ #BUILDSTAMP=`TZ=UTC date "+%Y-%m-%dT%H:%M:%SZ"`
+ BUILDSTAMP=`TZ=UTC date "+%Y%m%dT%H%M%SZ"`
+fi
+
rdmnt=$1
copy_in=$2
if [ -z "${rdmnt}" ] || [ -z "${copy_in}" ]; then
@@ -12,7 +17,8 @@ pfexec cp /dev/null ${rdmnt}/etc/mnttab
pfexec cp /dev/null ${rdmnt}/var/log/syslog
pfexec cp /dev/null ${rdmnt}/var/adm/wtmpx
pfexec chown root:root ${rdmnt}
-TZ=UTC date "+%Y-%m-%dT%H:%M:%SZ" | pfexec tee ${rdmnt}/etc/joyent_buildstamp >/dev/null 2>&1
+echo "${BUILDSTAMP}" | pfexec tee ${rdmnt}/etc/joyent_buildstamp >/dev/null 2>&1
+pfexec gsed -i -e "s/ [0-9]\{8\}T[0-9]\{6\}Z/ ${BUILDSTAMP}/" ${rdmnt}/etc/motd
# Setup the SMF repository + initial manifests
pfexec cp /dev/null ${rdmnt}/etc/svc/repository.db
View
0  scanner → tools/scanner
File renamed without changes
View
0  sorter → tools/sorter
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.