From patchwork Fri May 27 19:25:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dirk Neukirchen X-Patchwork-Id: 627331 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rGbkK43g1z9syq for ; Sat, 28 May 2016 05:32:09 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b6NSJ-0003aS-A8; Fri, 27 May 2016 19:29:59 +0000 Received: from mout.web.de ([212.227.15.14]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b6NSG-0003Yl-Bs for lede-dev@lists.infradead.org; Fri, 27 May 2016 19:29:57 +0000 Received: from tenchi-htpc.lan ([91.66.244.150]) by smtp.web.de (mrweb002) with ESMTPSA (Nemesis) id 0MFtOY-1bLDQZ2eAw-00EswH for ; Fri, 27 May 2016 21:29:33 +0200 From: Dirk Neukirchen To: lede-dev@lists.infradead.org Date: Fri, 27 May 2016 21:25:14 +0200 Message-Id: <20160527192514.19071-1-dirkneukirchen@web.de> X-Mailer: git-send-email 2.8.3 X-Provags-ID: V03:K0:HNvqRlUlpIRSBfY6cSDcRnrtORo8zslv+oBBu8DQD8saBspXBqK 3y0TVdPRZQe/rxyxy/vM02/C+iC2ClGHgapAW5lTHq0xOOFmuaJD2uAsnCtIpH8LRhrTVVb //pRcWkvm6snGQfq9Y03Y3EI2YqVcvv8zRkeA939FLndv8KXkngLA1uu0XX3gsuBmbxY0ya /qDrK6xwLzJ9i6vURFsQw== X-UI-Out-Filterresults: notjunk:1; V01:K0:tbo1ikFWv6E=:K/80ftO05GzN3v2jY1MJ1t FmX8fKu0POr8L5jzdcSW8P2abYE35vFErJyE1Hzzkp71p+iSFhT6mQMj0l1PLrIbBOljjbuI3 cRTzCiJusj9A5TwhRK//HX4vp1x1LupiM8VdJL8zxdsji1oLreW55XZopA5RpYU5qxm2YvLt0 Y8+sdR/Softq1I50twXqZUBgdlxrVXFihrs/HpXmm0Tw+aoY5N0atUeoKQagbW7qwbBlxiGE2 Pl0HME0TFnF/1CxaK3JAk0ocQMMeFD8BXguJglksg3e37+vjYryQkEV7wHvd30eY3zAk4Vf+o 8bjkeUcloN2ujg+s/qMthlisAOagZ7ID4Gqi2PsLFJoJg0xDOQ/4FcyaZYXoQ7K3A3EnrVYiX jzo73VFP+Z5z9lCDPXDrIDMFYV8eFNLnQt0DvctnwKrlYPn9UB8Ht2fUhpHWgRA2grU1GFaqd O7GSi3cIVx5QdZv/UiZ1PUgLeqxGhWaDA/J81XVMWjMDqFUzy+sBfkvYO0910J7V5Jy7l/dvc 2YYpKHfJaLXt7KTFVyaCGH2zhY/Zl0vzSGIPaAIWX95Ad7L8KPn24jqXtTPv+lKJC8WSAWhGo 2aYykbOX9+nK4CqDbguZv5L374ZLvTsBrS8LwheLItughlWyH9M8UC8aVjuti/xuT1odquanE ifSeQRll06VlIA5DzO84iZD6Zo9CrlvngdRybcVPHBB8WG0fJg9EYOOzEpaS9by4R8Eae/eGQ xpEBV3dhJX1JRcp4wnKBm6At5eyI/ZHSjr1RnUVt4FJ481zXrBghdaActb972/INbZsjVLa29 XBHGb8WrPwvfahnq+Sb8mOjRe7K6g== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160527_122956_753628_07B34CF8 X-CRM114-Status: UNSURE ( 5.93 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.0 (----) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-4.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [212.227.15.14 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [212.227.15.14 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (dirkneukirchen[at]web.de) -1.4 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Subject: [LEDE-DEV] [PATCH v2] util-linux: fix breakage X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org - install correct libs to staging/usr/lib fixes eudev, nfs-kernel-server the lib*.a seem broken - use the correct .so files and remove .a libs - some build breakage was observed with parallel builds: text-utils/more-more.o: In function `putstring': more.c:(.text+0x1f4): undefined reference to `tputs' text-utils/more-more.o: In function `initterm': more.c:(.text+0x1b74): undefined reference to `setupterm' more.c:(.text+0x1f0c): undefined reference to `tparm' more.c:(.text+0x20ac): undefined reference to `tigetnum' more.c:(.text+0x20c8): undefined reference to `tigetflag' more.c:(.text+0x20ec): undefined reference to `tigetstr' more.c:(.text+0x2148): undefined reference to `PC' text-utils/more-more.o: In function `reset_tty': more.c:(.text+0x2630): undefined reference to `tputs' - fix line length Signed-off-by: Dirk Neukirchen --- package/utils/util-linux/Makefile | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index 9d4ca38..cfa244d 100644 --- a/package/utils/util-linux/Makefile +++ b/package/utils/util-linux/Makefile @@ -16,9 +16,16 @@ PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.28 PKG_MD5SUM:=e534e6ccc49107e5d31c329af798ef7d PKG_LICENSE:=GPL-2.0 -PKG_LICENSE_FILES:=COPYING getopt/COPYING libblkid/COPYING libmount/COPYING Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.LGPLv2.1 libuuid/COPYING Documentation/licenses/COPYING.BSD-3 +PKG_LICENSE_FILES:= COPYING \ + getopt/COPYING \ + libblkid/COPYING \ + libmount/COPYING \ + Documentation/licenses/COPYING.GPLv2 \ + Documentation/licenses/COPYING.LGPLv2.1 \ + libuuid/COPYING \ + Documentation/licenses/COPYING.BSD-3 -PKG_BUILD_PARALLEL:=1 +PKG_BUILD_PARALLEL:=0 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_cal \ @@ -457,37 +464,48 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/include/libsmartcols/libsmartcols.h $(1)/usr/include/libsmartcols $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libblkid.{a,so*} $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfdisk.{a,so*} $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmount.{a,so*} $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuuid.{a,so*} $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsmartcols.{a,so*} $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/lib/libblkid.so* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/lib/libfdisk.so* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/lib/libmount.so* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/lib/libuuid.so* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/lib/libsmartcols.so* $(1)/usr/lib + + $(LN) libblkid.so.1 $(1)/usr/lib/libblkid.so + $(LN) libfdisk.so.1 $(1)/usr/lib/libfdisk.so + $(LN) libmount.so.1 $(1)/usr/lib/libmount.so + $(LN) libuuid.so.1 $(1)/usr/lib/libuuid.so + $(LN) libsmartcols.so.1 $(1)/usr/lib/libsmartcols.so endef define Package/libfdisk/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/lib/libfdisk.so* $(1)/usr/lib/ + $(LN) libfdisk.so.1 $(1)/usr/lib/libfdisk.so endef define Package/libblkid/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/lib/libblkid.so* $(1)/usr/lib/ + $(LN) libblkid.so.1 $(1)/usr/lib/libblkid.so endef define Package/libmount/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/lib/libmount.so* $(1)/usr/lib/ + $(LN) libmount.so.1 $(1)/usr/lib/libmount.so endef define Package/libsmartcols/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/lib/libsmartcols.so* $(1)/usr/lib/ + $(LN) libsmartcols.so.1 $(1)/usr/lib/libsmartcols.so endef define Package/libuuid/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/lib/libuuid.so* $(1)/usr/lib/ + $(LN) libuuid.so.1 $(1)/usr/lib/libuuid.so endef define Package/agetty/install