From patchwork Fri Mar 12 20:05:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Barnett X-Patchwork-Id: 1452380 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=rockwellcollins.com header.i=@rockwellcollins.com header.a=rsa-sha256 header.s=hrcrc2020 header.b=qrRrujfn; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DxxgJ0Xvbz9sSC for ; Sat, 13 Mar 2021 07:07:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 0763B60695; Fri, 12 Mar 2021 20:07:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wkHaVbG-7bsL; Fri, 12 Mar 2021 20:07:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 3283E60636; Fri, 12 Mar 2021 20:07:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 798191BF580 for ; Fri, 12 Mar 2021 20:06:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 695B560636 for ; Fri, 12 Mar 2021 20:06:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ET65HkbeXKKE for ; Fri, 12 Mar 2021 20:06:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from ch3vs02.rockwellcollins.com (ch3vs02.rockwellcollins.com [205.175.226.29]) by smtp3.osuosl.org (Postfix) with ESMTPS id 621F4605C0 for ; Fri, 12 Mar 2021 20:06:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rockwellcollins.com; s=hrcrc2020; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=iTiagR/GOCGdsRwDE3VA547glicCDdgHWsKLEUMg+DM=; b=qrRrujfnLW/lFlHFv1055haTk3lQKduRXKLTh+yqbccv7AbBsCjHCnh9 ZvbybSYcWJsZZCTM9TwYAAn4DXQjdPVfDoFRDBCXU8O44EevFam0augJF y2+4Ozj3FJOw9l/Cz9jJ/UeSE6eeoveuYv208hNvtC+r0MttAuTRTHPWt qq0pJe6kRIL+MWvBaU0fVnwbkCKHvh0QdM7FHT8X/azLjgP/IofLDTxZy +HQAjM9nnRfONWp8EfrV7dZDSUgJCRMOax2w4fZB+OMJqM90vUOM6w4v2 R+Fih2wn1ry1EZ+8wK98bEHpooH2fTneRB+oHE8Vfo81RpZlAnyJCp66N Q==; IronPort-SDR: xm2JFyAlTZnITwXtjYf9Q6lSl4FEMlt7dMuyrGawO6ApoSJ7cvCfOosnkaJlZzUBuQWZcYP39Q tW+NVeWv0eUaoRM0xUaqVp61E8uh2TizzTmvMz6AQpXv8EbQnVoQuG43KyQoOcfrA8Ane8ozOO QKOdMoEqSC7vZR87+Q0GWy4zRl/O3E4SJB9YHcTRUAyVK/e6bTKaHX3Cd2J+cNypyEvrwa9iz0 eSnrWgsj0pDP/NM5AK7beQq0BHs0+Ffla38o2W+At6qtKdd5+pM+FH5T7PB70WWcJTP114sUds BPw= Received: from ofwch3n02.rockwellcollins.com (HELO ciulimr02.rockwellcollins.com) ([205.175.226.14]) by ch3vs02.rockwellcollins.com with ESMTP; 12 Mar 2021 14:06:29 -0600 X-Received: from eggs.rockwellcollins.com (eggs.rockwellcollins.lab [10.148.117.42]) by ciulimr02.rockwellcollins.com (Postfix) with ESMTP id 6A0872007E; Fri, 12 Mar 2021 14:06:29 -0600 (CST) From: Ryan Barnett To: buildroot@buildroot.org Date: Fri, 12 Mar 2021 14:05:33 -0600 Message-Id: <20210312200534.923-8-ryan.barnett@rockwellcollins.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210312200534.923-1-ryan.barnett@rockwellcollins.com> References: <20210312200534.923-1-ryan.barnett@rockwellcollins.com> Subject: [Buildroot] [PATCH 7/8] package/opkg-utils: add opkg-utils as target pkg X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas De Schampheleire , Ryan Barnett , "Yann E . MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Supports a use case of building container rootfs images where a matching target version of the tools is required for repackaging of a installer archive. Signed-off-by: Ryan Barnett --- package/Config.in | 1 + package/opkg-utils/Config.in | 33 ++++++++++++++++++++++++++++++++ package/opkg-utils/opkg-utils.mk | 20 +++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 package/opkg-utils/Config.in diff --git a/package/Config.in b/package/Config.in index 992e46a319..fb77ba134e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2337,6 +2337,7 @@ comment "See the manual: " comment "http://buildroot.org/manual.html#faq-no-binary-packages" comment "-------------------------------------------------------" source "package/opkg/Config.in" + source "package/opkg-utils/Config.in" source "package/rpm/Config.in" endmenu diff --git a/package/opkg-utils/Config.in b/package/opkg-utils/Config.in new file mode 100644 index 0000000000..b60a48c19d --- /dev/null +++ b/package/opkg-utils/Config.in @@ -0,0 +1,33 @@ +config BR2_PACKAGE_OPKG_UTILS + bool "opkg-utils" + depends on BR2_USE_MMU # bash, coreutils, findutils, tar + depends on !BR2_nios2 # binutils + # binutils, coreutils, diffutils, findutils, grep, gzip, python3, sed, + # tar + depends on BR2_USE_WCHAR + depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + depends on BR2_TOOLCHAIN_HAS_THREADS # libffi + depends on !BR2_STATIC_LIBS # python3 + depends on !BR2_PACKAGE_PYTHON # python3 + select BR2_PACKAGE_BASH + select BR2_PACKAGE_BINUTILS + select BR2_PACKAGE_BZIP2 + select BR2_PACKAGE_COREUTILS + select BR2_PACKAGE_DIFFUTILS + select BR2_PACKAGE_FINDUTILS + select BR2_PACKAGE_GREP + select BR2_PACKAGE_GZIP + select BR2_PACKAGE_LZ4 + select BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_SED + select BR2_PACKAGE_TAR + select BR2_PACKAGE_XZ + help + Helper scripts for use with the opkg package manager. + + https://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/ + +comment "opkg-utils needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_nios2 + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/opkg-utils/opkg-utils.mk b/package/opkg-utils/opkg-utils.mk index d7f68b8555..a445c9f49e 100644 --- a/package/opkg-utils/opkg-utils.mk +++ b/package/opkg-utils/opkg-utils.mk @@ -10,6 +10,21 @@ OPKG_UTILS_SITE_METHOD = git OPKG_UTILS_LICENSE = GPL-2.0+ OPKG_UTILS_LICENSE_FILES = COPYING +OPKG_UTILS_DEPENDENCIES += \ + bash \ + binutils \ + bzip2 \ + coreutils \ + diffutils \ + findutils \ + grep \ + gzip \ + lz4 \ + python3 \ + sed \ + tar \ + xz + HOST_OPKG_UTILS_DEPENDENCIES += \ host-coreutils \ host-diffutils \ @@ -19,8 +34,13 @@ HOST_OPKG_UTILS_DEPENDENCIES += \ $(BR2_PYTHON3_HOST_DEPENDENCY) \ host-xz +define OPKG_UTILS_INSTALL_CMDS + $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR) install-utils +endef + define HOST_OPKG_UTILS_INSTALL_CMDS $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install-utils endef +$(eval $(generic-package)) $(eval $(host-generic-package))