aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2021-03-09 12:01:55 +0100
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2021-03-09 12:01:55 +0100
commit98c86936b55fca0da01fd75096784b637898eea8 (patch)
tree6bd456a1c629a9adb5362a847d43c712c5016289
parentb401786df2a201e1d881d7f1dfd10f0de3f686a5 (diff)
media_build: handle kernel sublevel > 255
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-rw-r--r--backports/backports.txt54
-rw-r--r--linux/Makefile4
-rwxr-xr-xlinux/patches_for_kernel.pl1
-rwxr-xr-xlinux/use_dir.pl2
4 files changed, 31 insertions, 30 deletions
diff --git a/backports/backports.txt b/backports/backports.txt
index 58edd03..d296b50 100644
--- a/backports/backports.txt
+++ b/backports/backports.txt
@@ -5,7 +5,7 @@
# by summing the patches needed to backport to all kernel
# versions higher or equal to the desired one. For example,
# if this file has:
-# [3.255.255]
+# [3.255.1023]
# add patch_for_upstream.patch
# [2.6.38]
# add patch_for_2.6.38.patch
@@ -20,123 +20,123 @@
# use linux/patches_for_kernel.pl <version>
# All supported versions need those patches
-[9.255.255]
+[9.255.1023]
add api_version.patch
add pr_fmt.patch
add debug.patch
add drx39xxj.patch
add ccs.patch
-[5.11.255]
+[5.11.1023]
add v5.11_isa.patch
-[5.10.255]
+[5.10.1023]
add v5.10_vb2_dma_buf_map.patch
-[5.9.255]
+[5.9.1023]
add v5.9_tasklet.patch
add v5.9_netup_unidvb_devm_revert.patch
-[5.7.255]
+[5.7.1023]
add v5.7_mmap_read_lock.patch
add v5.7_vm_map_ram.patch
add v5.7_pin_user_pages.patch
add v5.7_define_seq_attribute.patch
-[5.6.255]
+[5.6.1023]
add v5.6_pin_user_pages.patch
add v5.6_const_fb_ops.patch
add v5.6_pm_runtime_get_if_active.patch
-[5.5.255]
+[5.5.1023]
add v5.5_alsa_pcm_api_updates.patch
add v5.5_memtype_h.patch
add v5.5_dev_printk_h.patch
add v5.5_vb2_kmap.patch
-[5.4.255]
+[5.4.1023]
add v5.4_revert_spi_transfer.patch
add v5.4_async.patch
-[5.1.255]
+[5.1.1023]
add v5.1_vm_map_pages.patch
add v5.1_devm_i2c_new_dummy_device.patch
-[5.0.255]
+[5.0.1023]
add v5.0_ipu3-cio2.patch
add v5.0_time32.patch
add v5.0_gpio.patch
-[4.20.255]
+[4.20.1023]
add v4.20_access_ok.patch
-[4.18.255]
+[4.18.1023]
add v4.18_fwnode_args_args.patch
add v4.18_ccs_bitops.patch
add v4.18_vb2_map_atomic.patch
-[4.17.255]
+[4.17.1023]
add v4.17_i2c_check_num_msgs.patch
-[4.15.255]
+[4.15.1023]
add v4.15_pmdown_time.patch
add v4.15_async.patch
-[4.14.255]
+[4.14.1023]
add v4.14_saa7146_timer_cast.patch
add v4.14_module_param_call.patch
add v4.14_fwnode_handle_get.patch
delete v4.13_fwnode_graph_get_port_parent.patch
-[4.13.255]
+[4.13.1023]
add v4.13_remove_nospec_h.patch
add v4.13_drmP.patch
add v4.13_fwnode_graph_get_port_parent.patch
-[4.12.255]
+[4.12.1023]
add v4.12_revert_solo6x10_copykerneluser.patch
-[4.11.255]
+[4.11.1023]
add v4.11_drop_drm_file.patch
add v4.11_vb2_kmap.patch
add v4.11_pwc.patch
-[4.10.255]
+[4.10.1023]
add v4.10_sched_signal.patch
add v4.10_fault_page.patch
add v4.10_refcount.patch
-[4.9.255]
+[4.9.1023]
add v4.9_mm_address.patch
add v4.9_dvb_net_max_mtu.patch
add v4.9_probe_new.patch
-[4.8.255]
+[4.8.1023]
add v4.8_user_pages_flag.patch
add v4.8_em28xx_bitfield.patch
add v4.8_dma_map_resource.patch
add v4.8_drm_crtc.patch
-[4.7.255]
+[4.7.1023]
add v4.7_dma_attrs.patch
add v4.7_pci_alloc_irq_vectors.patch
add v4.7_copy_to_user_warning.patch
add v4.7_objtool_warning.patch
-[4.6.255]
+[4.6.1023]
add v4.6_i2c_mux.patch
-[4.5.255]
+[4.5.1023]
add v4.5_gpiochip_data_pointer.patch
add v4.5_get_user_pages.patch
add v4.5_uvc_super_plus.patch
add v4.5_copy_to_user_warning.patch
add v4.5_vb2_cpu_access.patch
-[4.4.255]
+[4.4.1023]
add v4.4_gpio_chip_parent.patch
add v4.4_user_pages_flag.patch
-[4.3.255]
+[4.3.1023]
delete v4.4_user_pages_flag.patch
add v4.3_bt87x_const_fix.patch
diff --git a/linux/Makefile b/linux/Makefile
index ebf04d7..dc55691 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -78,7 +78,7 @@ todaytar:
-rm -f $(PWD)/$(TODAY_TAR).bz2
tar cf $(PWD)/$(TODAY_TAR) -C $(DIR) $(TARFILES)
git --git-dir $(DIR)/.git log --pretty=oneline -n3 |sed -r 's,([\x22]),,g; s,([\x25\x5c]),\1\1,g' >git_log
- perl -e 'while (<>) { $$a=$$1 if (m/^\s*VERSION\s*=\s*(\d+)/); $$b=$$1 if (m/^\s*PATCHLEVEL\s*=\s*(\d+)/); $$c=$$1 if (m/^\s*SUBLEVEL\s*=\s*(\d+)/); } printf "#define V4L2_VERSION %d\n", ((($$a) << 16) + (($$b) << 8) + ($$c))' $(DIR)/Makefile > kernel_version.h
+ perl -e 'while (<>) { $$a=$$1 if (m/^\s*VERSION\s*=\s*(\d+)/); $$b=$$1 if (m/^\s*PATCHLEVEL\s*=\s*(\d+)/); $$c=$$1 if (m/^\s*SUBLEVEL\s*=\s*(\d+)/); } printf "#define V4L2_VERSION %d\n", ((($$a) << 16) + (($$b) << 8) + ($$c > 255 ? 255 : $$c))' $(DIR)/Makefile > kernel_version.h
tar rvf $(PWD)/$(TODAY_TAR) git_log kernel_version.h
for i in $(TARDIR); do \
@@ -97,7 +97,7 @@ tar:
-rm -f $(PWD)/linux-media.tar.bz2
tar cf $(PWD)/linux-media.tar -C $(DIR) $(TARFILES)
git --git-dir $(DIR)/.git log --pretty=oneline -n3 |sed -r 's,([\x22]),,g; s,([\x25\x5c]),\1\1,g' >git_log
- perl -e 'while (<>) { $$a=$$1 if (m/^\s*VERSION\s*=\s*(\d+)/); $$b=$$1 if (m/^\s*PATCHLEVEL\s*=\s*(\d+)/); $$c=$$1 if (m/^\s*SUBLEVEL\s*=\s*(\d+)/); } printf "#define V4L2_VERSION %d\n", ((($$a) << 16) + (($$b) << 8) + ($$c))' $(DIR)/Makefile > kernel_version.h
+ perl -e 'while (<>) { $$a=$$1 if (m/^\s*VERSION\s*=\s*(\d+)/); $$b=$$1 if (m/^\s*PATCHLEVEL\s*=\s*(\d+)/); $$c=$$1 if (m/^\s*SUBLEVEL\s*=\s*(\d+)/); } printf "#define V4L2_VERSION %d\n", ((($$a) << 16) + (($$b) << 8) + ($$c > 255 ? 255 : $$c))' $(DIR)/Makefile > kernel_version.h
tar rvf $(PWD)/linux-media.tar git_log kernel_version.h
for i in $(TARDIR); do \
if [ "`echo $$i|grep Documentation`" = "" ]; then \
diff --git a/linux/patches_for_kernel.pl b/linux/patches_for_kernel.pl
index 91b79fd..6ab3077 100755
--- a/linux/patches_for_kernel.pl
+++ b/linux/patches_for_kernel.pl
@@ -22,6 +22,7 @@ sub kernel_version($) {
$sublevel = 0;
}
$sublevel = 0 if ($sublevel == "");
+ $sublevel = 255 if ($sublevel > 255);
return ($version * 65536 + $patchlevel * 256 + $sublevel);
}
diff --git a/linux/use_dir.pl b/linux/use_dir.pl
index b461ec5..7ca8b35 100755
--- a/linux/use_dir.pl
+++ b/linux/use_dir.pl
@@ -291,7 +291,7 @@ sub sync_kernel_version()
$c=$1 if (m/^\s*SUBLEVEL\s*=\s*(\d+)/);
}
close IN;
- $source_v4l_version = ((($a) << 16) + (($b) << 8) + ($c));
+ $source_v4l_version = ((($a) << 16) + (($b) << 8) + ($c > 255 ? 255 : $c));
if (open IN, "kernel_version.h") {
while (<IN>) {

Privacy Policy