package/slirp: switch official tarball
PATCH 1/2 package/slirp: switch official tarball
Other "official" tarballs don't ship .tarball-version resulting in a build
failure: https://gitlab.freedesktop.org/slirp/libslirp/-/issues/24
Fixes:
- http://autobuild.buildroot.org/results/0b9cff1bc650876a6fff6102b2cb31dcdf4c5e8f
--- package/slirp/slirp.hash | 2 +- package/slirp/slirp.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-)
package/slirp/slirp.hash +1 -1
@@ -1,3 +1,3 @@ # Locally computed: -sha256 6b1641f04d41bc45f94018ac8d42d3c9f3ba0e463cbeacf5f26fe83fc050161e libslirp-v4.3.1.tar.bz2 +sha256 388b4b08a8cc0996cc5155cb027a097dc1a7f2cfe84b1121496608ab5366cc48 libslirp-4.3.1.tar.xz sha256 b28aecf4796a6a22054167f0a976de13d9db335669d37afd2dc7ea4c335e1e13 COPYRIGHT
package/slirp/slirp.mk +4 -3
@@ -5,9 +5,10 @@ ################################################################################ SLIRP_VERSION = 4.3.1 -SLIRP_SOURCE = libslirp-v$(SLIRP_VERSION).tar.bz2 -SLIRP_SITE = \ - https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v$(SLIRP_VERSION) +SLIRP_SOURCE = libslirp-$(SLIRP_VERSION).tar.xz +# Other "official" tarballs don't ship .tarball-version resulting in a build +# failure: https://gitlab.freedesktop.org/slirp/libslirp/-/issues/24 +SLIRP_SITE = https://elmarco.fedorapeople.org SLIRP_LICENSE = BSD-3-Clause SLIRP_LICENSE_FILES = COPYRIGHT SLIRP_INSTALL_STAGING = YES
Signature · 1 line
2.28.0
PATCH 2/2 package/slirp: add libglib2 mandatory dependency
slirp depends on libglib2, don't update xen as it already depends on it
Fixes:
- http://autobuild.buildroot.org/results/0b9cff1bc650876a6fff6102b2cb31dcdf4c5e8f
--- package/slirp/Config.in | 8 ++++++++ package/slirp/slirp.mk | 1 + 2 files changed, 9 insertions(+)
package/slirp/Config.in +8 -0
@@ -1,5 +1,9 @@ config BR2_PACKAGE_SLIRP bool "slirp" + depends on BR2_USE_MMU # libglib2 + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + select BR2_PACKAGE_LIBGLIB2 help libslirp is a user-mode networking library used by virtual machines, containers or various tools.
@@ -18,3 +22,7 @@ config BR2_PACKAGE_SLIRP around May 2009 which archived it in 2012 - So we switched to https://gitlab.freedesktop.org/slirp/libslirp + +comment "slirp needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
package/slirp/slirp.mk +1 -0
@@ -12,5 +12,6 @@ SLIRP_SITE = https://elmarco.fedorapeople.org SLIRP_LICENSE = BSD-3-Clause SLIRP_LICENSE_FILES = COPYRIGHT SLIRP_INSTALL_STAGING = YES +SLIRP_DEPENDENCIES = libglib2 $(eval $(meson-package))
Signature · 1 line
2.28.0
PATCH 2/2 package/slirp: add libglib2 mandatory dependency
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
slirp depends on libglib2, don't update xen as it already depends on it Fixes:
- http://autobuild.buildroot.org/results/0b9cff1bc650876a6fff6102b2cb31dcdf4c5e8fSigned-off-by Fabrice Fontaine <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/2 package/slirp: add libglib2 mandatory dependency
In reply to Fabrice FontaineQuoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
slirp depends on libglib2, don't update xen as it already depends on it Fixes:
- http://autobuild.buildroot.org/results/0b9cff1bc650876a6fff6102b2cb31dcdf4c5e8fSigned-off-by Fabrice Fontaine <[email protected]>
Committed to 2020.02.x and 2020.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/2 package/slirp: switch official tarball
In reply to Fabrice FontaineQuoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Other "official" tarballs don't ship .tarball-version resulting in a build
failure: https://gitlab.freedesktop.org/slirp/libslirp/-/issues/24Fixes:
- http://autobuild.buildroot.org/results/0b9cff1bc650876a6fff6102b2cb31dcdf4c5e8f
:/
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/2 package/slirp: switch official tarball
In reply to Fabrice FontaineQuoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Other "official" tarballs don't ship .tarball-version resulting in a build
failure: https://gitlab.freedesktop.org/slirp/libslirp/-/issues/24Fixes:
- http://autobuild.buildroot.org/results/0b9cff1bc650876a6fff6102b2cb31dcdf4c5e8fSigned-off-by Fabrice Fontaine <[email protected]>
Committed to 2020.02.x and 2020.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard