Merge branch 'tizen_base' into tizen_7.0_baseaccepted/tizen/7.0/base/20230719.134320tizen_7.0_baseaccepted/tizen_7.0_base

* packaging: remove rpmlint-*
* skip build-compare
* build x86_64 only

Change-Id: Iece90863d3fd7de56ecd24d07d73544256c1ce1b
Signed-off-by: Hyunggi Lee <hyunggi.lee@samsung.com>
Signed-off-by: Dongkyun Son <dongkyun.s@samsung.com>

4 files changed, 16 insertions, 76 deletions

diff --git a/packaging/qemu-accel-aarch64.spec b/packaging/qemu-accel-aarch64.spec
index 7dc2b77..716a218 100644
--- a/packaging/qemu-accel-aarch64.spec
+++ b/packaging/qemu-accel-aarch64.spec
@@ -49,8 +49,6 @@ BuildRequires:  m4
 # required for xxd
 BuildRequires:  vim
 BuildRequires:  patchelf
-BuildRequires:  rpmlint-mini
-BuildRequires:  rpmlint-tizen
 BuildRequires:  elfutils
 BuildRequires:  libxslt-tools
 BuildRequires:  cmake
@@ -74,10 +72,13 @@ BuildRequires:  python3-base
 
 # required for LLVM gold plugin
 BuildRequires:  llvm-devel
+# do not comapre with old rpms
+#!BuildIgnore:  build-compare
+
 Summary:        Native binaries for speeding up cross compile
 License:        GPL-2.0
 Group:          Development/Cross Compilation
-ExclusiveArch:  x86_64 %{ix86}
+ExclusiveArch:  x86_64
 %ifarch x86_64
 BuildRequires:  libgcc-32bit
 BuildRequires:  glibc-32bit
@@ -468,22 +469,6 @@ echo "%{libdir}/${host_python}/site-packages/SCons" >> python.list
 ln -sf %{libdir}/${host_python}/site-packages/ply ${buildroot_emul_path}%{libdir}/${host_python}/site-packages/ply
 echo "%{libdir}/${host_python}/site-packages/ply" >> python.list
 
-# rpmlint acceleration
-mkdir -p ${buildroot_emul_path}/opt/testing/bin
-ln -s %{emul_path}%{_bindir}/${host_python}-orig ${buildroot_emul_path}/opt/testing/bin/
-cat > ${buildroot_emul_path}/opt/testing/bin/${host_python} << EOF
-#!/bin/bash
-if [ -z "\$PYTHONPATH" ]; then
-  export PYTHONPATH="%{libdir}/${host_python}"
-else
-  export PYTHONPATH+=":%{libdir}/${host_python}"
-fi
-export PYTHONHOME="%{emul_path}%{_prefix}"
-%{emul_path}/opt/testing/bin/${host_python}-orig "\$@"
-EOF
-chmod +x ${buildroot_emul_path}/opt/testing/bin/${host_python}
-ln -s ${host_python} ${buildroot_emul_path}/opt/testing/bin/python
-
 mkdir -p ${buildroot_emul_path}%{_libdir}/${host_python}/site-packages/rpm/
 mkdir -p ${buildroot_emul_path}%{_libdir}/${host_python}/encodings/
 cp %{_libdir}/${host_python}/site-packages/rpm/*.py ${buildroot_emul_path}%{_libdir}/${host_python}/site-packages/rpm/
diff --git a/packaging/qemu-accel-armv7hl.spec b/packaging/qemu-accel-armv7hl.spec
index 878df60..e39eee5 100644
--- a/packaging/qemu-accel-armv7hl.spec
+++ b/packaging/qemu-accel-armv7hl.spec
@@ -49,8 +49,6 @@ BuildRequires:  m4
 # required for xxd
 BuildRequires:  vim
 BuildRequires:  patchelf
-BuildRequires:  rpmlint-mini
-BuildRequires:  rpmlint-tizen
 BuildRequires:  elfutils
 BuildRequires:  libxslt-tools
 BuildRequires:  cmake
@@ -74,10 +72,13 @@ BuildRequires:  python3-base
 
 # required for LLVM gold plugin
 BuildRequires:  llvm-devel
+# do not comapre with old rpms
+#!BuildIgnore:  build-compare
+
 Summary:        Native binaries for speeding up cross compile
 License:        GPL-2.0
 Group:          Development/Cross Compilation
-ExclusiveArch:  x86_64 %{ix86}
+ExclusiveArch:  x86_64
 %ifarch x86_64
 BuildRequires:  libgcc-32bit
 BuildRequires:  glibc-32bit
@@ -468,22 +469,6 @@ echo "%{libdir}/${host_python}/site-packages/SCons" >> python.list
 ln -sf %{libdir}/${host_python}/site-packages/ply ${buildroot_emul_path}%{libdir}/${host_python}/site-packages/ply
 echo "%{libdir}/${host_python}/site-packages/ply" >> python.list
 
-# rpmlint acceleration
-mkdir -p ${buildroot_emul_path}/opt/testing/bin
-ln -s %{emul_path}%{_bindir}/${host_python}-orig ${buildroot_emul_path}/opt/testing/bin/
-cat > ${buildroot_emul_path}/opt/testing/bin/${host_python} << EOF
-#!/bin/bash
-if [ -z "\$PYTHONPATH" ]; then
-  export PYTHONPATH="%{libdir}/${host_python}"
-else
-  export PYTHONPATH+=":%{libdir}/${host_python}"
-fi
-export PYTHONHOME="%{emul_path}%{_prefix}"
-%{emul_path}/opt/testing/bin/${host_python}-orig "\$@"
-EOF
-chmod +x ${buildroot_emul_path}/opt/testing/bin/${host_python}
-ln -s ${host_python} ${buildroot_emul_path}/opt/testing/bin/python
-
 mkdir -p ${buildroot_emul_path}%{_libdir}/${host_python}/site-packages/rpm/
 mkdir -p ${buildroot_emul_path}%{_libdir}/${host_python}/encodings/
 cp %{_libdir}/${host_python}/site-packages/rpm/*.py ${buildroot_emul_path}%{_libdir}/${host_python}/site-packages/rpm/
diff --git a/packaging/qemu-accel-armv7l.spec b/packaging/qemu-accel-armv7l.spec
index 3262d21..55070c0 100644
--- a/packaging/qemu-accel-armv7l.spec
+++ b/packaging/qemu-accel-armv7l.spec
@@ -49,8 +49,6 @@ BuildRequires:  m4
 # required for xxd
 BuildRequires:  vim
 BuildRequires:  patchelf
-BuildRequires:  rpmlint-mini
-BuildRequires:  rpmlint-tizen
 BuildRequires:  elfutils
 BuildRequires:  libxslt-tools
 BuildRequires:  cmake
@@ -74,10 +72,13 @@ BuildRequires:  python3-base
 
 # required for LLVM gold plugin
 BuildRequires:  llvm-devel
+# do not comapre with old rpms
+#!BuildIgnore:  build-compare
+
 Summary:        Native binaries for speeding up cross compile
 License:        GPL-2.0
 Group:          Development/Cross Compilation
-ExclusiveArch:  x86_64 %{ix86}
+ExclusiveArch:  x86_64
 %ifarch x86_64
 BuildRequires:  libgcc-32bit
 BuildRequires:  glibc-32bit
@@ -468,22 +469,6 @@ echo "%{libdir}/${host_python}/site-packages/SCons" >> python.list
 ln -sf %{libdir}/${host_python}/site-packages/ply ${buildroot_emul_path}%{libdir}/${host_python}/site-packages/ply
 echo "%{libdir}/${host_python}/site-packages/ply" >> python.list
 
-# rpmlint acceleration
-mkdir -p ${buildroot_emul_path}/opt/testing/bin
-ln -s %{emul_path}%{_bindir}/${host_python}-orig ${buildroot_emul_path}/opt/testing/bin/
-cat > ${buildroot_emul_path}/opt/testing/bin/${host_python} << EOF
-#!/bin/bash
-if [ -z "\$PYTHONPATH" ]; then
-  export PYTHONPATH="%{libdir}/${host_python}"
-else
-  export PYTHONPATH+=":%{libdir}/${host_python}"
-fi
-export PYTHONHOME="%{emul_path}%{_prefix}"
-%{emul_path}/opt/testing/bin/${host_python}-orig "\$@"
-EOF
-chmod +x ${buildroot_emul_path}/opt/testing/bin/${host_python}
-ln -s ${host_python} ${buildroot_emul_path}/opt/testing/bin/python
-
 mkdir -p ${buildroot_emul_path}%{_libdir}/${host_python}/site-packages/rpm/
 mkdir -p ${buildroot_emul_path}%{_libdir}/${host_python}/encodings/
 cp %{_libdir}/${host_python}/site-packages/rpm/*.py ${buildroot_emul_path}%{_libdir}/${host_python}/site-packages/rpm/
diff --git a/packaging/qemu-accel.spec.in b/packaging/qemu-accel.spec.in
index 7aadd20..fcabf45 100644
--- a/packaging/qemu-accel.spec.in
+++ b/packaging/qemu-accel.spec.in
@@ -46,8 +46,6 @@ BuildRequires:  m4
 # required for xxd
 BuildRequires:  vim
 BuildRequires:  patchelf
-BuildRequires:  rpmlint-mini
-BuildRequires:  rpmlint-tizen
 BuildRequires:  elfutils
 BuildRequires:  libxslt-tools
 BuildRequires:  cmake
@@ -71,10 +69,13 @@ BuildRequires:  python3-base
 
 # required for LLVM gold plugin
 BuildRequires:  llvm-devel
+# do not comapre with old rpms
+#!BuildIgnore:  build-compare
+
 Summary:        Native binaries for speeding up cross compile
 License:        GPL-2.0
 Group:          Development/Cross Compilation
-ExclusiveArch:  x86_64 %{ix86}
+ExclusiveArch:  x86_64
 %ifarch x86_64
 BuildRequires:  libgcc-32bit
 BuildRequires:  glibc-32bit
@@ -465,22 +466,6 @@ echo "%{libdir}/${host_python}/site-packages/SCons" >> python.list
 ln -sf %{libdir}/${host_python}/site-packages/ply ${buildroot_emul_path}%{libdir}/${host_python}/site-packages/ply
 echo "%{libdir}/${host_python}/site-packages/ply" >> python.list
 
-# rpmlint acceleration
-mkdir -p ${buildroot_emul_path}/opt/testing/bin
-ln -s %{emul_path}%{_bindir}/${host_python}-orig ${buildroot_emul_path}/opt/testing/bin/
-cat > ${buildroot_emul_path}/opt/testing/bin/${host_python} << EOF
-#!/bin/bash
-if [ -z "\$PYTHONPATH" ]; then
-  export PYTHONPATH="%{libdir}/${host_python}"
-else
-  export PYTHONPATH+=":%{libdir}/${host_python}"
-fi
-export PYTHONHOME="%{emul_path}%{_prefix}"
-%{emul_path}/opt/testing/bin/${host_python}-orig "\$@"
-EOF
-chmod +x ${buildroot_emul_path}/opt/testing/bin/${host_python}
-ln -s ${host_python} ${buildroot_emul_path}/opt/testing/bin/python
-
 mkdir -p ${buildroot_emul_path}%{_libdir}/${host_python}/site-packages/rpm/
 mkdir -p ${buildroot_emul_path}%{_libdir}/${host_python}/encodings/
 cp %{_libdir}/${host_python}/site-packages/rpm/*.py ${buildroot_emul_path}%{_libdir}/${host_python}/site-packages/rpm/