summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-08-16 01:44:35 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-08-16 01:44:35 -0300
commit29b5d73de0535263b749a07c4a92fa2103119c7b (patch)
tree54a4f6cd9a822b68aa6de98b3b19799fdcfde735
parentb58b17b90cf7656e1c51d531c2df8d743f7ebf2b (diff)
downloadabslibre-29b5d73de0535263b749a07c4a92fa2103119c7b.tar.gz
abslibre-29b5d73de0535263b749a07c4a92fa2103119c7b.tar.bz2
abslibre-29b5d73de0535263b749a07c4a92fa2103119c7b.zip
linux-libre-3.5.2-1: updating version
-rw-r--r--libre/linux-libre/PKGBUILD11
-rw-r--r--libre/linux-libre/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch48
2 files changed, 2 insertions, 57 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 21a5a68d4..6c287447d 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,7 +10,7 @@
pkgbase=linux-libre # Build stock -LIBRE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.5
-_sublevel=1
+_sublevel=2
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
@@ -29,13 +29,12 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'Kbuild.platforms'
'boot-logo.patch'
'change-default-console-loglevel.patch'
- 'avmfritz-only-few-bytes-are-transfered-on-a-conn.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
_kernelname=${pkgbase#linux-libre}
_localversionname=-LIBRE
md5sums=('2407fc9563a74acaf38aa0c06516eb1c'
- '67b650dd355fbca16035510df063420b'
+ 'b081f37b73c652cbb0d5193174092709'
'7f0b7950bc9d2a20cdb6b850e6e4eb5a'
'a796ea383eb136cb38fab0a52b6d2f52'
'e49ac236dfeef709f91a3d993ea7b62c'
@@ -43,7 +42,6 @@ md5sums=('2407fc9563a74acaf38aa0c06516eb1c'
'8267264d9a8966e57fdacd1fa1fc65c4'
'04b21c79df0a952c22d681dd4f4562df'
'9d3c56a4b999c8bfbd4018089a62f662'
- '2afcc001cc178be72e3a19d95f4bd5eb'
'eb25429666af638b01baa663eca74d08')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
@@ -67,11 +65,6 @@ build() {
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
- # fix avmfritz capi20 functionallity
- # will be added to 3.5.2
- # https://bugzilla.kernel.org/show_bug.cgi?id=45271
- patch -Np1 -i "${srcdir}/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch"
-
if [ "$CARCH" == "mips64el" ]; then
sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre/linux-libre/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch b/libre/linux-libre/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch
deleted file mode 100644
index f8bb193c6..000000000
--- a/libre/linux-libre/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 285c08154eede7dc4387bfc925967c884594dcc9 Mon Sep 17 00:00:00 2001
-From: Karsten Keil <keil@b1-systems.de>
-Date: Sat, 28 Jul 2012 20:10:04 +0200
-Subject: [PATCH] mISDN: Bugfix only few bytes are transfered on a connection
-
-The test for the fillempty condition was wrong in one place.
-Changed the variable to the right boolean type.
-
-Signed-off-by: Karsten Keil <keil@b1-systems.de>
----
- drivers/isdn/hardware/mISDN/avmfritz.c | 7 ++++---
- 1 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/isdn/hardware/mISDN/avmfritz.c b/drivers/isdn/hardware/mISDN/avmfritz.c
-index c08fc60..fa6ca47 100644
---- a/drivers/isdn/hardware/mISDN/avmfritz.c
-+++ b/drivers/isdn/hardware/mISDN/avmfritz.c
-@@ -449,7 +449,8 @@ hdlc_fill_fifo(struct bchannel *bch)
- {
- struct fritzcard *fc = bch->hw;
- struct hdlc_hw *hdlc;
-- int count, fs, cnt = 0, idx, fillempty = 0;
-+ int count, fs, cnt = 0, idx;
-+ bool fillempty = false;
- u8 *p;
- u32 *ptr, val, addr;
-
-@@ -462,7 +463,7 @@ hdlc_fill_fifo(struct bchannel *bch)
- return;
- count = fs;
- p = bch->fill;
-- fillempty = 1;
-+ fillempty = true;
- } else {
- count = bch->tx_skb->len - bch->tx_idx;
- if (count <= 0)
-@@ -477,7 +478,7 @@ hdlc_fill_fifo(struct bchannel *bch)
- hdlc->ctrl.sr.cmd |= HDLC_CMD_XME;
- }
- ptr = (u32 *)p;
-- if (fillempty) {
-+ if (!fillempty) {
- pr_debug("%s.B%d: %d/%d/%d", fc->name, bch->nr, count,
- bch->tx_idx, bch->tx_skb->len);
- bch->tx_idx += count;
---
-1.7.7
-