diff options
| author | Ilya Palachev <i.palachev@samsung.com> | 2014-09-15 11:37:07 +0400 |
|---|---|---|
| committer | Ilya Palachev <i.palachev@samsung.com> | 2014-09-15 11:40:44 +0400 |
| commit | 895fcea706038f92d3569179641cb2a5567d26a4 (patch) | |
| tree | 6ac30ba93b0350b4711ac9ad09f1afb94d5d5540 | |
| parent | 6ecde265f99a46f18b9dd6b858afdce983f98fe1 (diff) | |
| download | qemu-accel-tizen_3.0.m14.3_ivi.tar.gz qemu-accel-tizen_3.0.m14.3_ivi.tar.bz2 qemu-accel-tizen_3.0.m14.3_ivi.zip | |
packaging: adapt to lib/lib64 directory structuresubmit/tizen/20140917.124329accepted/tizen/ivi/20140926.185945accepted/tizen/common/20140918.093154tizen_3.0.m14.3_iviaccepted/tizen_3.0.m14.3_ivi
1. Create aarch64 binary package from x86_64 build, since it's better
compatible with lib/lib64 directory structure. (in baselibs.conf)
2. Fixed path in symlinks in post-install script. (in baselibs.conf)
3. Disabled packaging of gconv locales that were packed for x86_64
build (that was not used before) from /usr/lib64/gconv/* .
This was done, because these locales are packed in glibc-locale
package for now (so these 2 packages conflict with each other.
(in qemu-accel-aarch64.spec)
Change-Id: I4a98753c6e9229733162f4c922e42e3aa5268549
Signed-off-by: Ilya Palachev <i.palachev@samsung.com>
| -rw-r--r-- | packaging/baselibs.conf | 5 | ||||
| -rw-r--r-- | packaging/qemu-accel-aarch64.spec | 10 |
2 files changed, 3 insertions, 12 deletions
diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf index 4692fe3..87f4223 100644 --- a/packaging/baselibs.conf +++ b/packaging/baselibs.conf @@ -1,4 +1,5 @@ -arch i686 targets armv7l:cross-arm aarch64:cross-aarch64 +arch i686 targets armv7l:cross-arm +arch x86_64 targets aarch64:cross-aarch64 qemu-accel-armv7l targettype cross-arm requires "gcc" @@ -109,7 +110,7 @@ qemu-accel-aarch64 post " export GCCVER=$(LANG=C gcc --version | head -1 | sed -e "s/^.*gcc[^0-9]*\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*$/\1.\2/") " post " # Create symlinks to files needed by native ld for the case if we want to use it instead of cross ld:" post " for f in crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o ; do" - post " ln -s /usr/lib/gcc/aarch64-tizen-linux/${GCCVER}/$f /usr/lib/$f;" + post " ln -s /usr/lib64/gcc/aarch64-tizen-linux/${GCCVER}/$f /usr/lib/$f;" post " done" post "fi" +/ diff --git a/packaging/qemu-accel-aarch64.spec b/packaging/qemu-accel-aarch64.spec index ec8ce99..ba22ae7 100644 --- a/packaging/qemu-accel-aarch64.spec +++ b/packaging/qemu-accel-aarch64.spec @@ -222,13 +222,6 @@ do done %if 0%{?use_cross_binaries} -# make gconv libraries available (needed for msg*) -%if 0%{?use_cross_gettext_tools} -%ifarch x86_64 -mkdir -p %{buildroot}/usr/lib64/gconv -cp -a /usr/lib64/gconv/* "%{buildroot}/usr/lib64/gconv/" -%endif -%endif # use_cross_gettext_tools # create symlinks for bash %if 0%{?use_cross_bash} @@ -440,8 +433,5 @@ ln -s /lib /usr/aarch64-tizen-linux/usr/lib /usr/bin/qemu-arm64-binfmt /usr/bin/qemu-arm64 /usr/bin/qemu-aarch64 -%ifarch x86_64 -/usr/lib64 -%endif %changelog |