mirror of
https://github.com/LiBwrt-op/openwrt-6.x.git
synced 2025-12-16 16:57:28 +00:00
Merge Official Source
Signed-off-by: ZiMing Mo <msylgj@immortalwrt.org>
This commit is contained in:
ZiMing Mo
commit
372a017011
@ -619,7 +619,7 @@ endchoice
|
||||
|
||||
config KERNEL_ARM64_CONTPTE
|
||||
bool "Compile the kernel with Contiguous PTE mappings for user memory"
|
||||
depends on KERNEL_ARM64
|
||||
depends on aarch64
|
||||
depends on KERNEL_TRANSPARENT_HUGEPAGE
|
||||
depends on !LINUX_6_6
|
||||
default y
|
||||
|
||||
@ -8,12 +8,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=linux-firmware
|
||||
PKG_VERSION:=20251111
|
||||
PKG_VERSION:=20251125
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_HASH:=ab57a1526595090bb4874c35335e2252288dcbea546eff491654b2313438a47d
|
||||
PKG_HASH:=eb807a01c52882ac97ef5b678d4a246b209e6165ac1287d62a5f93a09ee93cd2
|
||||
|
||||
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libselinux
|
||||
PKG_VERSION:=3.8.1
|
||||
PKG_VERSION:=3.9
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/$(PKG_VERSION)
|
||||
PKG_HASH:=ec2d2789f931152d21c1db1eb4bc202ce4eccede34d9be9e360e3b45243cee2c
|
||||
PKG_HASH:=e7ee2c01dba64a0c35c9d7c9c0e06209d8186b325b0638a0d83f915cc3c101e8
|
||||
|
||||
PKG_LICENSE:=libselinux-1.0
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
@ -1,75 +0,0 @@
|
||||
From 5c3fcbd931b7f9752b5ce29cec3b6813991d61c0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczleweli@nabijaczleweli.xyz>
|
||||
Date: Thu, 20 Mar 2025 16:55:17 +0100
|
||||
Subject: [PATCH] Inject matchpathcon_filespec_add64() if
|
||||
!defined(__INO_T_MATCHES_INO64_T) instead of using __BITS_PER_LONG < 64 as
|
||||
proxy
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The __INO_T_MATCHES_INO64_T is defined
|
||||
if ino_t would be the same size as ino64_t
|
||||
if -D_FILE_OFFSET_BITS=64 were not defined.
|
||||
|
||||
This is /exactly/ what
|
||||
/* ABI backwards-compatible shim for non-LFS 32-bit systems */
|
||||
#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 && __BITS_PER_LONG < 64
|
||||
is trying to get at, but currently fails because x32/RV32 are "LFS"
|
||||
with 32-bit longs and 64-bit time_ts natively.
|
||||
|
||||
Thus, the
|
||||
static_assert(sizeof(unsigned long) == sizeof(__ino_t), "inode size mismatch");
|
||||
assertion fails (__ino_t is the "kernel ino_t" type,
|
||||
which generally corresponds to the kernel's ulong, which is u64 on x32).
|
||||
|
||||
glibc headers allow us to check the condition we care about directly.
|
||||
|
||||
Fixes: commit 9395cc0322 ("Always build for LFS mode on 32-bit archs.")
|
||||
Closes: #463
|
||||
Closes: Debian#1098481
|
||||
Signed-off-by: наб <nabijaczleweli@nabijaczleweli.xyz>
|
||||
Cc: Alba Mendez <me@alba.sh>
|
||||
Acked-by: James Carter <jwcart2@gmail.com>
|
||||
---
|
||||
include/selinux/selinux.h | 2 +-
|
||||
src/matchpathcon.c | 8 ++++++--
|
||||
2 files changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
--- a/include/selinux/selinux.h
|
||||
+++ b/include/selinux/selinux.h
|
||||
@@ -537,7 +537,7 @@ extern int matchpathcon_index(const char
|
||||
with the same inode (e.g. due to multiple hard links). If so, then
|
||||
use the latter of the two specifications based on their order in the
|
||||
file contexts configuration. Return the used specification index. */
|
||||
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 && __BITS_PER_LONG < 64
|
||||
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 && !defined(__INO_T_MATCHES_INO64_T)
|
||||
#define matchpathcon_filespec_add matchpathcon_filespec_add64
|
||||
#endif
|
||||
extern int matchpathcon_filespec_add(ino_t ino, int specind, const char *file);
|
||||
--- a/src/matchpathcon.c
|
||||
+++ b/src/matchpathcon.c
|
||||
@@ -261,7 +261,7 @@ int matchpathcon_filespec_add(ino_t ino,
|
||||
return -1;
|
||||
}
|
||||
|
||||
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 && __BITS_PER_LONG < 64
|
||||
+#if (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) && !defined(__INO_T_MATCHES_INO64_T)
|
||||
/* alias defined in the public header but we undefine it here */
|
||||
#undef matchpathcon_filespec_add
|
||||
|
||||
@@ -280,9 +280,13 @@ int matchpathcon_filespec_add(unsigned l
|
||||
{
|
||||
return matchpathcon_filespec_add64(ino, specind, file);
|
||||
}
|
||||
+#elif (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) || defined(__INO_T_MATCHES_INO64_T)
|
||||
+
|
||||
+static_assert(sizeof(uint64_t) == sizeof(ino_t), "inode size mismatch");
|
||||
+
|
||||
#else
|
||||
|
||||
-static_assert(sizeof(unsigned long) == sizeof(ino_t), "inode size mismatch");
|
||||
+static_assert(sizeof(uint32_t) == sizeof(ino_t), "inode size mismatch");
|
||||
|
||||
#endif
|
||||
|
||||
@ -1,158 +0,0 @@
|
||||
From patchwork Sat Apr 26 15:13:57 2025
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 8bit
|
||||
X-Patchwork-Submitter: Alyssa Ross <hi@alyssa.is>
|
||||
X-Patchwork-Id: 14067708
|
||||
Received: from fhigh-b7-smtp.messagingengine.com
|
||||
(fhigh-b7-smtp.messagingengine.com [202.12.124.158])
|
||||
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
|
||||
(No client certificate requested)
|
||||
by smtp.subspace.kernel.org (Postfix) with ESMTPS id 33F71A31
|
||||
for <selinux@vger.kernel.org>; Sat, 26 Apr 2025 15:15:54 +0000 (UTC)
|
||||
Authentication-Results: smtp.subspace.kernel.org;
|
||||
arc=none smtp.client-ip=202.12.124.158
|
||||
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
|
||||
t=1745680559; cv=none;
|
||||
b=Pq1cEfDSDJ0fkBMv6QVCQI8UUqLnYGihmK9UeuLduv0kwLuwpvD6WOxM/TSLMRIywjgR8gd2c853qlcX7DDrHAnyddbljBfUmT7TClUWm+eES9n51wREeMkgpjwZEvuOCVXfWzMNnBJNztbAVx+10PtGeluwXSHG1odCX/NjgQI=
|
||||
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
|
||||
s=arc-20240116; t=1745680559; c=relaxed/simple;
|
||||
bh=pJMDSW9OyFQkw5+mTn23RDQ0ioaHtTd6I+0qBZvmwP4=;
|
||||
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type;
|
||||
b=VY6d+x8V7xkeJ2uh/a5R7YERgjbG4KKpSH0LL+z/D5ebQqDoQYyVyuQAhANwGBuFP81lunmLcZc2wMIkhtTTIzrFJyVwMsKJnPT2vLUBI6Um9ow9ZAwrpU3bMzV3KjnKaTZMGAZ87fAstIzB5jJaPIF2rhU9NiBHjpTAn5ofXYo=
|
||||
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
|
||||
dmarc=none (p=none dis=none) header.from=alyssa.is;
|
||||
spf=pass smtp.mailfrom=alyssa.is;
|
||||
dkim=pass (2048-bit key) header.d=alyssa.is header.i=@alyssa.is
|
||||
header.b=sVvu9/jU;
|
||||
dkim=pass (2048-bit key) header.d=messagingengine.com
|
||||
header.i=@messagingengine.com
|
||||
header.b=Oe16/9D7; arc=none smtp.client-ip=202.12.124.158
|
||||
Authentication-Results: smtp.subspace.kernel.org;
|
||||
dmarc=none (p=none dis=none) header.from=alyssa.is
|
||||
Authentication-Results: smtp.subspace.kernel.org;
|
||||
spf=pass smtp.mailfrom=alyssa.is
|
||||
Authentication-Results: smtp.subspace.kernel.org;
|
||||
dkim=pass (2048-bit key) header.d=alyssa.is header.i=@alyssa.is
|
||||
header.b="sVvu9/jU";
|
||||
dkim=pass (2048-bit key) header.d=messagingengine.com
|
||||
header.i=@messagingengine.com header.b="Oe16/9D7"
|
||||
Received: from phl-compute-02.internal (phl-compute-02.phl.internal
|
||||
[10.202.2.42])
|
||||
by mailfhigh.stl.internal (Postfix) with ESMTP id ED5B02540205;
|
||||
Sat, 26 Apr 2025 11:15:53 -0400 (EDT)
|
||||
Received: from phl-mailfrontend-02 ([10.202.2.163])
|
||||
by phl-compute-02.internal (MEProxy); Sat, 26 Apr 2025 11:15:54 -0400
|
||||
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc
|
||||
:cc:content-transfer-encoding:content-type:content-type:date
|
||||
:date:from:from:in-reply-to:message-id:mime-version:reply-to
|
||||
:subject:subject:to:to; s=fm2; t=1745680553; x=1745766953; bh=rW
|
||||
uOFM2rzwdFfxgV2+EnHMjhI780MNjU9R+9eFq8dvg=; b=sVvu9/jU9LemQ6RFQI
|
||||
DtSKhUj2+dsfX0he1Ov1CofCaTdNc+esuMzB8dGEgQnIY6sfB7FHrPAuDDQaCTEb
|
||||
Qb0MW0FQNzuTyNO94P8IXvcPEN7XWpcH1UKkWyohOsX/DRQYs8YP/oyrZB7gy8h+
|
||||
LPbqcyracjmJriUdC8aesJ3FKHmyQiXY8ka08VFQyiVrksvEwfM7tleNW0mQVrVG
|
||||
VpHxDigwP71zXB3gHl0ogks6VloaqH0f3EKo1nT19xuzWGcMPKtBrs3jHJFSgy8X
|
||||
9+jY/qFSAq6OvItkKnwXf08McbuKVuPnYZrrsVgx3NZFcaCo+tklqEvWJUJCPxnz
|
||||
BfXw==
|
||||
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
|
||||
messagingengine.com; h=cc:cc:content-transfer-encoding
|
||||
:content-type:content-type:date:date:feedback-id:feedback-id
|
||||
:from:from:in-reply-to:message-id:mime-version:reply-to:subject
|
||||
:subject:to:to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=
|
||||
fm3; t=1745680553; x=1745766953; bh=rWuOFM2rzwdFfxgV2+EnHMjhI780
|
||||
MNjU9R+9eFq8dvg=; b=Oe16/9D7/7d67cUSyAPHmj+rekiHlxK3tMneIFP/5hTG
|
||||
MlpQlyg5QLsVRSUxfGn/OjX1vvg5VrpRpeGYaxJyNU/oPy2jFBSwUmB1lR7/W4Lz
|
||||
M4NYele9Nufotym19hpJylkMpOi266PNIqG1lT4OfK7d+ZEJSoZygq/tnsgE08ql
|
||||
2AFSMbYbTQC6YM8sk+9tk2ypCjb7W1NouIshFQ33J7LNniu67KJDcPtH3VqfkG6q
|
||||
RYkGhc21tTZl/e9EQ6m8Z4c6yWk8kDqozOBI0lOh6GrhAaDEj1+/2v0DF7OAcqwG
|
||||
KhqGnYTkH2Qj8pshvMSctbOWckywkqxX+fREJWN9Gw==
|
||||
X-ME-Sender: <xms:qfgMaJE8VrzV69Ds-EsG48fFI5UaqMSYVinivYKJ4ML0p0Qd_UDicQ>
|
||||
<xme:qfgMaOUrxIYKlodKAw1Xg57c4yZT6ZBIwMc_Jxf2xmsgkKIf3HHUkRikoeiSWWlvF
|
||||
2vLA9kyO05KG8VGKQ>
|
||||
X-ME-Received:
|
||||
<xmr:qfgMaLLGcqX6upspD9CqnV5CuWYyVoe7dkYN-ilEpG08JiM1cEurmgjMsOzEj6QU>
|
||||
X-ME-Proxy-Cause:
|
||||
gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvheehheefucetufdoteggodetrf
|
||||
dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv
|
||||
pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih
|
||||
gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofggtgfgsehtkeertdertdej
|
||||
necuhfhrohhmpeetlhihshhsrgcutfhoshhsuceohhhisegrlhihshhsrgdrihhsqeenuc
|
||||
ggtffrrghtthgvrhhnpeevieegveegkeefieekffeuuddtuefhtdfhgfdvfeeugfffvdeh
|
||||
tdekveeufedtjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehluhhsthgvrh
|
||||
fuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhephhhisegrlhihshhsrgdrihhs
|
||||
pdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehmvg
|
||||
esrghlsggrrdhshhdprhgtphhtthhopehjfigtrghrthdvsehgmhgrihhlrdgtohhmpdhr
|
||||
tghpthhtohepnhgrsghijhgrtgiilhgvfigvlhhisehnrggsihhjrggtiihlvgifvghlih
|
||||
drgiihiidprhgtphhtthhopehsvghlihhnuhigsehvghgvrhdrkhgvrhhnvghlrdhorhhg
|
||||
X-ME-Proxy: <xmx:qfgMaPHxXV0etoyRJkgcYPe-u5lQsB6cvXgoxiMYU6OgH09vt9RJJA>
|
||||
<xmx:qfgMaPVNzmzj8XlzIEYZvhuhOvK7xCeHS_NHGryjhfN_xqE-mmaCSA>
|
||||
<xmx:qfgMaKPro4JgdEKJ3LZ0e1t9yipSpo-CqpVMe_Xg9n4ohUp0rhtvEw>
|
||||
<xmx:qfgMaO1XYewudNFS8g1h7cOv-f3pWJTH7mubtCGLTV6fyEUJfKdQJQ>
|
||||
<xmx:qfgMaPC5FGWuV_5Cknij04lvxGSeCOFW3wA8lCW6fChGDgA8HzuEfqKb>
|
||||
Feedback-ID: i12284293:Fastmail
|
||||
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat,
|
||||
26 Apr 2025 11:15:52 -0400 (EDT)
|
||||
Received: by mbp.qyliss.net (Postfix, from userid 1000)
|
||||
id E07A2117F8; Sat, 26 Apr 2025 17:15:46 +0200 (CEST)
|
||||
From: Alyssa Ross <hi@alyssa.is>
|
||||
To: selinux@vger.kernel.org
|
||||
Cc: =?utf-8?b?0L3QsNCx?= <nabijaczleweli@nabijaczleweli.xyz>,
|
||||
James Carter <jwcart2@gmail.com>, Alba Mendez <me@alba.sh>
|
||||
Subject: [PATCH v2] libselinux: be careful with non-portable LFS macro
|
||||
Date: Sat, 26 Apr 2025 17:13:57 +0200
|
||||
Message-ID: <20250426151356.7116-2-hi@alyssa.is>
|
||||
X-Mailer: git-send-email 2.47.2
|
||||
Precedence: bulk
|
||||
X-Mailing-List: selinux@vger.kernel.org
|
||||
List-Id: <selinux.vger.kernel.org>
|
||||
List-Subscribe: <mailto:selinux+subscribe@vger.kernel.org>
|
||||
List-Unsubscribe: <mailto:selinux+unsubscribe@vger.kernel.org>
|
||||
MIME-Version: 1.0
|
||||
|
||||
musl does not provide the obsolete LFS64 APIs (like ino64_t) — ino_t
|
||||
has always been 64-bit on all platforms there. That means there's
|
||||
also no __INO_T_MATCHES_INO64_T macro, meaning the check would pass
|
||||
and reach the static asserts for the shim, which would fail due to
|
||||
there being no ino64_t to check the size of. Fix this by only
|
||||
assuming the absense of __INO_T_MATCHES_INO64_t is meaningful when
|
||||
another non-portable Glibc macro, __INO64_T_TYPE, is defined. If both
|
||||
are missing, that probably just means there is no ino64_t.
|
||||
|
||||
Fixes: 5c3fcbd9 ("Inject matchpathcon_filespec_add64() if !defined(__INO_T_MATCHES_INO64_T) instead of using __BITS_PER_LONG < 64 as proxy")
|
||||
Signed-off-by: Alyssa Ross <hi@alyssa.is>
|
||||
Acked-by: James Carter <jwcart2@gmail.com>
|
||||
---
|
||||
v2: Made the same change to the condition in the header, as suggested
|
||||
in a GitHub comment. The omission didn't seem to break anything,
|
||||
but it makes sense to change it there too.
|
||||
https://github.com/NixOS/nixpkgs/pull/391728#issuecomment-2832282846
|
||||
|
||||
include/selinux/selinux.h | 2 +-
|
||||
src/matchpathcon.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
|
||||
base-commit: 2647cc0fdca326b81ee3c08718cbe19b7866b53a
|
||||
|
||||
--- a/include/selinux/selinux.h
|
||||
+++ b/include/selinux/selinux.h
|
||||
@@ -537,7 +537,7 @@ extern int matchpathcon_index(const char
|
||||
with the same inode (e.g. due to multiple hard links). If so, then
|
||||
use the latter of the two specifications based on their order in the
|
||||
file contexts configuration. Return the used specification index. */
|
||||
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 && !defined(__INO_T_MATCHES_INO64_T)
|
||||
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 && defined(__INO64_T_TYPE) && !defined(__INO_T_MATCHES_INO64_T)
|
||||
#define matchpathcon_filespec_add matchpathcon_filespec_add64
|
||||
#endif
|
||||
extern int matchpathcon_filespec_add(ino_t ino, int specind, const char *file);
|
||||
--- a/src/matchpathcon.c
|
||||
+++ b/src/matchpathcon.c
|
||||
@@ -261,7 +261,7 @@ int matchpathcon_filespec_add(ino_t ino,
|
||||
return -1;
|
||||
}
|
||||
|
||||
-#if (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) && !defined(__INO_T_MATCHES_INO64_T)
|
||||
+#if (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) && defined(__INO64_T_TYPE) && !defined(__INO_T_MATCHES_INO64_T)
|
||||
/* alias defined in the public header but we undefine it here */
|
||||
#undef matchpathcon_filespec_add
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libsemanage
|
||||
PKG_VERSION:=3.8.1
|
||||
PKG_VERSION:=3.9
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/$(PKG_VERSION)
|
||||
PKG_HASH:=7b39127b219cc70bfd935a4af6b0f2ba83d4b35c916f253c7e942c23ab490f07
|
||||
PKG_HASH:=ec05850aef48bfb8e02135a7f4f3f7edba3670f63d5e67f2708d4bd80b9a4634
|
||||
PKG_MAINTAINER:=Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
PKG_LICENSE:=LGPL-2.1
|
||||
PKG_LICENSE_FILES:=COPYING
|
||||
|
||||
@ -1,157 +0,0 @@
|
||||
From a339594da6f027aed5d66ec6798a3d732df235e4 Mon Sep 17 00:00:00 2001
|
||||
From: Rahul Sandhu <nvraxn@gmail.com>
|
||||
Date: Fri, 21 Feb 2025 09:39:10 +0000
|
||||
Subject: [PATCH] libsemanage: create semanage_basename to ensure posix
|
||||
compliance
|
||||
|
||||
Passing a const char * to basename(3) is a glibc-specific extension, so
|
||||
create our own basename implementation. As it's a trivial 2 LOC, always
|
||||
use our implementation of basename even if glibc is available to avoid
|
||||
the complications of attaining the non-posix glibc implementation of
|
||||
basename(3) as _GNU_SOURCE needs to be defined, but libgen.h also needs
|
||||
to have not been included.
|
||||
|
||||
Also fix a missing check for selinux_policy_root(3). From the man page:
|
||||
On failure, selinux_policy_root returns NULL.
|
||||
|
||||
As the glibc basename(3) (unlike posix basename(3)) does not support
|
||||
having a nullptr passed to it, only pass the policy_root to basename(3)
|
||||
if it is non-null.
|
||||
|
||||
Signed-off-by: Rahul Sandhu <nvraxn@gmail.com>
|
||||
Acked-by: James Carter <jwcart2@gmail.com>
|
||||
---
|
||||
src/conf-parse.y | 13 ++++++++++---
|
||||
src/direct_api.c | 1 +
|
||||
src/utilities.c | 9 +++++++++
|
||||
src/utilities.h | 13 +++++++++++++
|
||||
tests/test_utilities.c | 26 ++++++++++++++++++++++++++
|
||||
5 files changed, 59 insertions(+), 3 deletions(-)
|
||||
|
||||
--- a/src/conf-parse.y
|
||||
+++ b/src/conf-parse.y
|
||||
@@ -21,6 +21,7 @@
|
||||
%{
|
||||
|
||||
#include "semanage_conf.h"
|
||||
+#include "utilities.h"
|
||||
|
||||
#include <sepol/policydb.h>
|
||||
#include <selinux/selinux.h>
|
||||
@@ -382,7 +383,10 @@ external_opt: PROG_PATH '=' ARG { PAS
|
||||
static int semanage_conf_init(semanage_conf_t * conf)
|
||||
{
|
||||
conf->store_type = SEMANAGE_CON_DIRECT;
|
||||
- conf->store_path = strdup(basename(selinux_policy_root()));
|
||||
+ const char *policy_root = selinux_policy_root();
|
||||
+ if (policy_root != NULL) {
|
||||
+ conf->store_path = strdup(semanage_basename(policy_root));
|
||||
+ }
|
||||
conf->ignoredirs = NULL;
|
||||
conf->store_root_path = strdup("/var/lib/selinux");
|
||||
conf->compiler_directory_path = strdup("/usr/libexec/selinux/hll");
|
||||
@@ -544,8 +548,11 @@ static int parse_module_store(char *arg)
|
||||
free(current_conf->store_path);
|
||||
if (strcmp(arg, "direct") == 0) {
|
||||
current_conf->store_type = SEMANAGE_CON_DIRECT;
|
||||
- current_conf->store_path =
|
||||
- strdup(basename(selinux_policy_root()));
|
||||
+ const char *policy_root = selinux_policy_root();
|
||||
+ if (policy_root != NULL) {
|
||||
+ current_conf->store_path =
|
||||
+ strdup(semanage_basename(policy_root));
|
||||
+ }
|
||||
current_conf->server_port = -1;
|
||||
} else if (*arg == '/') {
|
||||
current_conf->store_type = SEMANAGE_CON_POLSERV_LOCAL;
|
||||
--- a/src/direct_api.c
|
||||
+++ b/src/direct_api.c
|
||||
@@ -26,6 +26,7 @@
|
||||
|
||||
#include <assert.h>
|
||||
#include <fcntl.h>
|
||||
+#include <libgen.h>
|
||||
#include <stdio.h>
|
||||
#include <stdio_ext.h>
|
||||
#include <stdlib.h>
|
||||
--- a/src/utilities.c
|
||||
+++ b/src/utilities.c
|
||||
@@ -349,3 +349,12 @@ int write_full(int fd, const void *buf,
|
||||
|
||||
return 0;
|
||||
}
|
||||
+
|
||||
+#ifdef __GNUC__
|
||||
+__attribute__((nonnull))
|
||||
+#endif
|
||||
+char *semanage_basename(const char *filename)
|
||||
+{
|
||||
+ char *p = strrchr(filename, '/');
|
||||
+ return p ? p + 1 : (char *)filename;
|
||||
+}
|
||||
--- a/src/utilities.h
|
||||
+++ b/src/utilities.h
|
||||
@@ -156,4 +156,17 @@ semanage_list_t *semanage_slurp_file_fil
|
||||
|
||||
int write_full(int fd, const void *buf, size_t len) WARN_UNUSED;
|
||||
|
||||
+/**
|
||||
+ * Portable implementation of the glibc version of basename(3).
|
||||
+ *
|
||||
+ * @param filename path to find basename of
|
||||
+ *
|
||||
+ * @return basename of filename
|
||||
+ */
|
||||
+
|
||||
+#ifdef __GNUC__
|
||||
+__attribute__((nonnull))
|
||||
+#endif
|
||||
+char *semanage_basename(const char *filename);
|
||||
+
|
||||
#endif
|
||||
--- a/tests/test_utilities.c
|
||||
+++ b/tests/test_utilities.c
|
||||
@@ -46,6 +46,7 @@ static void test_semanage_rtrim(void);
|
||||
static void test_semanage_str_replace(void);
|
||||
static void test_semanage_findval(void);
|
||||
static void test_slurp_file_filter(void);
|
||||
+static void test_semanage_basename(void);
|
||||
|
||||
static char fname[] = {
|
||||
'T', 'E', 'S', 'T', '_', 'T', 'E', 'M', 'P', '_', 'X', 'X', 'X', 'X',
|
||||
@@ -117,6 +118,10 @@ int semanage_utilities_add_tests(CU_pSui
|
||||
test_slurp_file_filter)) {
|
||||
goto err;
|
||||
}
|
||||
+ if (NULL == CU_add_test(suite, "semanage_basename",
|
||||
+ test_semanage_basename)) {
|
||||
+ goto err;
|
||||
+ }
|
||||
return 0;
|
||||
err:
|
||||
CU_cleanup_registry();
|
||||
@@ -346,3 +351,24 @@ static void test_slurp_file_filter(void)
|
||||
|
||||
semanage_list_destroy(&data);
|
||||
}
|
||||
+
|
||||
+static void test_semanage_basename(void)
|
||||
+{
|
||||
+ char *basename1 = semanage_basename("/foo/bar");
|
||||
+ CU_ASSERT_STRING_EQUAL(basename1, "bar");
|
||||
+
|
||||
+ char *basename2 = semanage_basename("/foo/bar/");
|
||||
+ CU_ASSERT_STRING_EQUAL(basename2, "");
|
||||
+
|
||||
+ char *basename3 = semanage_basename("/foo.bar");
|
||||
+ CU_ASSERT_STRING_EQUAL(basename3, "foo.bar");
|
||||
+
|
||||
+ char *basename5 = semanage_basename(".");
|
||||
+ CU_ASSERT_STRING_EQUAL(basename5, ".");
|
||||
+
|
||||
+ char *basename6 = semanage_basename("");
|
||||
+ CU_ASSERT_STRING_EQUAL(basename6, "");
|
||||
+
|
||||
+ char *basename7 = semanage_basename("/");
|
||||
+ CU_ASSERT_STRING_EQUAL(basename7, "");
|
||||
+}
|
||||
@ -6,12 +6,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libsepol
|
||||
PKG_VERSION:=3.8.1
|
||||
PKG_VERSION:=3.9
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/$(PKG_VERSION)
|
||||
PKG_HASH:=0e78705305f955abd4c0654d37a5477ee26349ab74db9e2b03a7868897ae1ddf
|
||||
PKG_HASH:=ba630b59e50c5fbf9e9dd45eb3734f373cf78d689d8c10c537114c9bd769fa2e
|
||||
|
||||
PKG_MAINTAINER:=Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
PKG_CPE_ID:=cpe:/a:selinuxproject:libsepol
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=wolfssl
|
||||
PKG_VERSION:=5.8.2
|
||||
PKG_VERSION:=5.8.4
|
||||
PKG_REAL_VERSION:=$(PKG_VERSION)-stable
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_REAL_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://github.com/wolfSSL/wolfssl/archive/v$(PKG_REAL_VERSION)
|
||||
PKG_HASH:=3ef126e3466e2f8f6ebb62b916a7f8fb26c6709dbdf2b63a167759f2fdb53068
|
||||
PKG_HASH:=2b702b7a66b0067bfd284408827b1e59288b357b0dd758d0089c062395f2a522
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_REAL_VERSION)
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- a/wolfssl/wolfcrypt/settings.h
|
||||
+++ b/wolfssl/wolfcrypt/settings.h
|
||||
@@ -3842,7 +3842,7 @@ extern void uITRON4_free(void *p) ;
|
||||
@@ -4048,7 +4048,7 @@ extern void uITRON4_free(void *p) ;
|
||||
|
||||
/* warning for not using harden build options (default with ./configure) */
|
||||
/* do not warn if big integer support is disabled */
|
||||
|
||||
@ -12,11 +12,11 @@ PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcpd.git
|
||||
PKG_MIRROR_HASH:=2b5f21240010d1374f92800c1aa586edf646566fc1b853f35cda93032779aca4
|
||||
PKG_SOURCE_DATE:=2025-11-14
|
||||
PKG_SOURCE_VERSION:=d3dc577d7e843b21ecae0b17de4a6cce36b075db
|
||||
PKG_MIRROR_HASH:=cdf61fc424b23811aaefc7b47fb24aef94013ef1d299e1cbac94cbd029c1e099
|
||||
PKG_SOURCE_DATE:=2025-11-23
|
||||
PKG_SOURCE_VERSION:=650a5df88ebae82d956831c2f87c7c6eedd8c283
|
||||
|
||||
PKG_MAINTAINER:=Hans Dedecker <dedeckeh@gmail.com>
|
||||
PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
|
||||
PKG_LICENSE:=GPL-2.0
|
||||
|
||||
PKG_ASLR_PIE_REGULAR:=1
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=checkpolicy
|
||||
PKG_VERSION:=3.8.1
|
||||
PKG_VERSION:=3.9
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/$(PKG_VERSION)
|
||||
PKG_HASH:=7b477c516e2693d8b6c511386323177f1d7db51c2e04eb6d0de8ca2b36120e5d
|
||||
PKG_HASH:=dd85b0173ca6e96b22ebf472bcbccf04eb10e1aa07add8f1b7e0e9e8e995e027
|
||||
PKG_INSTALL:=1
|
||||
PKG_BUILD_DEPENDS:=libselinux
|
||||
HOST_BUILD_DEPENDS:=libselinux/host
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=policycoreutils
|
||||
PKG_VERSION:=3.8.1
|
||||
PKG_RELEASE:=2
|
||||
PKG_VERSION:=3.9
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/$(PKG_VERSION)
|
||||
PKG_HASH:=eef23196b501d141cb95f5fc52ef1a7289f459b65e4415ea0fe9aeedc5d80ef2
|
||||
PKG_HASH:=44a294139876cf4c7969cb6a75d1932cb42543d74a7661760ded44a20bf7ebe8
|
||||
PKG_INSTALL:=1
|
||||
HOST_BUILD_DEPENDS:=libsemanage/host gettext-full/host
|
||||
PKG_BUILD_DEPENDS:=BUSYBOX_CONFIG_PAM:libpam gettext-full/host
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
From 2ffd51650fb1886d6466f652d2e626b1bb6a5ce3 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Marko <robimarko@gmail.com>
|
||||
Date: Thu, 1 May 2025 21:15:11 +0200
|
||||
Subject: [PATCH] policycoreutils: run_init: define _GNU_SOURCE
|
||||
|
||||
Trying to compile run_init with musl will fail with:
|
||||
run_init.c: In function 'authenticate_via_shadow_passwd':
|
||||
run_init.c:206:40: error: implicit declaration of function 'getpass' [-Wimplicit-function-declaration]
|
||||
206 | if (!(unencrypted_password_s = getpass(PASSWORD_PROMPT))) {
|
||||
|
||||
This is because getpass in musl is guarded only for _GNU_SOURCE, so
|
||||
define _GNU_SOURCE for run_init.
|
||||
|
||||
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
---
|
||||
run_init/run_init.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
--- a/run_init/run_init.c
|
||||
+++ b/run_init/run_init.c
|
||||
@@ -37,6 +37,8 @@
|
||||
*
|
||||
*************************************************************************/
|
||||
|
||||
+#define _GNU_SOURCE
|
||||
+
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h> /* for malloc(), realloc(), free() */
|
||||
#include <pwd.h> /* for getpwuid() */
|
||||
@ -6,12 +6,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=secilc
|
||||
PKG_VERSION:=3.8.1
|
||||
PKG_VERSION:=3.9
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/$(PKG_VERSION)
|
||||
PKG_HASH:=3db2974dd9a3c8403ada0392deff267b0398a74b4e7a0b051af76457270848d1
|
||||
PKG_HASH:=c53fb7218ac158c05f28de186e48404857eb191bd4f9415802f85449fdf6da7f
|
||||
HOST_BUILD_DEPENDS:=libsepol/host
|
||||
|
||||
PKG_MAINTAINER:=Dominick Grift <dominick.grift@defensec.nl>
|
||||
|
||||
@ -63,7 +63,6 @@ CONFIG_ARM64=y
|
||||
CONFIG_ARM64_4K_PAGES=y
|
||||
CONFIG_ARM64_AMU_EXTN=y
|
||||
CONFIG_ARM64_BTI=y
|
||||
CONFIG_ARM64_CONTPTE=y
|
||||
CONFIG_ARM64_CRYPTO=y
|
||||
CONFIG_ARM64_E0PD=y
|
||||
CONFIG_ARM64_ERRATUM_1024718=y
|
||||
|
||||
@ -188,7 +188,7 @@
|
||||
req-mask = <0xf>;
|
||||
reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
|
||||
|
||||
wifi@0,0 {
|
||||
wifi@e,0 {
|
||||
compatible = "pci168c,002d";
|
||||
reg = <0x7000 0 0 0 0>;
|
||||
nvmem-cells = <&cal_ath9k_cal_985>;
|
||||
|
||||
@ -214,7 +214,7 @@
|
||||
req-mask = <0xf>;
|
||||
reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
|
||||
|
||||
wifi@0,0 {
|
||||
wifi@e,0 {
|
||||
compatible = "pci168c,002d";
|
||||
reg = <0x7000 0 0 0 0>;
|
||||
nvmem-cells = <&cal_ath9k_cal_985>;
|
||||
|
||||
@ -179,7 +179,7 @@
|
||||
|
||||
reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
|
||||
|
||||
wifi@7000 {
|
||||
wifi@e,0 {
|
||||
reg = <0x7000 0 0 0 0>;
|
||||
qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
|
||||
};
|
||||
|
||||
@ -135,7 +135,7 @@
|
||||
|
||||
reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
|
||||
|
||||
wifi@168c,0029 {
|
||||
wifi@e,0 {
|
||||
compatible = "pci168c,0029";
|
||||
reg = <0x7000 0 0 0 0>;
|
||||
qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
|
||||
|
||||
@ -48,72 +48,72 @@
|
||||
compatible = "gpio-leds";
|
||||
power: power {
|
||||
label = "power";
|
||||
gpios = <&gpios 21 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 21 GPIO_ACTIVE_HIGH>;
|
||||
default-state = "keep";
|
||||
};
|
||||
power2: power2 {
|
||||
label = "power2";
|
||||
gpios = <&gpios 20 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 20 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
lan1 {
|
||||
label = "lan1";
|
||||
gpios = <&gpios 19 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 19 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
lan2 {
|
||||
label = "lan2";
|
||||
gpios = <&gpios 18 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 18 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
lan3 {
|
||||
label = "lan3";
|
||||
gpios = <&gpios 17 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 17 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
lan4 {
|
||||
label = "lan4";
|
||||
gpios = <&gpios 16 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 16 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
wifi: wifi {
|
||||
label = "wifi";
|
||||
gpios = <&gpios 15 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 15 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
adsl: adsl {
|
||||
label = "adsl";
|
||||
gpios = <&gpios 14 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 14 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
internet: internet {
|
||||
label = "internet";
|
||||
gpios = <&gpios 13 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 13 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
internet2 {
|
||||
label = "internet2";
|
||||
gpios = <&gpios 12 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 12 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
voip {
|
||||
label = "voip";
|
||||
gpios = <&gpios 11 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 11 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
phone {
|
||||
label = "phone";
|
||||
gpios = <&gpios 10 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 10 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
phone2 {
|
||||
label = "phone2";
|
||||
gpios = <&gpios 9 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 9 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
led_usb: usb {
|
||||
label = "usb";
|
||||
gpios = <&gpios 8 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 8 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
led_usb2: usb2 {
|
||||
label = "usb2";
|
||||
gpios = <&gpios 7 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 7 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
usb3 {
|
||||
label = "usb3";
|
||||
gpios = <&gpios 6 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 6 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
unlabeled {
|
||||
label = "unlabeled";
|
||||
gpios = <&gpios 5 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 5 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -147,7 +147,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
&gpios {
|
||||
&stp0 {
|
||||
status = "okay";
|
||||
lantiq,groups = <0x7>;
|
||||
};
|
||||
|
||||
@ -171,7 +171,7 @@
|
||||
lantiq,external-clock;
|
||||
reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
|
||||
|
||||
wifi@1814,3592 {
|
||||
wifi@e,0 {
|
||||
compatible = "pci1814,3592";
|
||||
reg = <0x7000 0 0 0 0>;
|
||||
ralink,mtd-eeprom = <&boardconfig 0x410>;
|
||||
|
||||
@ -184,7 +184,7 @@
|
||||
reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
|
||||
req-mask = <0x3>;
|
||||
|
||||
wifi@1814,3592 {
|
||||
wifi@e,0 {
|
||||
compatible = "pci1814,3592";
|
||||
reg = <0x7000 0 0 0 0>;
|
||||
ralink,mtd-eeprom = <&boardconfig 0x410>;
|
||||
|
||||
@ -229,7 +229,7 @@
|
||||
lantiq,external-clock;
|
||||
req-mask = <0xf>;
|
||||
|
||||
wifi@168c,0029 {
|
||||
wifi@e,0 {
|
||||
compatible = "pci168c,0029";
|
||||
reg = <0x7000 0 0 0 0>;
|
||||
qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
|
||||
|
||||
@ -210,7 +210,7 @@
|
||||
reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
|
||||
req-mask = <0xf>;
|
||||
|
||||
wifi@0,0 {
|
||||
wifi@e,0 {
|
||||
compatible = "pci0,0";
|
||||
reg = <0x7000 0 0 0 0>;
|
||||
ralink,mtd-eeprom = <&boardconfig 0x410>;
|
||||
|
||||
@ -153,7 +153,7 @@
|
||||
|
||||
interrupt-map = <0x7000 0 0 1 &icu0 135 1>;
|
||||
|
||||
wifi@0,0 {
|
||||
wifi@e,0 {
|
||||
compatible = "pci0,0";
|
||||
reg = <0x7000 0 0 0 0>;
|
||||
nvmem-cells = <&eeprom_boardconfig_410>;
|
||||
|
||||
@ -231,7 +231,7 @@
|
||||
interrupt-map = <0x7000 0 0 1 &icu0 135>;
|
||||
req-mask = <0x3>;
|
||||
|
||||
wifi0: wifi@1814,0601 {
|
||||
wifi0: wifi@e,0 {
|
||||
compatible = "pci1814,0601";
|
||||
reg = <0x7000 0 0 0 0>;
|
||||
nvmem-cells = <&macaddr_boardconfig_16>;
|
||||
|
||||
@ -251,7 +251,7 @@
|
||||
reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
|
||||
req-mask = <0x3>;
|
||||
|
||||
wifi@1814,3592 {
|
||||
wifi@e,0 {
|
||||
compatible = "pci1814,3592";
|
||||
reg = <0x7000 0 0 0 0>;
|
||||
ralink,mtd-eeprom = <&boardconfig 0x410>;
|
||||
|
||||
@ -172,7 +172,7 @@
|
||||
|
||||
reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
|
||||
|
||||
wifi@168c,0029 {
|
||||
wifi@e,0 {
|
||||
compatible = "pci168c,0029";
|
||||
reg = <0x7000 0 0 0 0>;
|
||||
qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
|
||||
|
||||
@ -52,55 +52,55 @@
|
||||
|
||||
upgrading-orange {
|
||||
label = "orange:upgrading";
|
||||
gpios = <&gpios 5 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 5 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
|
||||
phone-orange {
|
||||
label = "orange:phone";
|
||||
gpios = <&gpios 6 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 6 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
phone-blue {
|
||||
label = "blue:phone";
|
||||
gpios = <&gpios 7 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 7 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
|
||||
wireless-orange {
|
||||
label = "orange:wireless";
|
||||
gpios = <&gpios 8 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 8 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
wireless_blue: wireless-blue {
|
||||
label = "blue:wireless";
|
||||
gpios = <&gpios 9 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 9 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
|
||||
broadband-red {
|
||||
label = "red:broadband";
|
||||
gpios = <&gpios 10 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 10 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
broadband-orange {
|
||||
label = "orange:broadband";
|
||||
gpios = <&gpios 11 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 11 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
broadband_blue: broadband-blue {
|
||||
label = "blue:broadband";
|
||||
gpios = <&gpios 12 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 12 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
|
||||
power_red: power-red {
|
||||
function = LED_FUNCTION_POWER;
|
||||
color = <LED_COLOR_ID_RED>;
|
||||
gpios = <&gpios 13 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 13 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
power_orange: power-orange {
|
||||
function = LED_FUNCTION_POWER;
|
||||
color = <LED_COLOR_ID_ORANGE>;
|
||||
gpios = <&gpios 14 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 14 GPIO_ACTIVE_HIGH>;
|
||||
default-state = "keep";
|
||||
};
|
||||
power_blue: power-blue {
|
||||
function = LED_FUNCTION_POWER;
|
||||
color = <LED_COLOR_ID_BLUE>;
|
||||
gpios = <&gpios 15 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&stp0 15 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -130,7 +130,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
&gpios {
|
||||
&stp0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
@ -221,7 +221,7 @@
|
||||
|
||||
reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
|
||||
|
||||
wifi@168c,0027 {
|
||||
wifi@e,0 {
|
||||
compatible = "pci168c,0027";
|
||||
reg = <0x7000 0 0 0 0>;
|
||||
qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
|
||||
|
||||
@ -49,7 +49,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
&gpios {
|
||||
&stp0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
||||
@ -235,7 +235,7 @@
|
||||
status = "okay";
|
||||
reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
|
||||
|
||||
wifi@1814,3592 {
|
||||
wifi@e,0 {
|
||||
compatible = "pci1814,3592";
|
||||
reg = <0x7000 0 0 0 0>;
|
||||
ralink,mtd-eeprom = <&boardconfig 0x410>;
|
||||
|
||||
@ -255,7 +255,7 @@
|
||||
status = "okay";
|
||||
reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
|
||||
|
||||
wifi@1814,3091 {
|
||||
wifi@e,0 {
|
||||
compatible = "pci1814,3091";
|
||||
reg = <0x7000 0 0 0 0>;
|
||||
ralink,mtd-eeprom = <&boardconfig 0x410>;
|
||||
|
||||
@ -161,7 +161,7 @@
|
||||
#address-cells = <3>;
|
||||
device_type = "pci";
|
||||
|
||||
wifi@168c,002e {
|
||||
wifi@0,0 {
|
||||
compatible = "pci168c,002e";
|
||||
reg = <0 0 0 0 0>;
|
||||
qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:01:00.0.bin */
|
||||
|
||||
@ -307,7 +307,7 @@
|
||||
status = "okay";
|
||||
reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
|
||||
|
||||
wifi@0,0 {
|
||||
wifi@e,0 {
|
||||
compatible = "pci168c,002d";
|
||||
reg = <0x7000 0 0 0 0>;
|
||||
nvmem-cells = <&cal_caldata_1000>, <&macaddr_caldata_110c 2>;
|
||||
|
||||
@ -58,7 +58,7 @@
|
||||
};
|
||||
|
||||
&pci0 {
|
||||
wifi@1814,3062 {
|
||||
wifi@e,0 {
|
||||
compatible = "pci1814,3062";
|
||||
reg = <0x7000 0 0 0 0>;
|
||||
ralink,eeprom = "RT3062.eeprom";
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
};
|
||||
|
||||
&pci0 {
|
||||
wifi@1814,3092 {
|
||||
wifi@e,0 {
|
||||
compatible = "pci1814,3092";
|
||||
reg = <0x7000 0 0 0 0>;
|
||||
ralink,eeprom = "RT3092.eeprom";
|
||||
|
||||
@ -25,7 +25,6 @@ CONFIG_ARCH_WANTS_NO_INSTR=y
|
||||
CONFIG_ARCH_WANTS_THP_SWAP=y
|
||||
CONFIG_ARM64=y
|
||||
CONFIG_ARM64_4K_PAGES=y
|
||||
CONFIG_ARM64_CONTPTE=y
|
||||
CONFIG_ARM64_ERRATUM_1165522=y
|
||||
CONFIG_ARM64_ERRATUM_1286807=y
|
||||
CONFIG_ARM64_ERRATUM_2051678=y
|
||||
|
||||
@ -11,8 +11,7 @@ CPU_TYPE:=e5500
|
||||
FEATURES:=boot-part ext4 fpu legacy-sdcard powerpc64 ramdisk rootfs-part rtc squashfs
|
||||
SUBTARGETS:=generic
|
||||
|
||||
KERNEL_PATCHVER:=6.6
|
||||
KERNEL_TESTING_PATCHVER:=6.12
|
||||
KERNEL_PATCHVER:=6.12
|
||||
|
||||
KERNELNAME:=zImage
|
||||
|
||||
|
||||
@ -1,421 +0,0 @@
|
||||
CONFIG_64BIT=y
|
||||
CONFIG_ALTIVEC=y
|
||||
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
|
||||
CONFIG_ARCH_DMA_DEFAULT_COHERENT=y
|
||||
CONFIG_ARCH_FORCE_MAX_ORDER=12
|
||||
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
|
||||
CONFIG_ARCH_KEEP_MEMBLOCK=y
|
||||
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
|
||||
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
|
||||
CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
|
||||
CONFIG_ARCH_MMAP_RND_BITS=18
|
||||
CONFIG_ARCH_MMAP_RND_BITS_MAX=32
|
||||
CONFIG_ARCH_MMAP_RND_BITS_MIN=18
|
||||
CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17
|
||||
CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
|
||||
CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
|
||||
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
|
||||
CONFIG_ARCH_SPARSEMEM_ENABLE=y
|
||||
CONFIG_ARCH_STACKWALK=y
|
||||
CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y
|
||||
CONFIG_ASN1=y
|
||||
CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
|
||||
CONFIG_AUDIT_ARCH=y
|
||||
CONFIG_BLK_DEV_LOOP=y
|
||||
CONFIG_BLK_DEV_SD=y
|
||||
CONFIG_BLK_MQ_PCI=y
|
||||
CONFIG_BLK_PM=y
|
||||
CONFIG_BOOKE=y
|
||||
CONFIG_BOOKE_OR_40x=y
|
||||
CONFIG_BOOKE_WDT=y
|
||||
CONFIG_BUFFER_HEAD=y
|
||||
CONFIG_CLK_QORIQ=y
|
||||
CONFIG_CLONE_BACKWARDS=y
|
||||
CONFIG_CLZ_TAB=y
|
||||
CONFIG_COMMON_CLK=y
|
||||
CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
|
||||
# CONFIG_COMPAT_32BIT_TIME is not set
|
||||
CONFIG_CONSOLE_TRANSLATIONS=y
|
||||
CONFIG_CONTEXT_TRACKING=y
|
||||
CONFIG_CONTEXT_TRACKING_IDLE=y
|
||||
CONFIG_CORENET_GENERIC=y
|
||||
CONFIG_CPU_BIG_ENDIAN=y
|
||||
CONFIG_CPU_FREQ=y
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
|
||||
CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
|
||||
CONFIG_CPU_FREQ_GOV_ATTR_SET=y
|
||||
CONFIG_CPU_FREQ_GOV_COMMON=y
|
||||
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
|
||||
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
|
||||
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
|
||||
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
|
||||
CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
|
||||
CONFIG_CPU_FREQ_GOV_USERSPACE=y
|
||||
# CONFIG_CPU_FREQ_STAT is not set
|
||||
CONFIG_CPU_IDLE=y
|
||||
CONFIG_CPU_IDLE_GOV_TEO=y
|
||||
CONFIG_CPU_ISOLATION=y
|
||||
CONFIG_CPU_MITIGATIONS=y
|
||||
CONFIG_CPU_RMAP=y
|
||||
CONFIG_CRC16=y
|
||||
CONFIG_CRYPTO_AUTHENC=y
|
||||
CONFIG_CRYPTO_CRC32=y
|
||||
CONFIG_CRYPTO_CRC32C=y
|
||||
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
|
||||
CONFIG_CRYPTO_CURVE25519=y
|
||||
CONFIG_CRYPTO_DES=y
|
||||
CONFIG_CRYPTO_DEV_FSL_CAAM=y
|
||||
CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y
|
||||
CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API_DESC=y
|
||||
CONFIG_CRYPTO_DEV_FSL_CAAM_COMMON=y
|
||||
CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y
|
||||
CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=y
|
||||
CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI=y
|
||||
CONFIG_CRYPTO_DEV_FSL_CAAM_JR=y
|
||||
CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=y
|
||||
CONFIG_CRYPTO_DEV_FSL_CAAM_PRNG_API=y
|
||||
CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
|
||||
CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
|
||||
# CONFIG_CRYPTO_DEV_NX is not set
|
||||
CONFIG_CRYPTO_ECB=y
|
||||
CONFIG_CRYPTO_ENGINE=y
|
||||
CONFIG_CRYPTO_HW=y
|
||||
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
|
||||
CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=y
|
||||
CONFIG_CRYPTO_LIB_DES=y
|
||||
CONFIG_CRYPTO_LIB_GF128MUL=y
|
||||
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
|
||||
CONFIG_CRYPTO_LIB_SHA1=y
|
||||
CONFIG_CRYPTO_LIB_UTILS=y
|
||||
# CONFIG_CRYPTO_MD5_PPC is not set
|
||||
CONFIG_CRYPTO_RNG=y
|
||||
CONFIG_CRYPTO_RNG2=y
|
||||
CONFIG_CRYPTO_RSA=y
|
||||
# CONFIG_CRYPTO_SHA1_PPC is not set
|
||||
CONFIG_CRYPTO_XTS=y
|
||||
CONFIG_DATA_SHIFT=12
|
||||
CONFIG_DEBUG_INFO=y
|
||||
CONFIG_DEFAULT_UIMAGE=y
|
||||
CONFIG_DMADEVICES=y
|
||||
CONFIG_DMA_ENGINE=y
|
||||
CONFIG_DMA_OF=y
|
||||
CONFIG_DMA_OPS=y
|
||||
CONFIG_DMA_OPS_BYPASS=y
|
||||
CONFIG_DTC=y
|
||||
CONFIG_DUMMY_CONSOLE=y
|
||||
# CONFIG_E5500_CPU is not set
|
||||
CONFIG_E6500_CPU=y
|
||||
CONFIG_EARLY_PRINTK=y
|
||||
CONFIG_EDAC=y
|
||||
CONFIG_EDAC_ATOMIC_SCRUB=y
|
||||
# CONFIG_EDAC_CPC925 is not set
|
||||
# CONFIG_EDAC_DEBUG is not set
|
||||
CONFIG_EDAC_LEGACY_SYSFS=y
|
||||
CONFIG_EDAC_MPC85XX=y
|
||||
CONFIG_EDAC_SUPPORT=y
|
||||
CONFIG_EPAPR_PARAVIRT=y
|
||||
CONFIG_EXCLUSIVE_SYSTEM_RAM=y
|
||||
CONFIG_EXT4_FS=y
|
||||
CONFIG_F2FS_FS=y
|
||||
CONFIG_FIXED_PHY=y
|
||||
# CONFIG_FSL_BMAN_TEST is not set
|
||||
CONFIG_FSL_CORENET_CF=y
|
||||
CONFIG_FSL_CORENET_RCPM=y
|
||||
CONFIG_FSL_DMA=y
|
||||
CONFIG_FSL_DPAA=y
|
||||
# CONFIG_FSL_DPAA_CHECKING is not set
|
||||
CONFIG_FSL_DPAA_ETH=y
|
||||
CONFIG_FSL_EMB_PERFMON=y
|
||||
CONFIG_FSL_FMAN=y
|
||||
CONFIG_FSL_GUTS=y
|
||||
CONFIG_FSL_IFC=y
|
||||
CONFIG_FSL_LBC=y
|
||||
CONFIG_FSL_MPIC_TIMER_WAKEUP=y
|
||||
CONFIG_FSL_PAMU=y
|
||||
CONFIG_FSL_PCI=y
|
||||
# CONFIG_FSL_QMAN_TEST is not set
|
||||
CONFIG_FSL_SOC=y
|
||||
CONFIG_FSL_SOC_BOOKE=y
|
||||
# CONFIG_FSL_ULI1575 is not set
|
||||
CONFIG_FSL_XGMAC_MDIO=y
|
||||
CONFIG_FS_IOMAP=y
|
||||
CONFIG_FS_MBCACHE=y
|
||||
CONFIG_FTL=y
|
||||
CONFIG_FUNCTION_ALIGNMENT=0
|
||||
CONFIG_FUNCTION_ERROR_INJECTION=y
|
||||
CONFIG_FWNODE_MDIO=y
|
||||
CONFIG_FW_LOADER_PAGED_BUF=y
|
||||
CONFIG_FW_LOADER_SYSFS=y
|
||||
CONFIG_GENERIC_ALLOCATOR=y
|
||||
CONFIG_GENERIC_BUG=y
|
||||
CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
|
||||
CONFIG_GENERIC_CMOS_UPDATE=y
|
||||
CONFIG_GENERIC_CPU_AUTOPROBE=y
|
||||
CONFIG_GENERIC_CPU_VULNERABILITIES=y
|
||||
CONFIG_GENERIC_EARLY_IOREMAP=y
|
||||
CONFIG_GENERIC_GETTIMEOFDAY=y
|
||||
CONFIG_GENERIC_IDLE_POLL_SETUP=y
|
||||
CONFIG_GENERIC_IOREMAP=y
|
||||
CONFIG_GENERIC_IRQ_MIGRATION=y
|
||||
CONFIG_GENERIC_IRQ_SHOW=y
|
||||
CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
|
||||
CONFIG_GENERIC_ISA_DMA=y
|
||||
CONFIG_GENERIC_MSI_IRQ=y
|
||||
CONFIG_GENERIC_PCI_IOMAP=y
|
||||
CONFIG_GENERIC_PHY=y
|
||||
CONFIG_GENERIC_SMP_IDLE_THREAD=y
|
||||
CONFIG_GENERIC_STRNCPY_FROM_USER=y
|
||||
CONFIG_GENERIC_STRNLEN_USER=y
|
||||
CONFIG_GENERIC_TIME_VSYSCALL=y
|
||||
# CONFIG_GEN_RTC is not set
|
||||
# CONFIG_GIANFAR is not set
|
||||
CONFIG_GLOB=y
|
||||
CONFIG_GPIO_CDEV=y
|
||||
CONFIG_GPIO_GENERIC=y
|
||||
CONFIG_GPIO_MPC8XXX=y
|
||||
CONFIG_GRO_CELLS=y
|
||||
# CONFIG_HANGCHECK_TIMER is not set
|
||||
CONFIG_HAS_DMA=y
|
||||
CONFIG_HAS_IOMEM=y
|
||||
CONFIG_HAS_IOPORT=y
|
||||
CONFIG_HAS_IOPORT_MAP=y
|
||||
CONFIG_HWMON=y
|
||||
CONFIG_HW_CONSOLE=y
|
||||
CONFIG_HW_RANDOM=y
|
||||
CONFIG_I2C=y
|
||||
CONFIG_I2C_BOARDINFO=y
|
||||
CONFIG_I2C_MPC=y
|
||||
CONFIG_ILLEGAL_POINTER_VALUE=0x5deadbeef0000000
|
||||
CONFIG_INITRAMFS_SOURCE=""
|
||||
CONFIG_INPUT=y
|
||||
CONFIG_INTERRUPT_SANITIZE_REGISTERS=y
|
||||
# CONFIG_IOMMUFD is not set
|
||||
CONFIG_IOMMU_API=y
|
||||
# CONFIG_IOMMU_DEBUGFS is not set
|
||||
# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
|
||||
CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
|
||||
# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
|
||||
CONFIG_IOMMU_HELPER=y
|
||||
CONFIG_IOMMU_SUPPORT=y
|
||||
CONFIG_IRQCHIP=y
|
||||
CONFIG_IRQ_DOMAIN=y
|
||||
CONFIG_IRQ_DOMAIN_HIERARCHY=y
|
||||
CONFIG_IRQ_FORCED_THREADING=y
|
||||
CONFIG_IRQ_WORK=y
|
||||
CONFIG_ISA_DMA_API=y
|
||||
CONFIG_JBD2=y
|
||||
CONFIG_JUMP_LABEL=y
|
||||
CONFIG_JUMP_LABEL_FEATURE_CHECKS=y
|
||||
# CONFIG_JUMP_LABEL_FEATURE_CHECK_DEBUG is not set
|
||||
CONFIG_KALLSYMS=y
|
||||
CONFIG_KERNEL_GZIP=y
|
||||
CONFIG_KERNEL_START=0xc000000000000000
|
||||
CONFIG_KPROBES=y
|
||||
CONFIG_KRETPROBES=y
|
||||
CONFIG_LIBFDT=y
|
||||
CONFIG_LOCK_DEBUGGING_SUPPORT=y
|
||||
CONFIG_LOCK_SPIN_ON_OWNER=y
|
||||
CONFIG_MAGIC_SYSRQ=y
|
||||
CONFIG_MARVELL_PHY=y
|
||||
CONFIG_MATH_EMULATION=y
|
||||
# CONFIG_MATH_EMULATION_FULL is not set
|
||||
CONFIG_MATH_EMULATION_HW_UNIMPLEMENTED=y
|
||||
CONFIG_MDIO_BUS=y
|
||||
CONFIG_MDIO_DEVICE=y
|
||||
CONFIG_MDIO_DEVRES=y
|
||||
CONFIG_MEMORY=y
|
||||
CONFIG_MIGRATION=y
|
||||
CONFIG_MMC=y
|
||||
CONFIG_MMC_BLOCK=y
|
||||
CONFIG_MMC_DEBUG=y
|
||||
CONFIG_MMC_SDHCI=y
|
||||
CONFIG_MMC_SDHCI_IO_ACCESSORS=y
|
||||
CONFIG_MMC_SDHCI_OF_ESDHC=y
|
||||
# CONFIG_MMC_SDHCI_PCI is not set
|
||||
CONFIG_MMC_SDHCI_PLTFM=y
|
||||
# CONFIG_MMC_WBSD is not set
|
||||
CONFIG_MMIOWB=y
|
||||
CONFIG_MMU_GATHER_MERGE_VMAS=y
|
||||
CONFIG_MMU_GATHER_PAGE_SIZE=y
|
||||
CONFIG_MMU_LAZY_TLB_REFCOUNT=y
|
||||
CONFIG_MODULES_USE_ELF_RELA=y
|
||||
CONFIG_MPIC=y
|
||||
CONFIG_MPIC_MSGR=y
|
||||
CONFIG_MPIC_TIMER=y
|
||||
CONFIG_MPILIB=y
|
||||
CONFIG_MTD_NAND_CORE=y
|
||||
CONFIG_MTD_NAND_ECC=y
|
||||
CONFIG_MTD_NAND_ECC_SW_HAMMING=y
|
||||
CONFIG_MTD_NAND_FSL_IFC=y
|
||||
CONFIG_MTD_PHYSMAP=y
|
||||
CONFIG_MTD_RAW_NAND=y
|
||||
CONFIG_MUTEX_SPIN_ON_OWNER=y
|
||||
CONFIG_NEED_DMA_MAP_STATE=y
|
||||
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
|
||||
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
|
||||
CONFIG_NEED_SG_DMA_LENGTH=y
|
||||
CONFIG_NET_DEVLINK=y
|
||||
CONFIG_NET_EGRESS=y
|
||||
CONFIG_NET_FLOW_LIMIT=y
|
||||
CONFIG_NET_INGRESS=y
|
||||
CONFIG_NET_PTP_CLASSIFY=y
|
||||
CONFIG_NET_SELFTESTS=y
|
||||
CONFIG_NET_XGRESS=y
|
||||
CONFIG_NLS=y
|
||||
CONFIG_NONSTATIC_KERNEL=y
|
||||
CONFIG_NO_HZ_COMMON=y
|
||||
CONFIG_NO_HZ_IDLE=y
|
||||
CONFIG_NR_CPUS=24
|
||||
CONFIG_NR_IRQS=512
|
||||
CONFIG_NVMEM=y
|
||||
CONFIG_NVMEM_LAYOUTS=y
|
||||
CONFIG_OF=y
|
||||
CONFIG_OF_ADDRESS=y
|
||||
CONFIG_OF_EARLY_FLATTREE=y
|
||||
CONFIG_OF_FLATTREE=y
|
||||
CONFIG_OF_GPIO=y
|
||||
CONFIG_OF_IOMMU=y
|
||||
CONFIG_OF_IRQ=y
|
||||
CONFIG_OF_KOBJ=y
|
||||
CONFIG_OF_MDIO=y
|
||||
CONFIG_OLD_SIGSUSPEND=y
|
||||
CONFIG_OPTPROBES=y
|
||||
CONFIG_PACKING=y
|
||||
CONFIG_PADATA=y
|
||||
CONFIG_PAGE_OFFSET=0xc000000000000000
|
||||
CONFIG_PAGE_POOL=y
|
||||
CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
|
||||
CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
|
||||
CONFIG_PCI=y
|
||||
CONFIG_PCI_DOMAINS=y
|
||||
CONFIG_PCI_MSI=y
|
||||
CONFIG_PCI_MSI_ARCH_FALLBACKS=y
|
||||
CONFIG_PCS_LYNX=y
|
||||
CONFIG_PGTABLE_LEVELS=4
|
||||
CONFIG_PHYLIB=y
|
||||
CONFIG_PHYLIB_LEDS=y
|
||||
CONFIG_PHYLINK=y
|
||||
CONFIG_PHYSICAL_START=0x00000000
|
||||
CONFIG_PHYS_64BIT=y
|
||||
CONFIG_PHYS_ADDR_T_64BIT=y
|
||||
CONFIG_PM=y
|
||||
# CONFIG_PMU_SYSFS is not set
|
||||
CONFIG_PM_CLK=y
|
||||
CONFIG_PPC=y
|
||||
CONFIG_PPC64=y
|
||||
CONFIG_PPC64_BIG_ENDIAN_ELF_ABI_V2=y
|
||||
CONFIG_PPC64_ELF_ABI_V2=y
|
||||
CONFIG_PPC_ADV_DEBUG_DACS=2
|
||||
CONFIG_PPC_ADV_DEBUG_DVCS=0
|
||||
CONFIG_PPC_ADV_DEBUG_IACS=2
|
||||
CONFIG_PPC_ADV_DEBUG_REGS=y
|
||||
CONFIG_PPC_BARRIER_NOSPEC=y
|
||||
CONFIG_PPC_BOOK3E_64=y
|
||||
# CONFIG_PPC_BOOK3S_64 is not set
|
||||
CONFIG_PPC_DAWR=y
|
||||
CONFIG_PPC_DOORBELL=y
|
||||
CONFIG_PPC_E500=y
|
||||
CONFIG_PPC_E500MC=y
|
||||
# CONFIG_PPC_EARLY_DEBUG is not set
|
||||
CONFIG_PPC_EPAPR_HV_PIC=y
|
||||
CONFIG_PPC_FPU=y
|
||||
CONFIG_PPC_FPU_REGS=y
|
||||
CONFIG_PPC_HAS_LBARX_LHARX=y
|
||||
CONFIG_PPC_INDIRECT_PCI=y
|
||||
# CONFIG_PPC_IRQ_SOFT_MASK_DEBUG is not set
|
||||
CONFIG_PPC_KUAP=y
|
||||
# CONFIG_PPC_KUAP_DEBUG is not set
|
||||
CONFIG_PPC_KUEP=y
|
||||
CONFIG_PPC_MMU_NOHASH=y
|
||||
CONFIG_PPC_MSI_BITMAP=y
|
||||
CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
|
||||
CONFIG_PPC_PAGE_SHIFT=12
|
||||
# CONFIG_PPC_QEMU_E500 is not set
|
||||
CONFIG_PPC_QUEUED_SPINLOCKS=y
|
||||
CONFIG_PPC_SMP_MUXED_IPI=y
|
||||
CONFIG_PPC_UDBG_16550=y
|
||||
CONFIG_PPC_WERROR=y
|
||||
CONFIG_PPS=y
|
||||
CONFIG_PREEMPT_NONE_BUILD=y
|
||||
CONFIG_PTE_64BIT=y
|
||||
CONFIG_PTP_1588_CLOCK=y
|
||||
CONFIG_PTP_1588_CLOCK_OPTIONAL=y
|
||||
CONFIG_PTP_1588_CLOCK_QORIQ=y
|
||||
CONFIG_QORIQ_CPUFREQ=y
|
||||
CONFIG_QORIQ_THERMAL=y
|
||||
CONFIG_QUEUED_RWLOCKS=y
|
||||
CONFIG_RANDSTRUCT_NONE=y
|
||||
CONFIG_RAS=y
|
||||
CONFIG_RATIONAL=y
|
||||
# CONFIG_RAVE_SP_CORE is not set
|
||||
CONFIG_REGMAP=y
|
||||
CONFIG_REGMAP_MMIO=y
|
||||
CONFIG_RELOCATABLE=y
|
||||
# CONFIG_RELOCATABLE_TEST is not set
|
||||
CONFIG_RFS_ACCEL=y
|
||||
CONFIG_RPS=y
|
||||
CONFIG_RWSEM_SPIN_ON_OWNER=y
|
||||
# CONFIG_SCOM_DEBUGFS is not set
|
||||
CONFIG_SCSI=y
|
||||
CONFIG_SCSI_COMMON=y
|
||||
CONFIG_SERIAL_8250_EXTENDED=y
|
||||
CONFIG_SERIAL_8250_FSL=y
|
||||
CONFIG_SERIAL_8250_NR_UARTS=4
|
||||
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
|
||||
CONFIG_SERIAL_8250_SHARE_IRQ=y
|
||||
CONFIG_SERIAL_DEV_BUS=y
|
||||
CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
|
||||
CONFIG_SERIAL_FSL_LINFLEXUART=y
|
||||
CONFIG_SERIAL_FSL_LINFLEXUART_CONSOLE=y
|
||||
CONFIG_SERIAL_FSL_LPUART=y
|
||||
CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
|
||||
CONFIG_SERIAL_MCTRL_GPIO=y
|
||||
CONFIG_SG_POOL=y
|
||||
CONFIG_SMP=y
|
||||
CONFIG_SMT_NUM_THREADS_DYNAMIC=y
|
||||
CONFIG_SOCK_RX_QUEUE_MAPPING=y
|
||||
CONFIG_SOC_BUS=y
|
||||
CONFIG_SOFTIRQ_ON_OWN_STACK=y
|
||||
CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
|
||||
CONFIG_SPARSE_IRQ=y
|
||||
CONFIG_SPI=y
|
||||
CONFIG_SPI_FSL_ESPI=y
|
||||
CONFIG_SPI_MASTER=y
|
||||
CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
|
||||
CONFIG_SWIOTLB=y
|
||||
CONFIG_SWPHY=y
|
||||
CONFIG_SYSCTL_EXCEPTION_TRACE=y
|
||||
CONFIG_TARGET_CPU="e6500"
|
||||
CONFIG_TARGET_CPU_BOOL=y
|
||||
CONFIG_THERMAL=y
|
||||
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
|
||||
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
|
||||
CONFIG_THERMAL_GOV_STEP_WISE=y
|
||||
CONFIG_THERMAL_OF=y
|
||||
CONFIG_THREAD_INFO_IN_TASK=y
|
||||
CONFIG_THREAD_SHIFT=14
|
||||
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
|
||||
CONFIG_TOOLS_SUPPORT_RELR=y
|
||||
CONFIG_TREE_RCU=y
|
||||
CONFIG_TREE_SRCU=y
|
||||
# CONFIG_UCLAMP_TASK is not set
|
||||
CONFIG_USB=y
|
||||
CONFIG_USB_COMMON=y
|
||||
CONFIG_USB_EHCI_FSL=y
|
||||
CONFIG_USB_EHCI_HCD=y
|
||||
# CONFIG_USB_EHCI_HCD_PLATFORM is not set
|
||||
CONFIG_USB_STORAGE=y
|
||||
CONFIG_USB_SUPPORT=y
|
||||
CONFIG_USB_UAS=y
|
||||
CONFIG_VGA_CONSOLE=y
|
||||
CONFIG_VIRT_CPU_ACCOUNTING=y
|
||||
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
|
||||
CONFIG_VT=y
|
||||
CONFIG_VT_CONSOLE=y
|
||||
# CONFIG_VT_HW_CONSOLE_BINDING is not set
|
||||
CONFIG_WATCHDOG_CORE=y
|
||||
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
|
||||
CONFIG_XPS=y
|
||||
CONFIG_ZLIB_DEFLATE=y
|
||||
@ -24,7 +24,6 @@ CONFIG_ARCH_WANTS_THP_SWAP=y
|
||||
CONFIG_ARC_EMAC_CORE=y
|
||||
CONFIG_ARM64=y
|
||||
CONFIG_ARM64_4K_PAGES=y
|
||||
CONFIG_ARM64_CONTPTE=y
|
||||
CONFIG_ARM64_ERRATUM_1024718=y
|
||||
CONFIG_ARM64_ERRATUM_1165522=y
|
||||
CONFIG_ARM64_ERRATUM_1286807=y
|
||||
|
||||
@ -50,16 +50,20 @@
|
||||
#define UBI_VERSION 1
|
||||
--- a/ubifs-utils/common/compiler_attributes.h
|
||||
+++ b/ubifs-utils/common/compiler_attributes.h
|
||||
@@ -1,6 +1,8 @@
|
||||
@@ -1,6 +1,12 @@
|
||||
#ifndef __COMPILER_ATTRIBUTES_H__
|
||||
#define __COMPILER_ATTRIBUTES_H__
|
||||
|
||||
+#if HAVE_EXECINFO_H
|
||||
+#include <execinfo.h>
|
||||
+#else
|
||||
+#include "libmissing.h"
|
||||
+#endif
|
||||
+
|
||||
#if __has_attribute(__fallthrough__)
|
||||
#define fallthrough __attribute__((__fallthrough__))
|
||||
#else
|
||||
@@ -11,6 +13,7 @@
|
||||
@@ -11,6 +17,7 @@
|
||||
#define __unused __attribute__((__unused__))
|
||||
#define __const __attribute__((__const__))
|
||||
#define __must_check __attribute__((__warn_unused_result__))
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=ninja
|
||||
PKG_VERSION:=1.13.1
|
||||
PKG_VERSION:=1.13.2
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/ninja-build/ninja
|
||||
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
|
||||
PKG_MIRROR_HASH:=6e8b53c51243fbd1243736b8ebdc90e942c7ba91bea57bbae650ea2de534a7de
|
||||
PKG_MIRROR_HASH:=592d95e3529d65bddd65a6f6ee831a762e3d7959d4ef64cd5f7e97c1becd2020
|
||||
|
||||
include $(INCLUDE_DIR)/host-build.mk
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user