[arch-commits] Commit in pciutils/repos (6 files)
Andreas Radke
andyrtr at archlinux.org
Sat May 21 11:18:22 UTC 2016
Date: Saturday, May 21, 2016 @ 13:18:22
Author: andyrtr
Revision: 268461
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
pciutils/repos/testing-i686/PKGBUILD
(from rev 268460, pciutils/trunk/PKGBUILD)
pciutils/repos/testing-i686/fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff
(from rev 268460, pciutils/trunk/fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff)
pciutils/repos/testing-x86_64/PKGBUILD
(from rev 268460, pciutils/trunk/PKGBUILD)
pciutils/repos/testing-x86_64/fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff
(from rev 268460, pciutils/trunk/fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff)
Deleted:
pciutils/repos/testing-i686/PKGBUILD
pciutils/repos/testing-x86_64/PKGBUILD
---------------------------------------------------------------------+
/PKGBUILD | 76 ++++++++++
testing-i686/PKGBUILD | 29 ---
testing-i686/fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff | 21 ++
testing-x86_64/PKGBUILD | 29 ---
testing-x86_64/fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff | 21 ++
5 files changed, 118 insertions(+), 58 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2016-05-21 11:18:10 UTC (rev 268460)
+++ testing-i686/PKGBUILD 2016-05-21 11:18:22 UTC (rev 268461)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-pkgname=pciutils
-pkgver=3.5.0
-pkgrel=1
-pkgdesc="PCI bus configuration space access library and tools"
-arch=(i686 x86_64)
-license=('GPL2')
-groups=('base')
-url="http://mj.ucw.cz/sw/pciutils/"
-depends=('glibc' 'hwids' 'kmod')
-source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2
- ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz)
-md5sums=('6eeea209e4eea9eb8ce3faaedb3a10d0')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man SBINDIR=/usr/bin lib/libpci.a
- cp lib/libpci.a "${srcdir}/"
- make clean
- make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
- # this is now supplied by the hwids package
- rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8,hwdata}}
-}
Copied: pciutils/repos/testing-i686/PKGBUILD (from rev 268460, pciutils/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-05-21 11:18:22 UTC (rev 268461)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+pkgname=pciutils
+pkgver=3.5.0
+pkgrel=2
+pkgdesc="PCI bus configuration space access library and tools"
+arch=(i686 x86_64)
+license=('GPL2')
+groups=('base')
+url="http://mj.ucw.cz/sw/pciutils/"
+depends=('glibc' 'hwids' 'kmod')
+source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+ ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz
+ fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff)
+md5sums=('6eeea209e4eea9eb8ce3faaedb3a10d0'
+ '1c3cf4f4e691262e6272ebb6e34706a0')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ # fix broken ABI
+ # FS#49423; http://www.spinics.net/lists/linux-pci/msg51269.html
+ patch -Np1 -i ${srcdir}/fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man SBINDIR=/usr/bin lib/libpci.a
+ cp lib/libpci.a "${srcdir}/"
+ make clean
+ make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
+ # this is now supplied by the hwids package
+ rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8,hwdata}}
+}
Copied: pciutils/repos/testing-i686/fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff (from rev 268460, pciutils/trunk/fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff)
===================================================================
--- testing-i686/fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff (rev 0)
+++ testing-i686/fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff 2016-05-21 11:18:22 UTC (rev 268461)
@@ -0,0 +1,21 @@
+--- a/lib/init.c 2016-05-20 11:53:00.065874342 -0400
++++ b/lib/init.c 2016-05-20 11:53:16.725850370 -0400
+@@ -214,6 +214,8 @@
+ }
+
+ STATIC_ALIAS(void pci_init(struct pci_access *a), pci_init_v35(a));
++DEFINE_ALIAS(void pci_init_v30(struct pci_access *a), pci_init_v35);
++SYMBOL_VERSION(pci_init_v30, pci_init at LIBPCI_3.0);
+ SYMBOL_VERSION(pci_init_v35, pci_init@@LIBPCI_3.5);
+
+ void
+--- a/lib/internal.h 2016-05-14 05:58:01.000000000 -0400
++++ b/lib/internal.h 2016-05-20 12:04:02.144993094 -0400
+@@ -61,6 +61,7 @@
+ void pci_mfree(void *);
+ char *pci_strdup(struct pci_access *a, const char *s);
+
++void pci_init_v30(struct pci_access *a) VERSIONED_ABI;
+ void pci_init_v35(struct pci_access *a) VERSIONED_ABI;
+
+ /* access.c */
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2016-05-21 11:18:10 UTC (rev 268460)
+++ testing-x86_64/PKGBUILD 2016-05-21 11:18:22 UTC (rev 268461)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-pkgname=pciutils
-pkgver=3.5.0
-pkgrel=1
-pkgdesc="PCI bus configuration space access library and tools"
-arch=(i686 x86_64)
-license=('GPL2')
-groups=('base')
-url="http://mj.ucw.cz/sw/pciutils/"
-depends=('glibc' 'hwids' 'kmod')
-source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2
- ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz)
-md5sums=('6eeea209e4eea9eb8ce3faaedb3a10d0')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man SBINDIR=/usr/bin lib/libpci.a
- cp lib/libpci.a "${srcdir}/"
- make clean
- make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
- # this is now supplied by the hwids package
- rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8,hwdata}}
-}
Copied: pciutils/repos/testing-x86_64/PKGBUILD (from rev 268460, pciutils/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-05-21 11:18:22 UTC (rev 268461)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+pkgname=pciutils
+pkgver=3.5.0
+pkgrel=2
+pkgdesc="PCI bus configuration space access library and tools"
+arch=(i686 x86_64)
+license=('GPL2')
+groups=('base')
+url="http://mj.ucw.cz/sw/pciutils/"
+depends=('glibc' 'hwids' 'kmod')
+source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+ ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz
+ fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff)
+md5sums=('6eeea209e4eea9eb8ce3faaedb3a10d0'
+ '1c3cf4f4e691262e6272ebb6e34706a0')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ # fix broken ABI
+ # FS#49423; http://www.spinics.net/lists/linux-pci/msg51269.html
+ patch -Np1 -i ${srcdir}/fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man SBINDIR=/usr/bin lib/libpci.a
+ cp lib/libpci.a "${srcdir}/"
+ make clean
+ make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
+ # this is now supplied by the hwids package
+ rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8,hwdata}}
+}
Copied: pciutils/repos/testing-x86_64/fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff (from rev 268460, pciutils/trunk/fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff)
===================================================================
--- testing-x86_64/fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff (rev 0)
+++ testing-x86_64/fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff 2016-05-21 11:18:22 UTC (rev 268461)
@@ -0,0 +1,21 @@
+--- a/lib/init.c 2016-05-20 11:53:00.065874342 -0400
++++ b/lib/init.c 2016-05-20 11:53:16.725850370 -0400
+@@ -214,6 +214,8 @@
+ }
+
+ STATIC_ALIAS(void pci_init(struct pci_access *a), pci_init_v35(a));
++DEFINE_ALIAS(void pci_init_v30(struct pci_access *a), pci_init_v35);
++SYMBOL_VERSION(pci_init_v30, pci_init at LIBPCI_3.0);
+ SYMBOL_VERSION(pci_init_v35, pci_init@@LIBPCI_3.5);
+
+ void
+--- a/lib/internal.h 2016-05-14 05:58:01.000000000 -0400
++++ b/lib/internal.h 2016-05-20 12:04:02.144993094 -0400
+@@ -61,6 +61,7 @@
+ void pci_mfree(void *);
+ char *pci_strdup(struct pci_access *a, const char *s);
+
++void pci_init_v30(struct pci_access *a) VERSIONED_ABI;
+ void pci_init_v35(struct pci_access *a) VERSIONED_ABI;
+
+ /* access.c */
More information about the arch-commits
mailing list