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

Replaced make-linux with previous hwe version

Browse source
This commit is contained in:
Ruben Rodriguez 2019-05-04 18:45:43 -04:00
parent 0afe929a5f
commit 5d7a1bcf9d
17 changed files with 1361 additions and 23950 deletions
Download patch file Download diff file Expand all files Collapse all files

58
helpers/make-linux
View file

@ -17,8 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=2
VERSION=3
. ./config
@ -34,14 +33,13 @@ for FILE in $PRESERVE; do
cp $FILE /tmp/preserve --parents -a
done
sh $DATA/deblob-4.4 --force
sed 's/bnx2.*fw/$(DEBLOBBED)/' -i firmware/Makefile
sh $DATA/deblob-4.15 --force
cp /tmp/preserve/* . -a
echo "Reverting deblobbing for files patched by silent-accept-firmware"
cp /tmp/preserve/* . -av
# Remove ZFS
rm zfs spl debian/scripts/misc/update-zfs.sh -rf
#sed '/zfs/d; /spl/d' -i debian.master/reconstruct
/bin/sed 's/spl-dkms, zfs-dkms//' -i debian/control debian.master/control.d/vars.generic debian.master/control.d/vars.*
/bin/sed '/^define build_zfs/,/^endef/d; /^define install_zfs/,/^endef/d; /zfs/d' -i debian/rules.d/2-binary-arch.mk
/bin/sed '/ifeq ($(do_zfs),false)/,/endif/d' -i debian/rules
@ -49,29 +47,18 @@ rm zfs spl debian/scripts/misc/update-zfs.sh -rf
# Remove VBox
rm ubuntu/vbox* -rf
sed /vbox/d -i debian.master/info/RECONCILE 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
# The upstream release number for abi is on line 7 of the trisquel changelog, not 1.
#sed '/^release :=/s/1s/7s/' debian/rules.d/0-common-vars.mk -i
# For abi calculation, start counting from the previous release (upstream)
sed '/^revisions :=/ s/tac/tail -n +3 | tac/' debian/rules.d/0-common-vars.mk -i
# But keep the trisquel version number for $revision
rpl 'revision ?= $(word $(words $(revisions)),$(revisions))' 'revision := $(shell sed -n "1 s/^$(src_pkg_name)\ .*($(release)-\(.*\)).*$$/\1/p" $(DEBIAN)/changelog)' debian/rules.d/0-common-vars.mk
# 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
# Ignore the missing modules we remove
cat << EOF > debian.master/abi/$(ls debian.master/abi/ -1)/modules.ignore
spl
splat
vboxguest
vboxsf
vboxvideo
zavl
zcommon
znvpair
zpios
zunicode
EOF
# 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
line=$(grep -n ')-Ubuntu' debian/rules.d/0-common-vars.mk|cut -d: -f1)
sed $(expr $line - 1 ),$(expr $line + 1 )d debian/rules.d/0-common-vars.mk -i
@ -88,27 +75,14 @@ sed '/^firmware/d' ./debian*/abi/*/fwinfo -i
echo > ./debian.master/d-i/firmware/nic-modules
echo > ./debian.master/d-i/firmware/scsi-modules
# Use BFQ scheduler in lowlatency kernels
cat << EOF >> debian.master/config/config.common.trisquel
CONFIG_IOSCHED_BFQ=y
CONFIG_CGROUP_BFQIO=y
CONFIG_BFQ_GROUP_IOSCHED=y
CONFIG_DEFAULT_BFQ=n
EOF
cat << EOF >> debian.master/config/i386/config.flavour.lowlatency
CONFIG_DEFAULT_BFQ=y
CONFIG_DEFAULT_IOSCHED="bfq"
EOF
cat << EOF >> debian.master/config/amd64/config.flavour.lowlatency
CONFIG_DEFAULT_BFQ=y
CONFIG_DEFAULT_IOSCHED="bfq"
EOF
# Disable using udev as a fallback for firmware loading
replace "CONFIG_FW_LOADER_USER_HELPER=y" "CONFIG_FW_LOADER_USER_HELPER=n" debian.master/config
cp debian.master/config debian.hwe -a
changelog "Removed non-free bits"
cp debian/changelog debian.master/changelog
cp debian/changelog debian.hwe/changelog
compile