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

linux: update annotations for 6.8.0-39

Browse source
This commit is contained in:
Luis Guzmán 2024-08-01 06:21:22 +00:00
parent 0491017e0e
commit ccc3d1bd30
1 changed files with 36 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

66
helpers/make-linux
View file

@ -19,7 +19,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=30 VERSION=31
HWEKR=6.8 HWEKR=6.8
# DI_ENABLED = 1 enables udeb build, 0 or any other value disables them. # DI_ENABLED = 1 enables udeb build, 0 or any other value disables them.
@ -274,46 +274,52 @@ sed 's/on DESC//; s/PKGVER on/PKGVER/; /^ DESC.$/d;' debian*/control.d/flavour-c
#echo > ./debian.master/d-i/firmware/scsi-modules #echo > ./debian.master/d-i/firmware/scsi-modules
# Disable using udev as a fallback for firmware loading # Disable using udev as a fallback for firmware loading
replace "CONFIG_FW_LOADER_USER_HELPER=y" "CONFIG_FW_LOADER_USER_HELPER=n" $DEBIAN_PATH/config # Read more at: Documentation/driver-api/firmware/fallback-mechanisms.rst
#replace "CONFIG_FW_LOADER_USER_HELPER=y" "CONFIG_FW_LOADER_USER_HELPER=n" $DEBIAN_PATH/config
# Disable aaeon & ubuntu odm drivers, remove on both paths to match annotations. # Disable aaeon & ubuntu odm drivers, remove on both paths to match annotations.
for i in _AAEON CONFIG_UBUNTU_ODM_DRIVERS for i in CONFIG_GPIO_AAEON CONFIG_LEDS_AAEON CONFIG_MFD_AAEON CONFIG_SENSORS_AAEON
do do
grep -rl "$i" debian.*/config/annotations | \ echo "> Modifying $i annotations value:"
xargs -r sed -i "/$i/s|'y'|'n'|g;/$i/s|'-'|'n'|g;/$i/s|'m'|'-'|g" python3 debian/scripts/misc/annotations -f $DEBIAN_PATH/config/annotations \
--arch amd64 --flavour generic --config $i --write -
done done
for i in amd64 arm64 armhf ppc64el riscv64 s390x
do
echo "> Modifying CONFIG_UBUNTU_ODM_DRIVERS for arch $i:"
python3 debian/scripts/misc/annotations -f $DEBIAN_PATH/config/annotations \
--arch $i --flavour generic --config CONFIG_UBUNTU_ODM_DRIVERS --write n
done
python3 debian/scripts/misc/annotations -f $DEBIAN_PATH/config/annotations \
--arch arm64 --flavour generic-64k --config CONFIG_UBUNTU_ODM_DRIVERS --write n
## Disable ppc64el Werroron amdgpu
python3 debian/scripts/misc/annotations -f $DEBIAN_PATH/config/annotations \
--arch ppc64el --flavour generic --config CONFIG_DRM_AMDGPU_WERROR --write n
## 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
# Custom changes for linux and linux-hwe. # Custom changes for linux and linux-hwe.
if [ $HWE_ENABLED != 1 ]; then if [ $HWE_ENABLED != 1 ]; then
## HWEKR - 6.8 ## HWEKR - 6.8
## Disable ppc64el Werroron amdgpu for i in CONFIG_AX88796B_RUST_PHY CONFIG_CONSTRUCTORS CONFIG_RUST_BUILD_ASSERT_ALLOW \
for i in $(grep -rl CONFIG_DRM_AMDGPU_WERROR debian.*/config/annotations) CONFIG_RUST_DEBUG_ASSERTIONS CONFIG_RUST_OVERFLOW_CHECKS CONFIG_RUST_PHYLIB_ABSTRACTIONS \
CONFIG_SAMPLES_RUST
do do
sed -i "/CONFIG_DRM_AMDGPU_WERROR/s|'ppc64el': 'y'|'ppc64el': 'n'|" $i echo "> Modifying $i annotations value:"
done python3 debian/scripts/misc/annotations -f $DEBIAN_PATH/config/annotations \
## Remove disabled modules from generic list (starting at 6.2) --arch amd64 --flavour generic --config $i --write -
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 done
python3 debian/scripts/misc/annotations -f $DEBIAN_PATH/config/annotations \
--arch amd64 --flavour generic --config CONFIG_RUST --write n
else else
# HWEKR - 6.5+ echo "# HWEKR - 6.X+"
## 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 fi
grep -rl '^Vcs-Git:' | \ grep -rl '^Vcs-Git:' | \