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

device/testing/linux-oneplus-billie2: fix build (MR 3870)

Browse source 
[ci:skip-build]: already built successfully in CI
This commit is contained in:
Luca Weiss 2023-02-15 22:17:37 +01:00 committed by Oliver Smith
parent 78dffc2dbe
commit 7df5a66b17
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 89 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
device/testing/linux-oneplus-billie2/0008-Revert-selinux-Relocate-ss_initialized-and-selinux_e.patch Normal file
View file

@ -0,0 +1,82 @@
From ce0249eb837abad6d8829d5f964a3338be8aca67 Mon Sep 17 00:00:00 2001
From: Nick Desaulniers <ndesaulniers@google.com>
Date: Tue, 10 Mar 2020 15:36:45 -0700
Subject: [PATCH] Revert "selinux: Relocate ss_initialized and
selinux_enforcing to separate 4k"
This reverts commit 50240fa8416f5fd183cb147fd3c66aeaeb74a1f8.
That out of tree patch causes the resulting kernel image to be too
large, causing ld.lld to error; since .bss is specified twice.
Fixes the observed error:
ld.lld: error: output file too large: 18446743524330100280 bytes
when using LLD without LTO enabled.
Bug: 151154720
Reported-by: Matthias Maennich <maennich@google.com>
Debugged-by: Fangrui Song <maskray@google.com>
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Change-Id: Iebb8135630132cd4ae49f3d2d1e85bd61cfa6111
---
arch/arm64/kernel/vmlinux.lds.S | 8 --------
include/linux/init.h | 2 --
security/selinux/hooks.c | 2 +-
3 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
index 86a57e2fa9af..05df6fffedea 100644
--- a/arch/arm64/kernel/vmlinux.lds.S
+++ b/arch/arm64/kernel/vmlinux.lds.S
@@ -76,10 +76,6 @@ jiffies = jiffies_64;
#define TRAMP_TEXT
#endif
-#define RTIC_BSS \
- . = ALIGN(PAGE_SIZE); \
- KEEP(*(.bss.rtic)); \
- . = ALIGN(PAGE_SIZE); \
/*
* The size of the PE/COFF section that covers the kernel image, which
* runs from stext to _edata, must be a round multiple of the PE/COFF
@@ -260,10 +256,6 @@ SECTIONS
STABS_DEBUG
HEAD_SYMBOLS
-
- .bss : { /* bss segment */
- RTIC_BSS
- }
}
/*
diff --git a/include/linux/init.h b/include/linux/init.h
index bc719c7da735..586dd187e22f 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -322,8 +322,6 @@ void __init parse_early_options(char *cmdline);
/* Data marked not to be saved by software suspend */
#define __nosavedata __section(.data..nosave)
-#define __rticdata __attribute__((section(".bss.rtic")))
-
#ifdef MODULE
#define __exit_p(x) x
#else
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 305890cab97b..d4e1e63a55d6 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -100,7 +100,7 @@
#include "audit.h"
#include "avc_ss.h"
-struct selinux_state selinux_state __rticdata;
+struct selinux_state selinux_state;
/* SECMARK reference count */
static atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
--
2.39.2

10
device/testing/linux-oneplus-billie2/APKBUILD
View file

@ -7,7 +7,7 @@
pkgname=linux-oneplus-billie2
pkgver=4.19.95
pkgrel=1
pkgrel=2
pkgdesc="OnePlus Nord N100 kernel fork"
arch="aarch64"
_carch="arm64"
@ -31,6 +31,7 @@ source="
0005-Remove-inline-from-external-functions.patch
0006-Suppress-error-about-static-buffer-overflow.patch
0007-linux4.17-gcc10-extern_YYLOC_global_declaration.patch
0008-Revert-selinux-Relocate-ss_initialized-and-selinux_e.patch
"
builddir="$srcdir/$_repository-$_commit"
_outdir="out"
@ -64,7 +65,8 @@ package() {
modules_install
}
sha512sums="9995a00adeceb30d4a64421e17c85a8349fe674b8a20dc2462cf21af867197f23e62326f0948ca12b52c7cb954388a3767122cea85eb033ff9525e15aa5af9b5 linux-oneplus-billie2-6db26f433f9a8722d0858562804da13f3090bfd7.tar.gz
sha512sums="
9995a00adeceb30d4a64421e17c85a8349fe674b8a20dc2462cf21af867197f23e62326f0948ca12b52c7cb954388a3767122cea85eb033ff9525e15aa5af9b5 linux-oneplus-billie2-6db26f433f9a8722d0858562804da13f3090bfd7.tar.gz
53d5c7e98bcf0621f15e249393a610f685c9c9b20086dd1d463ce3d6c85df9bb7bed229ba65b80f0b28951ec174981613a48fad0c9d07228b0ae861eac8b98f7 config-oneplus-billie2.aarch64
c6739758f857f3da23702e005b1ed11e30fa28981a4307fa8d5d7419931400c419c3bd0c2dcfb2c0aff8972e5a19125be5074597e094195315d8a760e373802a 0001-Fix-function-declarations.patch
39007dd285b502633c7bbf398acd6841a14fb6f5e0a3ad8570d31be77763b537b2352401701d67c53d36ddbf4068ee32446bf3b4ef9aa20c39f052ca491d2be4 0002-Fix-dangerous-relocation.patch
@ -72,4 +74,6 @@ c6739758f857f3da23702e005b1ed11e30fa28981a4307fa8d5d7419931400c419c3bd0c2dcfb2c0
f8727c9c3b6c42ac921bd31fd05dc507e02a53c1c158fe7b67e75db482067b77ab9e2ffe33088c047a699b79642d6be1722d854cdf74cea6db5b46f586315bd0 0004-Fix-reading-after-array-end.patch
aba7ae12986a2df81c6993f369390c6b3f5586fa70ab747e03d59aaf08cb79482a44eab723aed4469e98cadea0f70912f4e67caaf67cc279e1dc85e485b93a0f 0005-Remove-inline-from-external-functions.patch
3835f7e4fca12aaba82fe21cc9632f0e569a8c4405231d137aea4f2640190d919e1a44612082decfbaaa41faa3c6a3ff0442086afb81d59c984a5697fdb9cac9 0006-Suppress-error-about-static-buffer-overflow.patch
27827877040007fc1c4c719f7e2e19e5c272d44972415cfc53feba0313d87e4074f8204bdb13cbc5fe21ea61bf595314b68f10c081e7b7bac3c888b60f008acf 0007-linux4.17-gcc10-extern_YYLOC_global_declaration.patch"
27827877040007fc1c4c719f7e2e19e5c272d44972415cfc53feba0313d87e4074f8204bdb13cbc5fe21ea61bf595314b68f10c081e7b7bac3c888b60f008acf 0007-linux4.17-gcc10-extern_YYLOC_global_declaration.patch
16459200092a2fa68054a758ad8fb175c86e6cdaa49e81c0c91568082cd0348526d43b9dfe0faac8b21465240f44253683f9c475c6f7350d7ef74149aa9c1dba 0008-Revert-selinux-Relocate-ss_initialized-and-selinux_e.patch
"