app-emulation/anbox: update dep, drop old

- app-emulation/lxc -> app-containers/lxc in dependencies
- drop older version of anbox

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfred Wingate <parona@protonmail.com>
This commit is contained in:
Alfred Wingate 2022-01-18 19:58:48 +02:00
parent b7eb892231
commit 2d7c469145
No known key found for this signature in database
GPG Key ID: A12750536B5E7010
6 changed files with 4 additions and 206 deletions

View File

@ -1,3 +1,2 @@
DIST anbox-0_pre20210320.tar.gz 1024515 BLAKE2B 7e25e15ee598dafc5fd3918e59bdd7808ca32f0a7546316529b145fe8cf985cf77ecf3a95a735b2885676aa759ba4bd4801322e69cbf32590119ea62ecf7cf73 SHA512 89d31043047c1e25b2789638dddd5ea49d9fd754e0baa573c073c3c454e3a6e6f1e3bea6e4a632d6c3942d3a206741bc62f7db6e435c8be34856915dc4b27464
DIST anbox-20211020.tar.gz 1025857 BLAKE2B e5c7d9d17751ecd5d52ef6db1f48c0a3a3b0398dd3e0cfce974e5743bcd58c1dc4e72a6eac719fc4a56f297917da56340bf45cda247c31f45c0001420e0188c1 SHA512 9092a212b6662b84becf86c96a001090187763003a3c16d4fd4d7b4d31cc6bb92be240cbba1593b89e39637cb43da19f8f91567a578c7626709addb96be16809
DIST cpu_features-b9593c8b395318bb2bc42683a94f962564cc4664.tar.gz 55211 BLAKE2B b49714863cbebfde09e6ab99f31d9aaace367d84df9ecb12989fffc1326c9c60cfa14d917e490332c2a0b2a3fe267b6327b719652afba9bfa1654fc2564408b8 SHA512 8c12b50741e2979a32b69c788934bee0d00811b7662006c8b493e98d5efeada67ed59460be40c234b2d3bafd85671cb1a1d7c1a6ee535a7fc1cc6ac56a754576

View File

