mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-05-05 12:26:52 +02:00
testing/linux-elm: upgrade to 6.7.3
This commit is contained in:
Milan P. Stanić
parent
3679fbb9d4
commit
2bc5810162
@ -4,19 +4,18 @@ _flavor=elm
|
||||
pkgname=linux-${_flavor}
|
||||
# NOTE: this kernel is intended for testing
|
||||
# please resist urge to upgrade it blindly
|
||||
pkgver=5.17.6
|
||||
pkgver=6.7.3
|
||||
case $pkgver in
|
||||
*.*.*) _kernver=${pkgver%.*};;
|
||||
*.*) _kernver=$pkgver;;
|
||||
esac
|
||||
pkgrel=1
|
||||
pkgdesc="Linux latest stable kernel for elm chromebooks"
|
||||
pkgrel=0
|
||||
pkgdesc="Linux latest stable kernel for $_flavor chromebooks"
|
||||
url="https://www.kernel.org"
|
||||
_depends_dev="perl gmp-dev bash flex bison"
|
||||
makedepends="$_depends_dev sed installkernel bc linux-headers linux-firmware-any
|
||||
openssl-dev>3 diffutils findutils vboot-utils u-boot-tools dtc"
|
||||
openssl-dev diffutils findutils vboot-utils u-boot-tools dtc"
|
||||
options="!strip !check"
|
||||
_config=${config:-config-elm.${CARCH}}
|
||||
install=
|
||||
|
||||
#subpackages="$pkgname-dev:_dev:$CBUILD_ARCH"
|
||||
@ -28,37 +27,16 @@ case $pkgver in
|
||||
esac
|
||||
|
||||
source="$source
|
||||
config-elm.aarch64
|
||||
kernel.its.elm
|
||||
fix-mmc1-speed.patch
|
||||
fix-spi-nor-max-frequency.patch
|
||||
config
|
||||
kernel.its.$_flavor
|
||||
fix-mmc-order.patch
|
||||
mps-ter12x24-font-kernel.patch
|
||||
"
|
||||
|
||||
arch="aarch64"
|
||||
_carch="arm64"
|
||||
license="GPL-2.0"
|
||||
|
||||
_flavors=
|
||||
for _i in $source; do
|
||||
case $_i in
|
||||
config-*.$CARCH)
|
||||
_f=${_i%.$CARCH}
|
||||
_f=${_f#config-}
|
||||
_flavors="$_flavors ${_f}"
|
||||
if [ "linux-$_f" != "$pkgname" ]; then
|
||||
subpackages="$subpackages linux-${_f}::$CBUILD_ARCH linux-${_f}-dev:_dev:$CBUILD_ARCH"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
_carch=${CARCH}
|
||||
case "$_carch" in
|
||||
aarch64*) _carch="arm64" ;;
|
||||
arm*) _carch="arm" ;;
|
||||
esac
|
||||
|
||||
prepare() {
|
||||
local _patch_failed=
|
||||
cd "$srcdir"/linux-$_kernver
|
||||
@ -94,29 +72,23 @@ prepare() {
|
||||
}
|
||||
|
||||
oldconfig() {
|
||||
for i in $_flavors; do
|
||||
local _config=config-$i.${CARCH}
|
||||
local _builddir="$srcdir"/build-$i.$CARCH
|
||||
mkdir -p "$_builddir"
|
||||
echo "-$pkgrel-$i" > "$_builddir"/localversion-alpine \
|
||||
local _builddir="$srcdir"/linux-$_kernver
|
||||
echo "-$pkgrel-$_flavor" > "$_builddir"/localversion-alpine \
|
||||
|| return 1
|
||||
|
||||
cp "$srcdir"/$_config "$_builddir"/.config
|
||||
cp "$srcdir"/config "$_builddir"/.config
|
||||
make -C "$srcdir"/linux-$_kernver \
|
||||
O="$_builddir" \
|
||||
ARCH="$_carch" \
|
||||
listnewconfig oldconfig
|
||||
done
|
||||
}
|
||||
|
||||
build() {
|
||||
unset LDFLAGS
|
||||
export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
|
||||
for i in $_flavors; do
|
||||
cd "$srcdir"/build-$i.$CARCH
|
||||
make ARCH="$_carch" CC="${CC:-gcc}" \
|
||||
KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine"
|
||||
done
|
||||
cd "$srcdir"/linux-$_kernver
|
||||
make ARCH="$_carch" CC="${CC:-gcc}" \
|
||||
KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine"
|
||||
}
|
||||
|
||||
_package() {
|
||||
@ -124,7 +96,7 @@ _package() {
|
||||
local _abi_release=${pkgver}-${pkgrel}-${_buildflavor}
|
||||
export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
|
||||
|
||||
cd "$srcdir"/build-$_buildflavor.$CARCH
|
||||
cd "$srcdir"/linux-$_kernver
|
||||
# modules_install seems to regenerate a defect Modules.symvers on s390x. Work
|
||||
# around it by backing it up and restore it after modules_install
|
||||
cp Module.symvers Module.symvers.backup
|
||||
@ -156,14 +128,14 @@ _package() {
|
||||
# main flavor installs in $pkgdir
|
||||
package() {
|
||||
|
||||
_package elm "$pkgdir"
|
||||
local _builddir="$srcdir"/build-$_flavor.$CARCH
|
||||
_package $_flavor "$pkgdir"
|
||||
local _builddir="$srcdir"/linux-$_kernver
|
||||
cd $_builddir
|
||||
cp $srcdir/kernel.its.elm .
|
||||
mkimage -D "-I dts -O dtb -p 2048" -f kernel.its.elm vmlinux.uimg
|
||||
cp $srcdir/kernel.its.$_flavor .
|
||||
mkimage -D "-I dts -O dtb -p 2048" -f kernel.its.$_flavor vmlinux.uimg
|
||||
|
||||
dd if=/dev/zero of=bootloader.bin bs=512 count=1
|
||||
echo "console=tty1 earlyprintk=tty1 init=/sbin/init root=PARTUUID=%U/PARTNROFF=1 rootwait rw noinitrd loglevel=7" > cmdline
|
||||
echo "console=tty0 earlyprintk=tty0 init=/sbin/init root=PARTUUID=%U/PARTNROFF=1 rootwait rw mitigations=off loglevel=7" > cmdline
|
||||
vbutil_kernel \
|
||||
--pack $pkgdir/boot/vmlinux.kpart-$pkgver-$pkgrel-$_flavor \
|
||||
--version 1 \
|
||||
@ -176,7 +148,7 @@ package() {
|
||||
--bootloader bootloader.bin
|
||||
|
||||
rm cmdline bootloader.bin
|
||||
rm $pkgdir/boot/vmlinuz-elm
|
||||
rm $pkgdir/boot/vmlinuz-$_flavor
|
||||
cd $pkgdir/boot
|
||||
ln -s vmlinux.kpart-$pkgver-$pkgrel-$_flavor vmlinux.kpart
|
||||
}
|
||||
@ -234,12 +206,10 @@ _dev() {
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b linux-5.17.tar.xz
|
||||
294199421db88a203e1ccfa0833d394e7ab444860875327979bd1dda1fcb1c211809728f2e39c1ce20b14754bc9e20183a885d0b74aae92dba58197d09b0590c patch-5.17.6.xz
|
||||
bb41f3f12831661d8efc9c846225ddf7cb0c546de4197898413caf8f5fc06ee468b7e0e31e7a68c54b03f0b57df3513f910e741822313c35006c025a9316dff0 config-elm.aarch64
|
||||
de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad linux-6.7.tar.xz
|
||||
0b80999d6477cb363ae38237600360f5919ee50c46249df80fcb181dd85b5cf5f784c0eda96e67222be5bd3dc80753506f6b7a7b316ec402e7eb750a9487fe8c patch-6.7.3.xz
|
||||
fb3fecc2306ceb4b0bc42cf47c2ea945e35793e1a09a5772844f2725cfbada4514656fcc54619cad95d3a6f7e23bbe1c64e1368f2ae06b303c3d27862ce7ec02 config
|
||||
112af92af4a3f61867ffc20076d057845aa8c9139e58153d0c88f4d7185d9a9628fa79d4edfa8855f095fb70d257bfbd7c4573a7431d4b17706415b411a50775 kernel.its.elm
|
||||
65c57a6d9a5bd5b6ec8798d1c46091bb72377ed1349b66e9a0a1a50ffa077f044f2bfdd30eab974c9c9774fc62d8dd5020a38432d108fce7f4fc1ed6648ea703 fix-mmc1-speed.patch
|
||||
9e17fb96b81590da0f9b0917ddd2b9d195bab5cde2a4e7feb19991c50a8ac8e4502445715153ced8666e5b6575137c1d49899bb0ae9ab4505ed8f1ff7e569269 fix-spi-nor-max-frequency.patch
|
||||
00e7afdab1dc89a6e0426829685d85cebb98fb95cb13a253d01326fd22f78ddf792bbe3b5be4c9bc93784f1fa93f87f604a4b6c6710660319db6f2e35dd09835 fix-mmc-order.patch
|
||||
fcea50a1ba2356d64a9c3ee0b7b7c326654996956d68eb445fafdb4320b4104b6321f768f0ce4ceb5cd4696be3a7332908ba1de7054fb20bf8c97f4234bfa6a4 mps-ter12x24-font-kernel.patch
|
||||
"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,13 +0,0 @@
|
||||
cut max-frequency to half because at full speed mmc is buggy
|
||||
|
||||
--- a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi 2020-12-28 21:22:16.614538427 +0000
|
||||
+++ b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi 2020-12-28 21:23:59.702157398 +0000
|
||||
@@ -381,7 +381,7 @@
|
||||
pinctrl-0 = <&mmc1_pins_default>;
|
||||
pinctrl-1 = <&mmc1_pins_uhs>;
|
||||
bus-width = <4>;
|
||||
- max-frequency = <200000000>;
|
||||
+ max-frequency = <100000000>;
|
||||
cap-sd-highspeed;
|
||||
sd-uhs-sdr50;
|
||||
sd-uhs-sdr104;
|
||||
@ -1,11 +0,0 @@
|
||||
--- a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi 2021-01-03 10:20:26.482347785 +0000
|
||||
+++ b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi 2021-01-03 11:36:43.321775391 +0000
|
||||
@@ -437,7 +437,7 @@
|
||||
flash@0 {
|
||||
compatible = "jedec,spi-nor";
|
||||
reg = <0>;
|
||||
- spi-max-frequency = <50000000>;
|
||||
+ spi-max-frequency = <109200000>;
|
||||
};
|
||||
};
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user