From 3d78fa1be1a8a698787e58853cac48e6e2bfd163 Mon Sep 17 00:00:00 2001 From: Yury Usishchev Date: Mon, 15 Sep 2014 14:35:59 +0400 Subject: [PATCH] Revert "Enabling AArch64 directory structure" This reverts commit af883648637317923821d124520743299cf29394. Change-Id: Id9acebc6990531fc801075ed2efc33c8c2ab031c Signed-off-by: Yury Usishchev --- packaging/filesystem.spec | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/packaging/filesystem.spec b/packaging/filesystem.spec index 4251363..a009790 100644 --- a/packaging/filesystem.spec +++ b/packaging/filesystem.spec @@ -54,11 +54,7 @@ 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} @@ -69,11 +65,6 @@ 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 @@ -138,10 +129,9 @@ posix.symlink("../run/lock", "/var/lock") %{_sysconfdir}/pki /home /lib +#%ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x /%{_lib} -%ifarch aarch64 -/lib32 -%endif +#%endif /media %dir /mnt %dir %attr(755,root,root) %{TZ_SYS_DB} @@ -159,10 +149,9 @@ 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} -%ifarch aarch64 -%attr(555,root,root) /usr/lib32 -%endif +#%endif /usr/libexec /usr/local %attr(555,root,root) /usr/sbin -- 2.7.4