Merge pull request #277795 from ck3d/tbs-20231210

linux.tbs: 2018.04.18 -> 20231210

authored by Christian Kögler and committed by GitHub f8eccf95 7810c624

+19 -12
+19 -12
pkgs/os-specific/linux/tbs/default.nix
··· 1 - { stdenv, lib, fetchFromGitHub, kernel, kmod, perl, patchutils, perlPackages }: 1 + { stdenv, lib, fetchFromGitHub, kernel, kmod, patchutils, perlPackages }: 2 2 let 3 3 4 4 media = fetchFromGitHub rec { 5 5 name = repo; 6 6 owner = "tbsdtv"; 7 7 repo = "linux_media"; 8 - rev = "efe31531b77efd3a4c94516504a5823d31cdc776"; 9 - sha256 = "1533qi3sb91v00289hl5zaj4l35r2sf9fqc6z5ky1vbb7byxgnlr"; 8 + rev = "d0a7e44358f28064697e0eed309db03166dcd83b"; 9 + hash = "sha256-BTHlnta5qv2bdPjD2bButwYGpwR/bq99/AUoZqTHHYw="; 10 10 }; 11 11 12 12 build = fetchFromGitHub rec { 13 13 name = repo; 14 14 owner = "tbsdtv"; 15 15 repo = "media_build"; 16 - rev = "a0d62eba4d429e0e9d2c2f910fb203e817cac84b"; 17 - sha256 = "1329s7w9xlqjqwkpaqsd6b5dmzhm97jw0c7c7zzmmbdkl289i4i4"; 16 + rev = "88764363a3e3d36b3c59a0a2bf2244e262035d47"; 17 + hash = "sha256-LFTxYVPudflxqYTSBIDNkTrGs09MOuYBXwpGYqWfEFQ="; 18 18 }; 19 19 20 - in stdenv.mkDerivation { 20 + in 21 + stdenv.mkDerivation { 21 22 pname = "tbs"; 22 - version = "2018.04.18-${kernel.version}"; 23 + version = "20231210-${kernel.version}"; 23 24 24 25 srcs = [ media build ]; 25 26 sourceRoot = build.name; 26 27 28 + # https://github.com/tbsdtv/linux_media/wiki 27 29 preConfigure = '' 28 30 make dir DIR=../${media.name} 31 + make allyesconfig 32 + sed --regexp-extended --in-place v4l/.config \ 33 + -e 's/(^CONFIG.*_RC.*=)./\1n/g' \ 34 + -e 's/(^CONFIG.*_IR.*=)./\1n/g' \ 35 + -e 's/(^CONFIG_VIDEO_VIA_CAMERA=)./\1n/g' 29 36 ''; 30 37 31 38 postPatch = '' ··· 44 51 buildFlags = [ "VER=${kernel.modDirVersion}" ]; 45 52 installFlags = [ "DESTDIR=$(out)" ]; 46 53 47 - hardeningDisable = [ "all" ]; 54 + hardeningDisable = [ "pic" ]; 48 55 49 - nativeBuildInputs = [ patchutils kmod perl perlPackages.ProcProcessTable ] 50 - ++ kernel.moduleBuildDependencies; 56 + nativeBuildInputs = [ patchutils kmod perlPackages.ProcProcessTable ] 57 + ++ kernel.moduleBuildDependencies; 51 58 52 - postInstall = '' 59 + postInstall = '' 53 60 find $out/lib/modules/${kernel.modDirVersion} -name "*.ko" -exec xz {} \; 54 61 ''; 55 62 ··· 59 66 license = licenses.gpl2; 60 67 maintainers = with maintainers; [ ck3d ]; 61 68 priority = -1; 62 - broken = true; 69 + broken = kernel.kernelOlder "4.14" || kernel.kernelAtLeast "6.6"; 63 70 }; 64 71 }