Enabling AArch64 directory structure

We have only one libdir and set of symlinks:
/lib
/lib64
/usr/lib
/usr/lib64
point to one single directory
If some 32bit libraries are needed, they can be installed into
/lib32
/usr/lib32
which are also a single directory

Change-Id: I34dce8b5683aa3029a82eddba60a59d1fe23b070
Signed-off-by: Vyacheslav Barinov <v.barinov@samsung.com>

diff --git a/packaging/filesystem.spec b/packaging/filesystem.spec
index a009790..4251363 100644 (file)
--- a/packaging/filesystem.spec
+++ b/packaging/filesystem.spec
@@ -54,7 +54,11 @@ mkdir -p boot dev \
 %endif
        etc/{xdg/autostart,ld.so.conf.d,opt,pm/{config.d,power.d,sleep.d},xinetd.d,skel,sysconfig,pki} \
         home media mnt proc root run/lock srv sys tmp \
+%ifarch aarch64
+        usr/{bin,etc,games,include,lib/{pkgconfig,games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{games,locale,modules,sse2},libexec,local/{bin,etc,games,lib,%{_lib},sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{help/C,aclocal,applications,augeas/lenses,backgrounds,desktop-directories,dict,doc,empty,games,ghostscript/conf.d,gnome,icons,idl,info,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},mime-info,misc,omf,pixmaps,sounds,themes},src,src/kernels,src/debug} \
+%else
         usr/{bin,etc,games,include,%{_lib}/{pkgconfig,games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{games,locale,modules,sse2},libexec,local/{bin,etc,games,lib,%{_lib},sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{help/C,aclocal,applications,augeas/lenses,backgrounds,desktop-directories,dict,doc,empty,games,ghostscript/conf.d,gnome,icons,idl,info,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},mime-info,misc,omf,pixmaps,sounds,themes},src,src/kernels,src/debug} \
+%endif
         var/{adm,empty,gopher,lib/{empty,games,misc,rpm-state},local,lock/subsys,log,nis,preserve,run,spool/{mail,lpd,uucp},tmp,db,cache,opt,games,yp} \
         %{buildroot}%{TZ_SYS_DB} \
         %{buildroot}%{TZ_SYS_RO_APP}
@@ -65,6 +69,11 @@ ln -snf usr/bin bin
 ln -snf usr/sbin sbin
 ln -snf usr/lib lib
 ln -snf usr/%{_lib} %{_lib}
+%ifarch aarch64
+ln -snf lib usr/%{_lib}
+mkdir usr/lib32
+ln -snf usr/lib32 lib32
+%endif
 
 # Create the locale directories:
 while read LANG ; do
@@ -129,9 +138,10 @@ posix.symlink("../run/lock", "/var/lock")
 %{_sysconfdir}/pki
 /home
 /lib
-#%ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x
 /%{_lib}
-#%endif
+%ifarch aarch64
+/lib32
+%endif
 /media
 %dir /mnt
 %dir %attr(755,root,root) %{TZ_SYS_DB}
@@ -149,9 +159,10 @@ posix.symlink("../run/lock", "/var/lock")
 /usr/games
 /usr/include
 %attr(555,root,root) /usr/lib
-#%ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x
 %attr(555,root,root) /usr/%{_lib}
-#%endif
+%ifarch aarch64
+%attr(555,root,root) /usr/lib32
+%endif
 /usr/libexec
 /usr/local
 %attr(555,root,root) /usr/sbin