tizen 2.4 releasetizen_2.4_mobile_releasesubmit/tizen_2.4_base/20151026.091245submit/tizen_2.4_base/20151026.090132accepted/tizen/2.4/base/20151026.113809tizen_2.4_baseaccepted/tizen_2.4_base

4 files changed, 138 insertions, 45 deletions

diff --git a/packaging/OBS-Accelerator-0.1.tar.bz2 b/packaging/OBS-Accelerator-0.1.tar.bz2
new file mode 100644
index 0000000..b569eac
--- /dev/null
+++ b/packaging/OBS-Accelerator-0.1.tar.bz2
diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf
index a27197a..a279b90 100644
--- a/packaging/baselibs.conf
+++ b/packaging/baselibs.conf
@@ -1,3 +1,2 @@
-arch i586 targets armv7l:arm armv7hl:arm armv7nhl:arm
-
-
+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/libxml2-x86.changes b/packaging/libxml2-x86.changes
new file mode 100644
index 0000000..8ffd27d
--- /dev/null
+++ b/packaging/libxml2-x86.changes
@@ -0,0 +1,34 @@
+* Sat Jun 28 2014 UkJung Kim <ujkim@samsung.com> - None 
+- PROJECT: toolchains/libxml2-x86
+- COMMIT_ID: 20219be53bbc053247c546217c0653bed548985a
+- BRANCH: master
+- PATCHSET_REVISION: 20219be53bbc053247c546217c0653bed548985a
+- CHANGE_OWNER: \"UkJung Kim\" <ujkim@samsung.com>
+- PATCHSET_UPLOADER: \"UkJung Kim\" <ujkim@samsung.com>
+- CHANGE_URL: http://slp-info.sec.samsung.net/gerrit/534441
+- PATCHSET_REVISION: 20219be53bbc053247c546217c0653bed548985a
+- TAGGER: UkJung Kim <ujkim@samsung.com>
+- Gerrit patchset approval info:
+- Newton Lee <newton.lee@samsung.com> Code-Review : 2
+- Newton Lee <newton.lee@samsung.com> Verified : 1
+- CHANGE_SUBJECT: Merged x86_64 support to master
+
+- Merged x86_64 support to master
+
+* 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
+
+* Sun Apr 24 08:02:35 UTC 2011 - Jan-Simon Möller <jsmoeller@linuxfoundation.org> - 1.0
+- Add baselibs.conf to src.rpm
+
+* Mon Jan  3 21:03:00 UTC 2011 Carsten Munk <carsten@maemo.org> - 1.0
+- 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/libxml2-x86.spec b/packaging/libxml2-x86.spec
index 9132862..e584326 100644
--- a/packaging/libxml2-x86.spec
+++ b/packaging/libxml2-x86.spec
@@ -1,38 +1,74 @@
+%define release_prefix 9
 %define __strip /bin/true
-%define _build_name_fmt    %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.dontuse.rpm
-# meta spec file for cross-chroot setup 
+%define _build_name_fmt    %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.vanish.rpm
+# meta spec file for cross-chroot setup
 #
-# Copyright (c) 2010  Jan-Simon Möller (jsmoeller@linuxfoundation.org)
-# License: GPLv2
-
-## README
-##
-## In this file:
-## 1) define name of original package (see oldname)
-## 
-## File binaries_to_prepare:
-## 2) fill in the binaries which need to be available to the foreign chroot
-##    e.g. /bin/bash   -  this will make a i586 bash available
-##
+# Copyright (c) 2009-2011 Martin Mohring   (martin.mohring@opensuse.org)
+# Copyright (c) 2011      5eEcoSystems     (info@5eecosystems.com)
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of the copyright owners, unless otherwise agreed
+# upon. The cross build accelerators as is, and modifications
+# and additions to the it, are licensed under the GPLv2.
+# In addition, the cross build accelerators are licensed together with
+# a package where they will be contained in
+# under the license of the prestine package (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
 
 #\/\/\/\/\/\/\/\/\/\/
 ### only changes here
+
 #
 # The original package name
+# e.g. qemu
+#
 %define oldname libxml2 
+
 #
 # 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
+# This can be distribution dependent. Good start is:
+# e.g. rpm grep tar sed patchelf
+#
+BuildRequires: rpm grep tar sed patchelf
+
+#
+# Additional required packages needed in addition to those of original package
+# e.g. (usually empty) for an accelerator to be 100% compatible
 #
+#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
 
-### no changes needed
 #
-# The new package name - convention is %oldname-x86
-%define newname %{oldname}-x86
+# Release under which to put the accelerator
+#
+Release:       %release_prefix
+VCS:           toolchains/libxml2-x86#Z910F_PROTEX_0625-2-g20219be53bbc053247c546217c0653bed548985a
+
+#
+# 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)}
@@ -47,8 +83,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
@@ -63,17 +99,14 @@
 
 Name:          %newname
 Version:       %newversion
-Release:       7
 AutoReqProv:   0
 Provides:      %newname
-BuildRequires: rpm grep tar patchelf sed -rpmlint-Moblin -rpmlint-mini -post-build-checks
 BuildRequires: %oldname
-Requires:      %oldname
 # no auto requirements - they're generated
 License:       %newlicense
 Group:         %newgroup
 ExclusiveArch: %myexclusive
-Summary:       Don't use! %newsummary
+Summary:       Dont use %newsummary !
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 %if %binaries_to_prepare
 Source10:      binaries_to_prepare
@@ -95,8 +128,6 @@ It is not intended to be used on a normal system/device!
 Original description:
 %{expand:%(rpm -q --qf '[%{description}]' %oldname)}
 
-
-
 %prep
 
 %build
@@ -127,6 +158,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
 
@@ -156,8 +194,9 @@ rm filestoinclude2
 echo ""
 echo "[ .oO Preparing binaries Oo. ]"
 echo ""
-mkdir %buildroot/%{_prefix}/share/applybinary/
-for binary in `cat %{_sourcedir}/binaries_to_prepare` ; do
+cat %{_sourcedir}/binaries_to_prepare | sed "s/@LIB@/%{_lib}/g" > binaries_to_prepare1
+mkdir -p %buildroot/%{_prefix}/share/applybinary/
+for binary in `cat binaries_to_prepare1` ; do
   echo "Processing binary: $binary"
   tmp="tmp.$$"
 %if %nodebug
@@ -165,16 +204,16 @@ for binary in `cat %{_sourcedir}/binaries_to_prepare` ; do
 %else
   debug="--debug"
 %endif
-  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)
-  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
+  if file $binary | grep -q dynamic; then
+    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
+    if test -n "$debug"; then
+      patchelf --print-rpath %buildroot/$binary
+      patchelf --print-interpreter %buildroot/$binary
+    fi
   fi
   echo "$binary" >> %buildroot/%{_prefix}/share/applybinary/%name
   echo ""
@@ -186,6 +225,7 @@ done
 echo ""
 echo "[ .oO Preparing libraries Oo. ]"
 echo ""
+cat %{_sourcedir}/libraries_to_prepare | sed "s/@LIB@/%{_lib}/g" > libraries_to_prepare1
 %endif
 
 # stub
@@ -221,7 +261,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
@@ -238,8 +278,8 @@ 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
-   shellquote "  targettype arm post \"  if test -e ${binary}.orig-arm; then \" " >> /tmp/baselibs_new.conf
+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
    shellquote "  targettype arm post \"    mv ${binary} ${binary}.orig-arm ; ln -s <prefix>${binary} ${binary} \"" >> /tmp/baselibs_new.conf
@@ -247,7 +287,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
@@ -256,6 +296,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 "################################################################################"