package/qemu: remove csky fork
PATCH 1/1 package/qemu: remove csky fork
We have a qemu fork for csky cpus [1] but since qemu version bump to 4.2.0 [2] and libssh2/libssh change the csky build is broken.
The csky fork is based on Qemu 3.0.0 but unlike autotools packages any unknown option is handled as error.
Since we don't want to support all options from previous qemu release and the github repository has been removed [3] and the only remaining archive is located on http://sources.buildroot.net,
remove the qemu csky fork as suggested by [4].
[1] https://git.buildroot.net/buildroot/commit/?id=f816e5b276f1ef15840bec6667f1e8219717ab7d
[2] https://git.buildroot.net/buildroot/commit/?id=0ea17054ce7dfc54efca5634133cef786445e7b1
[3] https://github.com/c-sky/qemu
[4] http://lists.busybox.net/pipermail/buildroot/2020-May/281885.html
---
The upcoming Qemu 5.0.0 switched libcap to libcap-ng, so the qemu csky would be broken with BR2_PACKAGE_HOST_QEMU_VIRTFS set.
--- package/qemu/Config.in.host | 1 - package/qemu/qemu.hash | 3 --- package/qemu/qemu.mk | 12 ------------ 3 files changed, 16 deletions(-)
package/qemu/Config.in.host +0 -1
@@ -3,7 +3,6 @@ config BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS default y if BR2_arm default y if BR2_armeb default y if BR2_aarch64 - default y if BR2_csky default y if BR2_i386 default y if BR2_m68k default y if BR2_microblazeel
package/qemu/qemu.hash +0 -3
@@ -2,6 +2,3 @@ sha256 d3481d4108ce211a053ef15be69af1bdd9dde1510fda80d92be0f6c3e98768f0 qemu-4.2.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB - -# Locally computed -sha256 61091767ffd16002e77f005155d096208094e69dee35e6d5ddcaa6c8a13b5e26 qemu-b517e1dc3125a57555d67a8deed9eac7b42288e2.tar.gz
package/qemu/qemu.mk +0 -12
@@ -4,14 +4,9 @@ # ################################################################################ -ifeq ($(BR2_csky),y) -QEMU_VERSION = b517e1dc3125a57555d67a8deed9eac7b42288e2 -QEMU_SITE = $(call github,c-sky,qemu,$(QEMU_VERSION)) -else QEMU_VERSION = 4.2.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org -endif QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c QEMU_LICENSE_FILES = COPYING COPYING.LIB # NOTE: there is no top-level license file for non-(L)GPL licenses;
@@ -238,13 +233,6 @@ endif ifeq ($(HOST_QEMU_ARCH),sh4aeb) HOST_QEMU_ARCH = sh4eb endif -ifeq ($(HOST_QEMU_ARCH),csky) -ifeq ($(BR2_ck610),y) -HOST_QEMU_ARCH = cskyv1 -else -HOST_QEMU_ARCH = cskyv2 -endif -endif HOST_QEMU_SYS_ARCH ?= $(HOST_QEMU_ARCH) HOST_QEMU_CFLAGS = $(HOST_CFLAGS)
Signature · 1 line
2.25.4
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 package/qemu: remove csky fork
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Guo" == Guo Ren <[email protected]> writes:
Acked-by Guo Ren <[email protected]>The qemu upstreaming is on the way, let?s wait for official version.
But the build is broken today, right? (As we pass --enable-libssh / --disable-libssh). Do you have any idea about an ETA for mainline c-sky support or atleast a more modern git repo with c-sky support which accepts the same configure options as our 4.2 version?
Unless we have something very soon, I think applying this patch for 2020.05 (and 2020.02.x) makes more sense.
What do you say?
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 package/qemu: remove csky fork
In reply to Romain NaourQuoted 14 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
We have a qemu fork for csky cpus [1] but since qemu version bump to 4.2.0 [2] and libssh2/libssh change the csky build is broken.
The csky fork is based on Qemu 3.0.0 but unlike autotools packages any unknown option is handled as error.
Since we don't want to support all options from previous qemu release and the github repository has been removed [3] and the only remaining archive is located on http://sources.buildroot.net,
remove the qemu csky fork as suggested by [4].
Quoted 8 lines
[1] https://git.buildroot.net/buildroot/commit/?id=f816e5b276f1ef15840bec6667f1e8219717ab7d
[2] https://git.buildroot.net/buildroot/commit/?id=0ea17054ce7dfc54efca5634133cef786445e7b1
[3] https://github.com/c-sky/qemu
[4] http://lists.busybox.net/pipermail/buildroot/2020-May/281885.htmlSigned-off-by Romain Naour <[email protected]>Cc Guo Ren <[email protected]>Cc Peter Korsgaard <[email protected]>
Committed, thanks. I also moved the patches out of the (now unneeded) 4.2.0 subdir.
Guo, please resubmit c-sky support for qemu when it is included upstream
- Thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 package/qemu: remove csky fork
In reply to Romain NaourQuoted 19 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
We have a qemu fork for csky cpus [1] but since qemu version bump to 4.2.0 [2] and libssh2/libssh change the csky build is broken.
The csky fork is based on Qemu 3.0.0 but unlike autotools packages any unknown option is handled as error.
Since we don't want to support all options from previous qemu release and the github repository has been removed [3] and the only remaining archive is located on http://sources.buildroot.net,
remove the qemu csky fork as suggested by [4].[1] https://git.buildroot.net/buildroot/commit/?id=f816e5b276f1ef15840bec6667f1e8219717ab7d
[2] https://git.buildroot.net/buildroot/commit/?id=0ea17054ce7dfc54efca5634133cef786445e7b1
[3] https://github.com/c-sky/qemu
[4] http://lists.busybox.net/pipermail/buildroot/2020-May/281885.html
Quoted 6 lines
Signed-off-by Romain Naour <[email protected]>Cc Guo Ren <[email protected]>Cc Peter Korsgaard <[email protected]>---
The upcoming Qemu 5.0.0 switched libcap to libcap-ng, so the qemu csky would be broken withBR2_PACKAGE_HOST_QEMU_VIRTFSset.
Committed to 2020.02.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard