From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from ptx.hi.pengutronix.de ([2001:6f8:1178:2:5054:ff:fec0:8e10] ident=Debian-exim) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1WVdJc-0004bo-B9 for ptxdist@pengutronix.de; Thu, 03 Apr 2014 10:48:04 +0200 Received: from mol by ptx.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1WVdJc-0004uh-9c for ptxdist@pengutronix.de; Thu, 03 Apr 2014 10:48:04 +0200 Date: Thu, 3 Apr 2014 10:48:04 +0200 From: Michael Olbrich Message-ID: <20140403084804.GB13902@pengutronix.de> References: <1396368155-27756-1-git-send-email-alex.aring@gmail.com> <1396368155-27756-3-git-send-email-alex.aring@gmail.com> <20140402091546.GG31118@pengutronix.de> <20140403082938.GA764@omega.Speedport_W_921V_1_24_000> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20140403082938.GA764@omega.Speedport_W_921V_1_24_000> Subject: Re: [ptxdist] [PATCH 2/3] pciutils: bump version and cleanup Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de On Thu, Apr 03, 2014 at 10:29:40AM +0200, Alexander Aring wrote: > Hi Michael, > > On Wed, Apr 02, 2014 at 11:15:46AM +0200, Michael Olbrich wrote: > > On Tue, Apr 01, 2014 at 06:02:34PM +0200, Alexander Aring wrote: > > > This patch bumps the version of pciutils from 3.1.2 to 3.2.1. > > > > > > Also cleanup the rule files: > > > > > > - remove of the prepare rule. > > > - use of call ptx/ifdef instead ifdefs. > > > - Adding support for installing libpci. > > > - Also adds a patch with rename the install dependency from > > > install-pcilib to install-lib, which also install pkg-config files. > > > Smells like a mainline bug, I don't know powertop doesn't find the > > > library otherwise. > > > - Addings support for libkmod feature (sounds cool). > > > - Add install of /usr/bin/update-pciids. > > > - fit the help messages in Kconfig in 80 char width. > > > > > > Signed-off-by: Alexander Aring > > > --- > > > ...iutils-install-lib-dependency-when-SHARED.patch | 31 ++++++++++++++++++++++ > > > patches/pciutils-3.2.1/series | 1 + > > > rules/pciutils.in | 23 ++++++++++++---- > > > rules/pciutils.make | 24 ++++++++--------- > > > 4 files changed, 61 insertions(+), 18 deletions(-) > > > create mode 100644 patches/pciutils-3.2.1/0001-pciutils-install-lib-dependency-when-SHARED.patch > > > create mode 100644 patches/pciutils-3.2.1/series > > > > > > diff --git a/patches/pciutils-3.2.1/0001-pciutils-install-lib-dependency-when-SHARED.patch b/patches/pciutils-3.2.1/0001-pciutils-install-lib-dependency-when-SHARED.patch > > > new file mode 100644 > > > index 0000000..84bc3a5 > > > --- /dev/null > > > +++ b/patches/pciutils-3.2.1/0001-pciutils-install-lib-dependency-when-SHARED.patch > > > @@ -0,0 +1,31 @@ > > > +From d0d7d419885d98f7d54d0a66b321db08f7974a93 Mon Sep 17 00:00:00 2001 > > > +From: Alexander Aring > > > +Date: Tue, 1 Apr 2014 14:40:33 +0200 > > > +Subject: [PATCH] pciutils: install-lib dependency when SHARED > > > + > > > +This patch rename the install rule dependency from install-pcilib > > > +to install-lib, when SHARED=yes. The install-pcilib doesn't install the > > > +libpci.pc files for pkg-config but install-lib does. This is necessary > > > +for packages like powertop which search for the libpci library. > > > + > > > +Signed-off-by: Alexander Aring > > > +--- > > > + Makefile | 2 +- > > > + 1 file changed, 1 insertion(+), 1 deletion(-) > > > + > > > +diff --git a/Makefile b/Makefile > > > +index 0a21ee8..5b91a5f 100644 > > > +--- a/Makefile > > > ++++ b/Makefile > > > +@@ -118,7 +118,7 @@ ifeq ($(SHARED),yes) > > > + endif > > > + > > > + ifeq ($(SHARED),yes) > > > +-install: install-pcilib > > > ++install: install-lib > > > + endif > > > > > > We can avoid this patch with: > > > > PCIUTILS_INSTALL_OPT := install install-lib > > > When I use INSTALL_OPT here I get a: > > ptxdist: error: ptxd_make_world_init_compat: _MAKEVARS is incompatible with _INSTALL_OPT > > and I detected we need something like: > > PCIUTILS_INSTALL_OPT := $(call ptx/ifdef,PTXCONF_PCIUTILS_LIBPCI,install-pcilib,install) > > because we can't run install-pcilib if SHARED MAKEVAR is not yes. Maybe I can > overwrite the install rule for that or should I keep the patch? Right. Rename PCIUTILS_MAKEVARS to PCIUTILS_MAKE_OPT and then: PCIUTILS_INSTALL_OPT := \ $(PCIUTILS_MAKE_OPT) \ $(call ptx/ifdef,PTXCONF_PCIUTILS_LIBPCI,install-pcilib,install) or something like that. Michael -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list ptxdist@pengutronix.de