@ -1,126 +0,0 @@
# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit linux-info systemd cmake
DESCRIPTION="Container-based approach to boot a full Android system"
HOMEPAGE="https://anbox.io/"
if [[ "${PV}" == "9999" ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/anbox/anbox.git"
EGIT_SUBMODULES=( 'external/cpu_features' )
EGIT_COMMIT_DATE="${PV}"
else
COMMIT="9de4e87cdd05135e1c71e6eadb68bf82719cebdf" # 20.03.2021
EXTCOMMIT="b9593c8b395318bb2bc42683a94f962564cc4664"
SRC_URI="
https://github.com/anbox/anbox/archive/"${COMMIT}".tar.gz -> "${P}".tar.gz
https://github.com/google/cpu_features/archive/"${EXTCOMMIT}".tar.gz -> cpu_features-"${EXTCOMMIT}".tar.gz
"
S=""${WORKDIR}"/"${PN}"-"${COMMIT}""
KEYWORDS="~amd64"
fi
LICENSE="GPL-3"
SLOT="0"
IUSE="X wayland systemd"
DEPEND="
>=app-emulation/lxc-3.0.0
dev-cpp/properties-cpp
dev-cpp/sdbus-cpp
dev-cpp/gtest
dev-libs/boost[threads]
dev-libs/expat
dev-libs/protobuf
media-libs/libsdl2
media-libs/glm
media-libs/mesa[egl,gles2]
media-libs/sdl2-image
sys-apps/dbus
sys-fs/fuse:3
sys-libs/libcap
|| ( sys-apps/systemd sys-auth/elogind )
"
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
CONFIG_CHECK="
~ANDROID_BINDERFS
~ANDROID_BINDER_IPC
~ASHMEM
~BLK_DEV_LOOP
~FUSE_FS
~SQUASHFS
~SQUASHFS_XZ
~SQUASHFS_XATTR
~TMPFS_XATTR
"
PATCHES=( ""${FILESDIR}"/no_bundled_sdbus-r1.patch" ""${FILESDIR}"/lxc.patch" )
pkg_pretend() {
if use !systemd; then
# Needed for anbox-bridge.sh
CONFIG_CHECK="
~NETFILTER_XT_MATCH_COMMENT
~NETFILTER_XT_TARGET_CHECKSUM
"
check_extra_config
fi
# Check if ANDROID_BINDER_DEVICES has binder string specicied in it
linux_config_exists && grep -qE '(CONFIG_ANDROID_BINDER_DEVICES=*[^h][^w]binder)' "${KERNEL_DIR}"/.config || eerror " CONFIG_ANDROID_BINDER_DEVICES does not contain string 'binder'"
}
src_prepare() {
cp "${FILESDIR}"/FindGMock.cmake "${S}"/cmake
[[ "${PV}" == "9999" ]] || mv "${WORKDIR}"/cpu_features-"${EXTCOMMIT}"/* "${S}"/external/cpu_features || die
use !systemd && eapply "${FILESDIR}"/remove_systemd_dependency.patch
cmake_src_prepare
}
src_configure() {
local mycmakeargs=(
-DCMAKE_BUILD_TYPE=Release
-DENABLE_X11=$(usex X)
-DENABLE_WAYLAND=$(usex wayland)
-DBUILD_SHARED_LIBS=OFF
)
[[ "${PV}" == "9999" ]] || mycmakeargs+=(-DANBOX_VERSION="${PV}")
cmake_src_configure
}
src_install() {
cmake_src_install
newbin "${FILESDIR}"/anbox-launch.sh anbox-launch
if use systemd; then
systemd_dounit "${FILESDIR}"/anbox-{container-manager.service,bridge.net{dev,work}}
systemd_douserunit "${FILESDIR}"/anbox-session-manager.service
else
exeinto /usr/share/anbox
doexe "scripts/anbox-bridge.sh"
newinitd "${FILESDIR}"/anbox-container-manager.initd anbox-container-manager
newconfd "${FILESDIR}"/anbox.confd anbox
fi
}
pkg_postinst() {
einfo "Anbox requires a specially made android image installed to /usr/share/anbox/android.img. "
einfo "You can either download it prebuilt from upstream:"
einfo " https://build.anbox.io/android-images/"
einfo "or to build it manually according to instructions:"
einfo " https://github.com/anbox/anbox/blob/master/docs/build-android.md"
einfo ""
einfo "How to get it running:"
einfo "First start the anbox-container-manager daemon"
if use systemd; then
einfo "# systemctl start anbox-container-manager"
else
einfo "# rc-service anbox-container-manager start"
fi
einfo "Then you can access the image"
einfo "$ anbox-launch"
}

View File

@ -1,4 +1,4 @@
# Copyright 2020-2021 Gentoo Authors
# Copyright 2020-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@ -28,7 +28,7 @@ SLOT="0"
IUSE="X wayland systemd"
DEPEND="
>=app-emulation/lxc-3.0.0
>=app-containers/lxc-3.0.0
dev-cpp/properties-cpp
dev-cpp/sdbus-cpp
dev-cpp/gtest

View File

@ -1,4 +1,4 @@
# Copyright 2020-2021 Gentoo Authors
# Copyright 2020-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@ -28,7 +28,7 @@ SLOT="0"
IUSE="X wayland systemd"
DEPEND="
>=app-emulation/lxc-3.0.0
>=app-containers/lxc-3.0.0
dev-cpp/properties-cpp
dev-cpp/sdbus-cpp
dev-cpp/gtest

View File

@ -1,50 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 713df49..1e8b462 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,6 +59,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
find_package(Boost COMPONENTS filesystem log serialization system thread program_options)
find_package(PkgConfig)
find_package(Threads)
+find_package(SDBus-C++ REQUIRED)
find_package(EGL REQUIRED)
find_package(GLESv2 REQUIRED)
find_package(Protobuf REQUIRED)
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index f677aa0..265a2eb 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -6,12 +6,3 @@ add_subdirectory(backward-cpp)
set(BUILD_TESTING OFF)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error")
add_subdirectory(cpu_features)
-include(ExternalProject)
-ExternalProject_Add(sdbus-cpp
- PREFIX sdbus-cpp
- SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sdbus-cpp"
- INSTALL_COMMAND ""
- CMAKE_CACHE_ARGS
- -DBUILD_CODE_GEN:BOOL=ON
- -DBUILD_SHARED_LIBS:BOOL=OFF
-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 796b881..a19da1b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,7 +26,6 @@ include_directories(
${CMAKE_SOURCE_DIR}/external/android-emugl/host/libs/renderControl_dec
${CMAKE_BINARY_DIR}/external/android-emugl/host/libs/renderControl_dec
${CMAKE_SOURCE_DIR}/external/cpu_features/include
- ${CMAKE_SOURCE_DIR}/external/sdbus-cpp/include
)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBINDERFS_PATH=\"\\\"${BINDERFS_PATH}\\\"\"")
@@ -59,7 +58,7 @@ add_library(anbox-protobuf
target_link_libraries(anbox-protobuf
${PROTOBUF_LITE_LIBRARIES})
-set(XML2CPP ${CMAKE_BINARY_DIR}/external/sdbus-cpp/src/sdbus-cpp-build/tools/sdbus-c++-xml2cpp)
+set(XML2CPP sdbus-c++-xml2cpp)
macro(DBusServer BaseName)
add_custom_command(

View File

@ -1,25 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 713df49..1e8b462 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,7 +69,6 @@ pkg_check_modules(SDL2_IMAGE SDL2_image REQUIRED)
pkg_check_modules(DBUS dbus-1 REQUIRED)
pkg_check_modules(LXC lxc REQUIRED)
pkg_check_modules(PROPERTIES_CPP properties-cpp REQUIRED)
-pkg_check_modules(LIBSYSTEMD libsystemd REQUIRED)
pkg_check_modules(LIBCAP libcap REQUIRED)
message(STATUS "LXC version: ${LXC_VERSION}")
diff --git a/src/anbox/dbus/bus.h b/src/anbox/dbus/bus.h
index 40b3d94..e798b4b 100644
--- a/src/anbox/dbus/bus.h
+++ b/src/anbox/dbus/bus.h
@@ -25,7 +25,7 @@
#include <mutex>
#include <thread>
-#include <systemd/sd-bus.h>
+#include <elogind/systemd/sd-bus.h>
namespace anbox::dbus {
class Bus : public DoNotCopyOrMove {