fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source
This commit is contained in:
CN_SZTL 2020-05-16 18:37:55 +08:00
commit 5aa4103f31
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
7 changed files with 192 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
package/system/procd/Makefile
View File

@ -12,9 +12,9 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git
PKG_SOURCE_DATE:=2020-04-25
PKG_SOURCE_VERSION:=17e7ae769a4739e4b41a93f588d52cfd216b8eb2
PKG_MIRROR_HASH:=6763cb63a53222d44be3b1ef238f3b9198d31fd533534abbbdc02202d3ef88e0
PKG_SOURCE_DATE:=2020-05-15
PKG_SOURCE_VERSION:=1ab539b3a8a0070b493112c8263ab380a689db66
PKG_MIRROR_HASH:=fcc9fb1a046dbbea776ab1ca616c885e73d6a0a35c2278b8fddcc7e42d6b8647
CMAKE_INSTALL:=1
PKG_LICENSE:=GPL-2.0
@ -56,6 +56,13 @@ define Package/procd-ujail
TITLE:=OpenWrt process jail helper
endef
define Package/procd-ujail-console
SECTION:=base
CATEGORY:=Base system
DEPENDS:=+procd-ujail +libubus +libubox
TITLE:=OpenWrt process jail console
endef
define Package/procd-seccomp
SECTION:=base
CATEGORY:=Base system
@ -110,6 +117,11 @@ define Package/procd-ujail/install
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ujail $(1)/sbin/
endef
define Package/procd-ujail-console/install
$(INSTALL_DIR) $(1)/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ujail-console $(1)/sbin/
endef
define Package/procd-seccomp/install
$(INSTALL_DIR) $(1)/sbin $(1)/lib
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libpreload-seccomp.so $(1)/lib
@ -120,4 +132,5 @@ endef
$(eval $(call BuildPackage,procd))
$(eval $(call BuildPackage,procd-ujail))
$(eval $(call BuildPackage,procd-ujail-console))
$(eval $(call BuildPackage,procd-seccomp))

1
package/system/procd/files/procd.sh
View File

@ -198,6 +198,7 @@ _procd_add_jail() {
netns) json_add_boolean "netns" "1";;
userns) json_add_boolean "userns" "1";;
cgroupsns) json_add_boolean "cgroupsns" "1";;
console) json_add_boolean "console" "1";;
esac
done
json_add_object "mount"

81
target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360v2.dts Normal file
View File

@ -0,0 +1,81 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/;
#include "vr9_avm_fritz736x.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/mips/lantiq_rcu_gphy.h>
/ {
compatible = "avm,fritz7360v2", "avm,fritz736x", "lantiq,xway", "lantiq,vr9";
model = "AVM FRITZ!Box 7360 V2";
};
&power_green {
label = "fritz7360v2:green:power";
};
&power_red {
label = "fritz7360v2:red:power";
};
&info_green {
label = "fritz7360v2:green:info";
};
&wifi {
label = "fritz7360v2:green:wlan";
};
&info_red {
label = "fritz7360v2:red:info";
};
&dect {
label = "fritz7360v2:green:dect";
};
&state_default {
pcie-rst {
lantiq,pins = "io21";
lantiq,pull = <0>;
lantiq,output = <1>;
};
};
&localbus {
flash@0 {
compatible = "lantiq,nor";
bank-width = <2>;
reg = <0 0x0 0x2000000>;
partitions {
#address-cells = <1>;
#size-cells = <1>;
compatible = "fixed-partitions";
urlader: partition@0 {
label = "urlader";
reg = <0x00000 0x20000>;
read-only;
};
partition@20000 {
label = "firmware";
reg = <0x20000 0x1f60000>;
};
partition@1f80000 {
label = "tffs (1)";
reg = <0x1f80000 0x40000>;
read-only;
};
partition@1fc0000 {
label = "tffs (2)";
reg = <0x1fc0000 0x40000>;
read-only;
};
};
};
};

81
target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360v2.dts Normal file
View File

@ -0,0 +1,81 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/;
#include "vr9_avm_fritz736x.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/mips/lantiq_rcu_gphy.h>
/ {
compatible = "avm,fritz7360v2", "avm,fritz736x", "lantiq,xway", "lantiq,vr9";
model = "AVM FRITZ!Box 7360 V2";
};
&power_green {
label = "fritz7360v2:green:power";
};
&power_red {
label = "fritz7360v2:red:power";
};
&info_green {
label = "fritz7360v2:green:info";
};
&wifi {
label = "fritz7360v2:green:wlan";
};
&info_red {
label = "fritz7360v2:red:info";
};
&dect {
label = "fritz7360v2:green:dect";
};
&state_default {
pcie-rst {
lantiq,pins = "io21";
lantiq,pull = <0>;
lantiq,output = <1>;
};
};
&localbus {
flash@0 {
compatible = "lantiq,nor";
bank-width = <2>;
reg = <0 0x0 0x2000000>;
partitions {
#address-cells = <1>;
#size-cells = <1>;
compatible = "fixed-partitions";
urlader: partition@0 {
label = "urlader";
reg = <0x00000 0x20000>;
read-only;
};
partition@20000 {
label = "firmware";
reg = <0x20000 0x1f60000>;
};
partition@1f80000 {
label = "tffs (1)";
reg = <0x1f80000 0x40000>;
read-only;
};
partition@1fc0000 {
label = "tffs (2)";
reg = <0x1fc0000 0x40000>;
read-only;
};
};
};
};

10
target/linux/lantiq/image/vr9.mk
View File

@ -127,6 +127,16 @@ define Device/avm_fritz7360sl
endef
TARGET_DEVICES += avm_fritz7360sl
define Device/avm_fritz7360v2
$(Device/AVM)
DEVICE_MODEL := FRITZ!Box 7360
DEVICE_VARIANT := v2
IMAGE_SIZE := 32128k
DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2
SUPPORTED_DEVICES += FRITZ7360V2
endef
TARGET_DEVICES += avm_fritz7360v2
define Device/avm_fritz7362sl
$(Device/AVM)
$(Device/NAND)

1
target/linux/lantiq/xrx200/base-files/etc/board.d/02_network
View File

@ -39,6 +39,7 @@ lantiq_setup_interfaces()
avm,fritz3370-rev2-hynix|\
avm,fritz3370-rev2-micron|\
avm,fritz7360sl|\
avm,fritz7360v2|\
avm,fritz7362sl)
ucidef_add_switch "switch0" \
"0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0"

3
target/linux/lantiq/xrx200/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom
View File

@ -16,7 +16,8 @@ case "$FIRMWARE" in
avm,fritz7362sl)
caldata_extract_reverse "urlader" 0x1541 0x440
;;
avm,fritz7360sl)
avm,fritz7360sl|\
avm,fritz7360v2)
caldata_extract "urlader" 0x985 0x1000
;;
avm,fritz7412)