* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/files/, dev-util/android-tools/
@ 2018-01-26 22:40 Mike Frysinger
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2018-01-26 22:40 UTC (permalink / raw
To: gentoo-commits
commit: 4ae818f00f38343a8dca9787c3ee7337b3654546
Author: Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Tue Jan 2 10:14:35 2018 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri Jan 26 22:40:11 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ae818f0
dev-util/android-tools: version bump to 8.1.0_p1 #632382
Closes: https://bugs.gentoo.org/632382
dev-util/android-tools/Manifest | 7 ++
.../android-tools/android-tools-8.1.0_p1.ebuild | 124 ++++++++++++++++++++
.../files/android-tools-8.1.0_p1-build.patch | 30 +++++
dev-util/android-tools/files/make-tarballs.sh | 128 +++++++++++++++++++++
4 files changed, 289 insertions(+)
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 05c7de00a27..15a69b3f57d 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -8,3 +8,10 @@ DIST android-tools-6.0.1_r79-core.tar.gz 1186562 BLAKE2B 473454d340e65f98201508c
DIST android-tools-6.0.1_r79-extras.tar.gz 648657 BLAKE2B 4582ddd57b729492e08987e17304c62778504ffc316ab26df8c83fff1aed33226106474131d5ad0e3e302b577c83a2b78d0be04fef9711e39861a223580ab1b9 SHA512 e10694737c518f591eff4e808bb826c83bf45dc44c5c1ee8a4082a6e0653350ffe2986e299348cb4a1219203192d01546a05e9354ce05e29897f856c147de8c3
DIST android-tools-6.0.1_r79-f2fs-tools.tar.gz 70255 BLAKE2B ab9ce3efd33c28a1a0a9cb8a5415057498dd493e059183cc9d3fcc9de1b5ca4d7488c75695c94700fc6a4e5503beb8647576c7096fa50229f98485d2983ce152 SHA512 0871f99f78006028889b42668ec627b6515bb812ad3ec4a489f62187a79f64d2a74f66556698a5f05fc99932f75fefd8810dedceeab744b212beb764e97b82c8
DIST android-tools-6.0.1_r79-libselinux.tar.gz 50814 BLAKE2B f09f26c801be83bc97f4b18606f513ce0fae791126a30c90067e3b2066c991fa1390ab2d0fac2475f755f3245179718204d5014f47ece46801dc0f80caf9758b SHA512 686557271271c4d59fb968c5aa76b433955009733f3151c4c86faa996ce846088d6632b0969b23699822b7a6f09eae60abedba6abb0edc9d444159bbdb5c6f91
+DIST android-tools-8.1.0_r1-arch.tar.gz 6250 BLAKE2B 65447517a33438c8531a9d707c6107703eaccb558e505e51a88ef51e70f83488620f76eb0240dc0899211cf120e9e1ffbea041086f1d8133f30b56358aba76d6 SHA512 5746e0b2f6aae37ebe60b7b1e939699a11de2f44286497f77d700c3896e02559d55002f036ecdc1c412844bfce4ab245b9086193dc982e6be74bcaea61010c5c
+DIST android-tools-8.1.0_r1-core.tar.gz 5227179 BLAKE2B afb280d67fe1b926e1f1ad68409584ad0209eb48921542e2bd490448c888cdf4bf6fb4c6f9552d580c7a396e79c2c85019e79a9a6c9881ea962c2f1064c33d82 SHA512 2c8e67232ca6348a4fd4b5d7077715491d2168c46fc8e336635a961bbbed156ef480718ee58393501196e9315c6c1bda807f8966944e3bc209dd5a0f7088642e
+DIST android-tools-8.1.0_r1-extras.tar.xz 275952 BLAKE2B 0fd3c536fee6ffbe2cdd4321604d32dc3a2b48a1b3edcb9121e83ceea760e491b47b301c3d8126565efd6b11adabd4f89c79bbe8731585660ce395af9e643fe7 SHA512 bfe3af89eadf38ce6805637e41f3fb15feb85455902f6a43e52a2f95dd1595cc896a9f46ccc82ab8db433f56a05f2f4c0ba85b77f40b03d5d69c8fec4082a2da
+DIST android-tools-8.1.0_r1-f2fs-tools.tar.xz 93924 BLAKE2B b8b6c7ba4c3f5309bfcfc91bd57d018d7af66f8dd25590207fd545f0dba02961826bf9963a56c7994feea5db8f9caedfe4fe62870420d9544283f87ec337cfb8 SHA512 de726be0691c58a5093098bd30cfc06c4312c44bec040cbecd594694cb7b38742dafd1f00b08c18f1b70abf56571738eb3e85e612f082e09e51a98980444e069
+DIST android-tools-8.1.0_r1-selinux.tar.xz 3188060 BLAKE2B 8c513d858e8dcaed705975ad61f362d7b1c2252685a63a1ad6035f36b0b402f1857ac5d2635d35ffa10f05b4a2605f30f27dcc5e9d91930eb0656f3ce2da036d SHA512 8799f10b4dba840ecea8f6abb8166c2e137eb3f0d9c5cfb132c661cf17800f2eeaafb1b4ec9e8974fc3324fae99e3654e52397c987faf1d48ab6148152d84f11
+DIST android-tools-8.1.0_r1.ninja.xz 2740 BLAKE2B 34473e33970cefdaf82bbe4524665fd50e6617cf867757ca07cdccc2e7356f43ef4bb455080ef4bac516ddba3c4e4120f0b27306e84725f8d5738a81800e3a53 SHA512 707e0e1c53832a42384e93d363f80007b76f18166b9f3f7d516431410b05319b1acc804daa1fddc218e11feb48de48683efb5203f4fa6d80646dcb1a2953139f
+DIST boringssl-14308731e5446a73ac2258688a9688b524483cb6.tar.gz 13030361 BLAKE2B 6982416b6e193e7faccd41fff3bd35f80b11d7495251d876e6b081bd94a887ec3c6bf5b7852d9595594fc2bdc57353f268272ef01fb79f7c93b52d46cbda69ac SHA512 171b524b0452a48853b2c8010ff5e14d5d720e69eeaf1d3b79f675838f3afa94aee9de2f47b37303feb2d92cbf77639efe585786625b7b37b8cc2ba727c37fdc
diff --git a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
new file mode 100644
index 00000000000..a1e81887fcd
--- /dev/null
+++ b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1 python-utils-r1
+
+MY_PV="${PV/_p/_r}"
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
+HOMEPAGE="https://android.googlesource.com/platform/system/core.git/"
+# See helper scripts in files/ for creating these tarballs and getting this hash.
+BORINGSSL_SHA1="14308731e5446a73ac2258688a9688b524483cb6"
+# The ninja file was created by running the ruby script from archlinux by hand and fixing the build vars.
+# No point in depending on something large/uncommon like ruby just to generate a ninja file.
+SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-2b7f9774cc468205fec145e64e9103aee8e5c6f9.tar.gz -> ${MY_P}-arch.tar.gz
+ https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz -> ${MY_P}-core.tar.gz
+ https://github.com/google/boringssl/archive/${BORINGSSL_SHA1}.tar.gz -> boringssl-${BORINGSSL_SHA1}.tar.gz
+ mirror://gentoo/${MY_P}-extras.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-extras.tar.xz
+ mirror://gentoo/${MY_P}-selinux.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-selinux.tar.xz
+ mirror://gentoo/${MY_P}-f2fs-tools.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-f2fs-tools.tar.xz
+ mirror://gentoo/${MY_P}.ninja.xz https://dev.gentoo.org/~vapier/dist/${MY_P}.ninja.xz"
+
+# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
+LICENSE="Apache-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~arm-linux ~x86-linux"
+IUSE="python"
+
+DEPEND="sys-libs/zlib:=
+ dev-libs/libpcre2:=
+ virtual/libusb:1="
+RDEPEND="${DEPEND}
+ python? ( ${PYTHON_DEPS} )"
+DEPEND+="
+ dev-lang/go"
+
+S=${WORKDIR}
+CMAKE_USE_DIR="${S}/boringssl"
+
+unpack_into() {
+ local archive="$1"
+ local dir="$2"
+
+ mkdir -p "${dir}"
+ pushd "${dir}" >/dev/null || die
+ unpack "${archive}"
+ if [[ ${dir} != ./* ]] ; then
+ mv */* ./ || die
+ fi
+ popd >/dev/null
+}
+
+src_unpack() {
+ unpack_into "${MY_P}-arch.tar.gz" arch
+ unpack_into "${MY_P}-core.tar.gz" core
+ unpack_into "${MY_P}-extras.tar.xz" extras
+ unpack_into "${MY_P}-f2fs-tools.tar.xz" ./f2fs-tools
+ unpack_into "${MY_P}-selinux.tar.xz" ./selinux
+ unpack_into boringssl-${BORINGSSL_SHA1}.tar.gz boringssl
+
+ unpack "${MY_P}.ninja.xz"
+ mv "${MY_P}.ninja" "build.ninja" || die
+
+ # Avoid depending on gtest just for its prod headers when boringssl bundles it.
+ ln -s ../../boringssl/third_party/googletest/include/gtest core/include/ || die
+}
+
+src_prepare() {
+ cd "${S}"/core
+ eapply "${WORKDIR}"/arch/trunk/fix_build_core.patch
+ eapply "${FILESDIR}"/${P}-build.patch
+ sed -i '1i#include <sys/sysmacros.h>' adb/client/usb_linux.cpp || die #616508
+
+ cd "${S}"/selinux
+ eapply "${WORKDIR}"/arch/trunk/fix_build_selinux.patch
+
+ cd "${S}"/extras
+ sed -e 's|^#include <sys/cdefs.h>$|/*\0*/|' \
+ -e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C" {\n#endif|' \
+ -e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \
+ -i ext4_utils/sha1.{c,h} || die #580686
+
+ cd "${S}"
+ default
+
+ # The pregenerated ninja file expects the build/ dir.
+ BUILD_DIR="${CMAKE_USE_DIR}/build"
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ append-lfs-flags
+
+ cmake-utils_src_configure
+
+ sed -i \
+ -e "s:@CC@:$(tc-getCC):g" \
+ -e "s:@CXX@:$(tc-getCXX):g" \
+ -e "s:@CFLAGS@:${CFLAGS}:g" \
+ -e "s:@CPPFLAGS@:${CPPFLAGS}:g" \
+ -e "s:@CXXFLAGS@:${CXXFLAGS}:g" \
+ -e "s:@LDFLAGS@:${LDFLAGS}:g" \
+ -e "s:@PV@:${PV}:g" \
+ build.ninja || die
+}
+
+src_compile() {
+ # We only need a few libs from boringssl.
+ cmake-utils_src_compile libcrypto.a libssl.a
+
+ eninja
+}
+
+src_install() {
+ dobin adb fastboot
+ dodoc core/adb/*.{txt,TXT} core/fastboot/README.md
+ use python && python_foreach_impl python_doexe core/mkbootimg/mkbootimg
+ newbashcomp arch/trunk/bash_completion.fastboot fastboot
+}
diff --git a/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch b/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch
new file mode 100644
index 00000000000..f3d664ef70a
--- /dev/null
+++ b/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch
@@ -0,0 +1,30 @@
+--- a/adb/sysdeps.h
++++ b/adb/sysdeps.h
+@@ -66,6 +66,11 @@
+ #endif
+ #endif
+
++#ifndef __clang__
++#define _Nonnull
++#define _Nullable
++#endif
++
+ #ifdef _WIN32
+
+ // Clang-only nullability specifiers
+--- a/libcutils/include/cutils/trace.h
++++ b/libcutils/include/cutils/trace.h
+@@ -18,7 +18,13 @@
+ #define _LIBS_CUTILS_TRACE_H
+
+ #include <inttypes.h>
++// https://gcc.gnu.org/PR60932
++#ifdef __cplusplus
++#include <atomic>
++using namespace std;
++#else
+ #include <stdatomic.h>
++#endif
+ #include <stdbool.h>
+ #include <stdint.h>
+ #include <stdio.h>
diff --git a/dev-util/android-tools/files/make-tarballs.sh b/dev-util/android-tools/files/make-tarballs.sh
new file mode 100755
index 00000000000..5a0a775c129
--- /dev/null
+++ b/dev-util/android-tools/files/make-tarballs.sh
@@ -0,0 +1,128 @@
+#!/bin/bash
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Create the various tarballs we need. GoB does not provide stable archives (unlike github),
+# and some repos are uselessly fat, so we have to create things by hand. Fun times.
+
+set -e
+
+die() {
+ echo "error: $*" >&2
+ exit 1
+}
+
+fetch_boringssl() {
+ local ver=$1 tag=$2
+ local content hash
+
+ echo "checking boringssl in ${tag}"
+ content=$(wget -nv "https://android.googlesource.com/platform/external/boringssl/+/${tag}/BORINGSSL_REVISION?format=TEXT" -O -)
+ hash=$(echo "${content}" | base64 -d)
+ echo "using boringssl ${hash}"
+
+ local tar="${DISTDIR}/boringssl-${hash}.tar.gz"
+ if [[ ! -e ${tar} ]] ; then
+ # We use github as it provides stable tarballs. GoB does not (includes timestamps).
+ # https://boringssl.googlesource.com/boringssl/+archive/${hash}.tar.gz
+ wget -c "https://github.com/google/boringssl/archive/${hash}.tar.gz" -O "${tar}"
+ fi
+
+ du -h "${tar}"
+}
+
+# The extras repo has ballooned to ~200MB, so we have to strip the large useless
+# files and random binaries.
+fetch_extras() {
+ local ver=$1 tag=$2
+ local tar="${DISTDIR}/android-tools-${ver}-extras.tar.xz"
+
+ if [[ ! -e ${tar} ]] ; then
+ local prune=(
+ ioshark
+ memory_replay
+ perfprofd
+ simpleperf
+ )
+ local dir="${tag}-extras"
+ rm -rf "${dir}"
+ mkdir "${dir}"
+ cd "${dir}"
+
+ wget "https://android.googlesource.com/platform/system/extras/+archive/${tag}.tar.gz" -O extras.tar.gz
+ tar xf extras.tar.gz
+ rm -rf "${prune[@]}" extras.tar.gz
+
+ cd ..
+ tar cf - "${dir}" | xz -9 > "${dir}.tar.xz"
+ rm -rf "${dir}"
+
+ mv "${dir}.tar.xz" "${tar}"
+ fi
+
+ du -h "${tar}"
+}
+
+# Since the GoB archive is unstable, we might as well rewrite it into xz to shrink.
+fetch_selinux() {
+ local ver=$1 tag=$2
+ local tar="${DISTDIR}/android-tools-${ver}-selinux.tar.xz"
+
+ if [[ ! -e ${tar} ]] ; then
+ wget "https://android.googlesource.com/platform/external/selinux/+archive/${tag}.tar.gz" -O - | zcat | xz > "${tar}"
+ fi
+
+ du -h "${tar}"
+}
+
+# Since the GoB archive is unstable, we might as well rewrite it into xz to shrink.
+fetch_f2fs() {
+ local ver=$1 tag=$2
+ local tar="${DISTDIR}/android-tools-${ver}-f2fs-tools.tar.xz"
+
+ if [[ ! -e ${tar} ]] ; then
+ wget "https://android.googlesource.com/platform/external/f2fs-tools/+archive/${tag}.tar.gz" -O - | zcat | xz > "${tar}"
+ fi
+
+ du -h "${tar}"
+}
+
+usage() {
+ local status=$1
+
+ [[ ${status} -eq 1 ]] && exec 1>&2
+
+ cat <<-EOF
+ Usage: $0 <android version>
+
+ To find the next available version, consult:
+ https://git.archlinux.org/svntogit/community.git/log/trunk?h=packages/android-tools
+
+ They have some helper scripts for building the files directly.
+
+ Example:
+ $0 android-8.1.0_r1
+ EOF
+
+ exit ${status}
+}
+
+main() {
+ [[ $# -ne 1 ]] && usage 1
+ [[ $1 == "-h" || $1 == "--help" ]] && usage 0
+
+ if [[ -z ${DISTDIR} ]] ; then
+ eval $(portageq -v envvar DISTDIR)
+ fi
+ if [[ -z ${DISTDIR} ]] ; then
+ die "Please set \$DISTDIR first"
+ fi
+
+ local ver="${1#android-}"
+ local tag="android-${ver}"
+ fetch_boringssl "${ver}" "${tag}"
+ fetch_extras "${ver}" "${tag}"
+ fetch_selinux "${ver}" "${tag}"
+ fetch_f2fs "${ver}" "${tag}"
+}
+main "$@"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/files/, dev-util/android-tools/
@ 2021-10-08 8:33 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2021-10-08 8:33 UTC (permalink / raw
To: gentoo-commits
commit: dc8d15630c7327ec09b9aa5dab666d6733cec01e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 4 08:33:52 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 8 08:33:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc8d1563
dev-util/android-tools: Drop 9.0.0_p3-r1, EAPI6--
Bug: https://bugs.gentoo.org/707568
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-util/android-tools/Manifest | 10 --
.../android-tools/android-tools-9.0.0_p3-r1.ebuild | 143 ---------------------
.../files/android-tools-8.1.0_p1-build.patch | 30 -----
.../files/android-tools-9.0.0-limits-gcc11.patch | 11 --
4 files changed, 194 deletions(-)
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index a3fcbecfb6d..8f9d98bc04d 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -1,15 +1,5 @@
DIST android-tools-31.0.0p1.tar.xz 25135336 BLAKE2B abef4fa611541370d6c745c3f6df8f0326074ef23d4e656ab19443484b5459531fab0544936177397dece12b79ff37189003e818e49bfc4bb3d47e98955b917f SHA512 40bded59614a6d0543e5011038b7f1c6abcb64f0daa71a13175ecb75fe42cb9985ed3a6301d73ee8d4ea20e2c98e3ed8130824ee74dcebe75bc0d7f3052c9d3b
-DIST android-tools-9.0.0_p3-bug-706946-fno-common.patch.xz 2696 BLAKE2B de8083846d6cb24d2fcb12789b302f5df766753989e004154746d4402a5777bbabff2e9c67758e9185c0ea56dde7e647a8a15dd696671c28f2f708703bcad9f0 SHA512 e65818e9d06295f7de8f8bc52270054f9936659b2bf07f7abc15f2ea7b138536396a24c39bb6a260a931250396b04022170f2045336f0ba6444cd90fb0dfdbb0
-DIST android-tools-9.0.0_p3-fix-build-with-glibc-2.30.patch 1262 BLAKE2B fa2d3cd31e82dd3b17bb840096c6158f1b117cb12b8b3c6f6c604efd85f880346c04e8e98b17bebd68d56e06cdc126677ad96dbd6214175544a9b93020292956 SHA512 21c2501fa24f59489e656ac5122c906476ad573e63f6dcc88605dafde9d4b8927ea904708caaababd12155153d969d2480aff591d98057859e8b885e94aa126a
-DIST android-tools-9.0.0_r3-arch.tar.gz 8451 BLAKE2B b28649333aa0e5a6f4bc83f9e42e1749a4d138075d03559c5871a24f782bf8608bcf07a609bd791ee29afabcb4435ece2ed8f8abc171265ef9d67da231c8a29e SHA512 d3409f89d2c334b66e694fd77e068e2d863dc9a99b9ef332b0a08c9c186c26eb9d969ef5cde5aa6e28b866847b4a85a4d3a4c2b0951a37752510b2f3b41c5943
-DIST android-tools-9.0.0_r3-core.tar.gz 27484684 BLAKE2B d071adacd5be0341a9114e57242fe51f623773683b9db2735eac9231a77cc22651f09e1c63682e729494aa6409939696a5635afcd5e8a40ec0f75d2784c00ffc SHA512 0edc8b02b57085ce88b39c987284af1c681870594b20ab9ecf4be98a0cfdff2905bc80f5d8eeb7fbc7f4604b800b6f95bc6b2b0321c900bf833313dfcbb2eefb
-DIST android-tools-9.0.0_r3-e2fsprogs.tar.xz 5255616 BLAKE2B 5fe62da70686148d755c60c1cef4b64d80f0c6a891d13a778d2a3209f950b0f9c5b19bf39ed28c5d38d01103ef1ea474133f57b7104a4fdf80eafd8edc17a3a5 SHA512 a9c3c180ddb96f10710a18794b20cfc641d40af3643a1133091127a40c27fa724b6e6f1af8e66fc1e1ca33053e33499b910880eab05979a2de95a0d3d7a79f93
-DIST android-tools-9.0.0_r3-extras.tar.xz 1653548 BLAKE2B 1a8c2ee2e564adc04d646ab54e1913d17e9ed0fb0ef3872bd8a459ecad5fbf7324830c1120c367d9515607ecc659fb0f27c4f7db740fda318fd13be1300a6a51 SHA512 13dc145faf919c1f7cc183f823ca46330568daff19ffb110af383876cdb6b0e9f0a83690a4e22633b572c1e6c2aba14ef0181c01720095173d258320229e9108
-DIST android-tools-9.0.0_r3-f2fs-tools.tar.xz 212092 BLAKE2B 32775e5b049bd2ff2ce7c9ea3362a602dcda6328e39036902020bd372a812898d84912f686cf347b225af630c2dea81ce30b601ac968b1168e2851b94ac2da2e SHA512 4fac8f18533c5c2270aed6e60b21721c643a44a27b37482ff8fd8fa4d7c875eb8a626d544ec4e6efb89c7408ae97e66ffd123588e90b98312e5291575ca8baa6
-DIST android-tools-9.0.0_r3-selinux.tar.xz 3202332 BLAKE2B 60a884eb1bd34fe5796f8fb33e5aefd7f9ffc85ac91784e0a8f0ca663010cf2222c80f4c419019b5817f9cbd8037ab78914e42417193e1b802a2682bb82c0097 SHA512 f0a77dc0ac91d434573370110c70529caabfd5f036c02ae5f1a4b2097e48324198d03ecdc92a622e1590012dd3f20f103384fed468f5e27aebcaf9315bb87078
-DIST android-tools-9.0.0_r3.ninja.xz 4244 BLAKE2B 14cea7523f22a7f4e02e93c32e4d4684e057abbe8e2b537b7e942cc27c13ea2aa13bcdb5c3ccafc261b8d7fc4b4cd4b9394e0970734b36111ccffbacecc5cfb9 SHA512 46956a608d6a9b93f1a035d6b0e153c476b55d4f8a2db4915b18ac9904a6d07befcbceb8e2e50054e7dbe2970be8539243134cd9722d2f2ec8a36a3153e03c56
DIST android-tools-dont-install-license.patch 1016 BLAKE2B da65a414d046995358e91a0ca037951bc9c5a3e790b3b2151716b234c2943301ecef4ed248914235736ddd949f772311bf823e9b3b3f1980b7a5c4b72e5bcd47 SHA512 747728723941091caa17c66e68e88d2145a2ff037e6f5724f89f680d2ce6f4031efebcda7dbcc5b459ca4f5f9ddbf4ba04b0451b9939d19eaf2fa9d9ab727284
DIST android-tools-fix-gcc11.patch 137252 BLAKE2B 0e80aab92cb69e3223f81834d53c1d84aef866787261305fd539cb8cb75a21361c65f091b2f7d83f6f8236816f43510f4f0f8b51dee4b03d99af31c78dc53a79 SHA512 fb4d8d13f9022f0472c81fe6b9252000d93ba5f77b84d7ac7d6846753078b6fdac0687fcb7157e445bba02cbf008ea3744d84e8fc5d534ee3807f61674e3238c
DIST android-tools-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff5ae820101628399540f3e5b87bf69224f4a61a6b76b8b6b3b06f8e7162a6c1e7ee43eee928cfa96824f5efff72317b4bbfe160d8e72d96aa84e0a1d6 SHA512 d5fd63c108ca6b880b1b79cf362468335f19fad7bf2042fb667b56e34dc95acc47e1bf9c9e72be1d2bd8252a529cd49eb030d141bf735524bdaeb85482d544a9
DIST android-tools-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423
-DIST boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz 13581532 BLAKE2B ca2f6757807adc265314a7444605c6199a19847fb426384bafa201bf63f4e3c7c567fb8094b740b8a00caf0d106bb1efea2893b00d45c9772740a81dc0a186f3 SHA512 c6695d078ee7b3694898dfdc0ee3382d01f9bb592ea46eb64026c73565735fd7251bbb0fd3e8c8552394bcdad5717de7ee5106cf1ed91aacec05d779ad693f6a
diff --git a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
deleted file mode 100644
index d5ba3b86332..00000000000
--- a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{7..9} )
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1
-
-MY_PV="${PV/_p/_r}"
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://android.googlesource.com/platform/system/core.git/"
-# See helper scripts in files/ for creating these tarballs and getting this hash.
-BORINGSSL_SHA1="45210dd4e21ace9d28cb76b3f83303fcdd2efcce"
-GLIBC_GETTID_PATCH="${P}-fix-build-with-glibc-2.30.patch"
-# The ninja file was created by running the ruby script from archlinux by hand and fixing the build vars.
-# No point in depending on something large/uncommon like ruby just to generate a ninja file.
-SRC_URI="https://github.com/archlinux/svntogit-community/archive/0ffb7b41d599741d100a6a00a4bb20e162cd3f90.tar.gz -> ${MY_P}-arch.tar.gz
- https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz -> ${MY_P}-core.tar.gz
- https://github.com/google/boringssl/archive/${BORINGSSL_SHA1}.tar.gz -> boringssl-${BORINGSSL_SHA1}.tar.gz
- mirror://gentoo/${MY_P}-e2fsprogs.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-e2fsprogs.tar.xz
- mirror://gentoo/${MY_P}-extras.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-extras.tar.xz
- mirror://gentoo/${MY_P}-selinux.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-selinux.tar.xz
- mirror://gentoo/${MY_P}-f2fs-tools.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-f2fs-tools.tar.xz
- mirror://gentoo/${MY_P}.ninja.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}.ninja.xz
- https://raw.githubusercontent.com/nmeum/android-tools/8a30dba5768304176fd78aaa131242f6b880f828/patches/core/0022-Use-glibc-s-gettid-when-using-glibc-2.30.patch -> ${GLIBC_GETTID_PATCH}
- https://dev.gentoo.org/~zmedico/dist/${P}-bug-706946-fno-common.patch.xz"
-
-# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="sys-libs/zlib:=
- dev-libs/libpcre2:=
- virtual/libusb:1="
-RDEPEND="${DEPEND}
- python? ( ${PYTHON_DEPS} )"
-DEPEND+="
- dev-lang/go"
-
-PATCHES=("${FILESDIR}"/${PN}-9.0.0-limits-gcc11.patch)
-
-S=${WORKDIR}
-CMAKE_USE_DIR="${S}/boringssl"
-
-unpack_into() {
- local archive="$1"
- local dir="$2"
-
- mkdir -p "${dir}"
- pushd "${dir}" >/dev/null || die
- unpack "${archive}"
- if [[ ${dir} != ./* ]] ; then
- mv */* ./ || die
- fi
- popd >/dev/null
-}
-
-src_unpack() {
- unpack_into "${MY_P}-arch.tar.gz" arch
- unpack_into "${MY_P}-core.tar.gz" core
- unpack_into "${MY_P}-e2fsprogs.tar.xz" ./e2fsprogs
- unpack_into "${MY_P}-extras.tar.xz" extras
- unpack_into "${MY_P}-f2fs-tools.tar.xz" ./f2fs-tools
- unpack_into "${MY_P}-selinux.tar.xz" ./selinux
- unpack_into boringssl-${BORINGSSL_SHA1}.tar.gz boringssl
-
- unpack "${MY_P}.ninja.xz"
- mv "${MY_P}.ninja" "build.ninja" || die
-
- unpack "${P}-bug-706946-fno-common.patch.xz"
-
- # Avoid depending on gtest just for its prod headers when boringssl bundles it.
- ln -s ../../boringssl/third_party/googletest/include/gtest core/include/ || die
-}
-
-src_prepare() {
- sed -e 's:elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386"):\0\n set(ARCH "x86")\nelseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i586"):' \
- -i "${S}"/boringssl/CMakeLists.txt || die #668792
-
- cd "${S}"/core || die
- eapply "${WORKDIR}"/arch/trunk/fix_build_core.patch
- eapply "${FILESDIR}"/android-tools-8.1.0_p1-build.patch
- eapply "${DISTDIR}/${GLIBC_GETTID_PATCH}"
-
- cd "${S}"/selinux || die
- eapply "${WORKDIR}"/arch/trunk/fix_build_selinux.patch
-
- cd "${S}"/e2fsprogs || die
- eapply "${WORKDIR}"/arch/trunk/fix_build_e2fsprogs.patch
-
- cd "${S}"/extras
- sed -e 's|^#include <sys/cdefs.h>$|/*\0*/|' \
- -e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C" {\n#endif|' \
- -e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \
- -i ext4_utils/include/ext4_utils/ext4_crypt{,_init_extensions}.h || die #580686
-
- cd "${S}" || die
-
- eapply "${WORKDIR}/${P}-bug-706946-fno-common.patch"
-
- sed -E \
- -e "s|^(CC =).*|\\1 $(tc-getCC)|g" \
- -e "s|^(CXX =).*|\\1 $(tc-getCXX)|g" \
- -e "s|^(CFLAGS =).*|\\1 ${CFLAGS}|g" \
- -e "s|^(CPPFLAGS =).*|\\1 ${CPPFLAGS}|g" \
- -e "s|^(CXXFLAGS =).*|\\1 ${CXXFLAGS}|g" \
- -e "s|^(LDFLAGS =).*|\\1 ${LDFLAGS}|g" \
- -e "s|^(PKGVER =).*|\\1 ${MY_PV}|g" \
- -i build.ninja || die
-
- grep -rlZ -- -Werror . | xargs -0 sed -e 's:-Werror ::g' -e 's: -Werror::g' -i || die #706946
-
- # The pregenerated ninja file expects the build/ dir.
- BUILD_DIR="${CMAKE_USE_DIR}/build"
- cmake-utils_src_prepare
-}
-
-src_configure() {
- append-lfs-flags
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- # We only need a few libs from boringssl.
- cmake-utils_src_compile libcrypto.a libssl.a
-
- eninja
-}
-
-src_install() {
- dobin adb e2fsdroid ext2simg fastboot mke2fs.android
- dodoc core/adb/*.{txt,TXT} core/fastboot/README.md
- use python && python_foreach_impl python_doexe core/mkbootimg/mkbootimg
- newbashcomp arch/trunk/bash_completion.fastboot fastboot
-}
diff --git a/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch b/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch
deleted file mode 100644
index f3d664ef70a..00000000000
--- a/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/adb/sysdeps.h
-+++ b/adb/sysdeps.h
-@@ -66,6 +66,11 @@
- #endif
- #endif
-
-+#ifndef __clang__
-+#define _Nonnull
-+#define _Nullable
-+#endif
-+
- #ifdef _WIN32
-
- // Clang-only nullability specifiers
---- a/libcutils/include/cutils/trace.h
-+++ b/libcutils/include/cutils/trace.h
-@@ -18,7 +18,13 @@
- #define _LIBS_CUTILS_TRACE_H
-
- #include <inttypes.h>
-+// https://gcc.gnu.org/PR60932
-+#ifdef __cplusplus
-+#include <atomic>
-+using namespace std;
-+#else
- #include <stdatomic.h>
-+#endif
- #include <stdbool.h>
- #include <stdint.h>
- #include <stdio.h>
diff --git a/dev-util/android-tools/files/android-tools-9.0.0-limits-gcc11.patch b/dev-util/android-tools/files/android-tools-9.0.0-limits-gcc11.patch
deleted file mode 100644
index ced85fc8306..00000000000
--- a/dev-util/android-tools/files/android-tools-9.0.0-limits-gcc11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/764071
---- a/core/fastboot/protocol.cpp 2018-06-21 02:58:42.000000000 +0200
-+++ b/core/fastboot/protocol.cpp 2021-01-06 10:11:52.806586912 +0100
-@@ -37,6 +37,7 @@
-
- #include <algorithm>
- #include <vector>
-+#include <limits>
-
- #include <android-base/file.h>
- #include <android-base/stringprintf.h>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/files/, dev-util/android-tools/
@ 2022-08-12 16:38 Zac Medico
0 siblings, 0 replies; 5+ messages in thread
From: Zac Medico @ 2022-08-12 16:38 UTC (permalink / raw
To: gentoo-commits
commit: 85fdec6a3f2d4acfc6a3ff9184953cba2f62b7af
Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com>
AuthorDate: Thu Aug 11 22:46:50 2022 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 16:38:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85fdec6a
dev-util/android-tools: Drop old
Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
dev-util/android-tools/Manifest | 7 --
.../android-tools/android-tools-31.0.0_p1.ebuild | 95 ---------------
.../android-tools/android-tools-31.0.3_p1.ebuild | 93 ---------------
.../files/android-tools-31.0.3_p1-gcc12.patch | 15 ---
dev-util/android-tools/files/make-tarballs.sh | 128 ---------------------
5 files changed, 338 deletions(-)
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 4894b5c017a7..bd676ad4e3bf 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -1,12 +1,5 @@
-DIST android-tools-31.0.0p1.tar.xz 25135336 BLAKE2B abef4fa611541370d6c745c3f6df8f0326074ef23d4e656ab19443484b5459531fab0544936177397dece12b79ff37189003e818e49bfc4bb3d47e98955b917f SHA512 40bded59614a6d0543e5011038b7f1c6abcb64f0daa71a13175ecb75fe42cb9985ed3a6301d73ee8d4ea20e2c98e3ed8130824ee74dcebe75bc0d7f3052c9d3b
DIST android-tools-31.0.3-disable-werror-boringssl.patch 1815 BLAKE2B 63e911ba27e2995a11b27e2e1501c5e881d694c5477a216cb910bf1c9c1bf9f9fedffa864748ea4df668a1008124501f7815997304bc355e4ee105bf9b61f75f SHA512 db626d3680ec9f18be394bb2720c8bc7e380aac227ae6f1058476edb83784343f653afc583b06e7a2acd3f2ff500fa37d613d5efca4a9a24daedbf61b5b84015
DIST android-tools-31.0.3-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff5ae820101628399540f3e5b87bf69224f4a61a6b76b8b6b3b06f8e7162a6c1e7ee43eee928cfa96824f5efff72317b4bbfe160d8e72d96aa84e0a1d6 SHA512 d5fd63c108ca6b880b1b79cf362468335f19fad7bf2042fb667b56e34dc95acc47e1bf9c9e72be1d2bd8252a529cd49eb030d141bf735524bdaeb85482d544a9
DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423
DIST android-tools-31.0.3.tar.xz 25768908 BLAKE2B e8ca8ff93fcd3936f447926769d7b45194dd96ad99cddd570183a1cbae34dbf49a23e0c53d9eb8f5c25dd09717e1f160829752dc7ebc9404c804b48de8de9889 SHA512 d2c16325b190f77a8ffa38de18ae1aea4bf6848926620f25d14873dc4a3fda3fe2b13349fa2eee197b960ca65738a4a1d2c1f28cf8286ab79e73502e7a8e6357
-DIST android-tools-31.0.3_p1-install-e2fsdroid-ext2simg.patch 2075 BLAKE2B f30c99f2b60acac239f6c604d1cfe36ca49a74884f54fce85dba3bf9aae0f73abc5c8ba6b5232772e73aefe75813170c3427cf769e3f0f5e1b962b4ec606d4e4 SHA512 2f706384e1709fc6cc7b5e9183051fb15aaf9d188d23c072d449052ed2297d0e47222e53aaee3709e8bdc3e1b88481307b4b0c0e904bafe444f3fc0c3ad3e0e7
-DIST android-tools-31.0.3p1.tar.xz 25760004 BLAKE2B 1ae58daed61b82180a5a40efa6a67b64b2ce12f4397442663700a4b970f3493576e468dcf8a4c0351c6d7d8c13def1fb0621f9c680d1c41461cbf458e862ccec SHA512 a811eb1d7682b8807f7c110beb83ff234e65fe0f20127466dbd173ea13e68260def8891b4598d5776489af9ff8aeb9f0a19086f49b6df27f68ba63096688afa1
DIST android-tools-31.0.3p2.tar.xz 22458776 BLAKE2B a51f839ac44e6e998092d802eb182566f4dc2a7f47a5687e0c877fa4fa6d419b16054f75066a6afe8e458e44f8bc5750ca88a2517619379d1044202d64b2ec80 SHA512 367a502c11a136ff15a060df44df14ceec46eb5eb386babb4d38783622e363421d2ec9a65a5810fb8f2b308912c2bdb980e6fce24ba532a111e413647efe67d5
-DIST android-tools-dont-install-license.patch 1016 BLAKE2B da65a414d046995358e91a0ca037951bc9c5a3e790b3b2151716b234c2943301ecef4ed248914235736ddd949f772311bf823e9b3b3f1980b7a5c4b72e5bcd47 SHA512 747728723941091caa17c66e68e88d2145a2ff037e6f5724f89f680d2ce6f4031efebcda7dbcc5b459ca4f5f9ddbf4ba04b0451b9939d19eaf2fa9d9ab727284
-DIST android-tools-fix-gcc11.patch 137252 BLAKE2B 0e80aab92cb69e3223f81834d53c1d84aef866787261305fd539cb8cb75a21361c65f091b2f7d83f6f8236816f43510f4f0f8b51dee4b03d99af31c78dc53a79 SHA512 fb4d8d13f9022f0472c81fe6b9252000d93ba5f77b84d7ac7d6846753078b6fdac0687fcb7157e445bba02cbf008ea3744d84e8fc5d534ee3807f61674e3238c
-DIST android-tools-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff5ae820101628399540f3e5b87bf69224f4a61a6b76b8b6b3b06f8e7162a6c1e7ee43eee928cfa96824f5efff72317b4bbfe160d8e72d96aa84e0a1d6 SHA512 d5fd63c108ca6b880b1b79cf362468335f19fad7bf2042fb667b56e34dc95acc47e1bf9c9e72be1d2bd8252a529cd49eb030d141bf735524bdaeb85482d544a9
-DIST android-tools-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423
diff --git a/dev-util/android-tools/android-tools-31.0.0_p1.ebuild b/dev-util/android-tools/android-tools-31.0.0_p1.ebuild
deleted file mode 100644
index b322fd0f0ba5..000000000000
--- a/dev-util/android-tools/android-tools-31.0.0_p1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake python-r1
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
-
-MY_PV="${PV//_/}"
-SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
- https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.0_p1-no-gtest.patch -> ${PN}-no-gtest.patch
- https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.0_p1-fix-gcc11.patch -> ${PN}-fix-gcc11.patch
- https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.0_p1-dont-install-license.patch -> ${PN}-dont-install-license.patch
- https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.0_p1-install-e2fsdroid-ext2simg.patch -> ${PN}-install-e2fsdroid-ext2simg.patch
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# dev-libs/libpcre only required for e2fsdroid
-DEPEND="
- app-arch/brotli:=
- app-arch/lz4:=
- app-arch/zstd:=
- dev-libs/libpcre2:=
- >=dev-libs/protobuf-3.0.0:=
- sys-libs/zlib:=
- virtual/libusb:1=
-"
-RDEPEND="${DEPEND}
- python? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
- dev-lang/go
-"
-
-DOCS=()
-
-src_prepare() {
- eapply "${DISTDIR}/${PN}-no-gtest.patch"
- cd "${S}/vendor/core" || die
- eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
- cd "${S}/vendor/libziparchive" || die
- eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
- cd "${S}"
- eapply "${DISTDIR}/${PN}-fix-gcc11.patch"
- cd "${S}/vendor/boringssl" || die
- eapply "${S}/patches/boringssl/0001-Fix-mismatch-between-header-and-implementation-of-bn_sqr_comba8.patch"
- eapply "${S}/patches/boringssl/0002-Use-an-unsized-helper-for-truncated-SHA-512-variants.patch"
- eapply "${S}/patches/boringssl/0003-Fix-unnecessarily-direction-specific-tests-in-cipher_tests.txt.patch"
- eapply "${S}/patches/boringssl/0004-Test-empty-EVP_CIPHER-inputs-and-fix-exact-memcpy-overlap.patch"
- eapply "${S}/patches/boringssl/0005-Make-words-in-crypto-fipsmodule-modes-actually-words.patch"
- eapply "${S}/patches/boringssl/0006-Move-load-store-helpers-to-crypto-internal.h.patch"
- eapply "${S}/patches/boringssl/0007-Fold-ripemd-internal.h-into-ripemd.c.patch"
- eapply "${S}/patches/boringssl/0008-Pull-HASH_TRANSFORM-out-of-md32_common.h.patch"
- eapply "${S}/patches/boringssl/0009-Make-md32_common.h-single-included-and-use-an-unsized-helper-for-SHA-256.patch"
- eapply "${S}/patches/boringssl/0010-Fix-array-parametes-warnings.patch"
- cd "${S}"
- eapply "${DISTDIR}/${PN}-dont-install-license.patch"
- eapply "${DISTDIR}/${PN}-install-e2fsdroid-ext2simg.patch"
- rm -r patches || die
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- # Statically link the bundled boringssl
- -DBUILD_SHARED_LIBS=OFF
- )
- cmake_src_configure
-}
-
-src_compile() {
- export GOCACHE="${T}/go-build"
- export GOFLAGS="-mod=vendor"
- cmake_src_compile
-}
-
-src_install() {
- cmake_src_install
- use python && python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
- docinto adb
- dodoc vendor/adb/*.{txt,TXT}
- docinto fastboot
- dodoc vendor/core/fastboot/README.md
-}
diff --git a/dev-util/android-tools/android-tools-31.0.3_p1.ebuild b/dev-util/android-tools/android-tools-31.0.3_p1.ebuild
deleted file mode 100644
index 0f1abac32b14..000000000000
--- a/dev-util/android-tools/android-tools-31.0.3_p1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit cmake python-r1
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
-
-MY_PV="${PV//_/}"
-SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
- https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-no-gtest.patch
- https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-disable-werror-boringssl.patch
- https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3_p1-install-e2fsdroid-ext2simg.patch
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# dev-libs/libpcre only required for e2fsdroid
-DEPEND="
- app-arch/brotli:=
- app-arch/lz4:=
- app-arch/zstd:=
- dev-libs/libpcre2:=
- >=dev-libs/protobuf-3.0.0:=
- sys-libs/zlib:=
- virtual/libusb:1=
-"
-RDEPEND="${DEPEND}
- python? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
- dev-lang/go
-"
-
-DOCS=()
-
-src_prepare() {
- eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch"
- cd "${S}/vendor/core" || die
- eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
- cd "${S}/vendor/libziparchive" || die
- eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
- cd "${S}"
- eapply "${DISTDIR}/${PN}-31.0.3-disable-werror-boringssl.patch"
- cd "${S}/vendor/boringssl" || die
- eapply "${S}/patches/boringssl/0011-Disable-Werror.patch"
- cd "${S}/vendor/adb" || die
- eapply "${FILESDIR}/${PN}-31.0.3_p1-gcc12.patch"
- cd "${S}"
- eapply "${DISTDIR}/${PN}-31.0.3_p1-install-e2fsdroid-ext2simg.patch"
- rm -r patches || die
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- # Statically link the bundled boringssl
- -DBUILD_SHARED_LIBS=OFF
- )
- cmake_src_configure
-}
-
-src_compile() {
- export GOCACHE="${T}/go-build"
- export GOFLAGS="-mod=vendor"
- cmake_src_compile
-}
-
-src_install() {
- cmake_src_install
- rm "${ED}/usr/bin/mkbootimg" || die
- rm "${ED}/usr/bin/unpack_bootimg" || die
- rm "${ED}/usr/bin/repack_bootimg" || die
- if use python; then
- python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
- python_foreach_impl python_newexe vendor/mkbootimg/unpack_bootimg.py unpack_bootimg
- python_foreach_impl python_newexe vendor/mkbootimg/repack_bootimg.py repack_bootimg
- fi
- docinto adb
- dodoc vendor/adb/*.{txt,TXT}
- docinto fastboot
- dodoc vendor/core/fastboot/README.md
-}
diff --git a/dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch b/dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch
deleted file mode 100644
index aa313daf9042..000000000000
--- a/dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From 752fc3bd9a971858dbb7b51a0ef0289232e67e58 Mon Sep 17 00:00:00 2001
-From: Mike Lothian <mike@fireburn.co.uk>
-Date: Sat, 14 May 2022 02:01:18 +0100
-Subject: [PATCH] Add functional include
-
---- a/tls/include/adb/tls/tls_connection.h
-+++ b/tls/include/adb/tls/tls_connection.h
-@@ -19,6 +19,7 @@
- #include <stddef.h>
- #include <stdint.h>
-
-+#include <functional>
- #include <string_view>
- #include <vector>
-
diff --git a/dev-util/android-tools/files/make-tarballs.sh b/dev-util/android-tools/files/make-tarballs.sh
deleted file mode 100755
index 5a0a775c1290..000000000000
--- a/dev-util/android-tools/files/make-tarballs.sh
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Create the various tarballs we need. GoB does not provide stable archives (unlike github),
-# and some repos are uselessly fat, so we have to create things by hand. Fun times.
-
-set -e
-
-die() {
- echo "error: $*" >&2
- exit 1
-}
-
-fetch_boringssl() {
- local ver=$1 tag=$2
- local content hash
-
- echo "checking boringssl in ${tag}"
- content=$(wget -nv "https://android.googlesource.com/platform/external/boringssl/+/${tag}/BORINGSSL_REVISION?format=TEXT" -O -)
- hash=$(echo "${content}" | base64 -d)
- echo "using boringssl ${hash}"
-
- local tar="${DISTDIR}/boringssl-${hash}.tar.gz"
- if [[ ! -e ${tar} ]] ; then
- # We use github as it provides stable tarballs. GoB does not (includes timestamps).
- # https://boringssl.googlesource.com/boringssl/+archive/${hash}.tar.gz
- wget -c "https://github.com/google/boringssl/archive/${hash}.tar.gz" -O "${tar}"
- fi
-
- du -h "${tar}"
-}
-
-# The extras repo has ballooned to ~200MB, so we have to strip the large useless
-# files and random binaries.
-fetch_extras() {
- local ver=$1 tag=$2
- local tar="${DISTDIR}/android-tools-${ver}-extras.tar.xz"
-
- if [[ ! -e ${tar} ]] ; then
- local prune=(
- ioshark
- memory_replay
- perfprofd
- simpleperf
- )
- local dir="${tag}-extras"
- rm -rf "${dir}"
- mkdir "${dir}"
- cd "${dir}"
-
- wget "https://android.googlesource.com/platform/system/extras/+archive/${tag}.tar.gz" -O extras.tar.gz
- tar xf extras.tar.gz
- rm -rf "${prune[@]}" extras.tar.gz
-
- cd ..
- tar cf - "${dir}" | xz -9 > "${dir}.tar.xz"
- rm -rf "${dir}"
-
- mv "${dir}.tar.xz" "${tar}"
- fi
-
- du -h "${tar}"
-}
-
-# Since the GoB archive is unstable, we might as well rewrite it into xz to shrink.
-fetch_selinux() {
- local ver=$1 tag=$2
- local tar="${DISTDIR}/android-tools-${ver}-selinux.tar.xz"
-
- if [[ ! -e ${tar} ]] ; then
- wget "https://android.googlesource.com/platform/external/selinux/+archive/${tag}.tar.gz" -O - | zcat | xz > "${tar}"
- fi
-
- du -h "${tar}"
-}
-
-# Since the GoB archive is unstable, we might as well rewrite it into xz to shrink.
-fetch_f2fs() {
- local ver=$1 tag=$2
- local tar="${DISTDIR}/android-tools-${ver}-f2fs-tools.tar.xz"
-
- if [[ ! -e ${tar} ]] ; then
- wget "https://android.googlesource.com/platform/external/f2fs-tools/+archive/${tag}.tar.gz" -O - | zcat | xz > "${tar}"
- fi
-
- du -h "${tar}"
-}
-
-usage() {
- local status=$1
-
- [[ ${status} -eq 1 ]] && exec 1>&2
-
- cat <<-EOF
- Usage: $0 <android version>
-
- To find the next available version, consult:
- https://git.archlinux.org/svntogit/community.git/log/trunk?h=packages/android-tools
-
- They have some helper scripts for building the files directly.
-
- Example:
- $0 android-8.1.0_r1
- EOF
-
- exit ${status}
-}
-
-main() {
- [[ $# -ne 1 ]] && usage 1
- [[ $1 == "-h" || $1 == "--help" ]] && usage 0
-
- if [[ -z ${DISTDIR} ]] ; then
- eval $(portageq -v envvar DISTDIR)
- fi
- if [[ -z ${DISTDIR} ]] ; then
- die "Please set \$DISTDIR first"
- fi
-
- local ver="${1#android-}"
- local tag="android-${ver}"
- fetch_boringssl "${ver}" "${tag}"
- fetch_extras "${ver}" "${tag}"
- fetch_selinux "${ver}" "${tag}"
- fetch_f2fs "${ver}" "${tag}"
-}
-main "$@"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/files/, dev-util/android-tools/
@ 2022-10-16 23:41 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-10-16 23:41 UTC (permalink / raw
To: gentoo-commits
commit: c6a7d4c9d8258282768f10a9b47c8ecadcbdf726
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 16 23:41:28 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 16 23:41:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6a7d4c9
dev-util/android-tools: fix build w/ linux-headers-6.0
Closes: https://bugs.gentoo.org/876328
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../android-tools/android-tools-33.0.3-r1.ebuild | 6 ++
...e-of-usbdevfs_urb-to-match-new-kernel-UAP.patch | 120 +++++++++++++++++++++
2 files changed, 126 insertions(+)
diff --git a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
index 5e81ccbffd54..5aaa23ae15aa 100644
--- a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
+++ b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
@@ -45,10 +45,16 @@ DOCS=()
src_prepare() {
eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch"
+
cd "${S}/vendor/core" || die
eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
+
cd "${S}/vendor/libziparchive" || die
eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
+
+ cd "${S}/vendor/adb" || die
+ eapply "${FILESDIR}/${P}-adb-0023-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch"
+
cd "${S}"
rm -r patches || die
cmake_src_prepare
diff --git a/dev-util/android-tools/files/android-tools-33.0.3-adb-0023-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch b/dev-util/android-tools/files/android-tools-33.0.3-adb-0023-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch
new file mode 100644
index 000000000000..25572574d834
--- /dev/null
+++ b/dev-util/android-tools/files/android-tools-33.0.3-adb-0023-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch
@@ -0,0 +1,120 @@
+https://github.com/anatol/android-tools/blob/2f8405a47909861c9359fe4797e7b4a0fba4dc12/patches/adb/0023-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch
+https://github.com/nmeum/android-tools/issues/74
+https://bugs.gentoo.org/876328
+
+From c830c90995fc0877348e2ed9cdeccf9b739138d2 Mon Sep 17 00:00:00 2001
+From: Anatol Pomozov <anatol.pomozov@gmail.com>
+Date: Mon, 10 Oct 2022 10:47:57 -0700
+Subject: [PATCH] Update usage of usbdevfs_urb to match new kernel UAPI
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Linux kernel API has been changed by commit 94dfc73e7cf4 ("treewide: uapi: Replace zero-length arrays with flexible-array members")
+where zero-length array iso_frame_desc in struct usbdevfs_urb was replaced with a proper flexible-array member.
+
+Current USB API usage causes a compilation error at Linux 6.0:
+
+In file included from /home/mae/.cache/kiss/proc/121205/build/android-tools/vendor/adb/client/usb_linux.cpp:28:
+/usr/include/linux/usbdevice_fs.h:134:41: error: flexible array member ‘usbdevfs_urb::iso_frame_desc’ not at end of ‘struct usb_handle’
+ 134 | struct usbdevfs_iso_packet_desc iso_frame_desc[];
+ | ^~~~~~~~~~~~~~
+/home/mae/.cache/kiss/proc/121205/build/android-tools/vendor/adb/client/usb_linux.cpp:76:18: note: next member ‘usbdevfs_urb usb_handle::urb_out’ declared here
+ 76 | usbdevfs_urb urb_out;
+ | ^~~~~~~
+/home/mae/.cache/kiss/proc/121205/build/android-tools/vendor/adb/client/usb_linux.cpp:61:8: note: in the definition of ‘struct usb_handle’
+ 61 | struct usb_handle {
+ | ^~~~~~~~~~
+
+Fix it by using pointers to a struct with flexible-array members.
+Current fix works both with the old and the new API.
+
+See https://github.com/nmeum/android-tools/issues/74 for more context.
+
+Tested: built on Linux against kernel 5.19 and 6.0; 'adb shell' over USB
+cable
+Acked-by: Gustavo A. R. Silva gustavoars@kernel.org
+Change-Id: I7f0f7b35d9a3ab980d3520b541b60c7857a6b101
+Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com>
+--- a/client/usb_linux.cpp
++++ b/client/usb_linux.cpp
+@@ -71,8 +71,8 @@ struct usb_handle {
+ unsigned zero_mask;
+ unsigned writeable = 1;
+
+- usbdevfs_urb urb_in;
+- usbdevfs_urb urb_out;
++ usbdevfs_urb *urb_in;
++ usbdevfs_urb *urb_out;
+
+ bool urb_in_busy = false;
+ bool urb_out_busy = false;
+@@ -303,7 +303,7 @@ static int usb_bulk_write(usb_handle* h, const void* data, int len) {
+ std::unique_lock<std::mutex> lock(h->mutex);
+ D("++ usb_bulk_write ++");
+
+- usbdevfs_urb* urb = &h->urb_out;
++ usbdevfs_urb* urb = h->urb_out;
+ memset(urb, 0, sizeof(*urb));
+ urb->type = USBDEVFS_URB_TYPE_BULK;
+ urb->endpoint = h->ep_out;
+@@ -342,7 +342,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) {
+ std::unique_lock<std::mutex> lock(h->mutex);
+ D("++ usb_bulk_read ++");
+
+- usbdevfs_urb* urb = &h->urb_in;
++ usbdevfs_urb* urb = h->urb_in;
+ memset(urb, 0, sizeof(*urb));
+ urb->type = USBDEVFS_URB_TYPE_BULK;
+ urb->endpoint = h->ep_in;
+@@ -387,7 +387,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) {
+ }
+ D("[ urb @%p status = %d, actual = %d ]", out, out->status, out->actual_length);
+
+- if (out == &h->urb_in) {
++ if (out == h->urb_in) {
+ D("[ reap urb - IN complete ]");
+ h->urb_in_busy = false;
+ if (urb->status != 0) {
+@@ -396,7 +396,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) {
+ }
+ return urb->actual_length;
+ }
+- if (out == &h->urb_out) {
++ if (out == h->urb_out) {
+ D("[ reap urb - OUT compelete ]");
+ h->urb_out_busy = false;
+ h->cv.notify_all();
+@@ -500,10 +500,10 @@ void usb_kick(usb_handle* h) {
+ ** but this ensures that a reader blocked on REAPURB
+ ** will get unblocked
+ */
+- ioctl(h->fd, USBDEVFS_DISCARDURB, &h->urb_in);
+- ioctl(h->fd, USBDEVFS_DISCARDURB, &h->urb_out);
+- h->urb_in.status = -ENODEV;
+- h->urb_out.status = -ENODEV;
++ ioctl(h->fd, USBDEVFS_DISCARDURB, h->urb_in);
++ ioctl(h->fd, USBDEVFS_DISCARDURB, h->urb_out);
++ h->urb_in->status = -ENODEV;
++ h->urb_out->status = -ENODEV;
+ h->urb_in_busy = false;
+ h->urb_out_busy = false;
+ h->cv.notify_all();
+@@ -519,6 +519,8 @@ int usb_close(usb_handle* h) {
+
+ D("-- usb close %p (fd = %d) --", h, h->fd);
+
++ delete h->urb_in;
++ delete h->urb_out;
+ delete h;
+
+ return 0;
+@@ -572,6 +574,8 @@ static void register_device(const char* dev_name, const char* dev_path, unsigned
+ usb->ep_out = ep_out;
+ usb->zero_mask = zero_mask;
+ usb->max_packet_size = max_packet_size;
++ usb->urb_in = new usbdevfs_urb;
++ usb->urb_out = new usbdevfs_urb;
+
+ // Initialize mark so we don't get garbage collected after the device scan.
+ usb->mark = true;
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/files/, dev-util/android-tools/
@ 2024-08-10 19:38 Zac Medico
0 siblings, 0 replies; 5+ messages in thread
From: Zac Medico @ 2024-08-10 19:38 UTC (permalink / raw
To: gentoo-commits
commit: e987962a39893738df90b693c49508a18cd13cea
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 10 19:34:38 2024 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 19:34:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e987962a
dev-util/android-tools: drop 34.0.0, 34.0.1
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
dev-util/android-tools/Manifest | 2 -
dev-util/android-tools/android-tools-34.0.0.ebuild | 94 --------------------
dev-util/android-tools/android-tools-34.0.1.ebuild | 99 ----------------------
.../files/android-tools-34.0.0-protobuf.patch | 41 ---------
.../android-tools-34.0.1-include-algorithm.patch | 45 ----------
5 files changed, 281 deletions(-)
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index d4dcccbb0515..7e060f5bdad4 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -1,6 +1,4 @@
DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423
DIST android-tools-33.0.3.tar.xz 25300756 BLAKE2B 4254f0ab8657966cf56e2a7c3e9a3d889dfa9f26e61d8b46480bb74c5a8be33494f450827e3b2db4087006b3160892e6a846ef33719870cbbd032647cfc3ce78 SHA512 78c8141f5f13f1c0e5da474e1d79760a612e911519af4e9f21c0e5005f2ce99f3aeacf16f3fcdfe1250fc795a88190fa243592e1066a2156e1fd8d2b9c3d7f71
-DIST android-tools-34.0.0.tar.xz 37882448 BLAKE2B 19698c08dd650abba61e5cad9f7474ee3993f5b1fd2f173221560e5ccfc1677093758c325833993a68058c1427e132986b009f9e69a1eae9c4447053920b6feb SHA512 2d24cd95df7da1efa902fab3c848e2ebf09d3335fac61e667b19e1892e95c30a850413d354ceda72a402014623bbda4154cc33fb93a62c31fece8857efbbd596
-DIST android-tools-34.0.1.tar.xz 37904276 BLAKE2B 6b4d31dadbc646d52c8abd65602264dc16127eb36286d23be447539b0d9b46154592a04af37b3e7617933e62529e953b958db8cb77622e72cfe5ab176f822437 SHA512 413ddcca9a461d1c0a12d7fd19b9d8955619b281e1153318ed961bec17ad92bec103671abc8d63525bc83669376f37c11c887cc4cada85719120dff6c3951274
DIST android-tools-34.0.5.tar.xz 19389824 BLAKE2B a86ad9d22c356d2b3d0d85dd17e5540b5d105a286dd07946659dac4ab6d1e8285eecbbf0377c542ac6ca78e0af8df320a97e24ea2b735bbec66a2d2b23d2099c SHA512 2edea0c7a4c2f63531a8b5f518ed4dc9c315d08d8b23d3fac3b7024e2297860465f6df9fad43c9925fb80b5a50f5f3f4744886b552818bf3e961ba0372212496
DIST android-tools-35.0.1.tar.xz 21460424 BLAKE2B e87a4ad13e5b8030069c87cbbe47f3698888e797e319aa3a054a668ad55f4cdd7445e5ef7825f2d185f6891958fd52f815ee0cb3909649ee3ea703061d72d0ab SHA512 2dc3831f29a2c5ffc57978e4a6fa6d1469bcb0740750779b3e4f8239eaec87864f3474254a2d649ab630062be091d8b44a4e45c7e7b7e033f3b4481f81d76296
diff --git a/dev-util/android-tools/android-tools-34.0.0.ebuild b/dev-util/android-tools/android-tools-34.0.0.ebuild
deleted file mode 100644
index d8ca6ca82456..000000000000
--- a/dev-util/android-tools/android-tools-34.0.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake python-r1
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
-
-MY_PV="${PV//_/}"
-SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
- https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-no-gtest.patch
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="python udev"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# dev-libs/libpcre only required for e2fsdroid
-DEPEND="
- app-arch/brotli:=
- app-arch/lz4:=
- app-arch/zstd:=
- dev-libs/libpcre2:=
- >=dev-libs/protobuf-3.0.0:=
- sys-libs/zlib:=
- virtual/libusb:1=
-"
-RDEPEND="${DEPEND}
- udev? ( dev-util/android-udev-rules )
- python? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
- dev-lang/go
- dev-lang/perl
-"
-
-DOCS=()
-
-src_prepare() {
- eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch"
-
- cd "${S}/vendor/core" || die
- eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
-
- cd "${S}/vendor/libziparchive" || die
- eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
-
- cd "${S}" || die
- rm -r patches || die
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- # Statically link the bundled boringssl
- -DBUILD_SHARED_LIBS=OFF
- )
- cmake_src_configure
-}
-
-src_compile() {
- export GOCACHE="${T}/go-build"
- export GOFLAGS="-mod=vendor"
- cmake_src_compile
-}
-
-src_install() {
- cmake_src_install
- rm "${ED}/usr/bin/mkbootimg" || die
- rm "${ED}/usr/bin/unpack_bootimg" || die
- rm "${ED}/usr/bin/repack_bootimg" || die
- rm "${ED}/usr/bin/mkdtboimg" || die
- rm "${ED}/usr/bin/avbtool" || die
-
- if use python; then
- python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
- python_foreach_impl python_newexe vendor/mkbootimg/unpack_bootimg.py unpack_bootimg
- python_foreach_impl python_newexe vendor/mkbootimg/repack_bootimg.py repack_bootimg
- python_foreach_impl python_newexe vendor/libufdt/utils/src/mkdtboimg.py mkdtboimg
- python_foreach_impl python_newexe vendor/avb/avbtool.py avbtool
- fi
- docinto adb
- dodoc vendor/adb/*.{txt,TXT}
- docinto fastboot
- dodoc vendor/core/fastboot/README.md
-}
diff --git a/dev-util/android-tools/android-tools-34.0.1.ebuild b/dev-util/android-tools/android-tools-34.0.1.ebuild
deleted file mode 100644
index 022d6d2fc5be..000000000000
--- a/dev-util/android-tools/android-tools-34.0.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit flag-o-matic cmake python-r1
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
-
-MY_PV="${PV//_/}"
-SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
- https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-no-gtest.patch
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="python udev"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# dev-libs/libpcre only required for e2fsdroid
-DEPEND="
- app-arch/brotli:=
- app-arch/lz4:=
- app-arch/zstd:=
- dev-libs/libpcre2:=
- >=dev-libs/protobuf-3.0.0:=
- sys-libs/zlib:=
- virtual/libusb:1=
-"
-RDEPEND="${DEPEND}
- udev? ( dev-util/android-udev-rules )
- python? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
- dev-lang/go
- dev-lang/perl
-"
-
-DOCS=()
-
-src_prepare() {
- eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch"
- eapply "${FILESDIR}/${PN}-34.0.0-protobuf.patch"
- eapply "${FILESDIR}/${PN}-34.0.1-include-algorithm.patch"
-
- cd "${S}/vendor/core" || die
- eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
-
- cd "${S}/vendor/libziparchive" || die
- eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
-
- cd "${S}" || die
- rm -r patches || die
- cmake_src_prepare
-}
-
-src_configure() {
- # bug 905713
- use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
-
- local mycmakeargs=(
- # Statically link the bundled boringssl
- -DBUILD_SHARED_LIBS=OFF
- )
- cmake_src_configure
-}
-
-src_compile() {
- export GOCACHE="${T}/go-build"
- export GOFLAGS="-mod=vendor"
- cmake_src_compile
-}
-
-src_install() {
- cmake_src_install
- rm "${ED}/usr/bin/mkbootimg" || die
- rm "${ED}/usr/bin/unpack_bootimg" || die
- rm "${ED}/usr/bin/repack_bootimg" || die
- rm "${ED}/usr/bin/mkdtboimg" || die
- rm "${ED}/usr/bin/avbtool" || die
-
- if use python; then
- python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
- python_foreach_impl python_newexe vendor/mkbootimg/unpack_bootimg.py unpack_bootimg
- python_foreach_impl python_newexe vendor/mkbootimg/repack_bootimg.py repack_bootimg
- python_foreach_impl python_newexe vendor/libufdt/utils/src/mkdtboimg.py mkdtboimg
- python_foreach_impl python_newexe vendor/avb/avbtool.py avbtool
- fi
- docinto adb
- dodoc vendor/adb/*.{txt,TXT}
- docinto fastboot
- dodoc vendor/core/fastboot/README.md
-}
diff --git a/dev-util/android-tools/files/android-tools-34.0.0-protobuf.patch b/dev-util/android-tools/files/android-tools-34.0.0-protobuf.patch
deleted file mode 100644
index d7aa309410a4..000000000000
--- a/dev-util/android-tools/files/android-tools-34.0.0-protobuf.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/912789
-https://github.com/nmeum/android-tools/commit/c5eae90a06072c6982e483f8154e490b47e620f7
-https://github.com/nmeum/android-tools/pull/120#issuecomment-1621066529
-
---- a/vendor/CMakeLists.txt
-+++ b/vendor/CMakeLists.txt
-@@ -73,6 +73,8 @@
- pkg_check_modules(libzstd REQUIRED IMPORTED_TARGET libzstd)
-
-+find_package(Protobuf CONFIG)
- find_package(Protobuf REQUIRED)
-+set(PROTOBUF_LIBRARIES protobuf::libprotobuf)
- set(THREADS_PREFER_PTHREAD_FLAG ON)
- find_package(Threads REQUIRED)
-
---- a/vendor/extras/libjsonpb/parse/jsonpb.cpp
-+++ b/vendor/extras/libjsonpb/parse/jsonpb.cpp
-@@ -50,8 +50,10 @@
- if (!status.ok()) {
- #if GOOGLE_PROTOBUF_VERSION < 3016000
- return MakeError<std::string>(status.error_message().as_string());
--#else
-+#elif GOOGLE_PROTOBUF_VERSION < 4022000
- return MakeError<std::string>(status.message().as_string());
-+#else
-+ return MakeError<std::string>(std::string(status.message()));
- #endif
- }
- return ErrorOr<std::string>(std::move(json));
-@@ -67,8 +69,10 @@
- if (!status.ok()) {
- #if GOOGLE_PROTOBUF_VERSION < 3016000
- return MakeError<std::monostate>(status.error_message().as_string());
--#else
-+#elif GOOGLE_PROTOBUF_VERSION < 4022000
- return MakeError<std::monostate>(status.message().as_string());
-+#else
-+ return MakeError<std::monostate>(std::string(status.message()));
- #endif
- }
- if (!message->ParseFromString(binary)) {
diff --git a/dev-util/android-tools/files/android-tools-34.0.1-include-algorithm.patch b/dev-util/android-tools/files/android-tools-34.0.1-include-algorithm.patch
deleted file mode 100644
index 79bd52c4c634..000000000000
--- a/dev-util/android-tools/files/android-tools-34.0.1-include-algorithm.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 805c7e385123c6c142c8fec941406fea62af4459 Mon Sep 17 00:00:00 2001
-From: Christopher Fore <csfore@posteo.net>
-Date: Sat, 9 Dec 2023 15:07:12 -0500
-Subject: [PATCH] dev-util/android-tools: Add patch to fix compilation on GCC 14
-
-https://github.com/gentoo/gentoo/pull/34201
----
-
-diff --git a/vendor/adb/client/incremental_utils.cpp b/vendor/adb/client/incremental_utils.cpp
-index 2f6958b..67f21a1 100644
---- a/vendor/adb/client/incremental_utils.cpp
-+++ b/vendor/adb/client/incremental_utils.cpp
-@@ -24,6 +24,7 @@
- #include <ziparchive/zip_archive.h>
- #include <ziparchive/zip_writer.h>
-
-+#include <algorithm>
- #include <array>
- #include <cinttypes>
- #include <numeric>
-diff --git a/vendor/core/fs_mgr/liblp/super_layout_builder.cpp b/vendor/core/fs_mgr/liblp/super_layout_builder.cpp
-index 37f28e1..0db82e5 100644
---- a/vendor/core/fs_mgr/liblp/super_layout_builder.cpp
-+++ b/vendor/core/fs_mgr/liblp/super_layout_builder.cpp
-@@ -17,6 +17,8 @@
-
- #include <liblp/liblp.h>
-
-+#include <algorithm>
-+
- #include "images.h"
- #include "utility.h"
- #include "writer.h"
-diff --git a/vendor/core/fs_mgr/liblp/utility.cpp b/vendor/core/fs_mgr/liblp/utility.cpp
-index d8e171b..70c7b79 100644
---- a/vendor/core/fs_mgr/liblp/utility.cpp
-+++ b/vendor/core/fs_mgr/liblp/utility.cpp
-@@ -25,6 +25,7 @@
- #include <sys/ioctl.h>
- #endif
-
-+#include <algorithm>
- #include <map>
- #include <string>
- #include <vector>
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-08-10 19:38 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-12 16:38 [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/files/, dev-util/android-tools/ Zac Medico
-- strict thread matches above, loose matches on Subject: below --
2024-08-10 19:38 Zac Medico
2022-10-16 23:41 Sam James
2021-10-08 8:33 Andreas Sturmlechner
2018-01-26 22:40 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox