diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-10-16 20:10:34 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-10-16 20:10:34 +0200 |
| commit | 94c0a7374ee0c980a34e134f93dca1d46e7af7bc (patch) | |
| tree | 134e5415fb5d2ccc613bdab46c97f5fa3df8c730 /package/pciutils/patches | |
| parent | 07c250a84c1cc9ace9ebf00800f2125461a2662b (diff) | |
| parent | 084c175e59e9ea61c68154ad9982adcd918cbfcf (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/freeradius-server/Makefile
package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
Diffstat (limited to 'package/pciutils/patches')
| -rw-r--r-- | package/pciutils/patches/patch-Makefile | 11 | ||||
| -rw-r--r-- | package/pciutils/patches/patch-lib_configure | 6 |
2 files changed, 14 insertions, 3 deletions
diff --git a/package/pciutils/patches/patch-Makefile b/package/pciutils/patches/patch-Makefile new file mode 100644 index 000000000..9cadfa9c2 --- /dev/null +++ b/package/pciutils/patches/patch-Makefile @@ -0,0 +1,11 @@ +--- pciutils-3.1.7.orig/Makefile 2010-01-31 18:42:12.000000000 +0100 ++++ pciutils-3.1.7/Makefile 2010-10-10 20:15:01.000000000 +0200 +@@ -52,7 +52,7 @@ PCIINC_INS=lib/config.h lib/header.h lib + + export + +-all: lib/$(PCILIB) lspci setpci example lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS) ++all: lib/$(PCILIB) lspci setpci lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS) + + lib/$(PCILIB): $(PCIINC) force + $(MAKE) -C lib all diff --git a/package/pciutils/patches/patch-lib_configure b/package/pciutils/patches/patch-lib_configure index cde870cce..1c9629487 100644 --- a/package/pciutils/patches/patch-lib_configure +++ b/package/pciutils/patches/patch-lib_configure @@ -1,7 +1,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- pciutils-3.0.3.orig/lib/configure 2008-11-09 20:50:26.000000000 +0100 -+++ pciutils-3.0.3/lib/configure 2009-01-09 19:56:33.000000000 +0100 -@@ -60,7 +60,6 @@ case $sys in +--- pciutils-3.1.7.orig/lib/configure 2009-07-04 18:11:04.000000000 +0200 ++++ pciutils-3.1.7/lib/configure 2010-10-10 20:14:17.000000000 +0200 +@@ -64,7 +64,6 @@ case $sys in echo_n " sysfs proc" echo >>$c '#define PCI_HAVE_PM_LINUX_SYSFS' echo >>$c '#define PCI_HAVE_PM_LINUX_PROC' |