diff options
| author | Slava Barinov <v.barinov@samsung.com> | 2017-04-19 10:11:35 +0300 |
|---|---|---|
| committer | Dongkyun, Son <dongkyun.s@samsung.com> | 2017-04-20 18:03:31 +0900 |
| commit | 2f7e7fc026c9294b6e8269b3acb1bc67de97ac7a (patch) | |
| tree | c9398cf05d7c836899517a7b63f9207321d3f121 | |
| parent | 31d784941e9c24a19a5499b88d72a9faf009deeb (diff) | |
| download | qemu-accel-2f7e7fc026c9294b6e8269b3acb1bc67de97ac7a.tar.gz qemu-accel-2f7e7fc026c9294b6e8269b3acb1bc67de97ac7a.tar.bz2 qemu-accel-2f7e7fc026c9294b6e8269b3acb1bc67de97ac7a.zip | |
Force baselibs.conf to generate only rpm for current archtizen_4.0.m1_releasesubmit/tizen_base/20170420.125851accepted/tizen/base/20170421.042322
When there is no aarch64 repository in project overwriting of armv7l rpm with
aarch64 is possible. To prevent that the unneeded rpms should not be generated
at all.
Change-Id: Ieaefaf0276976582e04f0663aed80b24c712e541
Signed-off-by: Slava Barinov <v.barinov@samsung.com>
| -rw-r--r-- | packaging/baselibs_body (renamed from packaging/baselibs.conf) | 4 | ||||
| -rw-r--r-- | packaging/qemu-accel-aarch64.spec | 10 | ||||
| -rw-r--r-- | packaging/qemu-accel-armv7l.spec | 10 | ||||
| -rw-r--r-- | packaging/qemu-accel.spec.in | 10 |
4 files changed, 30 insertions, 4 deletions
diff --git a/packaging/baselibs.conf b/packaging/baselibs_body index e979d11..2323510 100644 --- a/packaging/baselibs.conf +++ b/packaging/baselibs_body @@ -1,7 +1,3 @@ -arch i686 targets armv7l:armv7l aarch64:aarch64 -arch i686 targets armv7l:x86-armv7l aarch64:x86-aarch64 -arch x86_64 targets armv7l:armv7l aarch64:aarch64 -arch x86_64 targets armv7l:x86_64-armv7l aarch64:x86_64-aarch64 qemu-accel targettype aarch64 block! diff --git a/packaging/qemu-accel-aarch64.spec b/packaging/qemu-accel-aarch64.spec index 6d9a9ee..0cad174 100644 --- a/packaging/qemu-accel-aarch64.spec +++ b/packaging/qemu-accel-aarch64.spec @@ -338,6 +338,16 @@ ln -sf %{our_path}%{_bindir}/g++ %{buildroot}%{our_path}/home/abuild/rpmbuild/BU # support /lib/cpp ln -sf %{our_path}%{_bindir}/cpp %{buildroot}%{our_path}/usr/lib/cpp +# generate baselibs.conf for current architecture to prevent rpm overwriting in download repo +echo %{cross} +cat > %{_sourcedir}/baselibs_prologue << EOF +arch i686 targets %{cross}:%{cross} +arch i686 targets %{cross}:x86-%{cross} +arch x86_64 targets %{cross}:%{cross} +arch x86_64 targets %{cross}:x86_64-%{cross} +EOF +cat %{_sourcedir}/baselibs_prologue %{_sourcedir}/baselibs_body > %{_sourcedir}/baselibs.conf + # Find gcc install directory gcc_install_dir=$(%{target_arch}-gcc -print-search-dirs | sed -ne '/install: /s/install: //p') # update baselibs.conf, overwrite LTO plugin diff --git a/packaging/qemu-accel-armv7l.spec b/packaging/qemu-accel-armv7l.spec index cd01b04..35fa679 100644 --- a/packaging/qemu-accel-armv7l.spec +++ b/packaging/qemu-accel-armv7l.spec @@ -338,6 +338,16 @@ ln -sf %{our_path}%{_bindir}/g++ %{buildroot}%{our_path}/home/abuild/rpmbuild/BU # support /lib/cpp ln -sf %{our_path}%{_bindir}/cpp %{buildroot}%{our_path}/usr/lib/cpp +# generate baselibs.conf for current architecture to prevent rpm overwriting in download repo +echo %{cross} +cat > %{_sourcedir}/baselibs_prologue << EOF +arch i686 targets %{cross}:%{cross} +arch i686 targets %{cross}:x86-%{cross} +arch x86_64 targets %{cross}:%{cross} +arch x86_64 targets %{cross}:x86_64-%{cross} +EOF +cat %{_sourcedir}/baselibs_prologue %{_sourcedir}/baselibs_body > %{_sourcedir}/baselibs.conf + # Find gcc install directory gcc_install_dir=$(%{target_arch}-gcc -print-search-dirs | sed -ne '/install: /s/install: //p') # update baselibs.conf, overwrite LTO plugin diff --git a/packaging/qemu-accel.spec.in b/packaging/qemu-accel.spec.in index fc0225a..f3764ee 100644 --- a/packaging/qemu-accel.spec.in +++ b/packaging/qemu-accel.spec.in @@ -335,6 +335,16 @@ ln -sf %{our_path}%{_bindir}/g++ %{buildroot}%{our_path}/home/abuild/rpmbuild/BU # support /lib/cpp ln -sf %{our_path}%{_bindir}/cpp %{buildroot}%{our_path}/usr/lib/cpp +# generate baselibs.conf for current architecture to prevent rpm overwriting in download repo +echo %{cross} +cat > %{_sourcedir}/baselibs_prologue << EOF +arch i686 targets %{cross}:%{cross} +arch i686 targets %{cross}:x86-%{cross} +arch x86_64 targets %{cross}:%{cross} +arch x86_64 targets %{cross}:x86_64-%{cross} +EOF +cat %{_sourcedir}/baselibs_prologue %{_sourcedir}/baselibs_body > %{_sourcedir}/baselibs.conf + # Find gcc install directory gcc_install_dir=$(%{target_arch}-gcc -print-search-dirs | sed -ne '/install: /s/install: //p') # update baselibs.conf, overwrite LTO plugin |