--- old/usr/src/pkg/manifests/system-zones-brand-lx.mf
          +++ new/usr/src/pkg/manifests/system-zones-brand-lx.mf

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  
  22   22  #
  23   23  # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  24   24  # Use is subject to license terms.
  25   25  # Copyright 2015 Joyent, Inc.
  26   26  #
  27   27  
  28   28  #
  29   29  # This package will install successfully into any zone, global or
  30   30  # non-global.  The files, directories, links, and hardlinks, however,
  31   31  # will only be installed into the global zone.

  32   32  #
  33   33  <include global_zone_only_component>
  34   34  set name=pkg.fmri value=pkg:/system/zones/brand/lx@$(PKGVERS)
  35   35  set name=pkg.description value="Support for the 'lx' Brand"
  36   36  set name=pkg.summary value="lx Brand"
  37   37  set name=info.classification \
  38   38      value="org.opensolaris.category.2008:Applications/System Utilities"
  39   39  set name=variant.arch value=i386
  40   40  dir path=etc group=sys
  41   41  dir path=etc/zones group=sys
       42 +dir path=kernel group=sys
       43 +dir path=kernel/fs group=sys
       44 +dir path=kernel/fs/$(ARCH64) group=sys
       45 +dir path=kernel/socketmod group=sys
       46 +dir path=kernel/socketmod/$(ARCH64) group=sys
  42   47  dir path=usr group=sys
       48 +dir path=usr/include group=bin
       49 +dir path=usr/include/sys group=bin
  43   50  dir path=usr/kernel group=sys
  44   51  dir path=usr/kernel/brand group=sys
  45   52  dir path=usr/kernel/brand/$(ARCH64) group=sys
  46   53  dir path=usr/kernel/drv group=sys
  47   54  dir path=usr/kernel/drv/$(ARCH64) group=sys
  48   55  dir path=usr/kernel/dtrace group=sys
  49   56  dir path=usr/kernel/dtrace/$(ARCH64) group=sys
  50   57  dir path=usr/kernel/fs group=sys
  51   58  dir path=usr/kernel/fs/$(ARCH64) group=sys
  52   59  dir path=usr/kernel/strmod group=sys
  53   60  dir path=usr/kernel/strmod/$(ARCH64) group=sys
  54   61  dir path=usr/lib
  55   62  dir path=usr/lib/brand
  56   63  dir path=usr/lib/brand/lx
  57   64  dir path=usr/lib/brand/lx/$(ARCH64)
  58      -dir path=usr/lib/brand/lx/distros
       65 +dir path=usr/lib/brand/lx/ld
       66 +dir path=usr/lib/brand/lx/ld/64
  59   67  dir path=usr/lib/devfsadm group=sys
  60   68  dir path=usr/lib/devfsadm/linkmod group=sys
  61      -driver name=lx_audio
       69 +dir path=usr/share
       70 +dir path=usr/share/man
       71 +dir path=usr/share/man/man3c
       72 +dir path=usr/share/man/man5
       73 +dir path=usr/share/man/man7fs
       74 +driver name=inotify perms="* 0666 root sys"
  62   75  driver name=lx_ptm perms="lx_ptmajor 0666 root sys"
  63   76  driver name=lx_systrace perms="* 0644 root sys"
       77 +driver name=lxautofs perms="lxautofs 0600 root sys"
  64   78  file path=etc/zones/SUNWlx.xml mode=0444
  65   79  file path=etc/zones/SUNWlx26.xml mode=0444
       80 +file path=kernel/socketmod/$(ARCH64)/lx_netlink mode=0755
       81 +file path=kernel/socketmod/lx_netlink mode=0755
  66   82  file path=usr/kernel/brand/$(ARCH64)/lx_brand group=sys mode=0755
  67   83  file path=usr/kernel/brand/lx_brand group=sys mode=0755
  68      -file path=usr/kernel/drv/$(ARCH64)/lx_audio group=sys
  69      -file path=usr/kernel/drv/$(ARCH64)/lx_ptm group=sys
  70      -file path=usr/kernel/drv/$(ARCH64)/lx_systrace group=sys
  71      -file path=usr/kernel/drv/lx_audio group=sys
  72      -file path=usr/kernel/drv/lx_audio.conf group=sys
       84 +file path=usr/kernel/drv/$(ARCH64)/inotify group=sys mode=0755
       85 +file path=usr/kernel/drv/$(ARCH64)/lx_ptm group=sys mode=0755
       86 +file path=usr/kernel/drv/$(ARCH64)/lx_systrace group=sys mode=0755
       87 +file path=usr/kernel/drv/$(ARCH64)/lxautofs group=sys mode=0755
       88 +file path=usr/kernel/drv/inotify group=sys mode=0755
       89 +file path=usr/kernel/drv/inotify.conf group=sys
  73   90  file path=usr/kernel/drv/lx_ptm group=sys
  74   91  file path=usr/kernel/drv/lx_ptm.conf group=sys
  75   92  file path=usr/kernel/drv/lx_systrace group=sys
  76   93  file path=usr/kernel/drv/lx_systrace.conf group=sys
  77      -file path=usr/kernel/fs/$(ARCH64)/lx_afs group=sys mode=0755
       94 +file path=usr/kernel/drv/lxautofs group=sys mode=0755
       95 +file path=usr/kernel/drv/lxautofs.conf group=sys
       96 +file path=usr/kernel/fs/$(ARCH64)/lx_cgroup group=sys mode=0755
       97 +file path=usr/kernel/fs/$(ARCH64)/lx_devfs group=sys mode=0755
  78   98  file path=usr/kernel/fs/$(ARCH64)/lx_proc group=sys mode=0755
  79      -file path=usr/kernel/fs/lx_afs group=sys mode=0755
       99 +file path=usr/kernel/fs/$(ARCH64)/lx_sysfs group=sys mode=0755
      100 +file path=usr/kernel/fs/lx_cgroup group=sys mode=0755
      101 +file path=usr/kernel/fs/lx_devfs group=sys mode=0755
  80  102  file path=usr/kernel/fs/lx_proc group=sys mode=0755
  81      -file path=usr/kernel/strmod/$(ARCH64)/ldlinux group=sys mode=0755
  82      -file path=usr/kernel/strmod/ldlinux group=sys mode=0755
      103 +file path=usr/kernel/fs/lx_sysfs group=sys mode=0755
      104 +#file path=usr/kernel/strmod/$(ARCH64)/ldlinux group=sys mode=0755
      105 +#file path=usr/kernel/strmod/ldlinux group=sys mode=0755
      106 +file path=usr/lib/$(ARCH64)/lx_brand.so.1
  83  107  file path=usr/lib/brand/lx/$(ARCH64)/lx_librtld_db.so.1
      108 +file path=usr/lib/brand/lx/$(ARCH64)/lx_vdso.so.1 mode=0755
  84  109  file path=usr/lib/brand/lx/config.xml mode=0444
  85      -file path=usr/lib/brand/lx/distros/centos35.distro mode=0444
  86      -file path=usr/lib/brand/lx/distros/centos36.distro mode=0444
  87      -file path=usr/lib/brand/lx/distros/centos37.distro mode=0444
  88      -file path=usr/lib/brand/lx/distros/centos38.distro mode=0444
  89      -file path=usr/lib/brand/lx/distros/rhel35.distro mode=0444
  90      -file path=usr/lib/brand/lx/distros/rhel36.distro mode=0444
  91      -file path=usr/lib/brand/lx/distros/rhel37.distro mode=0444
  92      -file path=usr/lib/brand/lx/distros/rhel38.distro mode=0444
  93      -file path=usr/lib/brand/lx/distros/rhel_centos_common mode=0444
  94  110  file path=usr/lib/brand/lx/etc_default_nfs group=sys mode=0444
  95      -file path=usr/lib/brand/lx/lx_distro_install mode=0755
  96      -file path=usr/lib/brand/lx/lxinit mode=0755
  97      -file path=usr/lib/brand/lx/lx_init_zone mode=0755
  98      -file path=usr/lib/brand/lx/lx_init_zone_debian mode=0755
  99      -file path=usr/lib/brand/lx/lx_init_zone_redhat mode=0755
      111 +file path=usr/lib/brand/lx/ld/64/ld.config group=sys
      112 +file path=usr/lib/brand/lx/ld/ld.config group=sys
      113 +file path=usr/lib/brand/lx/ltp_skiplist group=sys mode=0444
      114 +file path=usr/lib/brand/lx/ltp_tests group=sys mode=0444
      115 +file path=usr/lib/brand/lx/lx_boot mode=0755
      116 +file path=usr/lib/brand/lx/lx_boot_zone_busybox mode=0755
      117 +file path=usr/lib/brand/lx/lx_boot_zone_debian mode=0755
      118 +file path=usr/lib/brand/lx/lx_boot_zone_redhat mode=0755
      119 +file path=usr/lib/brand/lx/lx_boot_zone_ubuntu mode=0755
 100  120  file path=usr/lib/brand/lx/lx_install mode=0755
 101  121  file path=usr/lib/brand/lx/lx_librtld_db.so.1
 102      -file path=usr/lib/brand/lx/lx_native mode=0755
 103  122  file path=usr/lib/brand/lx/lx_support mode=0755
      123 +file path=usr/lib/brand/lx/lx_vdso.so.1 mode=0755
      124 +file path=usr/lib/brand/lx/lxinit mode=0555
 104  125  file path=usr/lib/brand/lx/platform.xml mode=0444
 105  126  file path=usr/lib/devfsadm/linkmod/SUNW_lx_link_$(ARCH).so group=sys
 106  127  file path=usr/lib/lx_brand.so.1
      128 +file path=usr/share/man/man3c/inotify_add_watch.3c
      129 +file path=usr/share/man/man3c/inotify_init.3c
      130 +file path=usr/share/man/man3c/inotify_rm_watch.3c
      131 +file path=usr/share/man/man5/inotify.5
      132 +file path=usr/share/man/man5/lx.5
 107  133  hardlink path=usr/kernel/dtrace/$(ARCH64)/lx_systrace \
 108  134      target=../../../kernel/drv/$(ARCH64)/lx_systrace
 109  135  hardlink path=usr/kernel/dtrace/lx_systrace \
 110  136      target=../../kernel/drv/lx_systrace
      137 +hardlink path=usr/kernel/fs/$(ARCH64)/lxautofs \
      138 +    target=../../../kernel/drv/$(ARCH64)/lxautofs
      139 +hardlink path=usr/kernel/fs/lxautofs target=../../kernel/drv/lxautofs
 111  140  legacy pkg=SUNWlxr arch=$(ARCH) category=system \
 112  141      desc="Support for the 'lx' Brand" \
 113  142      hotline="Please contact your local service provider" \
 114  143      name="lx Brand (Root)" vendor="Sun Microsystems, Inc." \
 115  144      version=11.11,REV=2009.11.11
 116  145  legacy pkg=SUNWlxu arch=$(ARCH) category=system \
 117  146      desc="Support for the 'lx' Brand" \
 118  147      hotline="Please contact your local service provider" \
 119  148      name="lx Brand (Usr)" vendor="Sun Microsystems, Inc." \
 120  149      version=11.11,REV=2009.11.11
 121  150  license cr_Sun license=cr_Sun
 122  151  license lic_CDDL license=lic_CDDL
 123  152  link path=usr/lib/brand/lx/64 target=$(ARCH64)
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX