* [Buildroot] svn commit: trunk/buildroot/package/pciutils
@ 2006-12-05 12:57 aldot at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2006-12-05 12:57 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-12-05 04:57:41 -0800 (Tue, 05 Dec 2006)
New Revision: 16784
Log:
- set PREFIX and SHAREDIR proper
Modified:
trunk/buildroot/package/pciutils/pciutils.mk
Changeset:
Modified: trunk/buildroot/package/pciutils/pciutils.mk
===================================================================
--- trunk/buildroot/package/pciutils/pciutils.mk 2006-12-05 05:23:56 UTC (rev 16783)
+++ trunk/buildroot/package/pciutils/pciutils.mk 2006-12-05 12:57:41 UTC (rev 16784)
@@ -29,7 +29,9 @@
touch $(PCIUTILS_DIR)/.unpacked
$(PCIUTILS_DIR)/.compiled: $(PCIUTILS_DIR)/.unpacked
- $(MAKE1) CC=$(TARGET_CC) OPT="$(TARGET_CFLAGS)" -C $(PCIUTILS_DIR)
+ $(MAKE1) CC=$(TARGET_CC) OPT="$(TARGET_CFLAGS)" -C $(PCIUTILS_DIR) \
+ SHAREDIR="/usr/share/misc" \
+ PREFIX=/usr
touch $(PCIUTILS_DIR)/.compiled
$(TARGET_DIR)/sbin/lspci: $(PCIUTILS_DIR)/.compiled
@@ -38,7 +40,7 @@
$(TARGET_DIR)/sbin/setpci: $(PCIUTILS_DIR)/.compiled
install -c $(PCIUTILS_DIR)/setpci $(TARGET_DIR)/sbin/setpci
-$(TARGET_DIR)/usr/share/misc/pci.ids: $(PCIUTILS_DIR)/.compiled
+$(TARGET_DIR)/usr/share/misc/pci.ids: $(PCIUTILS_DIR)/.unpacked
install -Dc $(PCIUTILS_DIR)/pci.ids $(TARGET_DIR)/usr/share/misc/pci.ids
pciutils: uclibc $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/sbin/lspci $(TARGET_DIR)/usr/share/misc/pci.ids
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/pciutils
@ 2007-08-21 16:51 aldot at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2007-08-21 16:51 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-08-21 09:51:46 -0700 (Tue, 21 Aug 2007)
New Revision: 19621
Log:
- bump version to 2.2.6
Modified:
trunk/buildroot/package/pciutils/pciutils.mk
trunk/buildroot/package/pciutils/pciutils.patch
Changeset:
Modified: trunk/buildroot/package/pciutils/pciutils.mk
===================================================================
--- trunk/buildroot/package/pciutils/pciutils.mk 2007-08-21 16:48:47 UTC (rev 19620)
+++ trunk/buildroot/package/pciutils/pciutils.mk 2007-08-21 16:51:46 UTC (rev 19621)
@@ -3,7 +3,7 @@
# pciutils
#
#############################################################
-PCIUTILS_VERSION:=2.1.11
+PCIUTILS_VERSION:=2.2.6
PCIUTILS_SOURCE:=pciutils-$(PCIUTILS_VERSION).tar.gz
PCIUTILS_CAT:=$(ZCAT)
PCIUTILS_SITE:=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
Modified: trunk/buildroot/package/pciutils/pciutils.patch
===================================================================
--- trunk/buildroot/package/pciutils/pciutils.patch 2007-08-21 16:48:47 UTC (rev 19620)
+++ trunk/buildroot/package/pciutils/pciutils.patch 2007-08-21 16:51:46 UTC (rev 19621)
@@ -1,5 +1,5 @@
---- pciutils-2.1.11/lib/configure
-+++ pciutils-2.1.11/lib/configure
+--- pciutils-2.2.6/lib/configure
++++ pciutils-2.2.6/lib/configure
@@ -12,7 +12,7 @@
echo_n "Configuring libpci for your system..."
sharedir=${1:-/usr/share}
@@ -9,68 +9,4 @@
rel=`uname -r`
if [ "$sys" = "AIX" -a -x /usr/bin/oslevel -a -x /usr/sbin/lsattr ]
then
-@@ -25,7 +25,6 @@
- echo " $sys/$cpu $rel"
-
- c=config.h
--echo >$c "#define ARCH_`echo $cpu | tr 'a-z' 'A-Z'`"
- echo >>$c "#define OS_`echo $sys | tr 'a-z' 'A-Z'`"
-
- echo_n "Looking for access methods..."
-@@ -40,17 +39,6 @@
- ok=1
- ;;
- esac
-- case $cpu in
-- i386) echo_n " i386-ports"
-- echo >>$c '#define HAVE_PM_INTEL_CONF'
-- ok=1
-- ;;
-- alpha|ia64) echo >>$c '#define HAVE_64BIT_ADDRESS'
-- ;;
-- sparc|sparc64) echo >>$c '#define HAVE_64BIT_ADDRESS'
-- echo >>$c '#define HAVE_LONG_ADDRESS'
-- ;;
-- esac
- ;;
- FreeBSD)
- echo_n " fbsd-device"
---- pciutils-2.1.11/Makefile
-+++ pciutils-2.1.11/Makefile
-@@ -18,16 +18,6 @@
- DIRINSTALL=install -d
- PCILIB=libpci.a
-
--ifeq ($(shell uname),NetBSD)
--PCILIB=libpciutils.a
--LDFLAGS+=-lpci
--else
--ifeq ($(shell uname),AIX)
--CFLAGS=-g
--INSTALL=installbsd
--DIRINSTALL=mkdir -p
--endif
--endif
-
- export
-
---- pciutils-2.1.11/lspci.c
-+++ pciutils-2.1.11/lspci.c
-@@ -51,7 +51,7 @@
-
- /* Format strings used for IRQ numbers and memory addresses */
-
--#ifdef ARCH_SPARC64
-+#ifdef __sparc64__
- #define IRQ_FORMAT "%08x"
- #else
- #define IRQ_FORMAT "%d"
-@@ -67,7 +67,7 @@
- #define ADDR_FORMAT "%08lx"
- #endif
-
--#ifdef ARCH_SPARC64
-+#ifdef __sparc64__
- #define IO_FORMAT "%016Lx"
- #elif defined(HAVE_LONG_ADDRESS)
- #define IO_FORMAT "%04Lx"
+
^ permalink raw reply [flat|nested] 17+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/pciutils
@ 2008-04-08 13:06 nkukard at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: nkukard at uclibc.org @ 2008-04-08 13:06 UTC (permalink / raw)
To: buildroot
Author: nkukard
Date: 2008-04-08 06:06:07 -0700 (Tue, 08 Apr 2008)
New Revision: 21670
Log:
* Bump pciutils version
Modified:
trunk/buildroot/package/pciutils/pciutils.mk
Changeset:
Modified: trunk/buildroot/package/pciutils/pciutils.mk
===================================================================
--- trunk/buildroot/package/pciutils/pciutils.mk 2008-04-08 10:21:16 UTC (rev 21669)
+++ trunk/buildroot/package/pciutils/pciutils.mk 2008-04-08 13:06:07 UTC (rev 21670)
@@ -3,7 +3,7 @@
# pciutils
#
#############################################################
-PCIUTILS_VERSION:=2.2.6
+PCIUTILS_VERSION:=2.2.10
PCIUTILS_SOURCE:=pciutils-$(PCIUTILS_VERSION).tar.gz
PCIUTILS_CAT:=$(ZCAT)
PCIUTILS_SITE:=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/pciutils
@ 2008-10-31 3:55 correa at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: correa at uclibc.org @ 2008-10-31 3:55 UTC (permalink / raw)
To: buildroot
Author: correa
Date: 2008-10-30 20:55:03 -0700 (Thu, 30 Oct 2008)
New Revision: 23875
Log:
Minor cleanups. Use touch for stamp-files
Modified:
trunk/buildroot/package/pciutils/pciutils.mk
Changeset:
Modified: trunk/buildroot/package/pciutils/pciutils.mk
===================================================================
--- trunk/buildroot/package/pciutils/pciutils.mk 2008-10-31 03:04:55 UTC (rev 23874)
+++ trunk/buildroot/package/pciutils/pciutils.mk 2008-10-31 03:55:03 UTC (rev 23875)
@@ -26,13 +26,13 @@
$(PCIUTILS_CAT) $(DL_DIR)/$(PCIUTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
$(PCIIDS_CAT) $(DL_DIR)/$(PCIIDS_SOURCE) > $(PCIUTILS_DIR)/pci.ids
toolchain/patch-kernel.sh $(PCIUTILS_DIR) package/pciutils pciutils\*.patch
- touch $(PCIUTILS_DIR)/.unpacked
+ touch $@
$(PCIUTILS_DIR)/.compiled: $(PCIUTILS_DIR)/.unpacked
$(MAKE1) CC=$(TARGET_CC) OPT="$(TARGET_CFLAGS)" -C $(PCIUTILS_DIR) \
SHAREDIR="/usr/share/misc" \
PREFIX=/usr
- touch $(PCIUTILS_DIR)/.compiled
+ touch $@
$(TARGET_DIR)/sbin/lspci: $(PCIUTILS_DIR)/.compiled
install -c $(PCIUTILS_DIR)/lspci $(TARGET_DIR)/sbin/lspci
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/pciutils
@ 2008-10-31 4:03 correa at uclibc.org
2008-10-31 10:30 ` Bernhard Reutner-Fischer
0 siblings, 1 reply; 17+ messages in thread
From: correa at uclibc.org @ 2008-10-31 4:03 UTC (permalink / raw)
To: buildroot
Author: correa
Date: 2008-10-30 21:03:27 -0700 (Thu, 30 Oct 2008)
New Revision: 23876
Log:
Fix bug #0005884 - pciutils depends on zlib
Modified:
trunk/buildroot/package/pciutils/Config.in
trunk/buildroot/package/pciutils/pciutils.mk
Changeset:
Modified: trunk/buildroot/package/pciutils/Config.in
===================================================================
--- trunk/buildroot/package/pciutils/Config.in 2008-10-31 03:55:03 UTC (rev 23875)
+++ trunk/buildroot/package/pciutils/Config.in 2008-10-31 04:03:27 UTC (rev 23876)
@@ -1,5 +1,6 @@
config BR2_PACKAGE_PCIUTILS
bool "pciutils"
+ depends on BR2_PACKAGE_ZLIB
help
Various utilities dealing with the PCI bus.
Provides things like setpci and lspci.
Modified: trunk/buildroot/package/pciutils/pciutils.mk
===================================================================
--- trunk/buildroot/package/pciutils/pciutils.mk 2008-10-31 03:55:03 UTC (rev 23875)
+++ trunk/buildroot/package/pciutils/pciutils.mk 2008-10-31 04:03:27 UTC (rev 23876)
@@ -43,7 +43,7 @@
$(TARGET_DIR)/usr/share/misc/pci.ids: $(PCIUTILS_DIR)/.unpacked
install -Dc $(PCIUTILS_DIR)/pci.ids $(TARGET_DIR)/usr/share/misc/pci.ids
-pciutils: uclibc $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/sbin/lspci $(TARGET_DIR)/usr/share/misc/pci.ids
+pciutils: uclibc zlib $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/sbin/lspci $(TARGET_DIR)/usr/share/misc/pci.ids
pciutils-clean:
rm $(TARGET_DIR)/sbin/lspci $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/usr/share/misc/pci.ids
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/pciutils
2008-10-31 4:03 correa at uclibc.org
@ 2008-10-31 10:30 ` Bernhard Reutner-Fischer
2008-10-31 10:54 ` Thiago A. Corrêa
0 siblings, 1 reply; 17+ messages in thread
From: Bernhard Reutner-Fischer @ 2008-10-31 10:30 UTC (permalink / raw)
To: buildroot
On Thu, Oct 30, 2008 at 09:03:28PM -0700, correa at uclibc.org wrote:
>Author: correa
>Date: 2008-10-30 21:03:27 -0700 (Thu, 30 Oct 2008)
>New Revision: 23876
>
>Log:
>Fix bug #0005884 - pciutils depends on zlib
This is not correct.
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/pciutils
2008-10-31 10:30 ` Bernhard Reutner-Fischer
@ 2008-10-31 10:54 ` Thiago A. Corrêa
2008-10-31 11:02 ` Bernhard Reutner-Fischer
0 siblings, 1 reply; 17+ messages in thread
From: Thiago A. Corrêa @ 2008-10-31 10:54 UTC (permalink / raw)
To: buildroot
On Fri, Oct 31, 2008 at 8:30 AM, Bernhard Reutner-Fischer
<rep.dot.nop@gmail.com> wrote:
> On Thu, Oct 30, 2008 at 09:03:28PM -0700, correa at uclibc.org wrote:
>>Author: correa
>>Date: 2008-10-30 21:03:27 -0700 (Thu, 30 Oct 2008)
>>New Revision: 23876
>>
>>Log:
>>Fix bug #0005884 - pciutils depends on zlib
>
> This is not correct.
Patches welcome.
Four words mails are not as much helpfull as they might seam. What
exactly is not correct? It looks pretty much correct:
http://git.kernel.org/?p=utils/pciutils/pciutils.git;a=blob;f=Makefile;h=bc163db5431c64d5d506944c5c98430a175049b5;hb=166bfe87b328908be0b1b7c7196410a1cfb1d8ea
Unless we add a patch that has no hope of ever going away or provide
the author with better build solutions. Neither of those I'm willing
to do for a package that I have no use for.
Either way, building without zlib, althougth possible, cripples
pciutils in not being able to use compressed PCI ID databases.
Kind Regards,
Thiago A. Correa
^ permalink raw reply [flat|nested] 17+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/pciutils
2008-10-31 10:54 ` Thiago A. Corrêa
@ 2008-10-31 11:02 ` Bernhard Reutner-Fischer
2008-10-31 11:27 ` Thiago A. Corrêa
0 siblings, 1 reply; 17+ messages in thread
From: Bernhard Reutner-Fischer @ 2008-10-31 11:02 UTC (permalink / raw)
To: buildroot
On Fri, Oct 31, 2008 at 08:54:59AM -0200, Thiago A. Corr?a wrote:
>>>Fix bug #0005884 - pciutils depends on zlib
>>
>> This is not correct.
>
>Patches welcome.
http://repo.or.cz/w/buildroot.git?a=tree;f=package/pciutils;hb=HEAD
>Either way, building without zlib, althougth possible, cripples
>pciutils in not being able to use compressed PCI ID databases.
yes, and that's perfectly fine.
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/pciutils
2008-10-31 11:02 ` Bernhard Reutner-Fischer
@ 2008-10-31 11:27 ` Thiago A. Corrêa
2008-10-31 12:15 ` Thiago A. Corrêa
0 siblings, 1 reply; 17+ messages in thread
From: Thiago A. Corrêa @ 2008-10-31 11:27 UTC (permalink / raw)
To: buildroot
On Fri, Oct 31, 2008 at 9:02 AM, Bernhard Reutner-Fischer
<rep.dot.nop@gmail.com> wrote:
> On Fri, Oct 31, 2008 at 08:54:59AM -0200, Thiago A. Corr?a wrote:
>
>>>>Fix bug #0005884 - pciutils depends on zlib
>>>
>>> This is not correct.
>>
>>Patches welcome.
>
> http://repo.or.cz/w/buildroot.git?a=tree;f=package/pciutils;hb=HEAD
>
>>Either way, building without zlib, althougth possible, cripples
>>pciutils in not being able to use compressed PCI ID databases.
>
> yes, and that's perfectly fine.
>
I see. Thanks. Will apply as soon as I finish build/testing your other
suggestion on zlib.
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/pciutils
@ 2008-10-31 12:14 correa at uclibc.org
2008-11-02 13:18 ` Peter Korsgaard
0 siblings, 1 reply; 17+ messages in thread
From: correa at uclibc.org @ 2008-10-31 12:14 UTC (permalink / raw)
To: buildroot
Author: correa
Date: 2008-10-31 05:14:39 -0700 (Fri, 31 Oct 2008)
New Revision: 23880
Log:
Improve pciutils based on Bernhard Reutner-Fischer's git repository (http://repo.or.cz/w/buildroot.git?a=tree;f=package/pciutils;hb=HEAD). Thanks
Removed:
trunk/buildroot/package/pciutils/pciutils.patch
Modified:
trunk/buildroot/package/pciutils/Config.in
trunk/buildroot/package/pciutils/pciutils.mk
Changeset:
Modified: trunk/buildroot/package/pciutils/Config.in
===================================================================
--- trunk/buildroot/package/pciutils/Config.in 2008-10-31 12:10:10 UTC (rev 23879)
+++ trunk/buildroot/package/pciutils/Config.in 2008-10-31 12:14:39 UTC (rev 23880)
@@ -1,6 +1,6 @@
config BR2_PACKAGE_PCIUTILS
bool "pciutils"
- depends on BR2_PACKAGE_ZLIB
+ default n
help
Various utilities dealing with the PCI bus.
Provides things like setpci and lspci.
Modified: trunk/buildroot/package/pciutils/pciutils.mk
===================================================================
--- trunk/buildroot/package/pciutils/pciutils.mk 2008-10-31 12:10:10 UTC (rev 23879)
+++ trunk/buildroot/package/pciutils/pciutils.mk 2008-10-31 12:14:39 UTC (rev 23880)
@@ -4,6 +4,7 @@
#
#############################################################
PCIUTILS_VERSION:=2.2.10
+PCIUTILS_VERSION:=3.0.1
PCIUTILS_SOURCE:=pciutils-$(PCIUTILS_VERSION).tar.gz
PCIUTILS_CAT:=$(ZCAT)
PCIUTILS_SITE:=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
@@ -14,40 +15,55 @@
PCIIDS_SOURCE:=pci.ids.bz2
PCIIDS_CAT:=$(BZCAT)
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+PCIUTILS_HAVE_ZLIB=yes
+PCIIDS_FILE=pci.ids.gz
+else
+PCIUTILS_HAVE_ZLIB=no
+PCIIDS_FILE=pci.ids
+endif
+
$(DL_DIR)/$(PCIUTILS_SOURCE):
$(WGET) -P $(DL_DIR) $(PCIUTILS_SITE)/$(PCIUTILS_SOURCE)
$(DL_DIR)/$(PCIIDS_SOURCE):
$(WGET) -P $(DL_DIR) $(PCIIDS_SITE)/$(PCIIDS_SOURCE)
-pciutils-source: $(DL_DIR)/$(PCIUTILS_SOURCE) $(DL_DIR)/$(PCIIDS_SOURCE)
-
$(PCIUTILS_DIR)/.unpacked: $(DL_DIR)/$(PCIUTILS_SOURCE) $(DL_DIR)/$(PCIIDS_SOURCE)
$(PCIUTILS_CAT) $(DL_DIR)/$(PCIUTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- $(PCIIDS_CAT) $(DL_DIR)/$(PCIIDS_SOURCE) > $(PCIUTILS_DIR)/pci.ids
- toolchain/patch-kernel.sh $(PCIUTILS_DIR) package/pciutils pciutils\*.patch
+ $(PCIIDS_CAT) $(DL_DIR)/$(PCIIDS_SOURCE) > $(PCIUTILS_DIR)/$(PCIIDS_FILE)
+ toolchain/patch-kernel.sh $(PCIUTILS_DIR) package/pciutils pciutils-$(PCIUTILS_VERSION)\*.patch
+ #$(CONFIG_UPDATE) $(@D)
+ $(SED) 's/uname -s/echo Linux/' \
+ -e 's/uname -r/echo $(LINUX_HEADERS_VERSION)/' \
+ $(PCIUTILS_DIR)/lib/configure
touch $@
$(PCIUTILS_DIR)/.compiled: $(PCIUTILS_DIR)/.unpacked
- $(MAKE1) CC=$(TARGET_CC) OPT="$(TARGET_CFLAGS)" -C $(PCIUTILS_DIR) \
+ $(MAKE1) CC="$(TARGET_CC)" OPT="$(TARGET_CFLAGS)" -C $(PCIUTILS_DIR) \
SHAREDIR="/usr/share/misc" \
+ ZLIB=$(PCIUTILS_HAVE_ZLIB) \
PREFIX=/usr
touch $@
$(TARGET_DIR)/sbin/lspci: $(PCIUTILS_DIR)/.compiled
- install -c $(PCIUTILS_DIR)/lspci $(TARGET_DIR)/sbin/lspci
+ $(INSTALL) $(PCIUTILS_DIR)/lspci $(TARGET_DIR)/sbin/lspci
+ $(STRIPCMD) $(STRIP_STRIP_ALL) $@
$(TARGET_DIR)/sbin/setpci: $(PCIUTILS_DIR)/.compiled
- install -c $(PCIUTILS_DIR)/setpci $(TARGET_DIR)/sbin/setpci
+ $(INSTALL) $(PCIUTILS_DIR)/setpci $(TARGET_DIR)/sbin/setpci
+ $(STRIPCMD) $(STRIP_STRIP_ALL) $@
-$(TARGET_DIR)/usr/share/misc/pci.ids: $(PCIUTILS_DIR)/.unpacked
- install -Dc $(PCIUTILS_DIR)/pci.ids $(TARGET_DIR)/usr/share/misc/pci.ids
+$(TARGET_DIR)/usr/share/misc/$(PCIIDS_FILE): $(PCIUTILS_DIR)/.unpacked
+ $(INSTALL) -D $(PCIUTILS_DIR)/$(PCIIDS_FILE) $(@D)
-pciutils: uclibc zlib $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/sbin/lspci $(TARGET_DIR)/usr/share/misc/pci.ids
+pciutils: uclibc $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/sbin/lspci $(TARGET_DIR)/usr/share/misc/$(PCIIDS_FILE)
+pciutils-source: $(DL_DIR)/$(PCIUTILS_SOURCE) $(DL_DIR)/$(PCIIDS_SOURCE)
+
pciutils-clean:
- rm $(TARGET_DIR)/sbin/lspci $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/usr/share/misc/pci.ids
-$(MAKE) -C $(PCIUTILS_DIR) clean
+ rm -f $(TARGET_DIR)/sbin/lspci $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/usr/share/misc/pci.ids*
pciutils-dirclean:
rm -rf $(PCIUTILS_DIR)
@@ -57,6 +73,6 @@
# Toplevel Makefile options
#
#############################################################
-ifeq ($(strip $(BR2_PACKAGE_PCIUTILS)),y)
+ifeq ($(BR2_PACKAGE_PCIUTILS),y)
TARGETS+=pciutils
endif
Deleted: trunk/buildroot/package/pciutils/pciutils.patch
===================================================================
--- trunk/buildroot/package/pciutils/pciutils.patch 2008-10-31 12:10:10 UTC (rev 23879)
+++ trunk/buildroot/package/pciutils/pciutils.patch 2008-10-31 12:14:39 UTC (rev 23880)
@@ -1,12 +0,0 @@
---- pciutils-2.2.6/lib/configure
-+++ pciutils-2.2.6/lib/configure
-@@ -12,7 +12,7 @@
- echo_n "Configuring libpci for your system..."
- sharedir=${1:-/usr/share}
- version=${2:-0.0}
--sys=`uname -s`
-+sys=Linux
- rel=`uname -r`
- if [ "$sys" = "AIX" -a -x /usr/bin/oslevel -a -x /usr/sbin/lsattr ]
- then
-
^ permalink raw reply [flat|nested] 17+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/pciutils
@ 2008-10-31 12:41 correa at uclibc.org
2008-11-02 13:24 ` Peter Korsgaard
0 siblings, 1 reply; 17+ messages in thread
From: correa at uclibc.org @ 2008-10-31 12:41 UTC (permalink / raw)
To: buildroot
Author: correa
Date: 2008-10-31 05:41:02 -0700 (Fri, 31 Oct 2008)
New Revision: 23881
Log:
pciutils may depend on zlib. Based on Bernhard's git repository.
Modified:
trunk/buildroot/package/pciutils/pciutils.mk
Changeset:
Modified: trunk/buildroot/package/pciutils/pciutils.mk
===================================================================
--- trunk/buildroot/package/pciutils/pciutils.mk 2008-10-31 12:14:39 UTC (rev 23880)
+++ trunk/buildroot/package/pciutils/pciutils.mk 2008-10-31 12:41:02 UTC (rev 23881)
@@ -57,7 +57,7 @@
$(TARGET_DIR)/usr/share/misc/$(PCIIDS_FILE): $(PCIUTILS_DIR)/.unpacked
$(INSTALL) -D $(PCIUTILS_DIR)/$(PCIIDS_FILE) $(@D)
-pciutils: uclibc $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/sbin/lspci $(TARGET_DIR)/usr/share/misc/$(PCIIDS_FILE)
+pciutils: uclibc $(if $(BR2_PACKAGE_ZLIB),zlib) $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/sbin/lspci $(TARGET_DIR)/usr/share/misc/$(PCIIDS_FILE)
pciutils-source: $(DL_DIR)/$(PCIUTILS_SOURCE) $(DL_DIR)/$(PCIIDS_SOURCE)
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/pciutils
2008-10-31 12:41 correa at uclibc.org
@ 2008-11-02 13:24 ` Peter Korsgaard
0 siblings, 0 replies; 17+ messages in thread
From: Peter Korsgaard @ 2008-11-02 13:24 UTC (permalink / raw)
To: buildroot
>>>>> "correa" == correa <correa@uclibc.org> writes:
correa> Author: correa
correa> Date: 2008-10-31 05:41:02 -0700 (Fri, 31 Oct 2008)
correa> New Revision: 23881
correa> Log:
correa> pciutils may depend on zlib. Based on Bernhard's git repository.
I personally don't find it worthwhile to do something like that for
such a standard/small library as zlib - But OK.
Buildroot is hard enough to test as it is, adding extra conditionals
to packages makes it worse - But OK.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/pciutils
@ 2009-01-01 14:05 nkukard at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: nkukard at uclibc.org @ 2009-01-01 14:05 UTC (permalink / raw)
To: buildroot
Author: nkukard
Date: 2009-01-01 14:05:54 +0000 (Thu, 01 Jan 2009)
New Revision: 24634
Log:
* By default pciutils build of libpci.a uses the host ar/ranlib, force the use of the target tools
Modified:
trunk/buildroot/package/pciutils/pciutils.mk
Changeset:
Modified: trunk/buildroot/package/pciutils/pciutils.mk
===================================================================
--- trunk/buildroot/package/pciutils/pciutils.mk 2009-01-01 14:00:35 UTC (rev 24633)
+++ trunk/buildroot/package/pciutils/pciutils.mk 2009-01-01 14:05:54 UTC (rev 24634)
@@ -40,7 +40,7 @@
touch $@
$(PCIUTILS_DIR)/.compiled: $(PCIUTILS_DIR)/.unpacked
- $(MAKE1) CC="$(TARGET_CC)" OPT="$(TARGET_CFLAGS)" -C $(PCIUTILS_DIR) \
+ $(MAKE1) CC="$(TARGET_CC)" OPT="$(TARGET_CFLAGS)" RANLIB=$(TARGET_RANLIB) AR=$(TARGET_AR) -C $(PCIUTILS_DIR) \
SHAREDIR="/usr/share/misc" \
ZLIB=$(PCIUTILS_HAVE_ZLIB) \
PREFIX=/usr
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/pciutils
@ 2009-01-01 17:28 nkukard at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: nkukard at uclibc.org @ 2009-01-01 17:28 UTC (permalink / raw)
To: buildroot
Author: nkukard
Date: 2009-01-01 17:28:51 +0000 (Thu, 01 Jan 2009)
New Revision: 24635
Log:
* Removed duplicate PCIUTILS_VERSION
* When installing pci.ids[.gz] the -D means create all components leading up, using $(@D) does not include the filename, the last directory component is then /usr/share. pci.ids[.gz] is therefore created as /usr/share/misc (misc being the filename). Using $@ fixes this, the directory path is created and the file is installed as /usr/share/misc/pci.ids[.gz] .
Modified:
trunk/buildroot/package/pciutils/pciutils.mk
Changeset:
Modified: trunk/buildroot/package/pciutils/pciutils.mk
===================================================================
--- trunk/buildroot/package/pciutils/pciutils.mk 2009-01-01 14:05:54 UTC (rev 24634)
+++ trunk/buildroot/package/pciutils/pciutils.mk 2009-01-01 17:28:51 UTC (rev 24635)
@@ -3,7 +3,6 @@
# pciutils
#
#############################################################
-PCIUTILS_VERSION:=2.2.10
PCIUTILS_VERSION:=3.0.1
PCIUTILS_SOURCE:=pciutils-$(PCIUTILS_VERSION).tar.gz
PCIUTILS_CAT:=$(ZCAT)
@@ -55,7 +54,7 @@
$(STRIPCMD) $(STRIP_STRIP_ALL) $@
$(TARGET_DIR)/usr/share/misc/$(PCIIDS_FILE): $(PCIUTILS_DIR)/.unpacked
- $(INSTALL) -D $(PCIUTILS_DIR)/$(PCIIDS_FILE) $(@D)
+ $(INSTALL) -D $(PCIUTILS_DIR)/$(PCIIDS_FILE) $@
pciutils: uclibc $(if $(BR2_PACKAGE_ZLIB),zlib) $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/sbin/lspci $(TARGET_DIR)/usr/share/misc/$(PCIIDS_FILE)
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/pciutils
@ 2009-01-02 12:01 nkukard at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: nkukard at uclibc.org @ 2009-01-02 12:01 UTC (permalink / raw)
To: buildroot
Author: nkukard
Date: 2009-01-02 12:01:49 +0000 (Fri, 02 Jan 2009)
New Revision: 24647
Log:
* Fix format of the pciutils pci.ids.gz data file
- If ZLIB is present the filename of pci.ids is changed to pci.ids.gz but its not compressed, add a compressor to ensure its gzipped
Modified:
trunk/buildroot/package/pciutils/pciutils.mk
Changeset:
Modified: trunk/buildroot/package/pciutils/pciutils.mk
===================================================================
--- trunk/buildroot/package/pciutils/pciutils.mk 2009-01-02 11:18:09 UTC (rev 24646)
+++ trunk/buildroot/package/pciutils/pciutils.mk 2009-01-02 12:01:49 UTC (rev 24647)
@@ -17,9 +17,11 @@
ifeq ($(BR2_PACKAGE_ZLIB),y)
PCIUTILS_HAVE_ZLIB=yes
PCIIDS_FILE=pci.ids.gz
+PCIIDS_COMPRESSOR=gzip -9 -c
else
PCIUTILS_HAVE_ZLIB=no
PCIIDS_FILE=pci.ids
+PCIIDS_COMPRESSOR=cat
endif
$(DL_DIR)/$(PCIUTILS_SOURCE):
@@ -30,7 +32,7 @@
$(PCIUTILS_DIR)/.unpacked: $(DL_DIR)/$(PCIUTILS_SOURCE) $(DL_DIR)/$(PCIIDS_SOURCE)
$(PCIUTILS_CAT) $(DL_DIR)/$(PCIUTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- $(PCIIDS_CAT) $(DL_DIR)/$(PCIIDS_SOURCE) > $(PCIUTILS_DIR)/$(PCIIDS_FILE)
+ $(PCIIDS_CAT) $(DL_DIR)/$(PCIIDS_SOURCE) | $(PCIIDS_COMPRESSOR) > $(PCIUTILS_DIR)/$(PCIIDS_FILE)
toolchain/patch-kernel.sh $(PCIUTILS_DIR) package/pciutils pciutils-$(PCIUTILS_VERSION)\*.patch
#$(CONFIG_UPDATE) $(@D)
$(SED) 's/uname -s/echo Linux/' \
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2009-01-02 12:01 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-12-05 12:57 [Buildroot] svn commit: trunk/buildroot/package/pciutils aldot at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2007-08-21 16:51 aldot at uclibc.org
2008-04-08 13:06 nkukard at uclibc.org
2008-10-31 3:55 correa at uclibc.org
2008-10-31 4:03 correa at uclibc.org
2008-10-31 10:30 ` Bernhard Reutner-Fischer
2008-10-31 10:54 ` Thiago A. Corrêa
2008-10-31 11:02 ` Bernhard Reutner-Fischer
2008-10-31 11:27 ` Thiago A. Corrêa
2008-10-31 12:15 ` Thiago A. Corrêa
2008-10-31 12:14 correa at uclibc.org
2008-11-02 13:18 ` Peter Korsgaard
2008-10-31 12:41 correa at uclibc.org
2008-11-02 13:24 ` Peter Korsgaard
2009-01-01 14:05 nkukard at uclibc.org
2009-01-01 17:28 nkukard at uclibc.org
2009-01-02 12:01 nkukard at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox