CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove non-free nvidia-dkms stuff in make-linux

Browse source
This commit is contained in:
David Trudgian 2019-09-08 22:09:02 -05:00
parent 4c4560c1f1
commit 32f34ad897
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
helpers/make-linux
View file

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2008-2018 Ruben Rodriguez <ruben@trisquel.info> # Copyright (C) 2008-2018 Ruben Rodriguez <ruben@trisquel.info>
# Copyright (C) 2019 David Trudgian <dave@trudgian.net>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -17,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=3 VERSION=4
. ./config . ./config
@ -38,6 +39,10 @@ sh $DATA/deblob-4.15 --force
echo "Reverting deblobbing for files patched by silent-accept-firmware" echo "Reverting deblobbing for files patched by silent-accept-firmware"
cp /tmp/preserve/* . -av cp /tmp/preserve/* . -av
# Wipe dkms-versions
# lists zfs / nvidia versions
echo > debian/dkms-versions
# Remove ZFS # Remove ZFS
rm zfs spl debian/scripts/misc/update-zfs.sh -rf rm zfs spl debian/scripts/misc/update-zfs.sh -rf
/bin/sed 's/spl-dkms, zfs-dkms//' -i debian/control debian.master/control.d/vars.generic debian.master/control.d/vars.* /bin/sed 's/spl-dkms, zfs-dkms//' -i debian/control debian.master/control.d/vars.generic debian.master/control.d/vars.*
@ -50,6 +55,13 @@ rm ubuntu/vbox* -rf
sed /vbox/d -i debian.master/control.d/generic.inclusion-list ubuntu/Makefile sed /vbox/d -i debian.master/control.d/generic.inclusion-list ubuntu/Makefile
sed '/vbox/d' -i debian.master/reconstruct sed '/vbox/d' -i debian.master/reconstruct
# Remove nvidia
rm -rf debian/scripts/debian/scripts/dkms-build--nvidia-N
/bin/sed '/ifeq ($(do_dkms_nvidia),true)/,/endif/d' -i debian/rules.d/2-binary-arch.mk
/bin/sed '/do_dkms_nvidia = true/d' -i debian.master/abi/*/*/*.modules debian/rules debian.master/control.d/vars.*
/bin/sed '/nvidiafb/d' -i debian.master/abi/*/*/*.modules debian/rules debian.master/control.d/vars.*
# Compile with less modules and avoid abi check # Compile with less modules and avoid abi check
echo 'skipmodule = true' >> debian.master/rules.d/0-common-vars.mk echo 'skipmodule = true' >> debian.master/rules.d/0-common-vars.mk
echo 'skipabi = true' >> debian.master/rules.d/0-common-vars.mk echo 'skipabi = true' >> debian.master/rules.d/0-common-vars.mk