From patchwork Fri Mar 12 20:05:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Barnett X-Patchwork-Id: 1452375 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::137; helo=smtp4.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=tkTJuVPA; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (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 4Dxxf30wdRz9sSC for ; Sat, 13 Mar 2021 07:06:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 97B8349FE3; Fri, 12 Mar 2021 20:06:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QH5FNBdB9kSw; Fri, 12 Mar 2021 20:06:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 872094C5CF; Fri, 12 Mar 2021 20:06:13 +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 234A11BF580 for ; Fri, 12 Mar 2021 20:06:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 1DDAC60628 for ; Fri, 12 Mar 2021 20:06:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=rockwellcollins.com 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 51-_2fG1YdkU for ; Fri, 12 Mar 2021 20:06:04 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from da1vs02.rockwellcollins.com (da1vs02.rockwellcollins.com [205.175.227.29]) by smtp3.osuosl.org (Postfix) with ESMTPS id 25F74605C0 for ; Fri, 12 Mar 2021 20:06:04 +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=mC8tnTFZnQs+iAGSsV2DX0xVgNqlPTssHoSSVCGQsqM=; b=tkTJuVPAHk2b6v1KMtxeQqq0k5X1R10CTkJB7jqhrF0ZHCn6SS89lbo6 w13dZZToDJ0x26IThtViyp+i1IhvB+tmEWV4bs96rwQ6UciQ92ku0IJ4W eW9kQZ6OgJn9StUcAGJ31YJejXFRA8E1M8cvLs6cnD2AFB/IjCgvrD9Ql pASCeZmZTb1gFb8ru3Se1wcwTrsSAUlUZmG4rZyGNhysNWwhSzOndpXUq PYhdmQXamQ9KwnJ7J8hHaL1tNdSrbF5ddPJZIsvwalmNlHTbi1tXVa024 dL8ov3r2Wig+Ay99pwiRBYdw6pTC8t3JrUj4lHV6850kEWtktlMEe40UB g==; IronPort-SDR: 0lc9Xd/sWs1GzLpiIuGU076gme0/Fl5LRo0EzC6CZgo3Lp4HhfY3lhe/75AhnTE+k4nSRq7X/6 ImY3S2VDSe5MIXEEnW2VsNZmS+92UohRbS5GdRDOz3TvX6w5kagWIZykw2MdRlGQmGdEF/aP7x rKGarTRdPrWaXvpiJqWS0UwWl2o5RvV/CQoexTRSnhATTzPzMgnMt1qLWYoCZNMjMtVPfPc3l8 BByA1cNhQ/dpAz8SbDEi8IxbEdPn9gHri/g6ZQXvoWkGpwa2Npb5S7m/7GCqRL0VaEhThZjmCd CAI= Received: from ofwda1n02.rockwellcollins.com (HELO ciulimr02.rockwellcollins.com) ([205.175.227.14]) by da1vs02.rockwellcollins.com with ESMTP; 12 Mar 2021 14:06:03 -0600 X-Received: from eggs.rockwellcollins.com (eggs.rockwellcollins.lab [10.148.117.42]) by ciulimr02.rockwellcollins.com (Postfix) with ESMTP id E15752007E; Fri, 12 Mar 2021 14:06:02 -0600 (CST) From: Ryan Barnett To: buildroot@buildroot.org Date: Fri, 12 Mar 2021 14:05:28 -0600 Message-Id: <20210312200534.923-3-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 2/8] package/opkg-utils: install only utility scripts 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: Ryan Barnett , "Yann E . MORIN" , Thomas De Schampheleire MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" When `make install` is run to install the opkg-utils scripts, it also invokes building of the man page for opkg-build. The generation of the man page requires `pod2man` executable which is a part of perl. Since buildroot does not support man pages in the host directory, patch the opkg-utils Makefile to separate the installation of man pages and utility scripts. With the options to install man pages and utils separately, only install the opkg-utils scripts. Signed-off-by: Ryan Barnett --- ...-seperate-manpages-and-utils-install.patch | 50 +++++++++++++++++++ package/opkg-utils/opkg-utils.mk | 2 +- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 package/opkg-utils/0001-Makefile-seperate-manpages-and-utils-install.patch diff --git a/package/opkg-utils/0001-Makefile-seperate-manpages-and-utils-install.patch b/package/opkg-utils/0001-Makefile-seperate-manpages-and-utils-install.patch new file mode 100644 index 0000000000..140187ca3a --- /dev/null +++ b/package/opkg-utils/0001-Makefile-seperate-manpages-and-utils-install.patch @@ -0,0 +1,50 @@ +From 74ccbee0f798822041dba5c6564df62a0c60d86b Mon Sep 17 00:00:00 2001 +From: Ryan Barnett +Date: Mon, 22 Feb 2021 07:09:34 -0600 +Subject: Makefile: separate manpages and utils install + +The installation of opkg-build man page introduces a host dependency +on perl for the pod2man package to generate the man page. + +To allow the opkg-utils scripts to be installed separately from the +manpages, break apart the install step into two install steps: +install-utils and install-docs + +Backported from: 74ccbee0f798822041dba5c6564df62a0c60d86b + +CC: Christian Hermann +Signed-off-by: Ryan Barnett +Signed-off-by: Alex Stewart +Signed-off-by: Ryan Barnett +--- + Makefile | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 4049654..fe96d5a 100644 +--- a/Makefile ++++ b/Makefile +@@ -27,9 +27,11 @@ mandir ?= $(PREFIX)/man + + all: $(UTILS) $(MANPAGES) + +-install: all ++install-utils: $(UTILS) + install -d $(DESTDIR)$(bindir) + install -m 755 $(UTILS) $(DESTDIR)$(bindir) ++ ++install-docs: $(MANPAGES) + install -d $(DESTDIR)$(mandir) + for m in $(MANPAGES); \ + do \ +@@ -37,4 +39,6 @@ install: all + install -m 644 "$$m" $(DESTDIR)$(mandir)/man$${m##*.}; \ + done + +-.PHONY: install all ++install: install-utils install-docs ++ ++.PHONY: install install-utils install-docs all +-- +cgit v1.2.2-1-g5e49 + diff --git a/package/opkg-utils/opkg-utils.mk b/package/opkg-utils/opkg-utils.mk index 47fc4c63b4..a250b4ef9f 100644 --- a/package/opkg-utils/opkg-utils.mk +++ b/package/opkg-utils/opkg-utils.mk @@ -13,7 +13,7 @@ OPKG_UTILS_LICENSE_FILES = COPYING HOST_OPKG_UTILS_DEPENDENCIES += $(BR2_PYTHON3_HOST_DEPENDENCY) define HOST_OPKG_UTILS_INSTALL_CMDS - $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install + $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install-utils endef $(eval $(host-generic-package))