Mercurial > unleashed > wips

changeset 20620:65bc63cd3d9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ship lib/i386 libdirs & link lib/32 to them
author Lauri Tirkkonen <lotheac@iki.fi>
date Sun, 19 May 2019 20:29:41 +0000
parents e1ed8d6406d3
children 97b7d8b5d0f3
files usr/src/Targetdirs usr/src/pkg/manifests/developer-object-file.mf usr/src/pkg/manifests/system-core-os.mf usr/src/pkg/manifests/system-library.inc
diffstat 4 files changed, 29 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/Targetdirs	Mon May 13 09:59:03 2019 +0000
+++ b/usr/src/Targetdirs	Sun May 19 20:29:41 2019 +0000
@@ -349,14 +349,19 @@
 
 DIRS64= \
 	$($(MACH64)_DIRS64) \
+	/lib/$(MACH32) \
 	/lib/$(MACH64) \
+	/lib/crypto/$(MACH32) \
 	/lib/crypto/$(MACH64) \
 	/lib/fm/$(MACH64) \
+	/lib/secure/$(MACH32) \
 	/lib/secure/$(MACH64) \
 	/usr/bin/$(MACH64) \
+	/usr/lib/$(MACH32) \
 	/usr/lib/$(MACH64) \
 	/usr/lib/$(MACH64)/gss \
 	/usr/lib/brand/sn1/$(MACH64) \
+	/usr/lib/elfedit/$(MACH32) \
 	/usr/lib/elfedit/$(MACH64) \
 	/usr/lib/fm/$(MACH64) \
 	/usr/lib/fs/nfs/$(MACH64) \
@@ -364,6 +369,7 @@
 	/usr/lib/inet/$(MACH64) \
 	/usr/lib/krb5/$(MACH64) \
 	/usr/lib/link_audit/$(MACH64) \
+	/usr/lib/lwp/$(MACH32) \
 	/usr/lib/lwp/$(MACH64) \
 	/usr/lib/mdb/kvm/$(MACH64) \
 	/usr/lib/mdb/proc/$(MACH64) \
@@ -372,6 +378,7 @@
 	/usr/lib/rcap/$(MACH64) \
 	/usr/lib/sasl/$(MACH64) \
 	/usr/lib/scsi/$(MACH64) \
+	/usr/lib/secure/$(MACH32) \
 	/usr/lib/secure/$(MACH64) \
 	/usr/lib/security/$(MACH64) \
 	/usr/lib/smbsrv/$(MACH64) \
@@ -477,9 +484,9 @@
 #
 $(ROOT)/usr/lib/cron:=			LINKDEST=../../etc/cron.d
 $(ROOT)/bin:=				LINKDEST=usr/bin
-$(ROOT)/lib/32:=			LINKDEST=.
-$(ROOT)/lib/crypto/32:=			LINKDEST=.
-$(ROOT)/lib/secure/32:=			LINKDEST=.
+$(ROOT)/lib/32:=			LINKDEST=i386
+$(ROOT)/lib/crypto/32:=			LINKDEST=i386
+$(ROOT)/lib/secure/32:=			LINKDEST=i386
 $(ROOT)/dev/stdin:=			LINKDEST=fd/0
 $(ROOT)/dev/stdout:=			LINKDEST=fd/1
 $(ROOT)/dev/stderr:=			LINKDEST=fd/2
@@ -494,10 +501,10 @@
 $(ROOT)/usr/preserve:=			LINKDEST=../var/preserve
 $(ROOT)/usr/spool:=			LINKDEST=../var/spool
 $(ROOT)/usr/tmp:=			LINKDEST=../var/tmp
-$(ROOT)/usr/lib/32:=			LINKDEST=.
-$(ROOT)/usr/lib/elfedit/32:=		LINKDEST=.
-$(ROOT)/usr/lib/lwp/32:=		LINKDEST=.
-$(ROOT)/usr/lib/secure/32:=		LINKDEST=.
+$(ROOT)/usr/lib/32:=			LINKDEST=i386
+$(ROOT)/usr/lib/elfedit/32:=		LINKDEST=i386
+$(ROOT)/usr/lib/lwp/32:=		LINKDEST=i386
+$(ROOT)/usr/lib/secure/32:=		LINKDEST=i386
 $(ROOT)/var/ld/32:=			LINKDEST=.
 
 $(BUILD64) $(ROOT)/lib/64:=		LINKDEST=$(MACH64)
--- a/usr/src/pkg/manifests/developer-object-file.mf	Mon May 13 09:59:03 2019 +0000
+++ b/usr/src/pkg/manifests/developer-object-file.mf	Sun May 19 20:29:41 2019 +0000
@@ -33,8 +33,10 @@
 dir path=usr/bin
 dir path=usr/bin/$(ARCH64)
 dir path=usr/lib
+dir path=usr/lib/$(ARCH32)
 dir path=usr/lib/$(ARCH64)
 dir path=usr/lib/elfedit
+dir path=usr/lib/elfedit/$(ARCH32)
 dir path=usr/lib/elfedit/$(ARCH64)
 dir path=usr/share
 dir path=usr/share/lib
@@ -113,7 +115,7 @@
 license lic_CDDL license=lic_CDDL
 license usr/src/cmd/backup/dump/THIRDPARTYLICENSE \
     license=usr/src/cmd/backup/dump/THIRDPARTYLICENSE
-link path=usr/lib/elfedit/32 target=.
+link path=usr/lib/elfedit/32 target=$(ARCH32)
 link path=usr/lib/elfedit/64 target=$(ARCH64)
 depend fmri=developer/illumos-gcc type=require
 depend fmri=runtime/perl$(PERL_PKGVERS) type=require
--- a/usr/src/pkg/manifests/system-core-os.mf	Mon May 13 09:59:03 2019 +0000
+++ b/usr/src/pkg/manifests/system-core-os.mf	Sun May 19 20:29:41 2019 +0000
@@ -207,6 +207,7 @@
 dir path=usr/lib/reparse
 dir path=usr/lib/saf
 dir path=usr/lib/secure
+dir path=usr/lib/secure/$(ARCH32)
 dir path=usr/lib/secure/$(ARCH64)
 dir path=usr/lib/security
 dir path=usr/lib/sysevent
@@ -1339,7 +1340,7 @@
 link path=usr/lib/fs/ufs/mount target=../../../../etc/fs/ufs/mount
 link path=usr/lib/inet/in.mpathd target=../../../lib/inet/in.mpathd
 link path=usr/lib/ld.so.1 target=../../lib/ld.so.1
-link path=usr/lib/secure/32 target=.
+link path=usr/lib/secure/32 target=$(ARCH32)
 link path=usr/lib/secure/64 target=$(ARCH64)
 link path=usr/mail target=../var/mail
 link path=usr/net/nls/listen target=../../lib/saf/listen
--- a/usr/src/pkg/manifests/system-library.inc	Mon May 13 09:59:03 2019 +0000
+++ b/usr/src/pkg/manifests/system-library.inc	Sun May 19 20:29:41 2019 +0000
@@ -77,20 +77,25 @@
 dir path=etc/flash/precreation group=sys mode=0700
 dir path=etc/flash/preexit group=sys mode=0700
 dir path=lib
+dir path=lib/$(ARCH32)
 dir path=lib/$(ARCH64)
 dir path=lib/crypto
+dir path=lib/crypto/$(ARCH32)
 dir path=lib/crypto/$(ARCH64)
 dir path=lib/mpxio
 dir path=lib/secure
+dir path=lib/secure/$(ARCH32)
 dir path=lib/secure/$(ARCH64)
 dir path=usr group=sys
 dir path=usr/bin
 dir path=usr/lib
+dir path=usr/lib/$(ARCH32)
 dir path=usr/lib/$(ARCH64)
 dir path=usr/lib/cfgadm
 dir path=usr/lib/cfgadm/$(ARCH64)
 dir path=usr/lib/iconv/$(ARCH64)
 dir path=usr/lib/lwp
+dir path=usr/lib/lwp/$(ARCH32)
 dir path=usr/lib/lwp/$(ARCH64)
 dir path=usr/lib/scsi
 dir path=usr/lib/scsi/$(ARCH64)
@@ -566,9 +571,9 @@
 link path=lib/$(ARCH64)/libumem.so target=libumem.so.1
 link path=lib/$(ARCH64)/libuuid.so target=libuuid.so.1
 link path=lib/$(ARCH64)/libw.so target=libw.so.1
-link path=lib/32 target=.
+link path=lib/32 target=$(ARCH32)
 link path=lib/64 target=$(ARCH64)
-link path=lib/crypto/32 target=.
+link path=lib/crypto/32 target=$(ARCH32)
 link path=lib/crypto/64 target=$(ARCH64)
 link path=lib/libadm.so target=libadm.so.1
 link path=lib/libaio.so target=libaio.so.1
@@ -624,7 +629,7 @@
 link path=lib/libumem.so target=libumem.so.1
 link path=lib/libuuid.so target=libuuid.so.1
 link path=lib/libw.so target=libw.so.1
-link path=lib/secure/32 target=.
+link path=lib/secure/32 target=$(ARCH32)
 link path=lib/secure/64 target=$(ARCH64)
 link path=usr/lib/$(ARCH64)/libadm.so \
     target=../../../lib/$(ARCH64)/libadm.so.1
@@ -861,7 +866,7 @@
 link path=usr/lib/$(ARCH64)/nss_user.so.1 \
     target=../../../lib/$(ARCH64)/nss_user.so.1
 link path=usr/lib/$(ARCH64)/straddr.so target=straddr.so.2
-link path=usr/lib/32 target=.
+link path=usr/lib/32 target=$(ARCH32)
 link path=usr/lib/64 target=$(ARCH64)
 link path=usr/lib/cfgadm/$(ARCH64)/ib.so target=./ib.so.1
 link path=usr/lib/cfgadm/$(ARCH64)/pci.so target=./pci.so.1
@@ -1018,7 +1023,7 @@
     target=../../$(ARCH64)/libthread.so.1
 link path=usr/lib/lwp/$(ARCH64)/libthread_db.so.1 \
     target=../../$(ARCH64)/libthread_db.so.1
-link path=usr/lib/lwp/32 target=.
+link path=usr/lib/lwp/32 target=$(ARCH32)
 link path=usr/lib/lwp/64 target=$(ARCH64)
 link path=usr/lib/lwp/libthread.so.1 target=../libthread.so.1
 link path=usr/lib/lwp/libthread_db.so.1 target=../libthread_db.so.1