From patchwork Wed Aug 4 01:20:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 31780 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 340E927BC6B; Wed, 4 Aug 2021 02:22:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A6D5027BC78 for ; Wed, 4 Aug 2021 02:22:37 +0100 (BST) Received: from localhost ([::1]:39452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mB5cC-0002ho-Oc for patchwork@mira.cbaines.net; Tue, 03 Aug 2021 21:22:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57498) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mB5be-0002HV-UZ for guix-patches@gnu.org; Tue, 03 Aug 2021 21:22:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58631) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mB5be-0006sT-Jk for guix-patches@gnu.org; Tue, 03 Aug 2021 21:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mB5be-0001vo-Fz for guix-patches@gnu.org; Tue, 03 Aug 2021 21:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49859] [PATCH 3/6] gnu: Remove adb and fastboot. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Aug 2021 01:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49859 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49859@debbugs.gnu.org Received: via spool by 49859-submit@debbugs.gnu.org id=B49859.16280400747324 (code B ref 49859); Wed, 04 Aug 2021 01:22:02 +0000 Received: (at 49859) by debbugs.gnu.org; 4 Aug 2021 01:21:14 +0000 Received: from localhost ([127.0.0.1]:41933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mB5as-0001ty-06 for submit@debbugs.gnu.org; Tue, 03 Aug 2021 21:21:14 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:52157) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mB5aq-0001tM-HY for 49859@debbugs.gnu.org; Tue, 03 Aug 2021 21:21:13 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 79E6A5C012B; Tue, 3 Aug 2021 21:21:07 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Tue, 03 Aug 2021 21:21:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=+odBaR3a06 Oq/B4jcJT9gs8BB+Hql5N+5HG0lQ5EYbE=; b=I8wTt2GWGUaRen/+NhQyDrostN ejhpBFW1AenRdpRGS5VJUU9ZH+zL9DnHggSNKlUyqeCWDuU15e0ClAr4kHgfRoCT V8UnSX0YIfuLF+OGc00qFkvWuST5gJO2KOColJUq2IKXAtWBhEzJW+aai5H/lxgW hHwIvmY4wjvL/qCeg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=+odBaR3a06Oq/B4jcJT9gs8BB+Hql5N+5HG0lQ5EYbE=; b=CdUoOk+L gt8fmdO4EVdxjbpaAi3OYw92WVCLez3V1AUhdUpu7Le0ss9MVkHyRA5QSCHvASnB Pbnno2mfhV8l7N93TULdYjus35k9tdABbkCl3pQNxmc4NIA0UykCYVVMRNmGQo2y nqJSwubA9aBZU8GsXmRB3ZsmoTUQAwIPiUtvTW809KilS4sMYR6FxyF22rSbwAQj BlVWWtGFNb9WCg2GpNlG3T61hHlsStBELNQTgTr7erLwcnM8rNix+o1juQnzI7t1 zhJLM6jdhlh39TTO7S6f2ifxNb90PJmWCExIFb0wj8QkdRU9XBLRYFC/JKrDSx5Q UGpatjuJY2+1mQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrieehgdegudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghr ihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeevtedvveffieduffejvdekudegtddule ejfeeiiedvudduvdejkedvjeeileeggfenucffohhmrghinhepghhnuhdrohhrghdprghn ughrohhiugdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih hlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for <49859@debbugs.gnu.org>; Tue, 3 Aug 2021 21:21:06 -0400 (EDT) From: Leo Famulari Date: Tue, 3 Aug 2021 21:20:46 -0400 Message-Id: <98b6d8eee70e27683b6617ba92afd7a353514e45.1628040049.git.leo@famulari.name> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches As discussed in , this version of adb does not support a current release of OpenSSL. * gnu/packages/android.scm (adb, fastboot): Remove variables. --- gnu/packages/android.scm | 95 ---------------------------------------- 1 file changed, 95 deletions(-) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index eb538f6540..746a104d43 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -351,53 +351,6 @@ various Android core host applications.") various Android core host applications.") (license license:asl2.0))) -(define-public adb - (package - (name "adb") - (version (android-platform-version)) - (source (android-platform-system-core version)) - (build-system android-ndk-build-system) - (arguments - `(#:tests? #f ; Test failure: sysdeps_poll.fd_count - #:make-flags - (list "CFLAGS=-Wno-error" - "CXXFLAGS=-fpermissive -Wno-error -std=gnu++14 -D_Nonnull= -D_Nullable= -I ." - (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib " - "-Wl,-rpath=" (assoc-ref %build-inputs "openssl") "/lib -L .")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'enter-source - (lambda _ (chdir "adb") #t)) - (add-after 'enter-source 'glibc-compat - (lambda _ - ;; Include sysmacros.h for "major" and "minor" in Glibc 2.28. - (substitute* "usb_linux.cpp" - (("#include " all) - (string-append all "\n#include \n"))) - #t)) - (add-after 'enter-source 'make-libs-available - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "Android.mk" - (("libcrypto_static") "libcrypto")) - #t)) - (add-after 'install 'install-headers - (lambda* (#:key inputs outputs #:allow-other-keys) - (install-file "diagnose_usb.h" (string-append (assoc-ref outputs "out") "/include")) - #t))))) - (inputs - `(("android-libbase" ,android-libbase) - ("android-libcutils" ,android-libcutils) - ("android-liblog" ,android-liblog) - ("openssl" ,openssl-1.0))) - (home-page "https://developer.android.com/studio/command-line/adb.html") - (synopsis "Android Debug Bridge") - (description - "@command{adb} is a versatile command line tool that lets you communicate -with an emulator instance or connected Android device. It facilitates a variety -of device actions, such as installing and debugging apps, and it provides access -to a Unix shell that can run commands on the connected device or emulator.") - (license license:asl2.0))) - (define-public mkbootimg (package (name "mkbootimg") @@ -652,54 +605,6 @@ file system.") (description "@code{android-libutils} provides utilities for Android NDK developers.") (license license:asl2.0))) -(define-public fastboot - (package - (name "fastboot") - (version (android-platform-version)) - (source (android-platform-system-core version)) - (build-system android-ndk-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'enter-source - (lambda _ - (chdir "fastboot") - #t)) - (add-after 'enter-source 'patch-source - (lambda _ - (substitute* "Android.mk" - (("libext4_utils_host") "libext4_utils_host libselinux libpcre")) - #t)) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib")) - (bin (string-append out "/bin"))) - (install-file "fastboot" bin) - #t)))))) - (inputs - `(("adb" ,adb) - ("android-safe-iop" ,android-safe-iop) - ("android-ext4-utils" ,android-ext4-utils) - ("android-f2fs-utils" ,android-f2fs-utils) - ("android-libbase" ,android-libbase) - ("android-libcutils" ,android-libcutils) - ("android-liblog" ,android-liblog) - ("android-libutils" ,android-libutils) - ("android-libsparse" ,android-libsparse) - ("android-libziparchive" ,android-libziparchive) - ("android-libselinux" ,android-libselinux) - ("pcre" ,pcre) - ("mkbootimg" ,mkbootimg) - ("zlib" ,zlib))) - (native-inputs - `(("xz" ,xz))) - (home-page "https://developer.android.com/studio/command-line/") - (synopsis "Android image flasher") - (description - "This package provides @command{fastboot}, a tool to upload file system images to Android devices.") - (license license:asl2.0))) - (define-public android-udev-rules (package (name "android-udev-rules")