Re: [RFC PATCH] media_build: two fixes + one unresolved issue

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The idea was good, but the patch didn't work ;)

Fixed it. It is now properly recognizing the version 2.40 as 3.0.0 on both
scripts. See enclosed. I didn't apply it yet.

Yeah, it's 2.6.40 to 3.0 instead of 2.40 to 3.0. It's amazing how quickly you
forget :-)

Yes :)

Btw, I just applied another fix upstream. The most noticed effect is that
calling make -C linux apply_patches will now show:
	Patches for 2.6.40.4-5.fc15.x86_64 already applied.
instead of:
	Patches for  already applied.

Nice!

-
Fix Name convention for kernels 2.6.40 and upper

Based on a patch from Hans Verkuil<hverkuil@xxxxxxxxx>

Signed-off-by: Mauro Carvalho Chehab<mchehab@xxxxxxxxxx>

diff --git a/linux/patches_for_kernel.pl b/linux/patches_for_kernel.pl
index 33348d9..2669e6c 100755
--- a/linux/patches_for_kernel.pl
+++ b/linux/patches_for_kernel.pl
@@ -13,11 +13,18 @@ my $file = "../backports/backports.txt";
   open IN, $file or die "can't find $file\n";

   sub kernel_version($) {
-	my $sublevel;
+	my ($version, $patchlevel, $sublevel) = $_[0] =~
m/^(\d+)\.(\d+)\.?(\d*)/;

-	$_[0] =~ m/^(\d+)\.(\d+)\.?(\d*)/;
-	$sublevel = $3 == "" ? 0 : $3;
-	return ($1*65536 + $2*256 + $sublevel);
+	# fix kernel version for distros that 'translated' 3.0 to 2.40

This comment is wrong, it should be 2.6.40.

+	$version += 0;
+	$patchlevel += 0;

These two lines seems to be leftovers from debugging.

Yes. Ok, fixed on a separate patch.

I assume you will commit this?

I can do it.

Ok, done!

Thanks!
Mauro
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Input]     [Video for Linux]     [Gstreamer Embedded]     [Mplayer Users]     [Linux USB Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux