misc: update changes from aramo to ecne
This commit is contained in:
Luis Guzmán
parent
88b3f96c45
commit
df6774d1fe
337 changed files with 341 additions and 125 deletions
|
|
@ -19,7 +19,20 @@
|
|||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
#
|
||||
|
||||
VERSION=26
|
||||
VERSION=28
|
||||
HWEKR=5.15
|
||||
|
||||
# DI_ENABLED = 1 enables udeb build, 0 or any other value disables them.
|
||||
DI_ENABLED=1
|
||||
# HWE_ENABLED = 1 enables HWE stack build, 0 or any other value disables it.
|
||||
HWE_ENABLED=0
|
||||
|
||||
[ $HWE_ENABLED != 1 ] && \
|
||||
DEBIAN_PATH=debian.master && \
|
||||
CONTROL_PACKAGE=linux
|
||||
[ $HWE_ENABLED = 1 ] && \
|
||||
DEBIAN_PATH=debian.hwe-$HWEKR && \
|
||||
CONTROL_PACKAGE=linux-hwe-$HWEKR
|
||||
|
||||
. ./config
|
||||
|
||||
|
|
@ -28,7 +41,6 @@ drivers/bluetooth
|
|||
drivers/gpu/drm/i915
|
||||
drivers/gpu/drm/amd/amdgpu
|
||||
drivers/gpu/drm/amd/pm/powerplay
|
||||
drivers/gpu/drm/r128
|
||||
drivers/gpu/drm/radeon
|
||||
drivers/net/wireless/intel/ipw2x00
|
||||
drivers/net/wireless/intel/iwlegacy
|
||||
|
|
@ -46,6 +58,10 @@ drivers/net/wireless/realtek/rtlwifi/rtl8723be
|
|||
drivers/net/wireless/realtek/rtlwifi/rtl8821ae
|
||||
drivers/net/wireless/broadcom/brcm80211
|
||||
'
|
||||
# HWEKR - 5.15
|
||||
[ $HWE_ENABLED != 1 ] && \
|
||||
PRESERVEDIRS="$PRESERVEDIRS
|
||||
drivers/gpu/drm/r128"
|
||||
|
||||
TMPDIR=$(mktemp -d preserve-XXXX)
|
||||
PRESERVE=$(grep '^+++' $DATA/silent-accept-firmware.patch | /bin/sed 's/+++ //; s/\t.*//;' | cut -d/ -f2- | sort -u )
|
||||
|
|
@ -56,7 +72,7 @@ for DIR in $PRESERVEDIRS; do
|
|||
cp $DIR $TMPDIR --parents -a
|
||||
done
|
||||
|
||||
sh $DATA/deblob-5.15
|
||||
sh $DATA/deblob-$HWEKR
|
||||
|
||||
echo "Reverting deblobbing for files patched by silent-accept-firmware"
|
||||
cp $TMPDIR/* . -av
|
||||
|
|
@ -67,20 +83,27 @@ for PATCH in $DATA/*.patch ; do
|
|||
patch --no-backup-if-mismatch -p1 < $PATCH
|
||||
done
|
||||
|
||||
# Simple test for finding missing cases of silent_accept_firmware method
|
||||
## Simple test for finding missing cases of silent_accept_firmware method
|
||||
#for dir in $PRESERVEDIRS; do
|
||||
# grep -i "load.*firmware.*%" $PRESERVEDIRS -r
|
||||
# grep -i "load.*ucode.*%" $PRESERVEDIRS -r
|
||||
# grep -i "load.*firmware.*%" $PRESERVEDIRS -r|grep -vi info
|
||||
# grep -i "load.*ucode.*%" $PRESERVEDIRS -r|grep -vi info
|
||||
#done
|
||||
|
||||
# Re-enable udebs
|
||||
cp $DATA/5-udebs.mk debian/rules.d
|
||||
cp -a $DATA/d-i debian.master
|
||||
cp $DATA/kernel-wedge-arch.pl debian/scripts/misc/
|
||||
enable_udebs() {
|
||||
|
||||
#Apply udeb/d-i related patches.
|
||||
for PATCH in $DATA/udeb/*.patch ; do
|
||||
echo $PATCH
|
||||
patch --no-backup-if-mismatch -p1 < $PATCH
|
||||
done
|
||||
|
||||
cp $DATA/udeb/5-udebs.mk debian/rules.d
|
||||
cp -a $DATA/udeb/d-i $DEBIAN_PATH
|
||||
|
||||
cat << EOF >> debian/control
|
||||
Package: linux-udebs-generic
|
||||
Build-Profiles: <!stage1>
|
||||
Package: $CONTROL_PACKAGE-udebs-generic
|
||||
Build-Profiles: <!stage1> <!noudeb> <!cross> <!autopkgtest>
|
||||
XC-Package-Type: udeb
|
||||
Section: debian-installer
|
||||
Architecture: amd64 armhf arm64 ppc64el s390x
|
||||
|
|
@ -89,8 +112,8 @@ Description: Metapackage depending on kernel udebs
|
|||
This package depends on the all udebs that the kernel build generated,
|
||||
for easier version and migration tracking.
|
||||
|
||||
Package: linux-udebs-generic-lpae
|
||||
Build-Profiles: <!stage1>
|
||||
Package: $CONTROL_PACKAGE-udebs-generic-lpae
|
||||
Build-Profiles: <!stage1> <!noudeb> <!cross> <!autopkgtest>
|
||||
XC-Package-Type: udeb
|
||||
Section: debian-installer
|
||||
Architecture: armhf
|
||||
|
|
@ -99,8 +122,8 @@ Description: Metapackage depending on kernel udebs
|
|||
This package depends on the all udebs that the kernel build generated,
|
||||
for easier version and migration tracking.
|
||||
|
||||
Package: linux-udebs-lowlatency
|
||||
Build-Profiles: <!stage1>
|
||||
Package: $CONTROL_PACKAGE-udebs-lowlatency
|
||||
Build-Profiles: <!stage1> <!noudeb> <!cross> <!autopkgtest>
|
||||
XC-Package-Type: udeb
|
||||
Section: debian-installer
|
||||
Architecture: amd64
|
||||
|
|
@ -110,9 +133,9 @@ Description: Metapackage depending on kernel udebs
|
|||
for easier version and migration tracking.
|
||||
EOF
|
||||
|
||||
cat << EOF >> debian.master/control.d/flavour-control.stub
|
||||
Package: linux-udebs-FLAVOUR
|
||||
Build-Profiles: <!stage1>
|
||||
cat << EOF >> $DEBIAN_PATH/control.d/flavour-control.stub
|
||||
Package: SRCPKGNAME-udebs-FLAVOUR
|
||||
Build-Profiles: <!stage1> <!noudeb> <!cross> <!autopkgtest>
|
||||
XC-Package-Type: udeb
|
||||
Section: debian-installer
|
||||
Architecture: ARCH
|
||||
|
|
@ -124,105 +147,180 @@ EOF
|
|||
|
||||
sed '/include.*2-binary-arch.mk/a\\n# Rules for building the udebs ($(DEBIAN)-installer)\ninclude $(DROOT)/rules.d/5-udebs.mk' -i debian/rules
|
||||
sed 's/+= binary-debs/+= binary-udebs/' -i debian/rules.d/2-binary-arch.mk
|
||||
sed '/Build-Depends:/a\ kernel-wedge <!stage1>,' -i debian/control \
|
||||
debian.master/control.stub.in
|
||||
|
||||
for i in dctrl-tools kernel-wedge
|
||||
do
|
||||
sed "/Build-Depends:/a\ $i <\!stage1> <\!noudeb> <\!cross> <\!autopkgtest>," -i debian/control \
|
||||
$DEBIAN_PATH/control.stub.in
|
||||
done
|
||||
}
|
||||
|
||||
[ "$DI_ENABLED" = "1" ] && enable_udebs
|
||||
|
||||
# Wipe dkms-versions
|
||||
# lists zfs / v4l2loopback 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.*
|
||||
# Remove ZFS - adjusting to each release
|
||||
rm debian/scripts/dkms-build-configure--zfs
|
||||
|
||||
/bin/sed -i '/ifeq ($(do_zfs),false)/,/endif$/d' debian/rules
|
||||
/bin/sed -i '/zfs/d' debian.master/abi/*/*.modules \
|
||||
debian/rules.d/2-binary-arch.mk \
|
||||
debian.master/rules.d/* \
|
||||
debian/rules
|
||||
# debian.master/d-i/modules/fs-core-modules \
|
||||
# debian.master/control.d/generic.inclusion-list \
|
||||
# debian.master/control.d/vars.*
|
||||
for i in $(grep -lr zfs $DEBIAN_PATH/reconstruct \
|
||||
$DEBIAN_PATH/abi/*/*.modules \
|
||||
debian/rules.d/2-binary-arch.mk \
|
||||
$DEBIAN_PATH/rules.d/ \
|
||||
debian/rules \
|
||||
$DEBIAN_PATH/control.d/)
|
||||
do
|
||||
sed -i '/zfs/d' $i
|
||||
done
|
||||
|
||||
[ "$DI_ENABLED" = "1" ] && \
|
||||
for i in $(grep -lr zfs $DEBIAN_PATH/d-i/modules/fs-core-modules) ; \
|
||||
do \
|
||||
sed -i '/zfs/d' $i ; \
|
||||
done
|
||||
|
||||
#/bin/sed 's/spl-dkms, zfs-dkms//' -i debian/control \
|
||||
# $DEBIAN_PATH/control.d/vars.generic \
|
||||
# $DEBIAN_PATH/control.d/vars.*
|
||||
|
||||
#/bin/sed -i '/ifeq ($(do_zfs),false)/,/endif$/d' debian/rules
|
||||
|
||||
# Remove VBox
|
||||
#sed -i '/vbox/s|true|false|' debian.master/rules.d/amd64.mk
|
||||
#sed -i '/vbox/s|true|false|' $DEBIAN_PATH/rules.d/amd64.mk
|
||||
|
||||
# Remove v4l2loopback
|
||||
/bin/sed -i '/ifeq ($(do_v4l2loopback),false)/,/endif$/d' debian/rules
|
||||
/bin/sed -i '/v4l2loopback/d' debian/rules.d/2-binary-arch.mk \
|
||||
debian/rules
|
||||
/bin/sed -i '/do_v4l2loopback/d' debian.master/rules.d/*
|
||||
for i in $(grep -lr v4l2loopback $DEBIAN_PATH/reconstruct \
|
||||
$DEBIAN_PATH/abi/*/*.modules \
|
||||
debian/rules.d/2-binary-arch.mk \
|
||||
$DEBIAN_PATH/rules.d/ \
|
||||
debian/rules \
|
||||
$DEBIAN_PATH/control.d/)
|
||||
do
|
||||
sed -i '/v4l2loopback/d' $i
|
||||
done
|
||||
|
||||
# Remove nvidia
|
||||
[ "$DI_ENABLED" = "1" ] && \
|
||||
for i in $(grep -lr v4l2loopback $DEBIAN_PATH/d-i/modules/fs-core-modules) ; \
|
||||
do \
|
||||
sed -i '/v4l2loopback/d' ; \
|
||||
done
|
||||
#/bin/sed -i '/ifeq ($(do_v4l2loopback),false)/,/endif$/d' debian/rules
|
||||
#/bin/sed -i '/do_v4l2loopback/d' debian.master/rules.d/*
|
||||
|
||||
# Remove nvidia driver
|
||||
rm -rf debian/scripts/dkms-build--nvidia-N
|
||||
sed -i '/dkms-build--nvidia-N/d' debian.master/reconstruct
|
||||
|
||||
#/bin/sed '/do_dkms_nvidia = true/d' -i debian.master/abi/*/*/*.modules \
|
||||
# debian/rules \
|
||||
# debian.master/control.d/vars.*
|
||||
for i in $(grep -l dkms-build--nvidia-N $DEBIAN_PATH/reconstruct)
|
||||
do
|
||||
sed -i '/dkms-build--nvidia-N/d' $i
|
||||
done
|
||||
|
||||
# Remove wireguard
|
||||
/bin/sed '/ifeq ($(do_dkms_wireguard),false)/,/endif$/d' -i debian/rules
|
||||
for i in $(grep -lr wireguard $DEBIAN_PATH/reconstruct \
|
||||
$DEBIAN_PATH/abi/*/*.modules \
|
||||
debian/rules.d/2-binary-arch.mk \
|
||||
$DEBIAN_PATH/rules.d/ \
|
||||
$DEBIAN_PATH/control.d/)
|
||||
do
|
||||
sed -i '/wireguard/d' $i
|
||||
done
|
||||
[ "$DI_ENABLED" = "1" ] && \
|
||||
for i in $(grep -lr wireguard $DEBIAN_PATH/d-i/modules/fs-core-modules) ; \
|
||||
do \
|
||||
sed -i '/wireguard/d' $i ; \
|
||||
done
|
||||
|
||||
#/bin/sed '/ifeq ($(do_dkms_wireguard),false)/,/endif$/d' -i debian/rules
|
||||
#sed '/do_dkms_wireguard/d' -i debian/rules.d/2-binary-arch.mk
|
||||
#/bin/sed '/do_dkms_wireguard/d' -i debian.master/rules.d/*
|
||||
#/bin/sed '/do_dkms_wireguard/d' -i $DEBIAN_PATH/rules.d/*
|
||||
|
||||
# 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
|
||||
echo -e 'skipmodule = true\nskipabi = true' | tee -a $DEBIAN_PATH/rules.d/0-common-vars.mk \
|
||||
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
|
||||
# Skip the retpoline check as there is no last release to check against
|
||||
echo 'skipretpoline = true' | tee -a $DEBIAN_PATH/rules.d/0-common-vars.mk \
|
||||
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
|
||||
sed '/Package:/s/.unsigned//;/This package /s/.unsigned//' -i debian/control
|
||||
|
||||
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
|
||||
sed s/family=ubuntu/family=trisquel/ -i debian/rules.d/0-common-vars.mk
|
||||
cat << EOF > debian.master/etc/kernelconfig
|
||||
archs="amd64 i386 armhf arm64 ppc64el"
|
||||
for i in $(grep -rl family=ubuntu debian/rules.d/)
|
||||
do
|
||||
sed -i s/family=ubuntu/family=trisquel/ $i
|
||||
done
|
||||
cat << EOF > $DEBIAN_PATH/etc/kernelconfig
|
||||
archs="i386 amd64 armhf arm64 ppc64el"
|
||||
family='trisquel'
|
||||
EOF
|
||||
|
||||
rename s/ubuntu/trisquel/ debian.*/config/config.common.ubuntu
|
||||
grep -lr config.common.ubuntu debian*/ | xargs -r sed -i 's|config.common.ubuntu|config.common.trisquel|g'
|
||||
for i in $(grep -lr config.common.ubuntu debian*/)
|
||||
do
|
||||
sed -i 's|config.common.ubuntu|config.common.trisquel|g' $i
|
||||
done
|
||||
|
||||
find debian* -type f -name *control* -exec sed 's/ with Ubuntu patches//; s/Linux/Linux-libre/g' -i {} \;
|
||||
|
||||
# Descriptions should not change based on the build arch
|
||||
sed 's/on DESC//; s/PKGVER on/PKGVER/; /^ DESC.$/d;' debian*/control.d/flavour-control.stub -i
|
||||
|
||||
sed '/^firmware/d' ./debian*/abi/fwinfo -i
|
||||
#sed '/^firmware/d' ./debian*/abi/fwinfo -i
|
||||
#echo > ./debian.master/d-i/firmware/nic-modules
|
||||
#echo > ./debian.master/d-i/firmware/scsi-modules
|
||||
|
||||
# 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
|
||||
replace "CONFIG_FW_LOADER_USER_HELPER=y" "CONFIG_FW_LOADER_USER_HELPER=n" $DEBIAN_PATH/config
|
||||
|
||||
# Fix ports build
|
||||
sed -i "/CONFIG_FW_LOADER_USER_HELPER/s|'armhf': 'y',|'armhf': 'n',|g" debian.master/config/annotations
|
||||
sed -i "/CONFIG_FW_LOADER_USER_HELPER/s|'arm64': 'y',|'arm64': 'n',|g" debian.master/config/annotations
|
||||
sed -i "/CONFIG_FW_LOADER_USER_HELPER/s|'ppc64el': 'y',|'ppc64el': 'n',|g" debian.master/config/annotations
|
||||
sed -i "/CONFIG_FW_LOADER_USER_HELPER_FALLBACK/s|'armhf': 'n',|'armhf': '-',|g" debian.master/config/annotations
|
||||
sed -i "/CONFIG_FW_LOADER_USER_HELPER_FALLBACK/s|'arm64': 'n',|'arm64': '-',|g" debian.master/config/annotations
|
||||
sed -i "/CONFIG_FW_LOADER_USER_HELPER_FALLBACK/s|'ppc64el': 'n',|'ppc64el': '-',|g" debian.master/config/annotations
|
||||
# Disable aaeon & ubuntu odm drivers, remove on both paths to match annotations.
|
||||
for i in AAEON CONFIG_UBUNTU_ODM_DRIVERS
|
||||
do
|
||||
grep -rl "$i" debian.*/config/annotations | \
|
||||
xargs -r sed -i "/$i/d"
|
||||
done
|
||||
|
||||
# Disable aaeon.
|
||||
sed -i "/AAEON/d" debian.master/config/annotations
|
||||
# Disable ubuntu ODM drivers
|
||||
sed -i "/CONFIG_UBUNTU_ODM_DRIVERS/d" debian.master/config/annotations
|
||||
# Tweak 5.15.0-94.104
|
||||
sed -i "/CONFIG_GPIO_M058SSAN/s|'amd64': 'm'|'amd64': '-'|" debian.master/config/annotations
|
||||
sed -i "/CONFIG_RTC_DRV_PCF85263/s|'amd64': 'm'|'amd64': '-'|" debian.master/config/annotations
|
||||
# Custom changes for linux and linux-hwe.
|
||||
if [ $HWE_ENABLED != 1 ]; then
|
||||
## HWEKR - 5.15
|
||||
## Removal wireguard 5.15 specific.
|
||||
sed '/ifeq ($(do_dkms_wireguard),false)/,/endif$/d' -i debian/rules
|
||||
## Fix ports build
|
||||
sed -i "/CONFIG_FW_LOADER_USER_HELPER/s|'armhf': 'y',|'armhf': 'n',|g" debian.master/config/annotations
|
||||
sed -i "/CONFIG_FW_LOADER_USER_HELPER/s|'arm64': 'y',|'arm64': 'n',|g" debian.master/config/annotations
|
||||
sed -i "/CONFIG_FW_LOADER_USER_HELPER/s|'ppc64el': 'y',|'ppc64el': 'n',|g" debian.master/config/annotations
|
||||
sed -i "/CONFIG_FW_LOADER_USER_HELPER_FALLBACK/s|'armhf': 'n',|'armhf': '-',|g" debian.master/config/annotations
|
||||
sed -i "/CONFIG_FW_LOADER_USER_HELPER_FALLBACK/s|'arm64': 'n',|'arm64': '-',|g" debian.master/config/annotations
|
||||
sed -i "/CONFIG_FW_LOADER_USER_HELPER_FALLBACK/s|'ppc64el': 'n',|'ppc64el': '-',|g" debian.master/config/annotations
|
||||
## Tweak 5.15.0-94.104
|
||||
sed -i "/CONFIG_GPIO_M058SSAN/s|'amd64': 'm'|'amd64': '-'|" debian.master/config/annotations
|
||||
sed -i "/CONFIG_RTC_DRV_PCF85263/s|'amd64': 'm'|'amd64': '-'|" debian.master/config/annotations
|
||||
else
|
||||
# HWEKR - 6.5+
|
||||
## Disable ppc64el Werroron amdgpu
|
||||
for i in $(grep -rl CONFIG_DRM_AMDGPU_WERROR debian.*/config/annotations)
|
||||
do
|
||||
sed -i "/CONFIG_DRM_AMDGPU_WERROR/s|'ppc64el': 'y'|'ppc64el': 'n'|" $i
|
||||
done
|
||||
## Remove disabled modules from generic list (starting at 6.2)
|
||||
for module in gpio-aaeon hwmon-aaeon leds-aaeon mfd-aaeon spl
|
||||
do
|
||||
for i in $(grep -rl "^$module$" $DEBIAN_PATH/abi/*/)
|
||||
do
|
||||
sed -i "/^$module$/d" $i
|
||||
done
|
||||
done
|
||||
fi
|
||||
|
||||
grep -rl '^Vcs-Git:' | \
|
||||
xargs sed -i "s|^Vcs-Git:.*|Vcs-Git: https://gitlab.trisquel.org/trisquel/package-helpers|"
|
||||
|
||||
changelog "Removed non-free bits"
|
||||
|
||||
cp debian/changelog debian.master/changelog
|
||||
cp debian/changelog $DEBIAN_PATH/changelog
|
||||
|
||||
package
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue