2.6.36-0.0.rc0.git1.fc15

10 files changed, 27 insertions, 24 deletions

diff --git a/freed-ora/current/master/deblob-2.6.35 b/freed-ora/current/master/deblob-2.6.35
index 2cc74e8f7..07aa834a1 100755
--- a/freed-ora/current/master/deblob-2.6.35
+++ b/freed-ora/current/master/deblob-2.6.35
@@ -45,7 +45,7 @@
 
 # For each kver release, start extra with an empty string, then count
 # from 1 if changes are needed that require rebuilding the tarball.
-kver=2.6.35 extra=1
+kver=2.6.35 extra=2
 
 case $1 in
 --force)
@@ -1015,7 +1015,7 @@ drop_fw_file firmware/e100/d102e_ucode.bin.ihex firmware/e100/d102e_ucode.bin
 reject_firmware drivers/net/e100.c
 clean_sed '
 /^static const struct firmware \*e100_\(reject\|request\)_firmware(/,/^}$/{
-  s:^\(.*\)return ERR_PTR(err);$:\1DPRINTK(PROBE,ERR, "Proceeding without firmware\\n");\n\1return NULL;:
+  s:^\(.*\)return ERR_PTR(err);$:\1netif_err(nic, probe, nic->netdev, "Proceeding without firmware\\n");\n\1return NULL;:
 }' drivers/net/e100.c 'proceed without firmware'
 clean_blob drivers/net/e100.c
 clean_kconfig drivers/net/Kconfig 'E100'
diff --git a/freed-ora/current/master/drm-nouveau-updates.patch b/freed-ora/current/master/drm-nouveau-updates.patch
index 1b704ff0a..b7db6144c 100644
--- a/freed-ora/current/master/drm-nouveau-updates.patch
+++ b/freed-ora/current/master/drm-nouveau-updates.patch
@@ -1,3 +1,5 @@
+* drivers/gpu/drm/nouveau/nouveau_grctx.c: Adjusted, was already deblobbed.
+
  drivers/gpu/drm/drm_crtc_helper.c           |   22 +-
  drivers/gpu/drm/i2c/ch7006_drv.c            |   22 +-
  drivers/gpu/drm/i2c/ch7006_priv.h           |    2 +-
@@ -2716,8 +2718,8 @@ index f731c5f..0000000
 -		return -ENODEV;
 -
 -	if (!pgraph->ctxprog) {
--		sprintf(name, "nouveau/nv%02x.ctxprog", chipset);
--		ret = request_firmware(&fw, name, &dev->pdev->dev);
+-		sprintf(name, "/*(DEBLOBBED)*/", chipset);
+-		ret = reject_firmware(&fw, name, &dev->pdev->dev);
 -		if (ret) {
 -			NV_ERROR(dev, "No ctxprog for NV%02x\n", chipset);
 -			return ret;
@@ -2743,8 +2745,8 @@ index f731c5f..0000000
 -	}
 -
 -	if (!pgraph->ctxvals) {
--		sprintf(name, "nouveau/nv%02x.ctxvals", chipset);
--		ret = request_firmware(&fw, name, &dev->pdev->dev);
+-		sprintf(name, "/*(DEBLOBBED)*/", chipset);
+-		ret = reject_firmware(&fw, name, &dev->pdev->dev);
 -		if (ret) {
 -			NV_ERROR(dev, "No ctxvals for NV%02x\n", chipset);
 -			nouveau_grctx_fini(dev);
diff --git a/freed-ora/current/master/kernel.spec b/freed-ora/current/master/kernel.spec
index 0f0399146..55d510738 100644
--- a/freed-ora/current/master/kernel.spec
+++ b/freed-ora/current/master/kernel.spec
@@ -58,7 +58,7 @@ Summary: The Linux kernel
 
 # librev starts empty, then 1, etc, as the linux-libre tarball
 # changes.  This is only used to determine which tarball to use.
-%define librev 1
+%define librev 2
 
 # To be inserted between "patch" and "-2.6.".
 #define stablelibre -libre
@@ -1926,10 +1926,11 @@ fi
 #                 ||     ||
 
 %changelog
-* Thu Aug 12 2010 Alexandre Oliva <lxoliva@fsfla.org> -libre
-- Deblobbed 2.6.35-libre1.
+* Sat Aug 28 2010 Alexandre Oliva <lxoliva@fsfla.org> -libre
+- Deblobbed 2.6.35-libre2.
 - Deblobbed lirc-staging-2.6.36.patch.
 - Deblobbed linux-2.6-v4l-dvb-ir-core-update.patch.
+- Adjusted drm-nouveau-updates.patch.
 
 * Wed Aug 04 2010 Kyle McMartin <kyle@redhat.com>
 - Disable %released_kernel.
diff --git a/freed-ora/current/master/linux-2.6.35-libre1.tar.bz2.sign b/freed-ora/current/master/linux-2.6.35-libre1.tar.bz2.sign
deleted file mode 100644
index 035112fa7..000000000
--- a/freed-ora/current/master/linux-2.6.35-libre1.tar.bz2.sign
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEABECAAYFAkxXtikACgkQvLfPh359R6fTVQCgivnHdoQntW+rt7V/LDVL56lz
-KVAAn2/AgUvOTjAJaEX+92vXp28RqPrZ
-=Bnhn
------END PGP SIGNATURE-----
diff --git a/freed-ora/current/master/linux-2.6.35-libre1.xdelta.bz2 b/freed-ora/current/master/linux-2.6.35-libre1.xdelta.bz2
deleted file mode 100644
index 34d88c8f6..000000000
--- a/freed-ora/current/master/linux-2.6.35-libre1.xdelta.bz2
+++ /dev/null
diff --git a/freed-ora/current/master/linux-2.6.35-libre1.xdelta.bz2.sign b/freed-ora/current/master/linux-2.6.35-libre1.xdelta.bz2.sign
deleted file mode 100644
index a71fba212..000000000
--- a/freed-ora/current/master/linux-2.6.35-libre1.xdelta.bz2.sign
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEABECAAYFAkxXti8ACgkQvLfPh359R6esZwCeKOiaFn3uriAQt9zVuireStpP
-jk0An1TNNct7IrbhkMlre6L7lcTb461k
-=58nE
------END PGP SIGNATURE-----
diff --git a/freed-ora/current/master/linux-2.6.35-libre2.tar.bz2.sign b/freed-ora/current/master/linux-2.6.35-libre2.tar.bz2.sign
new file mode 100644
index 000000000..032c482ef
--- /dev/null
+++ b/freed-ora/current/master/linux-2.6.35-libre2.tar.bz2.sign
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEABECAAYFAkxwrigACgkQvLfPh359R6cQ3wCfRg8CsEhwAzgW9SxI/D774Zql
+2ZsAn1L4s7u2cnp8JiRoP7wRcsHFADNE
+=b54R
+-----END PGP SIGNATURE-----
diff --git a/freed-ora/current/master/linux-2.6.35-libre2.xdelta.bz2 b/freed-ora/current/master/linux-2.6.35-libre2.xdelta.bz2
new file mode 100644
index 000000000..9b26d87ae
--- /dev/null
+++ b/freed-ora/current/master/linux-2.6.35-libre2.xdelta.bz2
diff --git a/freed-ora/current/master/linux-2.6.35-libre2.xdelta.bz2.sign b/freed-ora/current/master/linux-2.6.35-libre2.xdelta.bz2.sign
new file mode 100644
index 000000000..f648bcae2
--- /dev/null
+++ b/freed-ora/current/master/linux-2.6.35-libre2.xdelta.bz2.sign
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEABECAAYFAkxwrjUACgkQvLfPh359R6fi0ACcCIifFIah3eyYE8RwguqXWym1
+hhsAniarP5LWeTLKleFoXuHKu+78xqgO
+=MITz
+-----END PGP SIGNATURE-----
diff --git a/freed-ora/current/master/sources b/freed-ora/current/master/sources
index 94a6e3ee1..23f149e39 100644
--- a/freed-ora/current/master/sources
+++ b/freed-ora/current/master/sources
@@ -1,2 +1,2 @@
-a9916e9f685fec364cd0316832056acf  linux-2.6.35-libre1.tar.bz2
+046764af95a672b860dae1a955e91299  linux-2.6.35-libre2.tar.bz2
 1e730019937132cd4d0bcf2c35384e86  patch-2.6.35-git1.bz2