mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
Update OpenWRT and kernles
This commit is contained in:
parent
e75a92d4ae
commit
a2aa52dac8
17 changed files with 5626 additions and 580 deletions
35
root/tools/meson/Makefile
Normal file
35
root/tools/meson/Makefile
Normal file
|
@ -0,0 +1,35 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=meson
|
||||
PKG_VERSION:=0.61.5
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://github.com/mesonbuild/meson/releases/download/$(PKG_VERSION)
|
||||
PKG_HASH:=5e9a0d65c1a51936362b9686d1c5e9e184a6fd245d57e7269750ce50c20f5d9a
|
||||
|
||||
PKG_MAINTAINER:=Andre Heider <a.heider@gmail.com>
|
||||
PKG_LICENSE:=Apache-2.0
|
||||
PKG_LICENSE_FILES:=COPYING
|
||||
|
||||
include $(INCLUDE_DIR)/host-build.mk
|
||||
|
||||
define Host/Configure
|
||||
endef
|
||||
|
||||
define Host/Compile
|
||||
endef
|
||||
|
||||
define Host/Install
|
||||
$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
|
||||
$(HOST_BUILD_DIR)/packaging/create_zipapp.py $(HOST_BUILD_DIR) --outfile $(STAGING_DIR_HOST)/bin/meson.py
|
||||
$(INSTALL_DIR) $(STAGING_DIR_HOST)/lib/meson
|
||||
$(INSTALL_CONF) files/openwrt-cross.txt.in $(STAGING_DIR_HOST)/lib/meson/
|
||||
$(INSTALL_CONF) files/openwrt-native.txt.in $(STAGING_DIR_HOST)/lib/meson/
|
||||
endef
|
||||
|
||||
define Host/Clean
|
||||
$(call Host/Clean/Default)
|
||||
rm -rf $(STAGING_DIR_HOST)/lib/meson
|
||||
endef
|
||||
|
||||
$(eval $(call HostBuild))
|
25
root/tools/meson/files/openwrt-cross.txt.in
Normal file
25
root/tools/meson/files/openwrt-cross.txt.in
Normal file
|
@ -0,0 +1,25 @@
|
|||
[binaries]
|
||||
c = [@CC@]
|
||||
cpp = [@CXX@]
|
||||
ar = '@AR@'
|
||||
strip = '@STRIP@'
|
||||
nm = '@NM@'
|
||||
pkgconfig = '@PKGCONFIG@'
|
||||
cmake = '@CMAKE@'
|
||||
python = '@PYTHON@'
|
||||
|
||||
[built-in options]
|
||||
c_args = [@CFLAGS@]
|
||||
c_link_args = [@LDFLAGS@]
|
||||
cpp_args = [@CXXFLAGS@]
|
||||
cpp_link_args = [@LDFLAGS@]
|
||||
prefix = '/usr'
|
||||
|
||||
[host_machine]
|
||||
system = 'linux'
|
||||
cpu_family = '@ARCH@'
|
||||
cpu = '@CPU@'
|
||||
endian = '@ENDIAN@'
|
||||
|
||||
[properties]
|
||||
needs_exe_wrapper = true
|
15
root/tools/meson/files/openwrt-native.txt.in
Normal file
15
root/tools/meson/files/openwrt-native.txt.in
Normal file
|
@ -0,0 +1,15 @@
|
|||
[binaries]
|
||||
c = [@CC@]
|
||||
cpp = [@CXX@]
|
||||
pkgconfig = '@PKGCONFIG@'
|
||||
cmake = '@CMAKE@'
|
||||
python = '@PYTHON@'
|
||||
|
||||
[built-in options]
|
||||
c_args = [@CFLAGS@]
|
||||
c_link_args = [@LDFLAGS@]
|
||||
cpp_args = [@CXXFLAGS@]
|
||||
cpp_link_args = [@LDFLAGS@]
|
||||
prefix = '@PREFIX@'
|
||||
sbindir = 'bin'
|
||||
libdir = 'lib'
|
21
root/tools/meson/patches/010-wsl2.patch
Normal file
21
root/tools/meson/patches/010-wsl2.patch
Normal file
|
@ -0,0 +1,21 @@
|
|||
From 7d1ef4343ed5b2b7ab51469177a42c32c47f0528 Mon Sep 17 00:00:00 2001
|
||||
From: Rosen Penev <rosenp@gmail.com>
|
||||
Date: Tue, 6 Sep 2022 01:36:17 -0700
|
||||
Subject: [PATCH] minstall: handle extra error for selinuxenabled
|
||||
|
||||
Microsoft's WSL2 uses a Plan 9 filesystem, which returns IOError when file is missing.
|
||||
---
|
||||
mesonbuild/minstall.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/mesonbuild/minstall.py
|
||||
+++ b/mesonbuild/minstall.py
|
||||
@@ -229,7 +229,7 @@ def restore_selinux_contexts() -> None:
|
||||
'''
|
||||
try:
|
||||
subprocess.check_call(['selinuxenabled'])
|
||||
- except (FileNotFoundError, NotADirectoryError, PermissionError, subprocess.CalledProcessError):
|
||||
+ except (FileNotFoundError, NotADirectoryError, OSError, PermissionError, subprocess.CalledProcessError):
|
||||
# If we don't have selinux or selinuxenabled returned 1, failure
|
||||
# is ignored quietly.
|
||||
return
|
39
root/tools/ninja/Makefile
Normal file
39
root/tools/ninja/Makefile
Normal file
|
@ -0,0 +1,39 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=ninja
|
||||
PKG_VERSION:=1.11.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/ninja-build/ninja/tar.gz/v$(PKG_VERSION)?
|
||||
PKG_HASH:=3c6ba2e66400fe3f1ae83deb4b235faf3137ec20bd5b08c29bfc368db143e4c6
|
||||
|
||||
include $(INCLUDE_DIR)/host-build.mk
|
||||
|
||||
CONFIGURE_ARGS:=
|
||||
ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
|
||||
CONFIGURE_ARGS+=--verbose
|
||||
endif
|
||||
|
||||
define Host/Configure
|
||||
endef
|
||||
|
||||
define Host/Compile
|
||||
cd $(HOST_BUILD_DIR) && \
|
||||
CXX="$(HOSTCXX_NOCACHE)" \
|
||||
CXXFLAGS="$(HOST_CXXFLAGS) $(HOST_CPPFLAGS)" \
|
||||
LDFLAGS="$(HOST_LDFLAGS)" \
|
||||
$(STAGING_DIR_HOST)/bin/$(PYTHON) configure.py --bootstrap $(CONFIGURE_ARGS)
|
||||
endef
|
||||
|
||||
define Host/Install
|
||||
$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
|
||||
$(INSTALL_BIN) $(HOST_BUILD_DIR)/ninja $(STAGING_DIR_HOST)/bin/
|
||||
endef
|
||||
|
||||
define Host/Clean
|
||||
$(call Host/Clean/Default)
|
||||
rm -f $(STAGING_DIR_HOST)/bin/ninja
|
||||
endef
|
||||
|
||||
$(eval $(call HostBuild))
|
4290
root/tools/ninja/patches/100-make_jobserver_support.patch
Normal file
4290
root/tools/ninja/patches/100-make_jobserver_support.patch
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue