build-sys: move slirp as git submodule project (7c57bdd8) · Commits · SUMMER2020 / students / proj-2021291

.gitmodules

+3 −0

Original line number	Diff line number	Diff line
		@@ -52,3 +52,6 @@
		[submodule "roms/edk2"]
		path = roms/edk2
		url = https://github.com/tianocore/edk2.git
		[submodule "slirp"]
		path = slirp
		url = https://gitlab.freedesktop.org/slirp/libslirp.git

configure

+9 −2

Original line number	Diff line number	Diff line
		@@ -1115,6 +1115,8 @@ for opt do
		;;
		--disable-slirp) slirp="no"
		;;
		--enable-slirp=git) slirp="git"
		;;
		--enable-slirp=system) slirp="system"
		;;
		--disable-vde) vde="no"
		@@ -5885,6 +5887,8 @@ case "$slirp" in
		"" \| yes)
		if $pkg_config slirp; then
		slirp=system
		elif test -e "${source_path}/.git" && test $git_update = 'yes' ; then
		slirp=git
		elif test -e "${source_path}/slirp/Makefile" ; then
		slirp=internal
		elif test -z "$slirp" ; then
		@@ -5902,7 +5906,10 @@ case "$slirp" in
		esac

		case "$slirp" in
		internal)
		git \| internal)
		if test "$slirp" = git; then
		git_submodules="${git_submodules} slirp"
		fi
		mkdir -p slirp
		slirp_cflags="-I\$(SRC_PATH)/slirp/src -I\$(BUILD_DIR)/slirp/src"
		slirp_libs="-L\$(BUILD_DIR)/slirp -lslirp"
		@@ -6565,7 +6572,7 @@ if test "$slirp" != "no"; then
		echo "SLIRP_CFLAGS=$slirp_cflags" >> $config_host_mak
		echo "SLIRP_LIBS=$slirp_libs" >> $config_host_mak
		fi
		if [ "$slirp" = "internal" ]; then
		if [ "$slirp" = "git" -o "$slirp" = "internal" ]; then
		echo "config-host.h: subdir-slirp" >> $config_host_mak
		fi
		if test "$vde" = "yes" ; then

scripts/archive-source.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ vroot_dir="${tar_file}.vroot"
		# independent of what the developer currently has initialized
		# in their checkout, because the build environment is completely
		# different to the host OS.
		submodules="dtc ui/keycodemapdb tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3"
		submodules="dtc slirp ui/keycodemapdb tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3"

		trap "status=$?; rm -rf \"$list_file\" \"$vroot_dir\"; exit \$status" 0 1 2 3 15

slirp @ 59a1b1f1

Original line number	Diff line number	Diff line
		Subproject commit 59a1b1f165458c2acb7ff0525b543945f7416225

slirp/COPYRIGHT

deleted100644 → 0

+0 −62

Original line number	Diff line number	Diff line
		Slirp was written by Danny Gasparovski.
		Copyright (c), 1995,1996 All Rights Reserved.

		Slirp is free software; "free" as in you don't have to pay for it, and you
		are free to do whatever you want with it. I do not accept any donations,
		monetary or otherwise, for Slirp. Instead, I would ask you to pass this
		potential donation to your favorite charity. In fact, I encourage
		everyone who finds Slirp useful to make a small donation to their
		favorite charity (for example, GreenPeace). This is not a requirement, but
		a suggestion from someone who highly values the service they provide.

		The copyright terms and conditions:

		---BEGIN---

		Copyright (c) 1995,1996 Danny Gasparovski. All rights reserved.

		Redistribution and use in source and binary forms, with or without
		modification, are permitted provided that the following conditions
		are met:
		1. Redistributions of source code must retain the above copyright
		notice, this list of conditions and the following disclaimer.
		2. Redistributions in binary form must reproduce the above copyright
		notice, this list of conditions and the following disclaimer in the
		documentation and/or other materials provided with the distribution.
		3. Neither the name of the copyright holder nor the names of its
		contributors may be used to endorse or promote products derived
		from this software without specific prior written permission.

		THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
		INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
		AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
		DANNY GASPAROVSKI OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
		INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
		NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
		DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
		THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
		THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

		---END---

		This basically means you can do anything you want with the software, except
		1) call it your own, and 2) claim warranty on it. There is no warranty for
		this software. None. Nada. If you lose a million dollars while using
		Slirp, that's your loss not mine. So, *USE AT YOUR OWN RISK!*.

		If these conditions cannot be met due to legal restrictions (E.g. where it
		is against the law to give out Software without warranty), you must cease
		using the software and delete all copies you have.

		Slirp uses code that is copyrighted by the following people/organizations:

		Juha Pirkola.
		Gregory M. Christy.
		The Regents of the University of California.
		Carnegie Mellon University.
		The Australian National University.
		RSA Data Security, Inc.

		Please read the top of each source file for the details on the various
		copyrights.