tizen 2.3 releasetizen_2.4_mobile_releasetizen_2.3_releasetizen_2.3.1_releasesubmit/tizen_2.4_base/20151026.090932submit/tizen_2.4_base/20151026.085819submit/tizen_2.3/20150202.102431submit/tizen_2.3.1/20150921.024204accepted/tizen/2.4/base/20151026.095720tizen_2.4_basetizen_2.3.1tizen_2.3accepted/tizen_2.4_base

3 files changed, 67 insertions, 23 deletions

diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf
index a3e67d6..a279b90 100644
--- a/packaging/baselibs.conf
+++ b/packaging/baselibs.conf
@@ -1 +1,2 @@
 arch i586 targets armv5tel:arm armv6l:arm armv7l:arm armv7hl:arm armv7nhl:arm
+arch x86_64 targets armv5tel:arm armv6l:arm armv7l:arm armv7hl:arm armv7nhl:arm
diff --git a/packaging/diffutils-x86.changes b/packaging/diffutils-x86.changes
index dc29f65..6b4d008 100644
--- a/packaging/diffutils-x86.changes
+++ b/packaging/diffutils-x86.changes
@@ -1,3 +1,6 @@
+* Wed Jun 28 12:00:00 KST 2014 - UkJung Kim <ujkim@samsung.com> - 1.0
+- Update to support x86_64
+
 * Fri Jul  6 14:30:00 KST 2012 - UkJung Kim <ujkim@samsung.com> - 1.0
 - Added and updated OBS-Accelerator-0.1.tar.bz2
 
@@ -5,6 +8,10 @@
 - Add baselibs.conf to src.rpm
 
 * Mon Jan  3 21:03:00 UTC 2011 Carsten Munk <carsten@maemo.org> - 1.0
-- Part of BMC#12113 (speedrpm implementation)
-- Add armv7hl and armv7nhl support
-- Initial version on meego.com (based off Jan-Simon Moller's other -x86 packages)
+- Add armv7hl and armv7nhl support, part of fix for BMC#12112
+
+* Mon May  3 22:27:34 UTC 2010 Jan-Simon Möller <jsmoeller@linuxfoundation.org> - 1.0
+- Update to armv7 crossbuild.
+
+* Tue Apr 20 17:03:30 UTC 2010 Jan-Simon Möller <jsmoeller@linuxfoundation.org> - 1.0
+- Initial version on meego.com
diff --git a/packaging/diffutils-x86.spec b/packaging/diffutils-x86.spec
index 7b74cbb..bf91527 100644
--- a/packaging/diffutils-x86.spec
+++ b/packaging/diffutils-x86.spec
@@ -1,3 +1,4 @@
+%define release_prefix 9
 %define __strip /bin/true
 %define _build_name_fmt    %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.vanish.rpm
 # meta spec file for cross-chroot setup
@@ -22,11 +23,15 @@
 
 #
 # The original package name
+# e.g. qemu
+#
 %define oldname diffutils
 
 #
 # The architectures this meta package is built on
-%define myexclusive i586
+# e.g. i586
+#
+%define myexclusive i586 x86_64
 
 #
 # The required package for building this package
@@ -41,23 +46,28 @@ BuildRequires: rpm grep tar sed patchelf
 #
 #Requires:      <usuallyemptlylist>
 
+### no changes needed below this line
+# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+### no changes needed
+
 # For a real accelerator, also the old packge is required for compatibility
 # pls change this only if you know what you do
 Requires:      %oldname
 
 #
 # Release under which to put the accelerator
-# e.g. 1 or higher
 #
-Release:       8
+Release:       %release_prefix
 
-### no changes needed below this line
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-### no changes needed
 #
-# The new package name - convention is %oldname-x86
-%define newname %{oldname}-x86
+# 64bit arch
+%ifarch x86_64
+%define x64 x64
+%endif
+#
+# The new package name - convention is %oldname-%{!?x64:x86}%{?x64}
+%define newname %{oldname}-%{!?x64:x86}%{?x64}
 #
 # The version of the original package is read from its rpm db info
 %{expand:%%define newversion %(rpm -q --qf '[%{version}]' %oldname)}
@@ -72,8 +82,8 @@ Release:       8
 %{expand:%%define newsummary %(rpm -q --qf '[%{summary} - special version ]' %oldname)}
 #
 # New rpath to add to files on request
-%define newrpath "/emul/ia32-linux/lib:/emul/ia32-linux/usr/lib"
-%define newinterpreter /emul/ia32-linux/lib/ld-linux.so.2
+%define newrpath "/emul/ia32-linux/%{_lib}:/emul/ia32-linux/usr/%{_lib}"
+%define newinterpreter /emul/ia32-linux/%{_lib}/ld-linux%{?x64:-x86-64}.so.2
 #
 # Some automatic checks for availability
 # binaries_to_prepare
@@ -117,7 +127,6 @@ It is not intended to be used on a normal system/device!
 Original description:
 %{expand:%(rpm -q --qf '[%{description}]' %oldname)}
 
-
 %prep
 
 %build
@@ -148,6 +157,13 @@ for i in `rpm -ql filesystem`; do
   echo "s#^${i}\$##" >> $sedtmp
 done
 
+# ignore directories
+for i in `cat filestoinclude1`; do
+  if test -d $i ; then
+    echo "s#^${i}\$##" >> $sedtmp
+  fi
+done
+
 #finish up
 echo "/^\$/d" >> $sedtmp
 
@@ -177,8 +193,9 @@ rm filestoinclude2
 echo ""
 echo "[ .oO Preparing binaries Oo. ]"
 echo ""
+cat %{_sourcedir}/binaries_to_prepare | sed "s/@LIB@/%{_lib}/g" > binaries_to_prepare1
 mkdir -p %buildroot/%{_prefix}/share/applybinary/
-for binary in `cat %{_sourcedir}/binaries_to_prepare` ; do
+for binary in `cat binaries_to_prepare1` ; do
   echo "Processing binary: $binary"
   tmp="tmp.$$"
 %if %nodebug
@@ -187,13 +204,11 @@ for binary in `cat %{_sourcedir}/binaries_to_prepare` ; do
   debug="--debug"
 %endif
   if file $binary | grep -q dynamic; then
-    ldd $binary  | grep -v "ld-linux" | grep -v "linux-gate" |  sed -e "s#=.*##g" -e "s#^\t*##g"  > $tmp
-    deps=$(for i in `cat $tmp` ; do rpm -q --whatprovides "$i" | grep -v "no package"; done)
+    ldd $binary  | grep -v "ld-linux" | grep -v "linux-gate" | grep -v "linux-vdso" |  sed -e "s#=.*##g" -e "s#^\t*##g"  > $tmp
+    deps=$(for i in `cat $tmp` ; do rpm -q --whatprovides "${i}%{?x64:()(64bit)}" | grep -v "no package"; done)
     cleandeps=$(echo "$cleandeps" "$deps" | sort | uniq | sed -e "s/-[0-9].*//g")
     patchelf $debug --set-rpath %newrpath %buildroot/$binary
     patchelf $debug --set-interpreter %newinterpreter %buildroot/$binary
-    patchelf $debug --set-rpath %newrpath %buildroot/$binary
-    patchelf $debug --set-interpreter %newinterpreter %buildroot/$binary
     if test -n "$debug"; then
       patchelf --print-rpath %buildroot/$binary
       patchelf --print-interpreter %buildroot/$binary
@@ -209,6 +224,7 @@ done
 echo ""
 echo "[ .oO Preparing libraries Oo. ]"
 echo ""
+cat %{_sourcedir}/libraries_to_prepare | sed "s/@LIB@/%{_lib}/g" > libraries_to_prepare1
 %endif
 
 # stub
@@ -244,7 +260,7 @@ shellquote "  targettype arm autoreqprov off" >> /tmp/baselibs_new.conf
 
 # automagically fill in basic requirements
 for i in $cleandeps ; do 
-  shellquote "  targettype arm requires \"${i}-x86-arm\"" >> /tmp/baselibs_new.conf
+  shellquote "  targettype arm requires \"${i}-%{!?x64:x86}%{?x64}-arm\"" >> /tmp/baselibs_new.conf
 done
 
 # we require the native version
@@ -261,7 +277,7 @@ shellquote "  targettype arm requires \"tizen-accelerator\"" >> /tmp/baselibs_ne
 # replace native with x86 binaries as defined in file
 %if %binaries_to_prepare
 # Todo: error handling if .orig-arm is present
-for binary in `cat %{_sourcedir}/binaries_to_prepare` ; do
+for binary in `cat binaries_to_prepare1` ; do
    shellquote "  targettype arm post \"  if test -e ${binary}.orig-arm -a -h ${binary}; then \" " >> /tmp/baselibs_new.conf
    shellquote "  targettype arm post \"    echo \"${binary}.orig-arm already present - skipping.\" \" " >> /tmp/baselibs_new.conf
    shellquote "  targettype arm post \"  else \" " >> /tmp/baselibs_new.conf
@@ -270,7 +286,7 @@ for binary in `cat %{_sourcedir}/binaries_to_prepare` ; do
 done
 
 shellquote " " >> /tmp/baselibs_new.conf
-for binary in `cat %{_sourcedir}/binaries_to_prepare` ; do
+for binary in `cat binaries_to_prepare1` ; do
 
   shellquote "  targettype arm preun \"  if test -e ${binary}.orig-arm ; then \"" >> /tmp/baselibs_new.conf
   shellquote "  targettype arm preun \"    rm -f ${binary} ; mv ${binary}.orig-arm ${binary}\"" >> /tmp/baselibs_new.conf
@@ -279,6 +295,26 @@ for binary in `cat %{_sourcedir}/binaries_to_prepare` ; do
 done
 %endif
 
+%if %libraries_to_prepare
+# Todo: error handling if .orig-arm is present
+for library in `cat libraries_to_prepare1` ; do
+   shellquote "  targettype arm post \"  if test -e ${library}.orig-arm -a -h ${library}; then \" " >> /tmp/baselibs_new.conf
+   shellquote "  targettype arm post \"    echo \"${library}.orig-arm already present - skipping.\" \" " >> /tmp/baselibs_new.conf
+   shellquote "  targettype arm post \"  else \" " >> /tmp/baselibs_new.conf
+   shellquote "  targettype arm post \"    mv ${library} ${library}.orig-arm ; ln -s <prefix>${library} ${library} \"" >> /tmp/baselibs_new.conf
+   shellquote "  targettype arm post \"  fi \" " >> /tmp/baselibs_new.conf
+done
+
+shellquote " " >> /tmp/baselibs_new.conf
+for library in `cat libraries_to_prepare1` ; do
+
+  shellquote "  targettype arm preun \"  if test -e ${library}.orig-arm ; then \"" >> /tmp/baselibs_new.conf
+  shellquote "  targettype arm preun \"    rm -f ${library} ; mv ${library}.orig-arm ${library}\"" >> /tmp/baselibs_new.conf
+  shellquote "  targettype arm preun \"  fi \"" >> /tmp/baselibs_new.conf
+
+done
+%endif
+
 cat /tmp/baselibs_new.conf >> %{_sourcedir}/baselibs.conf
 
 echo "################################################################################"