Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

5 files changed, 72 insertions, 55 deletions

diff --git a/libre/linux-libre/3.4.2-rpc_pipefs.patch b/libre/linux-libre/3.4.2-rpc_pipefs.patch
deleted file mode 100644
index db53b3813..000000000
--- a/libre/linux-libre/3.4.2-rpc_pipefs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
-index 0404047..21fde99 100644
---- a/net/sunrpc/rpc_pipe.c
-+++ b/net/sunrpc/rpc_pipe.c
-@@ -71,7 +71,9 @@ static void rpc_purge_list(wait_queue_head_t *waitq, struct list_head *head,
- 		msg->errno = err;
- 		destroy_msg(msg);
- 	} while (!list_empty(head));
--	wake_up(waitq);
-+
-+	if (waitq)
-+		wake_up(waitq);
- }
- 
- static void
-@@ -91,11 +93,9 @@ rpc_timeout_upcall_queue(struct work_struct *work)
- 	}
- 	dentry = dget(pipe->dentry);
- 	spin_unlock(&pipe->lock);
--	if (dentry) {
--		rpc_purge_list(&RPC_I(dentry->d_inode)->waitq,
--			       &free_list, destroy_msg, -ETIMEDOUT);
--		dput(dentry);
--	}
-+	rpc_purge_list(dentry ? &RPC_I(dentry->d_inode)->waitq : NULL,
-+			&free_list, destroy_msg, -ETIMEDOUT);
-+	dput(dentry);
- }
- 
- ssize_t rpc_pipe_generic_upcall(struct file *filp, struct rpc_pipe_msg *msg,
--- 
-1.7.7.6
-
diff --git a/libre/linux-libre/3.4.4-fix-backlight-regression.patch b/libre/linux-libre/3.4.4-fix-backlight-regression.patch
new file mode 100644
index 000000000..a0cf0b1db
--- /dev/null
+++ b/libre/linux-libre/3.4.4-fix-backlight-regression.patch
@@ -0,0 +1,38 @@
+Subject: Still use ACPI backlight control if _DOS doesn't exist
+
+This is a regression introduced by commit
+ea9f8856bd6d4ed45885b06a338f7362cd6c60e5
+
+https://bugzilla.kernel.org/show_bug.cgi?id=43168
+
+Some platforms don't have _DOS control method, but the ACPI
+backlight still works.
+We do not want to lose the backlight control ability on these platforms.
+
+CC : Igor Murzov <intergalactic.anonymous@gmail.com>
+Signed-off-by: Zhang Rui <rui.zhang@intel.com>
+---
+ drivers/acpi/video.c |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+Index: rtd3/drivers/acpi/video.c
+===================================================================
+--- rtd3.orig/drivers/acpi/video.c
++++ rtd3/drivers/acpi/video.c
+@@ -565,8 +565,14 @@ acpi_video_bus_DOS(struct acpi_video_bus
+ 	video->dos_setting = arg0.integer.value;
+ 	status = acpi_evaluate_object(video->device->handle, "_DOS",
+ 		&args, NULL);
+-	if (ACPI_FAILURE(status))
+-		return -EIO;
++	if (ACPI_FAILURE(status)) {
++		/*
++		 * some platforms don't have _DOS, but the ACPI
++		 * backlight control still works
++		 */
++		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No _DOS\n"));
++		return 0;
++	}
+ 
+ 	return 0;
+ }
diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog
index a6f62e2cd..b41198fe5 100644
--- a/libre/linux-libre/ChangeLog
+++ b/libre/linux-libre/ChangeLog
@@ -1,19 +1,24 @@
-2012-05-26  André Silva  <andre.paulista@adinet.com.uy>
+2012-06-23  André Silva  <emulatorman@lavabit.com>
+
+	* linux-libre-3.4.4-1
+	* Replaced email account andre.paulista@adinet.com.uy to emulatorman@lavabit.com.
+
+2012-05-26  André Silva  <emulatorman@lavabit.com>
 
 	* linux-libre-3.4-1.2
 	* Disabled CONFIG_MICROCODE_INTEL and CONFIG_MICROCODE_AMD modules https://labs.parabola.nu/issues/116
 
-2012-04-24  André Silva  <andre.paulista@adinet.com.uy>
+2012-04-24  André Silva  <emulatorman@lavabit.com>
 
 	* linux-libre-3.3.3-1
 	* Disabled CONFIG_STUB_POULSBO module https://labs.parabola.nu/issues/90 
 
-2012-04-08  André Silva  <andre.paulista@adinet.com.uy>
+2012-04-08  André Silva  <emulatorman@lavabit.com>
 
 	* linux-libre-3.3.1-1.1
 	* Disabled CONFIG_IPW2100 and CONFIG_IPW2200 modules https://labs.parabola.nu/issues/47
 
-2012-03-03  André Silva  <andre.paulista@adinet.com.uy>
+2012-03-03  André Silva  <emulatorman@lavabit.com>
 
 	* linux-libre-2.3.9-2
 	* Enabled CONFIG_FB_VT8623 module https://labs.parabola.nu/issues/14
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 3c9b2a8cc..08a32eae0 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -5,17 +5,17 @@
 # Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgbase=linux-libre
 pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=-LIBRE
 _basekernel=3.4
-_sublevel=3
+_sublevel=4
 pkgver=${_basekernel}.${_sublevel}
-_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver
-pkgrel=1
+_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -32,10 +32,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'i915-fix-ghost-tv-output.patch'
-        '3.4.2-rpc_pipefs.patch'
+        '3.4.4-fix-backlight-regression.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
-         '0187759260fd998fc2130e069df5b054'
+         'e9bb311ab329555a61696b1a18df2d34'
          '669c3f9d5c6a2109bad8e511287826c3'
          '454231e14419e56a5281eb7bc6fde83e'
          'e49ac236dfeef709f91a3d993ea7b62c'
@@ -44,8 +44,8 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
-         '5a7baeab35f968bf9a6ab115d14586c7'
-         '972b3b460764780ee48f031a043a9c09')
+         '80a46681386bb87813989faeb92bdd9a'
+         '86910efeadb5d1e5d5416ff1a9dacb33')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -62,11 +62,6 @@ build() {
   # Add freedo as boot logo
   patch -Np1 -i "${srcdir}/boot-logo.patch"
 
-  # fix nfs4 regression
-  patch -Np1 -i "${srcdir}/3.4.2-rpc_pipefs.patch"
-  # add latest fixes from stable queue, if needed
-  # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
-
   # Some chips detect a ghost TV output
   # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html
   # Arch Linux bug report: FS#19234
@@ -76,7 +71,10 @@ build() {
   # needed.
   patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch"
 
-  # Patch submitted upstream, waiting for inclusion:
+  # Fix backlight control on some laptops:
+  # https://bugzilla.kernel.org/show_bug.cgi?id=43168
+  patch -Np1 -i "${srcdir}/3.4.4-fix-backlight-regression.patch"
+
   # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
@@ -111,6 +109,9 @@ build() {
   # set extraversion to pkgrel
   sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
 
+  # don't run depmod on 'make install'. We'll do this ourselves in packaging
+  sed -i '2iexit 0' scripts/depmod.sh
+
   # get kernel version
   make prepare
 
@@ -209,6 +210,12 @@ package_linux-libre() {
   # add real version for building modules and running depmod from post_install/upgrade
   mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}"
   echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}/version"
+
+  # move module tree /lib -> /usr/lib
+  mv "$pkgdir/lib" "$pkgdir/usr"
+
+  # Now we call depmod...
+  depmod -b "$pkgdir" -F System.map "$_kernver"
 }
 
 package_linux-libre-headers() {
@@ -226,10 +233,10 @@ package_linux-libre-headers() {
     _kernver="$(make kernelrelease)"
   fi
 
-  mkdir -p "${pkgdir}/lib/modules/${_kernver}"
+  install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
 
-  cd "${pkgdir}/lib/modules/${_kernver}"
-  ln -sf ../../../usr/src/linux-${_kernver} build
+  cd "${pkgdir}/usr/lib/modules/${_kernver}"
+  ln -sf ../../../src/linux-${_kernver} build
 
   cd "${srcdir}/linux-${_basekernel}"
   install -D -m644 Makefile \
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index b70fd9663..44850230f 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.4.3-1-LIBRE
+KERNEL_VERSION=3.4.4-3-LIBRE
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'