Fix the install error of debian and packaging.

Change-Id: I03f7edd406f1845ecebef08fd78c1a979c09d745
Signed-off-by: wanchao-xu <wanchao.xu@samsung.com>

diff --git a/debian/rules b/debian/rules
index 34678d6f0fc130b8984fbe3c7882df5fdc88bf32..993b30588f504e31d3de3760ef90233ec9a99990 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -80,10 +80,7 @@ install: build
        make DESTDIR=$(CURDIR)/debian/qemu-arm-static install
        mkdir -p $(CURDIR)/debian/qemu-arm-static/usr/sbin/
        install -m755 scripts/qemu-binfmt-conf.sh $(CURDIR)/debian/qemu-arm-static/usr/sbin/
-       cp $(CURDIR)/debian/qemu-arm-static/usr/bin/qemu-binfmt $(CURDIR)/debian/qemu-arm-static/usr/bin/qemu-arm-binfmt
-       cp $(CURDIR)/debian/qemu-arm-static/usr/bin/qemu-binfmt $(CURDIR)/debian/qemu-arm-static/usr/bin/qemu-arm64-binfmt
-       cp $(CURDIR)/debian/qemu-arm-static/usr/bin/qemu-binfmt $(CURDIR)/debian/qemu-arm-static/usr/bin/qemu-riscv32-binfmt
-       mv $(CURDIR)/debian/qemu-arm-static/usr/bin/qemu-binfmt $(CURDIR)/debian/qemu-arm-static/usr/bin/qemu-riscv64-binfmt
+       mv $(CURDIR)/debian/qemu-arm-static/usr/bin/qemu-aarch64-binfmt $(CURDIR)/debian/qemu-arm-static/usr/bin/qemu-arm64-binfmt
        mv $(CURDIR)/debian/qemu-arm-static/usr/bin/qemu-arm $(CURDIR)/debian/qemu-arm-static/usr/bin/qemu-arm-static
        mv $(CURDIR)/debian/qemu-arm-static/usr/bin/qemu-aarch64 $(CURDIR)/debian/qemu-arm-static/usr/bin/qemu-arm64-static
        mv $(CURDIR)/debian/qemu-arm-static/usr/bin/qemu-riscv32 $(CURDIR)/debian/qemu-arm-static/usr/bin/qemu-riscv32-static

diff --git a/packaging/qemu-arm-static.spec b/packaging/qemu-arm-static.spec
index 865e81e8e58aedb3869354fe985fadf38b605b68..f113e71f24d5bc53f2c75cedfd48212f60350005 100644 (file)
--- a/packaging/qemu-arm-static.spec
+++ b/packaging/qemu-arm-static.spec
@@ -134,10 +134,7 @@ unlink %{buildroot}%_datadir/qemu/trace-events-all
 install -d -m 755 %{buildroot}%_sbindir
 install -m 755 scripts/qemu-binfmt-conf.sh %{buildroot}%_sbindir
 
-mv %{buildroot}%_bindir/qemu-binfmt %{buildroot}%_bindir/qemu-arm-binfmt
-ln -s qemu-arm-binfmt %{buildroot}%_bindir/qemu-arm64-binfmt
-ln -s qemu-arm-binfmt %{buildroot}%_bindir/qemu-riscv32-binfmt
-ln -s qemu-arm-binfmt %{buildroot}%_bindir/qemu-riscv64-binfmt
+mv %{buildroot}%_bindir/qemu-aarch64-binfmt %{buildroot}%_bindir/qemu-arm64-binfmt
 
 mv %{buildroot}%_bindir/qemu-arm %{buildroot}%_bindir/qemu-arm-static
 mv %{buildroot}%_bindir/qemu-aarch64 %{buildroot}%_bindir/qemu-arm64-static