qemu: switch to building wireless as kernel modules
This is a hefty change * add support for kernel backports project * build wireless stack/drivers as modules from a backported kernel * create a service to load/unload the modules
This commit is contained in:
Daniel Barlow
80
pkgs/kernel-backport/default.nix
Normal file
80
pkgs/kernel-backport/default.nix
Normal file
@@ -0,0 +1,80 @@
|
||||
{ stdenv
|
||||
, git
|
||||
, python2
|
||||
, which
|
||||
, fetchgit
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, coccinelle
|
||||
}:
|
||||
let
|
||||
donorTree = fetchFromGitHub {
|
||||
owner = "torvalds";
|
||||
repo = "linux";
|
||||
rev = "e2c1a934fd8e4288e7a32f4088ceaccf469eb74c"; # 5.15.94
|
||||
hash= "sha256-Jg3EgL86CseuzYMAlUG3CDWPCo8glMSIZs10l7EuhWI=";
|
||||
};
|
||||
backports = stdenv.mkDerivation {
|
||||
name = "linux-backports";
|
||||
version = "dfe0f60ca8a";
|
||||
nativeBuildInputs = [ python2 ];
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/linux/kernel/git/backports/backports.git";
|
||||
name = "backports";
|
||||
rev = "dfe0f60ca8a1065e63b4db703b3bd2708ee23a0e";
|
||||
hash = "sha256-V+unO0rCom+TZS7WuaXFrb3C1EBImmflCPuOoP+LvBY=";
|
||||
};
|
||||
buildPhase = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -a . $out
|
||||
rm $out/patches/0073-netdevice-mtu-range.cocci
|
||||
# fq.patch is obsoleted by kernel commit 48a54f6bc45 and no longer
|
||||
# applies
|
||||
# rm $out/patches/0091-fq-no-siphash_key_t/fq.patch
|
||||
# don't know why this doesn't apply but it's only important for
|
||||
# compiling against linux < 4.1
|
||||
# rm $out/patches/0058-ptp_getsettime64/ptp_getsettime64.cocci
|
||||
'';
|
||||
patches = [
|
||||
# (fetchpatch {
|
||||
# url = "https://github.com/telent/nixwrt/blob/28ff2559e811c740b0a2922f52291b335804857b/nixwrt/kernel/gentree-writable-outputs.patch";
|
||||
# hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
|
||||
# })#
|
||||
./gentree-writable-outputs.patch
|
||||
# ./update-usb-sg-backport-patch.patch
|
||||
# ./backport_kfree_sensitive.patch
|
||||
];
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit donorTree;
|
||||
KERNEL_VERSION = builtins.substring 0 11 donorTree.rev;
|
||||
BACKPORTS_VERSION = backports.version;
|
||||
name = "backported-kernel-${KERNEL_VERSION}-${BACKPORTS_VERSION}";
|
||||
|
||||
# gentree uses "which" at runtime to test for the presence of git,
|
||||
# and I don't have the patience to patch it out. There is no other
|
||||
# reason we need either of them as build inputs.
|
||||
depsBuildBuild = [ coccinelle ];
|
||||
nativeBuildInputs = [ which git python2 ];
|
||||
|
||||
phases = [
|
||||
"backportFromFuture" "installPhase"
|
||||
];
|
||||
|
||||
backportFromFuture = ''
|
||||
echo $KERNEL_VERSION $BACKPORTS_VERSION
|
||||
WORK=`pwd`/build
|
||||
mkdir -p $WORK
|
||||
cat ${backports}/copy-list > copy-list
|
||||
echo 'include/linux/key.h' >> copy-list
|
||||
python ${backports}/gentree.py --verbose --clean --copy-list copy-list ${donorTree} $WORK
|
||||
'';
|
||||
installPhase = ''
|
||||
cp -a ./build/ $out
|
||||
'';
|
||||
}
|
||||
97
pkgs/kernel-backport/gentree-writable-outputs.patch
Normal file
97
pkgs/kernel-backport/gentree-writable-outputs.patch
Normal file
@@ -0,0 +1,97 @@
|
||||
--- /nix/store/swnksqfa53bv4c5n376zpw8zmzs47f4b-backports3/gentree.py 1970-01-01 01:00:01.000000000 +0100
|
||||
+++ ./gentree.py 2020-09-18 21:55:30.100918501 +0100
|
||||
@@ -2,6 +2,6 @@
|
||||
#
|
||||
# Generate the output tree into a specified directory.
|
||||
#
|
||||
-
|
||||
import argparse, sys, os, errno, shutil, re, subprocess
|
||||
+import stat
|
||||
import tarfile, gzip, time
|
||||
@@ -127,6 +127,10 @@
|
||||
if e.errno != errno.ENOENT:
|
||||
raise
|
||||
|
||||
+def makeWritable(filename):
|
||||
+ os.chmod(filename,
|
||||
+ os.stat(filename).st_mode | 0700)
|
||||
+
|
||||
|
||||
def copytree(src, dst, symlinks=False, ignore=None):
|
||||
"""
|
||||
@@ -141,6 +145,7 @@
|
||||
|
||||
if not os.path.isdir(dst):
|
||||
os.makedirs(dst)
|
||||
+ makeWritable(dst)
|
||||
errors = []
|
||||
for name in names:
|
||||
if name in ignored_names:
|
||||
@@ -154,7 +161,8 @@
|
||||
elif os.path.isdir(srcname):
|
||||
copytree(srcname, dstname, symlinks, ignore)
|
||||
else:
|
||||
- shutil.copy2(srcname, dstname)
|
||||
+ shutil.copy(srcname, dstname)
|
||||
+ makeWritable(dstname)
|
||||
except (IOError, os.error) as why:
|
||||
errors.append((srcname, dstname, str(why)))
|
||||
# catch the Error from the recursive copytree so that we can
|
||||
@@ -163,6 +172,7 @@
|
||||
errors.extend(err.args[0])
|
||||
try:
|
||||
shutil.copystat(src, dst)
|
||||
+ makeWritable(dst)
|
||||
except WindowsError:
|
||||
# can't copy file access times on Windows
|
||||
pass
|
||||
@@ -187,6 +197,7 @@
|
||||
for srcitem, tgtitem in copy_list:
|
||||
if tgtitem == '':
|
||||
copytree(srcpath, outdir, ignore=shutil.ignore_patterns('*~'))
|
||||
+ makeWritable(outdir)
|
||||
elif tgtitem[-1] == '/':
|
||||
def copy_ignore(dir, entries):
|
||||
r = []
|
||||
@@ -199,14 +210,17 @@
|
||||
ignore=copy_ignore)
|
||||
else:
|
||||
try:
|
||||
- os.makedirs(os.path.join(outdir, os.path.dirname(tgtitem)))
|
||||
+ n = os.path.join(outdir, os.path.dirname(tgtitem))
|
||||
+ os.makedirs(n, 0755)
|
||||
+ makeWritable(n)
|
||||
except OSError as e:
|
||||
# ignore dirs we might have created just now
|
||||
if e.errno != errno.EEXIST:
|
||||
raise
|
||||
- shutil.copy(os.path.join(srcpath, srcitem),
|
||||
- os.path.join(outdir, tgtitem))
|
||||
-
|
||||
+ outpath = os.path.join(outdir, tgtitem)
|
||||
+ if os.path.exists(outpath): os.remove(outpath)
|
||||
+ shutil.copy(os.path.join(srcpath, srcitem), outpath)
|
||||
+ makeWritable(outpath)
|
||||
|
||||
def copy_git_files(srcpath, copy_list, rev, outdir):
|
||||
"""
|
||||
@@ -886,7 +904,10 @@
|
||||
git_debug_snapshot(args, 'Add driver sources')
|
||||
|
||||
disable_list = add_automatic_backports(args)
|
||||
- if git_tracked_version:
|
||||
+ if os.environ['BACKPORTS_VERSION']:
|
||||
+ backports_version = os.environ['BACKPORTS_VERSION']
|
||||
+ kernel_version = os.environ['KERNEL_VERSION']
|
||||
+ elif git_tracked_version:
|
||||
backports_version = "(see git)"
|
||||
kernel_version = "(see git)"
|
||||
else:
|
||||
@@ -1037,6 +1030,7 @@ def process(kerneldir, copy_list_file, git_revision=None,
|
||||
break
|
||||
if copy_defconfig:
|
||||
shutil.copy(dfsrc, os.path.join(bpid.target_dir, 'defconfigs', dfbase))
|
||||
+ makeWritable(os.path.join(bpid.target_dir, 'defconfigs', dfbase))
|
||||
|
||||
git_debug_snapshot(args, "add (useful) defconfig files")
|
||||
|
||||
Reference in New Issue
Block a user