forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

device/main/linux-postmarketos-allwinner: upgrade to 6.1.0_rc7_git20221205 (MR 3694)

Browse source 
Contains the following fix:
- don't reinitialize bluetooth on Pinephone during resume

[ci:skip-build]: already built successfully in CI
This commit is contained in:
Jan Jasper de Kroon 2022-12-07 00:45:57 +01:00 committed by Oliver Smith
parent c7dc9e5fc3
commit 1542dbfb9d
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
4 changed files with 7 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
device/main/linux-postmarketos-allwinner/0013-revert-kbuild-fix-Wimplicit-function-declaration-in-.patch
View file

@ -1,29 +0,0 @@
From acfc63f6f42ccc8917652def2fcd330256f6e2fd Mon Sep 17 00:00:00 2001
From: Jan Jasper de Kroon <jajadekroon@gmail.com>
Date: Sat, 26 Nov 2022 20:33:28 +0100
Subject: [PATCH] revert: kbuild: fix -Wimplicit-function-declaration in
license_is_gpl_compatible
This commit introduces the include <linux/string.h> into licences.h,
which seems to have been introduced for building with Clang,
but breaks building with gcc. Reverting this will fix the build proces.
---
include/linux/license.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/linux/license.h b/include/linux/license.h
index ad937f57f..7cce390f1 100644
--- a/include/linux/license.h
+++ b/include/linux/license.h
@@ -2,8 +2,6 @@
#ifndef __LICENSE_H
#define __LICENSE_H
-#include <linux/string.h>
-
static inline int license_is_gpl_compatible(const char *license)
{
return (strcmp(license, "GPL") == 0
--
2.34.3

12
device/main/linux-postmarketos-allwinner/APKBUILD
View file

@ -7,9 +7,9 @@
_flavor=postmarketos-allwinner _flavor=postmarketos-allwinner
_config="config-$_flavor.$CARCH" _config="config-$_flavor.$CARCH"
pkgname=linux-$_flavor pkgname=linux-$_flavor
pkgver=6.1.0_rc7_git20221128 pkgver=6.1.0_rc7_git20221205
pkgrel=1 pkgrel=1
_tag="orange-pi-6.1-20221128-1027" _tag="orange-pi-6.1-20221205-1151"
pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)" pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
arch="aarch64 armv7" arch="aarch64 armv7"
url="https://megous.com/git/linux/" url="https://megous.com/git/linux/"
@ -48,7 +48,6 @@ source="$pkgname-$_tag.tar.gz::https://github.com/megous/linux/archive/$_tag.tar
0010-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch 0010-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
0011-sunxi-mmc-h6-fix.patch 0011-sunxi-mmc-h6-fix.patch
0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch 0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
0013-revert-kbuild-fix-Wimplicit-function-declaration-in-.patch
" "
builddir="$srcdir/linux-$_tag" builddir="$srcdir/linux-$_tag"
@ -84,9 +83,9 @@ package() {
} }
sha512sums=" sha512sums="
5223e80d1852337e498d7ac0ce6cbf4268be8102744143499a20a51c1f40aa5daf7da3b71d6f88978f9b14efb147fbec0cf2f8b4e533a808abbff7381701da81 linux-postmarketos-allwinner-orange-pi-6.1-20221128-1027.tar.gz f947f76e29f9ffe77583af9fe6fb985afd86e6da48111ded26ee5ef0796e7a4afc9aca8d2598f0eaed69c9022d21a972d922fd540ea878125417b887b3388d31 linux-postmarketos-allwinner-orange-pi-6.1-20221205-1151.tar.gz
81a9f3b99a49001ab191f3b94aaf7488d0be30fb08d3049d916811ac4ee1d2ed388516a966640ef5376b89696173bf8132fdf798a1fdfb0683fca48dce05c08c config-postmarketos-allwinner.aarch64 82b413a6385a733660d423a51fe10711d6f624e04b270d2516ff52320530d416a3f9abacea2c571ef831d1006c9090821271120eddff5f136a177e5059e7e416 config-postmarketos-allwinner.aarch64
8e15e8987ec52b3de3f618ce0cdadc5fbbf7aa1b005be1a6d1530289bcfed1ce8d4f24072b9967af09ecd68e6dba54138a64dced050c2ebc7a850a318be1fe75 config-postmarketos-allwinner.armv7 16e1fd952f65cccd41876fe66924b5a3182bd46f5fc7e97d677083e5a952e0e0e751b4ab38639b653626b80823215b1e325ecfe93a9cb27bb749acf9292ac99e config-postmarketos-allwinner.armv7
126e0a65e04f22f14eac1281a69000d9d5b107ed8fd1b52f37e812751f55e6c45b0240ceac61c9d95ae7f0543aaf9d96b85a8532baf59283c077b9945e615367 0001-dts-add-dontbeevil-pinephone-devkit.patch 126e0a65e04f22f14eac1281a69000d9d5b107ed8fd1b52f37e812751f55e6c45b0240ceac61c9d95ae7f0543aaf9d96b85a8532baf59283c077b9945e615367 0001-dts-add-dontbeevil-pinephone-devkit.patch
1dc710f5abacdd5698169d5e985efeca8114986c774c3d65e89812d08ceb3db5ebdc6dd64dd76a262c761f3bfc3ffb6bc237fd5236bd1f89c5975d12e42eda04 0002-dts-add-pinetab-dev-old-display-panel.patch 1dc710f5abacdd5698169d5e985efeca8114986c774c3d65e89812d08ceb3db5ebdc6dd64dd76a262c761f3bfc3ffb6bc237fd5236bd1f89c5975d12e42eda04 0002-dts-add-pinetab-dev-old-display-panel.patch
96849f40f6defc4ad7646256814bea5ac353c4e0479fd069365ff27456d63da801541ec616f6db736d60f3134384321a9eeb5bfbd555363bf1259c8de63d17fa 0003-dts-pinetab-add-missing-bma223-ohci1.patch 96849f40f6defc4ad7646256814bea5ac353c4e0479fd069365ff27456d63da801541ec616f6db736d60f3134384321a9eeb5bfbd555363bf1259c8de63d17fa 0003-dts-pinetab-add-missing-bma223-ohci1.patch
@ -99,5 +98,4 @@ c61d4f86eddecca99df1ea1323f988e575f9c49130b64a0c50d61028ff96e24aaa3131fb3731e62e
902708a5a8dd8a815d3d1793933d307c551e3c10368d1805431b70691ee5d4438b7146c466549f457468e365f94073a35ae3304928af7581e5dc91ba5c8fa682 0010-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch 902708a5a8dd8a815d3d1793933d307c551e3c10368d1805431b70691ee5d4438b7146c466549f457468e365f94073a35ae3304928af7581e5dc91ba5c8fa682 0010-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
2feeab0a6c3db46e514d45c9708f351c6d7dfb0bf951a5cb6f2dc01b4bdc8d4c46931000758a819a6d7317b16cb1933bb3946e6a78cbf448cc77f57a56c503bf 0011-sunxi-mmc-h6-fix.patch 2feeab0a6c3db46e514d45c9708f351c6d7dfb0bf951a5cb6f2dc01b4bdc8d4c46931000758a819a6d7317b16cb1933bb3946e6a78cbf448cc77f57a56c503bf 0011-sunxi-mmc-h6-fix.patch
22af33264090dac027ee054b4345a07f0b2ee077e2ae1620e83960bfeea096169aec710973fdd50531ed4f1db6cfd59b5796cd235316cb3512aee034f741a694 0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch 22af33264090dac027ee054b4345a07f0b2ee077e2ae1620e83960bfeea096169aec710973fdd50531ed4f1db6cfd59b5796cd235316cb3512aee034f741a694 0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
0758e4b03370475cd3c053083926c7ceb1cf5fb4bfcf107920eebdf18724e77ba6d7ed4280049ac88585da4c4e8d721fde380596939210d1dfd54123505ca1ba 0013-revert-kbuild-fix-Wimplicit-function-declaration-in-.patch
" "

2
device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64
View file

@ -2,7 +2,7 @@
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm64 6.1.0-rc7 Kernel Configuration # Linux/arm64 6.1.0-rc7 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r4) 12.2.1 20220924" CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r5) 12.2.1 20220924"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=120201 CONFIG_GCC_VERSION=120201
CONFIG_CLANG_VERSION=0 CONFIG_CLANG_VERSION=0

2
device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7
View file

@ -2,7 +2,7 @@
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm 6.1.0-rc7 Kernel Configuration # Linux/arm 6.1.0-rc7 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 12.2.1_git20220924-r4) 12.2.1 20220924" CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 12.2.1_git20220924-r5) 12.2.1 20220924"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=120201 CONFIG_GCC_VERSION=120201
CONFIG_CLANG_VERSION=0 CONFIG_CLANG_VERSION=0