Skip to content

Commit

Permalink
add kernel 5.10 support and sync with upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
coolsnowwolf committed Jun 14, 2021
1 parent 7883a5d commit 7a50383
Show file tree
Hide file tree
Showing 6,093 changed files with 354,884 additions and 425,667 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@ TAGS*~
git-src
.git-credentials
/*.log
.project
.cproject
.ccache
7 changes: 3 additions & 4 deletions BSDmakefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Copyright (C) 2006 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
# SPDX-License-Identifier: GPL-2.0-only
#
# Copyright (C) 2006 OpenWrt.org

world ${.TARGETS}:
@gmake $@
12 changes: 12 additions & 0 deletions COPYING
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
OpenWrt is provided under:

SPDX-License-Identifier: GPL-2.0-only

Being under the terms of the GNU General Public License version 2 only,
according with:

LICENSES/GPL-2.0

In addition, other licenses may also apply.

All contributions to OpenWrt are subject to this COPYING file.
6 changes: 2 additions & 4 deletions Config.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# Copyright (C) 2006-2013 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
# SPDX-License-Identifier: GPL-2.0-only
#
# Copyright (C) 2006-2013 OpenWrt.org

mainmenu "OpenWrt Configuration"

Expand Down
340 changes: 0 additions & 340 deletions LICENSE

This file was deleted.

14 changes: 9 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
# Makefile for OpenWrt
# SPDX-License-Identifier: GPL-2.0-only
#
# Copyright (C) 2007 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#

TOPDIR:=${CURDIR}
LC_ALL:=C
Expand Down Expand Up @@ -62,6 +58,11 @@ dirclean: clean
rm -rf $(TMP_DIR)
$(MAKE) -C $(TOPDIR)/scripts/config clean

cacheclean:
ifneq ($(CONFIG_CCACHE),)
$(STAGING_DIR_HOST)/bin/ccache -C
endif

ifndef DUMP_TARGET_DB
$(BUILD_DIR)/.prepared: Makefile
@mkdir -p $$(dirname $@)
Expand Down Expand Up @@ -119,6 +120,9 @@ world: prepare $(target/stamp-compile) $(package/stamp-compile) $(package/stamp-
$(_SINGLE)$(SUBMAKE) -r package/index
$(_SINGLE)$(SUBMAKE) -r json_overview_image_info
$(_SINGLE)$(SUBMAKE) -r checksum
ifneq ($(CONFIG_CCACHE),)
$(STAGING_DIR_HOST)/bin/ccache -s
endif

.PHONY: clean dirclean prereq prepare world package/symlinks package/symlinks-install package/symlinks-clean

Expand Down
88 changes: 65 additions & 23 deletions config/Config-build.in
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#
# Copyright (C) 2006-2013 OpenWrt.org
# Copyright (C) 2016 LEDE Project
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#

menu "Global build settings"

Expand Down Expand Up @@ -56,13 +54,12 @@ menu "Global build settings"
If the target supports a newer kernel version than the default,
you can use this config option to enable it


config DISPLAY_SUPPORT
bool "Show packages that require graphics support (local or remote)"
default n

config BUILD_PATENTED
default n
default y
bool "Compile with support for patented functionality"
help
When this option is disabled, software which provides patented functionality
Expand All @@ -89,19 +86,20 @@ menu "Global build settings"
This removes all ipkg/opkg status data files from the target directory
before building the root filesystem.

config IPK_FILES_CHECKSUMS
bool
prompt "Record files checksums in package metadata"
default n
help
This makes file checksums part of package metadata. It increases size
but provides you with pkg_check command to check for flash coruptions.

config INCLUDE_CONFIG
bool "Include build configuration in firmware" if DEVEL
default n
help
If enabled, buildinfo files will be stored in /etc/build.* of firmware.
If enabled, config.seed will be stored in /etc/build.config of firmware.

config REPRODUCIBLE_DEBUG_INFO
bool "Make debug information reproducible"
default BUILDBOT
help
This strips the local build path out of debug information. This has the
advantage of making it reproducible, but the disadvantage of making local
debugging using ./scripts/remote-gdb harder, since the debug data will
no longer point to the full path on the build host.

config COLLECT_KERNEL_DEBUG
bool
Expand Down Expand Up @@ -173,6 +171,14 @@ menu "Global build settings"
help
Specifies arguments passed to the strip command when stripping binaries.

config SSTRIP_ARGS
string
prompt "Sstrip arguments"
depends on USE_SSTRIP
default "-z"
help
Specifies arguments passed to the sstrip command when stripping binaries.

config STRIP_KERNEL_EXPORTS
bool "Strip unnecessary exports from the kernel image"
help
Expand All @@ -198,10 +204,6 @@ menu "Global build settings"
config USE_UCLIBCXX
bool "uClibc++"

config USE_LIBCXX
bool "libc++"
depends on !USE_UCLIBC

config USE_LIBSTDCXX
bool "libstdc++"
endchoice
Expand Down Expand Up @@ -256,10 +258,8 @@ menu "Global build settings"
bool "None"
config PKG_CC_STACKPROTECTOR_REGULAR
bool "Regular"
depends on KERNEL_CC_STACKPROTECTOR_REGULAR
config PKG_CC_STACKPROTECTOR_STRONG
bool "Strong"
depends on KERNEL_CC_STACKPROTECTOR_STRONG
endchoice

choice
Expand All @@ -275,11 +275,11 @@ menu "Global build settings"
bool "Strong"
endchoice

config KERNEL_STACKPROTECTOR
config KERNEL_STACKPROTECTOR
bool
default KERNEL_CC_STACKPROTECTOR_REGULAR || KERNEL_CC_STACKPROTECTOR_STRONG

config KERNEL_STACKPROTECTOR_STRONG
config KERNEL_STACKPROTECTOR_STRONG
bool
default KERNEL_CC_STACKPROTECTOR_STRONG

Expand Down Expand Up @@ -321,4 +321,46 @@ menu "Global build settings"
bool "Full"
endchoice

config TARGET_ROOTFS_SECURITY_LABELS
bool
select KERNEL_SQUASHFS_XATTR
select KERNEL_EXT4_FS_SECURITY
select KERNEL_F2FS_FS_SECURITY
select KERNEL_UBIFS_FS_SECURITY
select KERNEL_JFFS2_FS_SECURITY

config SELINUX
bool "Enable SELinux"
select KERNEL_SECURITY_SELINUX
select TARGET_ROOTFS_SECURITY_LABELS
select PACKAGE_procd-selinux
select PACKAGE_busybox-selinux
help
This option enables SELinux kernel features, applies security labels
in squashfs rootfs and selects the selinux-variants of busybox and procd.

Selecting this option results in about 0.5MiB of additional flash space
usage accounting for increased kernel and rootfs size.

choice
prompt "default SELinux type"
depends on TARGET_ROOTFS_SECURITY_LABELS
default SELINUXTYPE_dssp
help
Select SELinux policy to be installed and used for applying rootfs labels.

config SELINUXTYPE_targeted
bool "targeted"
select PACKAGE_refpolicy
help
SELinux Reference Policy (refpolicy)

config SELINUXTYPE_dssp
bool "dssp"
select PACKAGE_selinux-policy
help
Defensec SELinux Security Policy -- OpenWrt edition

endchoice

endmenu
27 changes: 15 additions & 12 deletions config/Config-devel.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# Copyright (C) 2006-2013 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
# SPDX-License-Identifier: GPL-2.0-only
#
# Copyright (C) 2006-2013 OpenWrt.org

menuconfig DEVEL
bool "Advanced configuration options (for developers)"
Expand Down Expand Up @@ -65,10 +63,17 @@ menuconfig DEVEL

config CCACHE
bool "Use ccache" if DEVEL
default n
default y
help
Compiler cache; see https://ccache.samba.org/

config CCACHE_DIR
string "Set ccache directory" if CCACHE
default ""
help
Store ccache in this directory.
If not set, uses './.ccache'

config EXTERNAL_KERNEL_TREE
string "Use external kernel tree" if DEVEL
default ""
Expand Down Expand Up @@ -100,18 +105,16 @@ menuconfig DEVEL
It can be a git hash or a branch name.
If unused, the clone's repository HEAD will be checked-out.

config KERNEL_GIT_MIRROR_HASH
string "Enter hash of Git kernel tree source checkout tarball" if DEVEL
depends on (KERNEL_GIT_CLONE_URI != "")
default ""

config BUILD_LOG
bool "Enable log files during build process" if DEVEL
help
If enabled, log files will be written to the ./log directory.

config BUILD_LOG_DIR
string "Log folder" if DEVEL
default ""
help
Store build logs in this directory.
If not set, uses './logs'

config SRC_TREE_OVERRIDE
bool "Enable package source tree override" if DEVEL
help
Expand Down
Loading

0 comments on commit 7a50383

Please sign in to comment.