diff options
Diffstat (limited to 'libre/linux-libre')
| -rw-r--r-- | libre/linux-libre/3.10.6-reset-superseed-xhci-hcd.patch | 24 | ||||
| -rw-r--r-- | libre/linux-libre/PKGBUILD | 17 |
2 files changed, 6 insertions, 35 deletions
diff --git a/libre/linux-libre/3.10.6-reset-superseed-xhci-hcd.patch b/libre/linux-libre/3.10.6-reset-superseed-xhci-hcd.patch deleted file mode 100644 index 0415b8a1e..000000000 --- a/libre/linux-libre/3.10.6-reset-superseed-xhci-hcd.patch +++ /dev/null @@ -1,24 +0,0 @@ -[PATCH] SCSI: Don't attempt to send extended INQUIRY command if skip_vpd_pages is set - -If a device has the skip_vpd_pages flag set we should simply fail the -scsi_get_vpd_page() call. - -Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> -Acked-by: Alan Stern <stern@rowland.harvard.edu> -Tested-by: Stuart Foster <smf.linux@ntlworld.com> -Cc: stable@vger.kernel.org - -diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c -index 3b1ea34..eaa808e 100644 ---- a/drivers/scsi/scsi.c -+++ b/drivers/scsi/scsi.c -@@ -1031,6 +1031,9 @@ int scsi_get_vpd_page(struct scsi_device *sdev, u8 page, unsigned char *buf, - { - int i, result; - -+ if (sdev->skip_vpd_pages) -+ goto fail; -+ - /* Ask for all the pages supported by this device */ - result = scsi_vpd_inquiry(sdev, buf, 0, buf_len); - if (result) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 4124814f4..b45052181 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 192495 2013-08-13 09:26:23Z tpowa $ +# $Id: PKGBUILD 193106 2013-08-16 10:56:45Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -_sublevel=6 +_sublevel=7 pkgver=${_basekernel}.${_sublevel} -pkgrel=2 -_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver +pkgrel=1 +_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,10 +31,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' 'criu-no-expert.patch' '3.10.6-logitech-dj.patch' - '3.10.6-reset-superseed-xhci-hcd.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '63a1c2aba22871f8e8dacdb4968d9a1f' + '8d05dec5772b17c4c21c00b93da42bd8' '8ec987449e0e42a1c98d8ce92b9019c2' '8efbd1f17f37bdaa8649c8a63761bf07' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -44,8 +43,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' 'f3def2cefdcbb954c21d8505d23cc83c' 'd50c1ac47394e9aec637002ef3392bd1' '3ff40ca684cfe719723e627e2cef7cea' - 'e751378a3e94532bfe85fb82c80e26c0' - '0f0e9441467a3eca33e23ebb75709f06') + '797e952fb0a168c0c1822acc0fac67bc') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -77,9 +75,6 @@ prepare() { # fix https://bugs.archlinux.org/task/35991 - [linux] 3.10.x renders Logitech Unified Receivers useless patch -Np1 -i "${srcdir}/3.10.6-logitech-dj.patch" - # fix https://bugs.archlinux.org/task/36296 - [linux] 3.10.3 reset SuperSpeed USB using xhci_hcd - patch -Np1 -i "${srcdir}/3.10.6-reset-superseed-xhci-hcd.patch" - if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ |