Skip to content
Snippets Groups Projects
Unverified Commit a3ae92f0 authored by Jan Jasper de Kroon's avatar Jan Jasper de Kroon Committed by Oliver Smith
Browse files

device/main/linux-postmarketos-allwinner: upgrade to 6.1-rc6 (MR 3666)

[ci:skip-build]: already built successfully in CI
parent 2f6a7c9f
No related branches found
No related tags found
No related merge requests found
Pipeline #206874 passed
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
......@@ -7,9 +7,9 @@
_flavor=postmarketos-allwinner
_config="config-$_flavor.$CARCH"
pkgname=linux-$_flavor
pkgver=6.0.7_git20221105
pkgrel=1
_tag="orange-pi-6.0-20221105-1830"
pkgver=6.1.0_rc6_git20221126
pkgrel=0
_tag="orange-pi-6.1-20221126-1540"
pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
arch="aarch64 armv7"
url="https://megous.com/git/linux/"
......@@ -48,6 +48,7 @@ source="$pkgname-$_tag.tar.gz::https://github.com/megous/linux/archive/$_tag.tar
0010-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
0011-sunxi-mmc-h6-fix.patch
0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
0013-revert-kbuild-fix-Wimplicit-function-declaration-in-.patch
"
builddir="$srcdir/linux-$_tag"
......@@ -83,9 +84,9 @@ package() {
}
sha512sums="
c36aec0f3e807d9631811b0f77fed75e961e9617a8d3f5e4ae21e87d39c64623dc201626d49a3f292298369ee18d99de66577adcf9347af192a651a3cc2545b3 linux-postmarketos-allwinner-orange-pi-6.0-20221105-1830.tar.gz
46bdcb9307dd7593dabdda9d046f2166a18086d7ea9374ea4d119645bcb91d2b0c32993b4076178265c7f259e1ad62f66b7ad3ea3b265aa5314794c8cac14edd config-postmarketos-allwinner.aarch64
04364e9b741e06efdf171e73bf7733ffb920f369a9e0748b5df2737eb86f7b7c4cfbac6fc72484505379b808e5896beee81599f850c0804fbb0ffecf09ca2a5b config-postmarketos-allwinner.armv7
8586ccd1f3922c848f6ff773e781581c53df8573a1fa018e4b687125f50313499d09504c65b10f74d4b0c30459fb1b6ee8c384a4fae6eae03a4f30cc966da231 linux-postmarketos-allwinner-orange-pi-6.1-20221126-1540.tar.gz
08a5b47ce9c5d1d69ab79af936a55cb7e5f445c6176cfc8da50c28670e238083bace2b5fafc117a46858ddeb3d2a506ba582f68fd0d7767d248d33bd610cbe0d config-postmarketos-allwinner.aarch64
585b5da7d69b2411950ae89681ef85155a6e5c2fd0d2c74f5a767c9ba2b41b25cd3ad6b335f61604b968bd889ba62a95467b79b12a5a029c58d39724cbcd5a5e config-postmarketos-allwinner.armv7
126e0a65e04f22f14eac1281a69000d9d5b107ed8fd1b52f37e812751f55e6c45b0240ceac61c9d95ae7f0543aaf9d96b85a8532baf59283c077b9945e615367 0001-dts-add-dontbeevil-pinephone-devkit.patch
1dc710f5abacdd5698169d5e985efeca8114986c774c3d65e89812d08ceb3db5ebdc6dd64dd76a262c761f3bfc3ffb6bc237fd5236bd1f89c5975d12e42eda04 0002-dts-add-pinetab-dev-old-display-panel.patch
96849f40f6defc4ad7646256814bea5ac353c4e0479fd069365ff27456d63da801541ec616f6db736d60f3134384321a9eeb5bfbd555363bf1259c8de63d17fa 0003-dts-pinetab-add-missing-bma223-ohci1.patch
......@@ -98,4 +99,5 @@ c61d4f86eddecca99df1ea1323f988e575f9c49130b64a0c50d61028ff96e24aaa3131fb3731e62e
902708a5a8dd8a815d3d1793933d307c551e3c10368d1805431b70691ee5d4438b7146c466549f457468e365f94073a35ae3304928af7581e5dc91ba5c8fa682 0010-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
2feeab0a6c3db46e514d45c9708f351c6d7dfb0bf951a5cb6f2dc01b4bdc8d4c46931000758a819a6d7317b16cb1933bb3946e6a78cbf448cc77f57a56c503bf 0011-sunxi-mmc-h6-fix.patch
22af33264090dac027ee054b4345a07f0b2ee077e2ae1620e83960bfeea096169aec710973fdd50531ed4f1db6cfd59b5796cd235316cb3512aee034f741a694 0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
0758e4b03370475cd3c053083926c7ceb1cf5fb4bfcf107920eebdf18724e77ba6d7ed4280049ac88585da4c4e8d721fde380596939210d1dfd54123505ca1ba 0013-revert-kbuild-fix-Wimplicit-function-declaration-in-.patch
"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment