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

Merge branch 'kernel_firmware' into 'etiona'

Browse source 
Etiona kernel & firmware - make-linux & make-firmware-free

See merge request trisquel/package-helpers!248
This commit is contained in:
Ruben Rodriguez 2019-09-13 21:29:51 +00:00
commit 92c653fad5
2 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
helpers/make-firmware-free
View file

@ -1,6 +1,7 @@
#!/bin/sh
#
# Copyright (C) 2017 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
# it under the terms of the GNU General Public License as published by
@ -17,9 +18,9 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=2
VERSION=3
EXTERNAL='deb-src http://ftp.us.debian.org/debian testing main'
REPOKEY=7638D0442B90D010
REPOKEY=04EE7237B7D453EC
. ./config

17
helpers/make-linux
View file

@ -1,6 +1,7 @@
#!/bin/sh
#
# 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
# 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
#
VERSION=3
VERSION=4
. ./config
@ -38,6 +39,10 @@ sh $DATA/deblob-4.15 --force
echo "Reverting deblobbing for files patched by silent-accept-firmware"
cp /tmp/preserve/* . -av
# Wipe dkms-versions
# lists zfs / nvidia versions
echo > debian/dkms-versions
# Remove ZFS
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.*
@ -50,12 +55,22 @@ rm ubuntu/vbox* -rf
sed /vbox/d -i debian.master/control.d/generic.inclusion-list ubuntu/Makefile
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.*
# Compile with less modules and avoid abi check
echo 'skipmodule = true' >> debian.master/rules.d/0-common-vars.mk
echo 'skipabi = true' >> debian.master/rules.d/0-common-vars.mk
echo 'skipmodule = true' >> debian/rules.d/0-common-vars.mk
echo 'skipabi = true' >> debian/rules.d/0-common-vars.mk
# Skip the retpoline check as there is no last release to chaeck against
echo 'skipretpoline = true' >> debian.master/rules.d/0-common-vars.mk
echo 'skipretpoline = true' >> debian/rules.d/0-common-vars.mk
# Do not label packages as unsigned
sed '/bin_pkg_name_unsigned/s/linux-image-unsigned/linux-image/' -i debian/rules.d/0-common-vars.mk
sed 's/.unsigned//' -i debian/scripts/control-create