Skip to content

Commit ae82243

Browse files
committed
update to upstream Linux kernel 6.10.7
1 parent f215b36 commit ae82243

File tree

2 files changed

+13
-16
lines changed

2 files changed

+13
-16
lines changed

vmdb2-debian/kernel-6.10.sh

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ if test "X$HOSTTYPE" != "Xx86_64" ; then
1919
RPIPATCHES=1
2020
fi
2121

22-
KVER=6.10.5
23-
KVERR=6.10.5
22+
KVER=6.10.7
23+
KVERR=6.10.7
2424
CDIR=linux-$KVERR
25-
RVER=6.10.3
25+
RVER=6.10.7
2626

2727
CROSS=0
2828
ARCH=
@@ -68,7 +68,7 @@ if test "$RPIPATCHES" = 1 -a ! -d rpi-patches-$RVER ; then
6868
popd
6969
fi
7070
cd $RDIR || exit 1
71-
git format-patch -o ../rpi-patches-$RVER d29de02effd4e8816333582ed8230d41e14a73dc
71+
git format-patch -o ../rpi-patches-$RVER 24873d2e5fe32f4635cf8406ff3b8d16f6e47505
7272
cd ..
7373
rm -fr $RDIR
7474
fi
@@ -79,11 +79,11 @@ if ! test -d $CDIR ; then
7979
fi
8080
sed -i -e '/install-rtla)/d' $CDIR/debian/rules.real
8181
# Change Debian source to new version:
82-
sed -i -e '1 s/6.10.4-/6.10.5-/' $CDIR/debian/changelog
82+
sed -i -e '1 s/6.10.7-/6.10.7-/' $CDIR/debian/changelog
8383
sed -i -e '1 s/unstable/UNRELEASED/' $CDIR/debian/changelog
8484
sed -i -e '1 s/experimental/UNRELEASED/' $CDIR/debian/changelog
85-
sed -i -e 's,^bugfix/all/net-drop-bad-gso-csum_start-and-offset-in-virtio_net.patch,,g' $CDIR/debian/patches/series
86-
sed -i -e 's,^bugfix/all/spi-spidev-Add-missing-spi_device_id-for-bh2228fv.patch,,g' $CDIR/debian/patches/series
85+
#sed -i -e 's,^bugfix/all/net-drop-bad-gso-csum_start-and-offset-in-virtio_net.patch,,g' $CDIR/debian/patches/series
86+
#sed -i -e 's,^bugfix/all/spi-spidev-Add-missing-spi_device_id-for-bh2228fv.patch,,g' $CDIR/debian/patches/series
8787
#sed -i -e 's,powerpc-imc-pmu-Use-the-correct-spinlock-initializer.patch,,g' $CDIR/debian/patches-rt/series
8888
#exit 0
8989
mkdir -p orig
@@ -102,12 +102,9 @@ if test "$RPIPATCHES" = 1 ; then
102102
pushd debian/patches
103103
mkdir bugfix/rpi
104104
cp ../../../rpi-patches-$RVER/*.patch bugfix/rpi/
105-
rm -f bugfix/rpi/0323-spi-spidev-Restore-loading-from-Device-Tree.patch
106-
rm -f bugfix/rpi/0429-mfd-Add-rp1-driver.patch
107-
rm -f bugfix/rpi/0412-cfg80211-ship-debian-certificates-as-hex-files.patch
108-
sed -i -e 's/ README$//g' bugfix/rpi/0048-BCM2708-Add-core-Device-Tree-support.patch
109-
#rm -f bugfix/rpi/0592-overlays-Use-dtbs-list-for-overlay-installation.patch
110-
rm -f bugfix/rpi/0610-module-Avoid-ABI-changes-when-debug-info-is-disabled.patch
105+
sed -i -e 's/ README$//g' bugfix/rpi/0046-BCM2708-Add-core-Device-Tree-support.patch
106+
rm -f bugfix/rpi/0410-cfg80211-ship-debian-certificates-as-hex-files.patch
107+
rm -f bugfix/rpi/0608-module-Avoid-ABI-changes-when-debug-info-is-disabled.patch
111108
ls bugfix/rpi/*.patch >> series
112109
popd
113110
echo "CONFIG_PCIE_BRCMSTB=y" >> debian/config/config

vmdb2-debian/kernel.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ if test "X$HOSTTYPE" != "Xx86_64" ; then
1919
RPIPATCHES=1
2020
fi
2121

22-
KVER=6.1.104
23-
KVERR=6.1.104
22+
KVER=6.1.107
23+
KVERR=6.1.107
2424
CDIR=linux-$KVERR
2525
RVER=6.1.66
2626

@@ -82,7 +82,7 @@ if ! test -d $CDIR ; then
8282
fi
8383
sed -i -e '/install-rtla)/d' $CDIR/debian/rules.real
8484
# Change Debian source to new version:
85-
sed -i -e '1 s/6.1.103-/6.1.104-/' $CDIR/debian/changelog
85+
sed -i -e '1 s/6.1.107-/6.1.107-/' $CDIR/debian/changelog
8686
sed -i -e '1 s/unstable/UNRELEASED/' $CDIR/debian/changelog
8787
sed -i -e '1 s/experimental/UNRELEASED/' $CDIR/debian/changelog
8888
#sed -i -e 's,^bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch,,g' $CDIR/debian/patches/series

0 commit comments

Comments
 (0)